Merge branch 'ft_local_dev' into 'main'

pref:优化物模型重复代码

See merge request huang/yun-teng-iot-front!388

@@ -186,7 +186,7 @@ export const getGATEWAYdevice = async (params: { organization: string }) => {
     params,
   });
   return Promise.resolve<{ label: string; value: string }[]>(
-    res.map((item) => ({ label: item.name, value: item.id }))
+    res.map((item) => ({ label: item.name, value: item.tbDeviceId }))
   );
 };
 

@@ -304,7 +304,7 @@
       async function handleEdit(record: Recordable) {
         if (record.deviceType === 'SENSOR') {
           const res = await getGATEWAY(record.tbDeviceId);
-          Reflect.set(record, 'gatewayId', res.id);
+          Reflect.set(record, 'gatewayId', res.tbDeviceId);
         }
         openModal(true, {
           isUpdate: true,

@@ -56,7 +56,7 @@
   const serveiceDisable = ref(false);
   const eventDisable = ref(false);
   const blockContent = `属性一般是设备的运行状态，如当前温度等；服务是设备可被调用的方法，支持定义参数，如执行某项任务；事件则是设备上报的
-通知，如告警，需要被及时处理。`;
+  通知，如告警，需要被及时处理。`;
   const activeKey = ref('1');
   const size = ref('small');
   const AttrRef = ref<InstanceType<typeof Attribute>>();
@@ -86,28 +86,28 @@
     let F = enums[val];
     F(data);
   }
+  function dynamicDisable(a, s, e) {
+    attrDisable.value = a;
+    serveiceDisable.value = s;
+    eventDisable.value = e;
+  }
+  function dynamicActive(n, callback) {
+    activeKey.value = n;
+    callback;
+  }
   const dynamicData = (t, a, s, e) => {
     switch (t) {
       case 'attr':
-        activeKey.value = '1';
-        action(t, a);
-        attrDisable.value = false;
-        serveiceDisable.value = true;
-        eventDisable.value = true;
+        dynamicActive('1', action(t, a));
+        dynamicDisable(false, true, true);
         break;
       case 'service':
-        activeKey.value = '2';
-        action(t, s);
-        attrDisable.value = true;
-        serveiceDisable.value = false;
-        eventDisable.value = true;
+        dynamicActive('2', action(t, s));
+        dynamicDisable(true, false, true);
         break;
       case 'events':
-        activeKey.value = '3';
-        action(t, e);
-        attrDisable.value = true;
-        serveiceDisable.value = true;
-        eventDisable.value = false;
+        dynamicActive('3', action(t, e));
+        dynamicDisable(true, true, false);
         break;
     }
   };

@@ -22,8 +22,7 @@
   import { attrSchemas } from './config';
   import { useModal } from '/@/components/Modal';
   import { validateValueStruct } from '../hook/useValidateParital';
-  import { useChangeTypeGetTypeForm } from '../hook/useTypeGetForm';
-  import { buildUUID } from '/@/utils/uuid';
+  import { useChangeTypeGetTypeForm, useGetInOrOutData } from '../hook/useTypeGetForm';
   import AddParamsModal from './components/AddParamsModal.vue';
   import CommomParam from './components/CommomParam.vue';
 
@@ -44,16 +43,7 @@
     showActionButtonGroup: false,
   });
 
-  const getData = (d, f) => {
-    if (f == 'input') {
-      if (d.id !== null) {
-        const findIndex = unref(inputParamData).findIndex((f) => f.id == d.id);
-        if (findIndex !== -1) unref(inputParamData).splice(findIndex, 1, d);
-      } else {
-        unref(inputParamData).push({ ...d, id: buildUUID() });
-      }
-    }
-  };
+  const getData = (d, f) => useGetInOrOutData(d, f, unref(inputParamData), []);
 
   const handleAddInParam = (b, o) => openModal(b, o);
 
@@ -83,8 +73,7 @@
       //回显结构体数据
       const { dataSpecsList } = v[0];
       if (dataSpecsList !== undefined) {
-        inputParamData.value = [...new Array(dataSpecsList.length).keys()];
-        inputParamData.value = dataSpecsList;
+        inputParamData.value = [...new Array(dataSpecsList.length).keys()] && dataSpecsList;
       }
     } catch (e) {
       console.log('Attribute error info', e);

@@ -21,9 +21,9 @@
   import { BasicForm, useForm } from '/@/components/Form';
   import { eventSchemas } from './config';
   import { useModal } from '/@/components/Modal';
-  import { buildUUID } from '/@/utils/uuid';
   import AddParamsModal from './components/AddParamsModal.vue';
   import CommomParam from './components/CommomParam.vue';
+  import { useGetInOrOutData } from '../hook/useTypeGetForm';
 
   const inputParamData: any = ref([]);
 
@@ -42,16 +42,7 @@
     showActionButtonGroup: false,
   });
 
-  const getData = (d, f) => {
-    if (f == 'input') {
-      if (d.id !== null) {
-        const findIndex = unref(inputParamData).findIndex((f) => f.id == d.id);
-        if (findIndex !== -1) unref(inputParamData).splice(findIndex, 1, d);
-      } else {
-        unref(inputParamData).push({ ...d, id: buildUUID() });
-      }
-    }
-  };
+  const getData = (d, f) => useGetInOrOutData(d, f, unref(inputParamData), []);
 
   const handleAddInParam = (b, o) => openModal(b, o);
 
@@ -64,8 +55,7 @@
     setFieldsValue(v[0]);
     const { outputData } = v[0];
     if (outputData !== undefined) {
-      inputParamData.value = [...new Array(outputData.length).keys()];
-      inputParamData.value = outputData;
+      inputParamData.value = [...new Array(outputData.length).keys()] && outputData;
     }
   };
 

@@ -32,14 +32,16 @@
   import { BasicForm, useForm } from '/@/components/Form';
   import { serviceSchemas } from './config';
   import { useModal } from '/@/components/Modal';
-  import { buildUUID } from '/@/utils/uuid';
   import AddParamsModal from './components/AddParamsModal.vue';
   import CommomParam from './components/CommomParam.vue';
+  import { useGetInOrOutData } from '../hook/useTypeGetForm';
 
   const inputParamData: any = ref([]);
+
   const outputParamData: any = ref([]);
 
   const CommomParamInParamRef = ref<InstanceType<typeof CommomParam>>();
+
   const CommomParamOutParamRef = ref<InstanceType<typeof CommomParam>>();
 
   const [registerModal, { openModal }] = useModal();
@@ -55,23 +57,7 @@
     showActionButtonGroup: false,
   });
 
-  const getData = (d, f) => {
-    if (f == 'input') {
-      if (d.id !== null) {
-        const findIndex = unref(inputParamData).findIndex((f) => f.id == d.id);
-        if (findIndex !== -1) unref(inputParamData).splice(findIndex, 1, d);
-      } else {
-        unref(inputParamData).push({ ...d, id: buildUUID() });
-      }
-    } else {
-      if (d.id !== null) {
-        const findIndex = unref(outputParamData).findIndex((f) => f.id == d.id);
-        if (findIndex !== -1) unref(outputParamData).splice(findIndex, 1, d);
-      } else {
-        unref(outputParamData).push({ ...d, id: buildUUID() });
-      }
-    }
-  };
+  const getData = (d, f) => useGetInOrOutData(d, f, unref(inputParamData), unref(outputParamData));
 
   const handleAddInParam = (b, o) => openModal(b, o);
 
@@ -90,12 +76,10 @@
     setFieldsValue(v[0]);
     const { inputParams, outputParams } = v[0];
     if (outputParams !== undefined) {
-      outputParamData.value = [...new Array(outputParams.length).keys()];
-      outputParamData.value = outputParams;
+      outputParamData.value = [...new Array(outputParams.length).keys()] && outputParams;
     }
     if (inputParams !== undefined) {
-      inputParamData.value = [...new Array(inputParams.length).keys()];
-      inputParamData.value = inputParams;
+      inputParamData.value = [...new Array(inputParams.length).keys()] && inputParams;
     }
   };
 

@@ -21,8 +21,11 @@
   import { BasicForm, useForm } from '/@/components/Form';
   import { addParamsSchemas } from '../config';
   import { useModal } from '/@/components/Modal';
-  import { buildUUID } from '/@/utils/uuid';
-  import { useChangeTypeGetTypeForm, useUpdateFormExcludeStruct } from '../../hook/useTypeGetForm';
+  import {
+    useChangeTypeGetTypeForm,
+    useGetInOrOutData,
+    useUpdateFormExcludeStruct,
+  } from '../../hook/useTypeGetForm';
   import AddParamsModal from './AddParamsModal.vue';
   import CommomParam from './CommomParam.vue';
 
@@ -45,16 +48,7 @@
     showActionButtonGroup: false,
   });
 
-  const getData = (d, f) => {
-    if (f === 'input') {
-      if (d.id !== null) {
-        const findIndex = unref(inputParamData).findIndex((f) => f.id == d.id);
-        if (findIndex !== -1) unref(inputParamData).splice(findIndex, 1, d);
-      } else {
-        unref(inputParamData).push({ ...d, id: buildUUID() });
-      }
-    }
-  };
+  const getData = (d, f) => useGetInOrOutData(d, f, unref(inputParamData), []);
 
   const handleAddInParam = (b, o) => openModal(b, o);
 

 import { validateValueBool, validateValueRangeAndStep } from './useValidateParital';
 import { findDictItemByCode } from '/@/api/system/dict';
+import { buildUUID } from '/@/utils/uuid';
 
 ///根据不同数据类型得到不同表单数据
 type TForm = {
@@ -94,3 +95,22 @@ export const useUpdateFormExcludeStruct = async (F, U) => {
     },
   });
 };
+
+//获取输入参数或者输出参数弹窗数据
+export const useGetInOrOutData = (d, f, inputData, outputData) => {
+  if (f == 'input') {
+    if (d.id !== null) {
+      const findIndex = inputData.findIndex((f) => f.id == d.id);
+      if (findIndex !== -1) inputData.splice(findIndex, 1, d);
+    } else {
+      inputData.push({ ...d, id: buildUUID() });
+    }
+  } else {
+    if (d.id !== null) {
+      const findIndex = outputData.findIndex((f) => f.id == d.id);
+      if (findIndex !== -1) outputData.splice(findIndex, 1, d);
+    } else {
+      outputData.push({ ...d, id: buildUUID() });
+    }
+  }
+};