From c52abd04233837746c90a2b69cf3a64bd4c4a855 Mon Sep 17 00:00:00 2001
From: baiqi <qi.bai@fit2cloud.com>
Date: Tue, 23 Apr 2024 15:54:33 +0800
Subject: [PATCH] =?UTF-8?q?fix(form-create):=20ms-form-create=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E5=BF=85=E5=A1=AB=E5=AD=97=E6=AE=B5=E9=94=99=E8=AF=AF?=
 =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pure/ms-form-create/formCreate.vue        | 58 +++++--------------
 .../menuManagement/components/defectSync.vue  |  5 --
 .../menuManagement/components/relatedCase.vue |  6 --
 .../template/components/detail.vue            |  2 -
 .../template/components/addTemplate.vue       |  9 +--
 .../template/components/viewTemplate.vue      |  3 -
 6 files changed, 18 insertions(+), 65 deletions(-)

diff --git a/frontend/src/components/pure/ms-form-create/formCreate.vue b/frontend/src/components/pure/ms-form-create/formCreate.vue
index ed54aaef81..fc4c0293cd 100644
--- a/frontend/src/components/pure/ms-form-create/formCreate.vue
+++ b/frontend/src/components/pure/ms-form-create/formCreate.vue
@@ -1,6 +1,6 @@
 <template>
   <FormCreate
-    v-model:api="innerApi"
+    v-model:api="formApi"
     :rule="formRules"
     :option="props.option || options"
     @mounted="handleMounted"
@@ -13,8 +13,6 @@
   /**
    * @description 用于原生字段form-create
    */
-  import { ref, watch, watchEffect } from 'vue';
-
   import MsTagsInput from '@/components/pure/ms-tags-input/index.vue';
   import JiraKey from './comp/jiraKey.vue';
   import PassWord from './formcreate-password.vue';
@@ -29,52 +27,27 @@
   const FormCreate = formCreate.$form();
 
   const props = defineProps<{
-    rule?: FormRule; // 表单的规则
     option: any; // 全局配置项
-    api?: Api; // 收集表单的值
   }>();
 
-  const innerApi = ref<any>();
+  const emits = defineEmits<{
+    (e: 'mounted'): void;
+    (e: 'reload'): void;
+    (e: 'change', filed: string): void;
+  }>();
 
-  const emits = defineEmits(['update:api', 'update:rule', 'mounted', 'reload', 'change']);
-
-  const formApi = computed({
-    get() {
-      return props.api;
-    },
-    set(val) {
-      emits('update:api', val);
-    },
+  const formApi = defineModel<Api>('api', {
+    default: undefined,
   });
 
-  watch(
-    () => formApi.value,
-    (val) => {
-      emits('update:api', val);
-    },
-    { deep: true }
-  );
-
-  const formRules = ref<FormRule | undefined>([]);
-  watchEffect(() => {
-    formRules.value = props.rule;
-    formApi.value = props.api || innerApi.value;
+  const formRules = defineModel<FormRule | undefined>('rule', {
+    default: {},
   });
-  watch(
-    () => props.rule,
-    (val) => {
-      formRules.value = val;
-      formApi.value?.refresh();
-    }
-  );
 
   watch(
     () => formRules.value,
-    (val) => {
-      emits('update:rule', val);
-    },
-    {
-      deep: true,
+    () => {
+      formApi.value?.refresh();
     }
   );
 
@@ -86,10 +59,9 @@
     emits('reload');
   }
 
-  function handleChange(value: any) {
-    formApi.value?.validateField(value);
-    emits('update:api', formApi.value);
-    emits('change', value, formApi.value);
+  function handleChange(filed: string) {
+    formApi.value?.validateField(filed);
+    emits('change', filed);
   }
   const options = {
     resetBtn: false, // 不展示默认配置的重置和提交
diff --git a/frontend/src/views/project-management/projectAndPermission/menuManagement/components/defectSync.vue b/frontend/src/views/project-management/projectAndPermission/menuManagement/components/defectSync.vue
index 1de4029590..e89d40687d 100644
--- a/frontend/src/views/project-management/projectAndPermission/menuManagement/components/defectSync.vue
+++ b/frontend/src/views/project-management/projectAndPermission/menuManagement/components/defectSync.vue
@@ -33,7 +33,6 @@
         v-model:api="fApi"
         v-model:form-item="platformItem"
         :form-rule="platformRules"
-        @change="changeHandler"
         @mounted="handleMounted"
       />
       <!-- 同步机制 -->
@@ -292,10 +291,6 @@
 
     fApi.value?.setValue({ ...tempObj });
   }
-  function changeHandler(a: any, b: FormRuleItem) {
-    fApi.value.validateField(b.field);
-    fApi.value.refreshValidate();
-  }
 
   function handleMounted() {
     setValue();
diff --git a/frontend/src/views/project-management/projectAndPermission/menuManagement/components/relatedCase.vue b/frontend/src/views/project-management/projectAndPermission/menuManagement/components/relatedCase.vue
index 55a3f2194f..03de6e4538 100644
--- a/frontend/src/views/project-management/projectAndPermission/menuManagement/components/relatedCase.vue
+++ b/frontend/src/views/project-management/projectAndPermission/menuManagement/components/relatedCase.vue
@@ -33,7 +33,6 @@
         v-model:api="fApi"
         v-model:form-item="platformItem"
         :form-rule="platformRules"
-        @change="changeHandler"
         @mounted="handleMounted"
       />
     </a-form>
@@ -220,11 +219,6 @@
     fApi.value?.setValue({ ...tempObj });
   }
 
-  function changeHandler(a: string, formValue: Record<string, any>) {
-    fApi.value.validateField(formValue.field);
-    fApi.value.refreshValidate();
-  }
-
   function handleMounted() {
     setValue();
   }
diff --git a/frontend/src/views/project-management/template/components/detail.vue b/frontend/src/views/project-management/template/components/detail.vue
index 68f6522b4a..0bf513de64 100644
--- a/frontend/src/views/project-management/template/components/detail.vue
+++ b/frontend/src/views/project-management/template/components/detail.vue
@@ -3,8 +3,6 @@
 </template>
 
 <script setup lang="ts">
-  import { ref } from 'vue';
-
   import AddTemplate from '@/views/setting/organization/template/components/addTemplate.vue';
 </script>
 
diff --git a/frontend/src/views/setting/organization/template/components/addTemplate.vue b/frontend/src/views/setting/organization/template/components/addTemplate.vue
index bf3bc409f9..fe6f26473a 100644
--- a/frontend/src/views/setting/organization/template/components/addTemplate.vue
+++ b/frontend/src/views/setting/organization/template/components/addTemplate.vue
@@ -132,7 +132,6 @@
                 v-model:rule="formItem.formRules"
                 :option="configOptions"
                 @click="activeHandler(index)"
-                @change="(value, formApi) => changeHandler(value, formApi)"
               />
               <a-form
                 v-if="templateForm.enableThirdPart && route.query.type === 'BUG'"
@@ -374,10 +373,6 @@
     isError.value = false;
   }
 
-  function changeHandler(value: string, api: any) {
-    api?.validateField(value);
-  }
-
   // 保存回调
   async function save() {
     try {
@@ -408,6 +403,7 @@
         setIsSave(true);
       }
     } catch (error) {
+      // eslint-disable-next-line no-console
       console.log(error);
     } finally {
       loading.value = false;
@@ -463,6 +459,7 @@
         scene: route.query.type,
       });
     } catch (error) {
+      // eslint-disable-next-line no-console
       console.log(error);
     }
   };
@@ -495,7 +492,6 @@
   }
 
   const selectFiled = ref<DefinedFieldItem[]>([]);
-  const selectedIds = ref<string[]>();
 
   // 编辑更新已选择字段
   const isEditField = ref<boolean>(false);
@@ -634,6 +630,7 @@
       selectData.value = getSelectData(customFields);
       systemFieldData.value = systemFields;
     } catch (error) {
+      // eslint-disable-next-line no-console
       console.log(error);
     } finally {
       loading.value = false;
diff --git a/frontend/src/views/setting/organization/template/components/viewTemplate.vue b/frontend/src/views/setting/organization/template/components/viewTemplate.vue
index 04d2d98b68..26a7ed1fc7 100644
--- a/frontend/src/views/setting/organization/template/components/viewTemplate.vue
+++ b/frontend/src/views/setting/organization/template/components/viewTemplate.vue
@@ -127,7 +127,6 @@
       width: 428px;
     }
   }
-
   :deep(.arco-picker-disabled) {
     border-color: var(--color-text-n8);
     background: var(--color-text-n8);
@@ -136,11 +135,9 @@
       background: var(--color-text-n8);
     }
   }
-
   :deep(.arco-form-item-layout-vertical > .arco-form-item-label-col) {
     overflow-wrap: break-word;
   }
-
   :deep(.arco-form-item-content) {
     overflow-wrap: anywhere;
   }