Merge branch 'fix/task-center-gen-modbus' into 'main_dev'

fix: 多个线圈寄存器值修改为必填

See merge request yunteng/thingskit-front!912

@@ -2,18 +2,19 @@
   import { Button, Spin } from 'ant-design-vue';
   import { Button, Spin } from 'ant-design-vue';
   import { BasicForm, useForm } from '/@/components/Form';
   import { BasicForm, useForm } from '/@/components/Form';
   import { BasicModal, useModal } from '/@/components/Modal';
   import { BasicModal, useModal } from '/@/components/Modal';
-  import { formSchemas } from './config';
+  import { formSchemas, FormFieldsEnum } from './config';
   import { ref } from 'vue';
   import { ref } from 'vue';
   import { unref } from 'vue';
   import { unref } from 'vue';
   import { composeModbusModalData } from './util';
   import { composeModbusModalData } from './util';
   import { ModbusCommandValueType } from './type';
   import { ModbusCommandValueType } from './type';
   import { genModbusCommand } from '/@/api/task';
   import { genModbusCommand } from '/@/api/task';
+  import { isNullOrUnDef } from '/@/utils/is';
 
 
   const emit = defineEmits(['update:value']);
   const emit = defineEmits(['update:value']);
 
 
   const [registerModal] = useModal();
   const [registerModal] = useModal();
 
 
-  const [registerForm, { getFieldsValue }] = useForm({
+  const [registerForm, { getFieldsValue, validate }] = useForm({
     schemas: formSchemas,
     schemas: formSchemas,
     showActionButtonGroup: false,
     showActionButtonGroup: false,
     rowProps: { gutter: 10 },
     rowProps: { gutter: 10 },
@@ -25,8 +26,12 @@
   const loading = ref(false);
   const loading = ref(false);
   const handleGetValue = async () => {
   const handleGetValue = async () => {
     try {
     try {
+      await validate();
       const value = getFieldsValue();
       const value = getFieldsValue();
       const record = composeModbusModalData(value as ModbusCommandValueType);
       const record = composeModbusModalData(value as ModbusCommandValueType);
+
+      if (record[FormFieldsEnum.REGISTER_VALUES]?.some((item) => isNullOrUnDef(item))) return;
+
       loading.value = true;
       loading.value = true;
       const result = await genModbusCommand(record);
       const result = await genModbusCommand(record);
       commandValue.value = result;
       commandValue.value = result;
@@ -46,7 +51,7 @@
     return arr.reduce((prev, next) => `${prev} ${next.join('')}`, '');
     return arr.reduce((prev, next) => `${prev} ${next.join('')}`, '');
   };
   };
 
 
-  const handleOk = () => {
+  const handleOk = async () => {
     emit('update:value', unref(commandValue));
     emit('update:value', unref(commandValue));
   };
   };
 </script>
 </script>

@@ -212,6 +212,7 @@ export const formSchemas: FormSchema[] = [
         showTotalControl: false,
         showTotalControl: false,
         itemProps: () => {
         itemProps: () => {
           return {
           return {
+            required: true,
             valueField: 'value',
             valueField: 'value',
             changeEvent: 'update:value',
             changeEvent: 'update:value',
           } as FormSchema;
           } as FormSchema;