Merge branch 'perf/rule-chain' into 'main_dev'

perf: 优化规则链设计器,新增提交前置钩子

See merge request yunteng/thingskit-front!1059

@@ -4,12 +4,6 @@ import { CreateModalDefineExposeType, AwaitPopupWindowReturnDataType } from '../
 import { EdgeData, NodeData } from '../types/node';
 import { EdgeData, NodeData } from '../types/node';
 import { DataActionModeEnum } from '/@/enums/toolEnum';
 import { DataActionModeEnum } from '/@/enums/toolEnum';
 import { ElementsTypeEnum } from '../enum';
 import { ElementsTypeEnum } from '../enum';
-import { FilterCategoryComponentEnum } from '../enum/category';
-import { useMessage } from '/@/hooks/web/useMessage';
-import { CheckExistenceFieldsNameEnum } from '../enum/formField/filter';
-import { useI18n } from '/@/hooks/web/useI18n';
-
-const { t } = useI18n();
 
 
 interface OptionsType {
 interface OptionsType {
   mode: DataActionModeEnum;
   mode: DataActionModeEnum;
@@ -108,25 +102,12 @@ export function useAwaitPopupWindowBindData(
     );
     );
   };
   };
 
 
-  const { createMessage } = useMessage();
-
   const handleSubmit = async (extraData: Recordable = {}) => {
   const handleSubmit = async (extraData: Recordable = {}) => {
     const { flag } = await validate();
     const { flag } = await validate();
     if (!flag) return;
     if (!flag) return;
+    await unref(createComponentEl)?.beforeSubmit?.();
     const value = await unref(createComponentEl)?.getFieldsValue?.();
     const value = await unref(createComponentEl)?.getFieldsValue?.();
-    const { config } = nodeData.value || {};
-    if (
-      config?.key === FilterCategoryComponentEnum.CHECK_EXISTENCE_FIELDS &&
-      !value?.messageNames &&
-      !value?.messageNames
-    ) {
-      createMessage.warning(
-        `${t(CheckExistenceFieldsNameEnum.MESSAGE_NAMES)}和${t(
-          CheckExistenceFieldsNameEnum.METADATA_NAMES
-        )}最少选填一个`
-      );
-      return true;
-    }
+
     unref(resolveFn)?.({
     unref(resolveFn)?.({
       flag: true,
       flag: true,
       data: handleSubmitData(extraData, value),
       data: handleSubmitData(extraData, value),

@@ -3,11 +3,16 @@
   import { BasicForm, useForm } from '/@/components/Form';
   import { BasicForm, useForm } from '/@/components/Form';
   import { formSchemas } from './create.config';
   import { formSchemas } from './create.config';
   import { NodeData } from '../../../types/node';
   import { NodeData } from '../../../types/node';
+  import { useMessage } from '/@/hooks/web/useMessage';
+  import { useI18n } from '/@/hooks/web/useI18n';
+  import { CheckExistenceFieldsNameEnum } from '../../../enum/formField/filter';
 
 
   defineProps<{
   defineProps<{
     config: NodeData;
     config: NodeData;
   }>();
   }>();
 
 
+  const { t } = useI18n();
+
   const [register, { validate, getFieldsValue, setFieldsValue, resetFields }] = useForm({
   const [register, { validate, getFieldsValue, setFieldsValue, resetFields }] = useForm({
     schemas: formSchemas,
     schemas: formSchemas,
     showActionButtonGroup: false,
     showActionButtonGroup: false,
@@ -24,9 +29,22 @@
     setFieldsValue(value);
     setFieldsValue(value);
   };
   };
 
 
+  const { createMessage } = useMessage();
+  const beforeSubmit = async () => {
+    const value = getFieldsValue();
+    if (!value?.messageNames && !value?.messageNames) {
+      const errorMessage = `${t(CheckExistenceFieldsNameEnum.MESSAGE_NAMES)}和${t(
+        CheckExistenceFieldsNameEnum.METADATA_NAMES
+      )}最少选填一个`;
+      createMessage.warning(errorMessage);
+      return Promise.reject(errorMessage);
+    }
+  };
+
   defineExpose({
   defineExpose({
     setFieldsValue: setValue,
     setFieldsValue: setValue,
     getFieldsValue: getValue,
     getFieldsValue: getValue,
+    beforeSubmit,
   } as CreateModalDefineExposeType);
   } as CreateModalDefineExposeType);
 </script>
 </script>
 
 

@@ -56,8 +56,7 @@
   const handleModalOk = async () => {
   const handleModalOk = async () => {
     await validate();
     await validate();
     const data = getFieldsValue();
     const data = getFieldsValue();
-    const flag = await handleSubmit(data);
-    if (flag) return;
+    await handleSubmit(data);
     resetFieldsValue();
     resetFieldsValue();
   };
   };
 
 

@@ -15,6 +15,8 @@ export interface CreateModalDefineExposeType {
   validate?: () => Promise<{ flag: boolean; error?: RuleError }>;
   validate?: () => Promise<{ flag: boolean; error?: RuleError }>;
   getFieldsValue?: () => Promise<Recordable>;
   getFieldsValue?: () => Promise<Recordable>;
   setFieldsValue?: (value?: DefaultNodeConfig, nodeData?: NodeData) => void;
   setFieldsValue?: (value?: DefaultNodeConfig, nodeData?: NodeData) => void;
+  clearValidate?: (name?: string | string[] | undefined) => Promise<void>;
+  beforeSubmit?: () => Promise<any>;
 }
 }
 
 
 export interface CreateModalDefineEmitType {
 export interface CreateModalDefineEmitType {