feat:物模型页面新增结构体验证

@@ -21,18 +21,18 @@
       <template #outputParamSlot>
       <template #outputParamSlot>
         <div>
         <div>
           <template v-for="(item, index) in outputParamData" :key="item">
           <template v-for="(item, index) in outputParamData" :key="item">
-            <span style="display: none">{{ item }}</span>
+            <span style="display: none">{{ item + index }}</span>
             <InputParamItem
             <InputParamItem
               :title="item.name"
               :title="item.name"
               :item="item"
               :item="item"
               class="mt-4"
               class="mt-4"
-              :index="index"
+              :index="item.id"
               :ref="dynamicBindRef.outputParamItemRef"
               :ref="dynamicBindRef.outputParamItemRef"
               @delete="deleteOutParItem"
               @delete="deleteOutParItem"
               @edit="editOutParItem"
               @edit="editOutParItem"
             />
             />
           </template>
           </template>
-          <div style="display: flex" class="mt-2">
+          <div style="display: flex" :class="{ 'mt-2': outputParamData.length > 0 }">
             <span style="color: #0170cc; cursor: pointer">+</span>
             <span style="color: #0170cc; cursor: pointer">+</span>
             <span style="color: #0170cc; cursor: pointer" @click="handleAddOutParam">增加参数</span>
             <span style="color: #0170cc; cursor: pointer" @click="handleAddOutParam">增加参数</span>
           </div>
           </div>
@@ -50,7 +50,11 @@
   import InputParamItem from './components/InputParamItem.vue';
   import InputParamItem from './components/InputParamItem.vue';
   import AddParamsModal from './components/AddParamsModal.vue';
   import AddParamsModal from './components/AddParamsModal.vue';
   import { Input } from 'ant-design-vue';
   import { Input } from 'ant-design-vue';
-  import { validateValueRangeAndStep, validateValueBool } from '../hook/useValidateParital';
+  import {
+    validateValueRangeAndStep,
+    validateValueBool,
+    validateValueStruct,
+  } from '../hook/useValidateParital';
   import { buildUUID } from '/@/utils/uuid';
   import { buildUUID } from '/@/utils/uuid';
 
 
   const outputParamData: any = ref([]);
   const outputParamData: any = ref([]);
@@ -138,6 +142,9 @@
     const values = await validate();
     const values = await validate();
     if (!values) return;
     if (!values) return;
     const dataSpecsList = getStructList();
     const dataSpecsList = getStructList();
+    if (values.dataType === 'STRUCT') {
+      validateValueStruct(dataSpecsList as any);
+    }
     validateValueRangeAndStep(Number(minMaxObj.min), Number(values.step), Number(minMaxObj.max));
     validateValueRangeAndStep(Number(minMaxObj.min), Number(values.step), Number(minMaxObj.max));
     validateValueBool(Number(values.boolClose), Number(values.boolOpen));
     validateValueBool(Number(values.boolClose), Number(values.boolOpen));
     const dataSpecs = {
     const dataSpecs = {

@@ -237,6 +237,7 @@
   };
   };
   const resetFormData = () => {
   const resetFormData = () => {
     resetFields();
     resetFields();
+    outputParamData.value = [];
     minMaxObj.min = '';
     minMaxObj.min = '';
     minMaxObj.max = '';
     minMaxObj.max = '';
   };
   };

@@ -17,6 +17,7 @@
   import { ref, computed, reactive } from 'vue';
   import { ref, computed, reactive } from 'vue';
   import { BasicModal, useModalInner } from '/@/components/Modal';
   import { BasicModal, useModalInner } from '/@/components/Modal';
   import AddParamForm from './AddParamForm.vue';
   import AddParamForm from './AddParamForm.vue';
+  import { validateValueStruct } from '../../hook/useValidateParital';
 
 
   const emits = defineEmits(['register', 'data']);
   const emits = defineEmits(['register', 'data']);
   const setEditData: any = reactive({
   const setEditData: any = reactive({
@@ -53,6 +54,9 @@
   const handleSubmit = async () => {
   const handleSubmit = async () => {
     const value = await AddParamFormRef.value?.getFormData();
     const value = await AddParamFormRef.value?.getFormData();
     if (!value) return;
     if (!value) return;
+    if (value.dataType === 'STRUCT') {
+      validateValueStruct(value.dataSpecsList as any);
+    }
     emits(
     emits(
       'data',
       'data',
       {
       {

@@ -21,3 +21,10 @@ export const validateValueBool = (boolClose, boolOpen) => {
     throw '布尔值不能相同';
     throw '布尔值不能相同';
   }
   }
 };
 };
+
+export const validateValueStruct = (data: []) => {
+  if (data.length === 0) {
+    createMessage.error('struct不能为空');
+    throw 'struct不能为空';
+  }
+};

@@ -3,7 +3,7 @@ import { BasicColumn, FormSchema } from '/@/components/Table';
 import { screenLinkOrganizationGetApi } from '/@/api/ruleengine/ruleengineApi';
 import { screenLinkOrganizationGetApi } from '/@/api/ruleengine/ruleengineApi';
 import { scheduleOptions } from './formatData';
 import { scheduleOptions } from './formatData';
 import { copyTransFun } from '/@/utils/fnUtils';
 import { copyTransFun } from '/@/utils/fnUtils';
-import { numberAndNonegativeRule, numberAndEngLishRule } from '/@/utils/rules';
+import { numberAndNonegativeRule } from '/@/utils/rules';
 
 
 /**
 /**
  * 所使用的枚举值
  * 所使用的枚举值
@@ -265,7 +265,7 @@ export const trigger_condition_schema: FormSchema[] = [
     },
     },
     ifShow: ({ values }) => isDevice(values.triggerType),
     ifShow: ({ values }) => isDevice(values.triggerType),
     colProps: { span: 6 },
     colProps: { span: 6 },
-    rules: numberAndEngLishRule,
+    // rules: numberAndEngLishRule,
   },
   },
   {
   {
     field: 'operationType',
     field: 'operationType',