Merge pull request #48 from zmops/fix-web-bug

fix: fix save dialog close
zmops · Apr 14, 2023 · 3fc26af · 3fc26af
2 parents b762bfb + 310e883
commit 3fc26af
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/web-app/src/pages/shared.ts b/web-app/src/pages/shared.ts
@@ -55,7 +55,7 @@ export const nameRules = [{
 }];
 
 export const reset = (form, formData, defaultForm) => {
-  form.resetFields();
+  form.value?.resetFields();
 
   Object.keys(form).forEach((key) => {
     formData[key] = defaultForm[key];

diff --git a/web-app/src/pages/warn/notify-rules/operate.tsx b/web-app/src/pages/warn/notify-rules/operate.tsx
@@ -120,7 +120,7 @@ export default defineComponent({
               <a-switch v-model={form.filterAll}></a-switch>
             </a-form-item>
             <a-form-item label={t('notificationRules.form.tags')}>
-              <a-select v-model={form.tags} disabled={!props.editId} multiple placeholder={t('notificationRules.form.tags_tip')}>
+              <a-select v-model={form.tags} multiple placeholder={t('notificationRules.form.tags_tip')}>
                 {
                   tagsOptions.value.map((item) => {
                     return (
@@ -131,7 +131,7 @@ export default defineComponent({
               </a-select>
             </a-form-item>
             <a-form-item label={t('notificationRules.form.priorities')}>
-              <a-select v-model={form.priorities} disabled={!props.editId} multiple placeholder={t('notificationRules.form.priorities_placeholder')}>
+              <a-select v-model={form.priorities} multiple placeholder={t('notificationRules.form.priorities_placeholder')}>
                 {
                   WARN_LEVEL.map((item) => {
                     return (

diff --git a/web-app/src/pages/warn/warn-rules/ass-monitoring.tsx b/web-app/src/pages/warn/warn-rules/ass-monitoring.tsx
@@ -107,7 +107,10 @@ export default defineComponent({
 
     };
     watch(() => props.editId, (val) => {
-      getData();
+
+      if (props.visible) {
+        getData();
+      }
     });
 
     return () => (