Merge branch 'fix/DEFECT-1663' into 'main_dev'

fix: 修复数据流转编辑不需要校验未填项也可以点击返回上一步

See merge request yunteng/thingskit-front!946

@@ -39,11 +39,13 @@
     privateKeyFileName: undefined,
   });
 
-  const [register, { validateFields, setFieldsValue, resetFields, setProps, updateSchema }] =
-    useForm({
-      schemas: modeApiForm,
-      ...modelFormPublicConfig,
-    });
+  const [
+    register,
+    { validateFields, setFieldsValue, resetFields, setProps, updateSchema, getFieldsValue },
+  ] = useForm({
+    schemas: modeApiForm,
+    ...modelFormPublicConfig,
+  });
 
   const handleFileUrlEmitH = (fileUrl) => (credentialsFile.caCertFileName = fileUrl);
 
@@ -52,7 +54,7 @@
   const handleFileUrlEmitB = (fileUrl) => (credentialsFile.privateKeyFileName = fileUrl);
 
   const getValue = async () => {
-    const values = await validateFields();
+    const values = await getFieldsValue();
     if (!values) return;
     // if (values.type == 'anonymous' || values.type == 'basic') {
     //   credentialsFile.caCertFileName = undefined;
@@ -70,6 +72,12 @@
     return mergeValues;
   };
 
+  const validateValue = async () => {
+    const values = await validateFields();
+    if (!values) return;
+    return values;
+  };
+
   const setValue = (value) => {
     const { credentials } = value;
     if (credentials) {
@@ -100,6 +108,7 @@
     resetValue,
     setDisabledProps,
     setCancelDisabled,
+    validateValue,
   });
 </script>
 

@@ -8,13 +8,22 @@
   import { modelKafkaForm } from './config';
   import { modelFormPublicConfig } from '../../../dataflowmodal/config';
 
-  const [register, { validate, setFieldsValue, resetFields, setProps, updateSchema }] = useForm({
+  const [
+    register,
+    { validateFields, setFieldsValue, resetFields, setProps, updateSchema, getFieldsValue },
+  ] = useForm({
     schemas: modelKafkaForm,
     ...modelFormPublicConfig,
   });
 
   const getValue = async () => {
-    const values = await validate();
+    const values = await getFieldsValue();
+    if (!values) return;
+    return values;
+  };
+
+  const validateValue = async () => {
+    const values = await validateFields();
     if (!values) return;
     return values;
   };
@@ -41,6 +50,7 @@
     resetValue,
     setDisabledProps,
     setCancelDisabled,
+    validateValue,
   });
 </script>
 

@@ -40,10 +40,11 @@
     privateKeyFileName: undefined,
   });
 
-  const [register, { validateFields, setFieldsValue, resetFields, setProps }] = useForm({
-    schemas: modeMqttForm,
-    ...modelFormPublicConfig,
-  });
+  const [register, { validateFields, setFieldsValue, resetFields, setProps, getFieldsValue }] =
+    useForm({
+      schemas: modeMqttForm,
+      ...modelFormPublicConfig,
+    });
 
   const handleFileUrlEmitH = (fileUrl) => (credentialsFile.caCertFileName = fileUrl);
 
@@ -52,7 +53,7 @@
   const handleFileUrlEmitB = (fileUrl) => (credentialsFile.privateKeyFileName = fileUrl);
 
   const getValue = async () => {
-    const values = await validateFields();
+    const values = await getFieldsValue();
     if (!values) return;
     if (values.type == 'anonymous' || values.type == 'basic') {
       credentialsFile.caCertFileName = undefined;
@@ -71,6 +72,12 @@
     return mergeValues;
   };
 
+  const validateValue = async () => {
+    const values = validateFields();
+    if (!values) return;
+    return values;
+  };
+
   const setValue = (value) => {
     const { credentials } = value;
     if (credentials) {
@@ -96,6 +103,7 @@
     setValue,
     resetValue,
     setDisabledProps,
+    validateValue,
   });
 </script>
 

@@ -8,13 +8,20 @@
   import { modeRabbitMqForm } from './config';
   import { modelFormPublicConfig } from '../../../dataflowmodal/config';
 
-  const [register, { validateFields, setFieldsValue, resetFields, setProps, updateSchema }] =
-    useForm({
-      schemas: modeRabbitMqForm,
-      ...modelFormPublicConfig,
-    });
+  const [
+    register,
+    { validateFields, setFieldsValue, resetFields, setProps, updateSchema, getFieldsValue },
+  ] = useForm({
+    schemas: modeRabbitMqForm,
+    ...modelFormPublicConfig,
+  });
 
   const getValue = async () => {
+    const values = await getFieldsValue();
+    return values;
+  };
+
+  const validateValue = async () => {
     const values = await validateFields();
     if (!values) return;
     return values;
@@ -39,6 +46,7 @@
     resetValue,
     setDisabledProps,
     setCancelDisabled,
+    validateValue,
   });
 </script>
 <style lang="less" scoped></style>

@@ -100,6 +100,8 @@
       if (closeModalAfterSuccess) {
         closeModalAfterSuccess && setModalProps({ confirmLoading: true });
         const getDataFlowMethod = await dataFlowMethodRef.value?.getValue();
+        const values = await dataFlowParamsRef.value?.validateValue();
+        if (!values) return;
         const { name, description, ...getDataFlowParams } =
           await dataFlowParamsRef.value?.getValue();
         removeFieldByModeForm.forEach((item) => {

@@ -54,6 +54,7 @@
 
   const currentDataFlowParamsHanlePrevStep = async () => {
     const values = await getValue();
+    console.log(values, 'values');
     emit('currentDataFlowParamsEmitPrevStep', { currentStep: 0, values });
   };
 
@@ -64,24 +65,28 @@
       () => dataFlowMethodIsKafkaRef.value?.getValue(),
       (value) => dataFlowMethodIsKafkaRef.value?.setValue(value),
       () => dataFlowMethodIsKafkaRef.value?.resetValue(),
+      () => dataFlowMethodIsKafkaRef.value?.validateValue(),
     ],
     [
       (dataFlowType) => dataFlowType === BusinessDataFlowMethodEnum.DATAFLOW_METHOD_MQTT,
       () => dataFlowMethodIsMqttRef.value?.getValue(),
       (value) => dataFlowMethodIsMqttRef.value?.setValue(value),
       () => dataFlowMethodIsMqttRef.value?.resetValue(),
+      () => dataFlowMethodIsMqttRef.value?.validateValue(),
     ],
     [
       (dataFlowType) => dataFlowType === BusinessDataFlowMethodEnum.DATAFLOW_METHOD_RABBITMQ,
       () => dataFlowMethodIsRabbitMqRef.value?.getValue(),
       (value) => dataFlowMethodIsRabbitMqRef.value?.setValue(value),
       () => dataFlowMethodIsRabbitMqRef.value?.resetValue(),
+      () => dataFlowMethodIsRabbitMqRef.value?.validateValue(),
     ],
     [
       (dataFlowType) => dataFlowType === BusinessDataFlowMethodEnum.DATAFLOW_METHOD_REST_API,
       () => dataFlowMethodIsApiRef.value?.getValue(),
       (value) => dataFlowMethodIsApiRef.value?.setValue(value),
       () => dataFlowMethodIsApiRef.value?.resetValue(),
+      () => dataFlowMethodIsApiRef.value?.validateValue(),
     ],
   ];
 
@@ -105,6 +110,12 @@
     findDateFlow[3](0);
   };
 
+  const validateValue = async () => {
+    const findDateFlow = dataFlowTypeGetForm.find((item) => item[0](props.dataFlowType));
+    if (!findDateFlow) return findDateFlow;
+    return findDateFlow[4](0);
+  };
+
   const setProps = async () => {
     await nextTick();
     props.dataFlowType === BusinessDataFlowMethodEnum.DATAFLOW_METHOD_KAFKA &&
@@ -133,6 +144,7 @@
     resetValue,
     setCancelDisabled,
     setProps,
+    validateValue,
   });
 </script>
 <style lang="less" scoped>