pref:优化场景联动部分代码根据产品获取对应设备

fengtao
1 parent db597a08
Showing 4 changed files with 63 additions and 143 deletions
src/views/rule/linkedge/config/config.data.ts
src/views/rule/linkedge/cpns/ClearAlarm.vue
src/views/rule/linkedge/cpns/Trigger-Condition.vue
src/views/rule/linkedge/hooks/useCommonFun.ts
--- a/src/views/rule/linkedge/config/config.data.ts
View file @350f551
+++ b/src/views/rule/linkedge/config/config.data.ts
View file @350f551
@@ -12,8 +12,10 @@ import { findDictItemByCode } from '/@/api/system/dict';
 import { deviceProfile } from '/@/api/device/deviceManager';
 import { getModelServices } from '/@/api/device/modelOfMatter';
 import { ModelOfMatterParams } from '/@/api/device/model/modelOfMatterModel';
+import useCommonFun from '../hooks/useCommonFun';
-type TOption = {
+const { useByProductGetAttribute } = useCommonFun();
+export type TOption = {
   label: string;
   value: string;
 };
@@ -217,27 +219,10 @@ export const trigger_condition_schema: FormSchema[] = [
         onChange: async (e) => {
           if (e) {
             setFieldsValue({ type2: '' });
+            setFieldsValue({ entityId: [] });
             const res = await getAttribute(e);
             const options = ref<TOption[]>([]);
-            const obj = (options) =>
-              updateSchema({
-                field: 'type2',
-                componentProps: {
-                  placeholder: '请选择属性',
-                  options,
-                },
-              });
-            if (Array.isArray(res)) {
-              options.value = res.map((m) => {
-                return {
-                  label: m?.identifier,
-                  value: m?.identifier,
-                };
-              });
-              obj(options.value);
-            } else {
-              obj(options.value);
-            }
+            useByProductGetAttribute(res, updateSchema, options);
           }
         },
       };
@@ -260,10 +245,22 @@ export const trigger_condition_schema: FormSchema[] = [
   {
     field: 'entityId',
     label: '',
-    component: 'Select',
-    componentProps: {
-      placeholder: '请选择设备',
-      mode: 'multiple',
+    component: 'ApiSelect',
+    componentProps: ({ formModel }) => {
+      const deviceProfileId = formModel['deviceProfileId'];
+      if (unref(organizationId)) {
+        return {
+          placeholder: '请选择设备',
+          mode: 'multiple',
+          api: byOrganizationIdGetMasterDevice,
+          params: {
+            organizationId: unref(organizationId),
+            deviceProfileId,
+          },
+          labelField: 'name',
+          valueField: 'id',
+        };
+      }
     },
     ifShow: ({ values }) => isPart(values.device),
     colProps: { span: 6 },
--- a/src/views/rule/linkedge/cpns/ClearAlarm.vue
View file @350f551
+++ b/src/views/rule/linkedge/cpns/ClearAlarm.vue
View file @350f551
@@ -62,7 +62,7 @@
   import { CollapseContainer } from '/@/components/Container/index';
   import { BasicForm, useForm } from '/@/components/Form/index';
   import { Card, Select, Input, Tooltip } from 'ant-design-vue';
-  import { trigger_condition_schema } from '../config/config.data';
+  import { trigger_condition_schema, TOption } from '../config/config.data';
   import { getAttribute } from '/@/api/ruleengine/ruleengineApi';
   import ConditionScreening from './ConditionScreening.vue';
   import { scheduleOptions, timeUnitOptions, options } from '../config/formatData';
@@ -70,7 +70,9 @@
   import AlarmSchedule from './AlarmSchedule.vue';
   import { useModal } from '/@/components/Modal';
   import { cloneDeep } from 'lodash-es';
+  import useCommonFun from '../hooks/useCommonFun';
+  const { useByProductGetAttribute } = useCommonFun();
   defineProps({
     index: {
       type: Number,
@@ -100,40 +102,8 @@
   };
   const updateFieldDeviceId = (deviceList: any[], _, isUpdate) => {
-    if (isUpdate) {
-      updateSchema({
-        field: 'entityId',
-        componentProps: {
-          options: deviceList,
-        },
-      });
-    }
-    //新增、编辑都会触发onChang事件
-    updateSchema({
-      field: 'device',
-      componentProps: {
-        options: [
-          { label: '全部', value: 'ALL' },
-          { label: '部分', value: 'PART' },
-        ],
-        async onChange(e) {
-          setFieldsValue({ entityId: [] });
-          if (e) {
-            //fengtao
-            if (e == 'ALL') {
-            } else {
-              updateSchema({
-                field: 'entityId',
-                componentProps: {
-                  options: deviceList,
-                },
-              });
-            }
-            //fengtao
-          }
-        },
-      },
-    });
+    console.log(deviceList);
+    console.log(isUpdate);
   };
   const resetFieldsValueFunc = () => resetFields();
@@ -143,30 +113,8 @@
   };
   const updateFieldAttributeFunc = async (e) => {
     const res = await getAttribute(e);
-    let options: any = [];
-    if (Array.isArray(res)) {
-      options = res.map((m) => {
-        return {
-          label: m?.identifier,
-          value: m?.identifier,
-        };
-      });
-      updateSchema({
-        field: 'type2',
-        componentProps: {
-          placeholder: '请选择属性',
-          options,
-        },
-      });
-    } else {
-      updateSchema({
-        field: 'type2',
-        componentProps: {
-          placeholder: '请选择属性',
-          options,
-        },
-      });
-    }
+    const options = ref<TOption[]>([]);
+    useByProductGetAttribute(res, updateSchema, options);
   };
   //TODO-fengtao
   const schedule = ref('ANY_TIME');
--- a/src/views/rule/linkedge/cpns/Trigger-Condition.vue
View file @350f551
+++ b/src/views/rule/linkedge/cpns/Trigger-Condition.vue
View file @350f551
@@ -62,7 +62,7 @@
   import { BasicForm, useForm } from '/@/components/Form/index';
   import { Icon } from '/@/components/Icon';
   import { Tooltip, Card, Select, Input } from 'ant-design-vue';
-  import { trigger_condition_schema } from '../config/config.data';
+  import { trigger_condition_schema, TOption } from '../config/config.data';
   import { getAttribute } from '/@/api/ruleengine/ruleengineApi';
   import ConditionScreening from './ConditionScreening.vue';
   import { scheduleOptions, timeUnitOptions, options } from '../config/formatData';
@@ -70,7 +70,9 @@
   import { useModal } from '/@/components/Modal';
   import { cloneDeep } from 'lodash-es';
   import { useMessage } from '/@/hooks/web/useMessage';
+  import useCommonFun from '../hooks/useCommonFun';
+  const { useByProductGetAttribute } = useCommonFun();
   defineProps({
     title: {
       type: String,
@@ -140,41 +142,8 @@
   //TODO-fengtao
   const updateFieldDeviceId = (deviceList: any[], _, isUpdate) => {
-    //用于编辑回显
-    if (isUpdate.value) {
-      updateSchema({
-        field: 'entityId',
-        componentProps: {
-          options: deviceList,
-        },
-      });
-    }
-    //新增、编辑都会触发onChang事件
-    updateSchema({
-      field: 'device',
-      componentProps: {
-        options: [
-          { label: '全部', value: 'ALL' },
-          { label: '部分', value: 'PART' },
-        ],
-        async onChange(e) {
-          setFieldsValue({ entityId: [] });
-          if (e) {
-            //fengtao
-            if (e == 'ALL') {
-            } else {
-              updateSchema({
-                field: 'entityId',
-                componentProps: {
-                  options: deviceList,
-                },
-              });
-            }
-            //fengtao
-          }
-        },
-      },
-    });
+    console.log(deviceList);
+    console.log(isUpdate);
   };
   //TODO-fengtao
   const resetFieldsValueFunc = () => {
@@ -188,30 +157,8 @@
   //TODO-fengtao
   const updateFieldAttributeFunc = async (e) => {
     const res = await getAttribute(e);
-    let options: any = [];
-    if (Array.isArray(res)) {
-      options = res.map((m) => {
-        return {
-          label: m?.identifier,
-          value: m?.identifier,
-        };
-      });
-      updateSchema({
-        field: 'type2',
-        componentProps: {
-          placeholder: '请选择属性',
-          options,
-        },
-      });
-    } else {
-      updateSchema({
-        field: 'type2',
-        componentProps: {
-          placeholder: '请选择属性',
-          options,
-        },
-      });
-    }
+    const options = ref<TOption[]>([]);
+    useByProductGetAttribute(res, updateSchema, options);
   };
   //TODO-fengtao
   const handleDelete = (params: { index: number; title: string }) => {
--- a/src/views/rule/linkedge/hooks/useCommonFun.ts 0 → 100644
View file @350f551
+++ b/src/views/rule/linkedge/hooks/useCommonFun.ts 0 → 100644
View file @350f551
+export default () => {
+  //根据产品获取对应属性
+  const useByProductGetAttribute = (res, callback, opt) => {
+    const getAttr = (opt) =>
+      callback({
+        field: 'type2',
+        componentProps: {
+          placeholder: '请选择属性',
+          opt,
+        },
+      });
+    if (Array.isArray(res)) {
+      opt = res.map((m) => {
+        return {
+          label: m?.identifier,
+          value: m?.identifier,
+        };
+      });
+      getAttr(opt);
+    } else {
+      getAttr(opt);
+    }
+  };
+
+  return {
+    useByProductGetAttribute,
+  };
+};