fix：回退场景联动代码--修改属性选择问题

fengtao
1 parent 9386a4a1
Showing 5 changed files with 176 additions and 110 deletions
src/api/ruleengine/ruleengineApi.ts
src/views/rule/linkedge/SceneLinkAgeDrawer.vue
src/views/rule/linkedge/config/config.data.ts
src/views/rule/linkedge/cpns/Trigger-Condition.vue
src/views/rule/linkedge/cpns/action.vue
--- a/src/api/ruleengine/ruleengineApi.ts
View file @9277d32
+++ b/src/api/ruleengine/ruleengineApi.ts
View file @9277d32
@@ -56,16 +56,6 @@ export const screenLinkPageAddApi = (params: ScreenAddModel, isUpdate: boolean) 
 };
 /**
- * 获取主设备列表（exclude子设备）
- * @param params organizationId
- */
-export const byOganizationIdGetMasterDevice = (params) => {
-  return defHttp.get({
-    url: ScreenManagerApi.MASTER_GET_DEVICE + '/' + params,
-  });
-};
-
-/**
  * 删除场景联动
  * @param params pageSize page name
  */
@@ -107,6 +97,7 @@ export const getOrganizationAlarmConfig = (params: { organizationId }) => {
   });
 };
+//TODO-fengtao
 /**
  * 获取设备属性列表
  */
@@ -116,3 +107,14 @@ export const getAttribute = (orgId, deviceIds) => {
     url: ScreenManagerApi.GET_ATTRBUTELIST + '/' + orgId + joinText,
   });
 };
+
+/**
+ * 获取主设备列表（exclude子设备）---执行动作
+ * @param params organizationId
+ */
+export const byOganizationIdGetMasterDevice = (params) => {
+  return defHttp.get({
+    url: ScreenManagerApi.MASTER_GET_DEVICE + '/' + params,
+  });
+};
+//TODO-fengtao
--- a/src/views/rule/linkedge/SceneLinkAgeDrawer.vue
View file @9277d32
+++ b/src/views/rule/linkedge/SceneLinkAgeDrawer.vue
View file @9277d32
@@ -99,7 +99,6 @@
     screenLinkPageByDeptIdGetDevice,
     getOrganizationAlarmConfig,
     byOganizationIdGetMasterDevice,
-    getAttribute,
   } from '/@/api/ruleengine/ruleengineApi';
   import TriggerOrCondition from './cpns/Trigger-Condition.vue';
   import Action from './cpns/Action.vue';
@@ -107,8 +106,8 @@
   import { formatToDateTime } from '/@/utils/dateUtil';
   const emit = defineEmits(['register', 'success']);
-
   const provideOrgid = ref('');
+
   const { createMessage } = useMessage();
   const triggerData = ref([]);
   const conditionData = ref([]);
@@ -125,8 +124,6 @@
   let getConditionFormValue = ref([]);
   let getActionFormValue = ref([]);
   const editEntryIdData = ref([]);
-  const editEntryIdExcludeDoActionData = ref([]);
-  let editAttrIdData = [];
   const editAlarmConfigData = ref([]);
   const isUpdate = ref(false);
   const id = ref(undefined);
@@ -158,31 +155,24 @@
       await setFieldsValue(data.record);
       id.value = recordId;
       tenantId.value = recordTenantId;
+      //TODO-fengtao-把组织id传给子组件
       provideOrgid.value = organizationId;
+      //TODO-fengtao获取当前执行动作下的设备(master那个接口)
+      getMasterDeviceList.value = await byOganizationIdGetMasterDevice(organizationId);
+      //TODO-fengtao
       // 获取当前组织下的设备列表
-      const options = await byOganizationIdGetMasterDevice(organizationId);
-      const optionsExcludeDoAction = await screenLinkPageByDeptIdGetDevice({ organizationId });
+      const options = await screenLinkPageByDeptIdGetDevice({
+        organizationId,
+      });
       // 获取当前组织下的告警配置
       const alarmConfig = await getOrganizationAlarmConfig({ organizationId });
-      // 获取当前组织下的属性列表
-      const attrList = await getAttribute(
-        organizationId,
-        triggers.map((m) => m.entityId).join(',')
-      );
-      watchAttrList.value = await getAttribute(organizationId, null);
       // 生成回显时对应得组件数量
       triggerData.value = [...new Array(triggers.length).keys()];
       conditionData.value = [...new Array(doConditions.length).keys()];
       actionData.value = [...new Array(doActions.length).keys()];
       // 回显设备列表
-      editEntryIdData.value = options.map((item) => {
-        return {
-          value: item.id,
-          label: item.name,
-        };
-      });
-      editEntryIdExcludeDoActionData.value = optionsExcludeDoAction.items.map((item) => {
+      editEntryIdData.value = options.items.map((item) => {
         return {
           value: item.tbDeviceId,
           label: item.name,
@@ -195,17 +185,11 @@
         };
       });
       deviceList.value = editEntryIdData.value;
-      deviceExcludeDoAction.value = editEntryIdExcludeDoActionData.value;
-
-      //回显属性列表
-      editAttrIdData = attrList;
       nextTick(() => {
-        setEditFields(skipUnwrap.triggerItemRefs, editEntryIdExcludeDoActionData);
-        setEditFields(skipUnwrap.conditionItemRefs, editEntryIdExcludeDoActionData);
+        setEditFields(skipUnwrap.triggerItemRefs, editEntryIdData);
+        setEditFields(skipUnwrap.conditionItemRefs, editEntryIdData);
         setEditFields(skipUnwrap.actionItemRefs, editEntryIdData);
         setEditAlarmConfig(skipUnwrap.actionItemRefs, editAlarmConfigData);
-        setEditAttr(skipUnwrap.triggerItemRefs, editAttrIdData);
-        setEditAttr(skipUnwrap.conditionItemRefs, editAttrIdData);
       });
       const map = {
@@ -216,6 +200,7 @@
       // 回显触发器数据---此处是个闭包!
       triggers.forEach((trigger, index) => {
         nextTick(async () => {
+          const selectDeviceId = ref('');
           // 回显启用规则
           unref(skipUnwrap.triggerItemRefs)[index].currentIndex =
             map[trigger.triggerCondition.schedule.type];
@@ -223,15 +208,12 @@
           unref(skipUnwrap.triggerItemRefs)[index].isUpdate = true;
           unref(skipUnwrap.triggerItemRefs)[index].alarmScheduleRef.scheduleData =
             trigger.triggerCondition.schedule;
-          const getAttrKeyOption = trigger?.triggerCondition?.condition?.condition?.map(
-            (m) => m.key.key
-          );
           unref(skipUnwrap.triggerItemRefs)[index].setFieldsFormValueFun({
             triggered: trigger?.triggerCondition?.condition?.spec?.type,
             device: trigger?.entityType,
             triggerType: trigger?.triggerType,
             type1: trigger?.triggerCondition?.condition?.condition[0]?.key?.type,
-            type2: getAttrKeyOption,
+            type2: trigger?.triggerCondition?.condition?.condition[0]?.key?.key,
             operationType: trigger?.triggerCondition?.condition?.condition[0]?.valueType,
             detail: trigger?.triggerCondition?.alarmDetails,
             entityId: trigger?.entityId,
@@ -239,6 +221,15 @@
             time: trigger?.triggerCondition?.condition?.spec?.predicate?.defaultValue,
             timeUnit: trigger?.triggerCondition?.condition?.spec?.unit,
           });
+          if (trigger.entityId != undefined) {
+            selectDeviceId.value = trigger?.entityId;
+          }
+          //fengtao-把设备id回传给子组件
+          unref(skipUnwrap.triggerItemRefs)[index].updateFieldAttributeFunc(
+            selectDeviceId.value,
+            provideOrgid.value
+          );
+          //fengtao
           // 设置值operationType
           unref(skipUnwrap.triggerItemRefs)[index].operationType =
             trigger.triggerCondition?.condition.condition[0].valueType;
@@ -298,15 +289,12 @@
           unref(skipUnwrap.conditionItemRefs)[index].isUpdate = true;
           unref(skipUnwrap.conditionItemRefs)[index].alarmScheduleRef.scheduleData =
             condition.triggerCondition.schedule;
-          const getAttrKeyOption = condition?.triggerCondition?.condition?.condition?.map(
-            (m) => m.key.key
-          );
           unref(skipUnwrap.conditionItemRefs)[index].setFieldsFormValueFun({
             triggered: condition?.triggerCondition?.condition?.spec?.type,
             device: condition?.entityType,
             triggerType: condition?.triggerType,
             type1: condition?.triggerCondition?.condition?.condition[0]?.key?.type,
-            type2: getAttrKeyOption,
+            type2: condition?.triggerCondition?.condition?.condition[0]?.key?.key,
             operationType: condition?.triggerCondition?.condition?.condition[0]?.valueType,
             detail: condition?.triggerCondition?.alarmDetails,
             entityId: condition?.entityId,
@@ -493,11 +481,9 @@
   // 设置设备的options
   const setEditFields = (linkAge, deviceList) => {
     unref(linkAge).map((item) => {
-      if (item.isTriggerAndConditionFlag == 'isTriggerAndConditionFlag') {
-        item.updateExcludeActionFieldDeviceId(deviceList);
-      } else {
-        item.updateFieldDeviceId(deviceList);
-      }
+      //TODO-fengtao
+      item.updateFieldDeviceId(deviceList, orgId, isUpdate, getMasterDeviceList);
+      //TODO-fengtao
     });
   };
   // 设置告警配置options
@@ -506,29 +492,21 @@
       item.updateEditFieldAlarmConfig(alarmConfigList);
     });
   };
-  //设置设备属性的options
-  const setEditAttr = (linkAge, attrList) => {
-    unref(linkAge).map((item) => {
-      item.updateFieldAttr(attrList);
-    });
-  };
-
   // 监听组织变化更新设备列表
   const deviceList = ref([]);
+  const getMasterDeviceList = ref([]);
+  const orgId = ref('');
   const alarmConfigList = ref([]);
-  const watchAttrList = ref([]);
-  const deviceExcludeDoAction = ref([]);
   watch(organizationId, async (newValue: string) => {
     if (!newValue) return;
-    provideOrgid.value = newValue;
-    const items = await byOganizationIdGetMasterDevice(newValue);
-    const itemExcludeDoAction = await screenLinkPageByDeptIdGetDevice({ organizationId: newValue });
-    deviceExcludeDoAction.value = itemExcludeDoAction.items.map((item) => ({
-      label: item.name,
-      value: item.tbDeviceId,
-    }));
-    deviceList.value = items.map((item) => ({ label: item.name, value: item.id }));
-    watchAttrList.value = await getAttribute(newValue, null);
+    const { items } = await screenLinkPageByDeptIdGetDevice({ organizationId: newValue });
+    //TODO fengtao
+    getMasterDeviceList.value = await byOganizationIdGetMasterDevice(newValue);
+    //TODO fengtao
+    deviceList.value = items.map((item) => ({ label: item.name, value: item.tbDeviceId }));
+    //TODO fengtao
+    orgId.value = newValue;
+    //TODO fengtao
     setFields(skipUnwrap.triggerItemRefs, true);
     setFields(skipUnwrap.conditionItemRefs, true);
     setFields(skipUnwrap.actionItemRefs, true);
@@ -541,12 +519,9 @@
   function setFields(linkAge, isOrganizationChange = false) {
     unref(linkAge).map((item) => {
       isOrganizationChange && item.resetFieldsValueFunc();
-      if (item.isTriggerAndConditionFlag == 'isTriggerAndConditionFlag') {
-        item.updateExcludeActionFieldDeviceId(deviceExcludeDoAction);
-        item.updateFieldAttr(watchAttrList);
-      } else {
-        item.updateFieldDeviceId(deviceList);
-      }
+      //TODO fengtao
+      item.updateFieldDeviceId(deviceList, orgId, isUpdate, getMasterDeviceList);
+      //TODO fengtao
     });
   }
   function setAlarmConfig(linkAge, isOrganizationChange = false) {
@@ -609,7 +584,20 @@
         id: unref(id),
         tenantId: unref(tenantId),
       };
-
+      //TODO fengtao---修改之前如果是新增，如果条件筛选页面打开，但没填值，还是可以新增成功
+      const typeBoolean = postAddOrEditData?.triggers?.some((f) => {
+        let type = false;
+        f?.triggerCondition?.condition?.condition?.some((s) => {
+          if (s?.predicate?.value?.defaultValue == undefined) {
+            type = true;
+          } else {
+            type = false;
+          }
+        });
+        return type;
+      });
+      if (typeBoolean) return createMessage.error('请填写条件筛选');
+      //TODO fengtao
       await screenLinkPageAddApi(postAddOrEditData, unref(isUpdate));
       createMessage.success(`${unref(isUpdate) ? '编辑' : '新增'}成功`);
       closeDrawer();
@@ -659,8 +647,14 @@
 </script>
 <style lang="less" scoped>
-  ///统一下拉选择框宽度,否则超出默认宽度会造成页面样式错乱
-  :deep(.ant-select-selector) {
-    max-width: 14.2rem;
+  //TODO-fengtao
+  ///移除选择框默认样式（24px）否则超出默认宽度会造成页面样式错乱
+  ::v-deep(.ant-select-selector) {
+    padding-right: 0px !important;
+  }
+
+  ::v-deep(.ant-select-selection-overflow) {
+    max-width: 10vw !important;
   }
+  //TODO-fengtao
 </style>
--- a/src/views/rule/linkedge/config/config.data.ts
View file @9277d32
+++ b/src/views/rule/linkedge/config/config.data.ts
View file @9277d32
@@ -257,7 +257,7 @@ export const trigger_condition_schema: FormSchema[] = [
   {
     field: 'type2',
     label: '',
-    component: 'Select',
+    component: 'AutoComplete',
     componentProps: {
       placeholder: '请选择属性',
     },
--- a/src/views/rule/linkedge/cpns/Trigger-Condition.vue
View file @9277d32
+++ b/src/views/rule/linkedge/cpns/Trigger-Condition.vue
View file @9277d32
@@ -98,42 +98,96 @@
     );
     return { ...getFieldsValue(), predicate, schedule: alarmScheduleRef.value.scheduleData };
   };
-  const updateExcludeActionFieldDeviceId = (deviceList: any[]) => {
+
+  //TODO-fengtao
+  const updateFieldDeviceId = (deviceList: any[], orgId, isUpdate) => {
+    //用于编辑回显
+    if (isUpdate.value != 3 && isUpdate.value) {
+      updateSchema({
+        field: 'entityId',
+        componentProps: {
+          options: deviceList,
+        },
+      });
+    }
+    //新增、编辑都会触发onChang事件
     updateSchema({
-      field: 'entityId',
+      field: 'device',
       componentProps: {
-        options: deviceList,
-        onChange(e) {
+        options: [
+          { label: '全部', value: 'ALL' },
+          { label: '部分', value: 'PART' },
+        ],
+        async onChange(e) {
+          setFieldsValue({ type2: '' });
+          //部分切换-清空或者重置为初始值
+          updateSchema({
+            field: 'type2',
+            componentProps: {
+              options: [],
+            },
+          });
           if (e) {
-            updateFieldAttributeFunc(e);
+            //fengtao
+            if (e == 'ALL') {
+              const data = await getAttribute(props.provideOrgid || orgId.value, null);
+              //fengtao
+              const options = data.map((m) => {
+                return {
+                  label: m,
+                  value: m,
+                };
+              });
+              updateSchema({
+                field: 'type2',
+                componentProps: {
+                  placeholder: '请选择属性',
+                  options,
+                },
+              });
+            } else {
+              const getT = getFieldsValue();
+              const entityId = getT.entityId;
+              if (entityId !== undefined && entityId.length > 0) {
+                updateFieldAttributeFunc(entityId, orgId.value);
+              }
+              updateSchema({
+                field: 'entityId',
+                componentProps: {
+                  options: deviceList,
+                  onChange(e) {
+                    if (e) {
+                      //fengtao
+                      updateFieldAttributeFunc(e, orgId.value);
+                      //fengtao
+                    }
+                  },
+                },
+              });
+            }
+            //fengtao
           }
         },
       },
     });
   };
-  const updateFieldAttr = (attrList: any[]) => {
-    const attrMapList = attrList.value?.map((m) => {
-      return {
-        label: m,
-        value: m,
-      };
-    });
-    updateSchema({
-      field: 'type2',
-      componentProps: {
-        placeholder: '请选择属性',
-        options: attrMapList,
-      },
-    });
-  };
+  //TODO-fengtao
   const resetFieldsValueFunc = () => resetFields();
   // 回显数据函数
   const setFieldsFormValueFun = (fieldsValue) => {
     setFieldsValue(fieldsValue);
   };
-  const updateFieldAttributeFunc = async (e) => {
-    const joinDeviceIds = e.join(',');
-    const data = await getAttribute(props.provideOrgid, joinDeviceIds);
+  //TODO-fengtao
+  const updateFieldAttributeFunc = async (deviceId, orgId) => {
+    //TODO-fengtao
+    let data;
+    if (deviceId !== undefined && deviceId.length > 0) {
+      const joinDeviceIds = deviceId.join(',');
+      data = await getAttribute(orgId || props.provideOrgid, joinDeviceIds);
+    } else {
+      data = await getAttribute(orgId || props.provideOrgid, null);
+    }
+    //TODO-fengtao
     const options = data.map((m) => {
       return {
         label: m,
@@ -144,11 +198,11 @@
       field: 'type2',
       componentProps: {
         placeholder: '请选择属性',
-        options,
+        options: options,
       },
     });
   };
-
+  //TODO-fengtao
   const handleDelete = (params: { index: number; title: string }) => {
     emit('delete', params);
   };
@@ -195,12 +249,9 @@
     currentIndex.value = index;
   };
   const scheduleData = ref(null);
-  const isTriggerAndConditionFlag = 'isTriggerAndConditionFlag';
   defineExpose({
-    isTriggerAndConditionFlag,
     getFieldsValueFunc,
-    updateExcludeActionFieldDeviceId,
-    updateFieldAttr,
+    updateFieldDeviceId,
     resetFieldsValueFunc,
     setFieldsFormValueFun,
     childGetFieldsValue,
@@ -212,9 +263,17 @@
     scheduleData,
     isUpdate,
     alarmScheduleRef,
+    updateFieldAttributeFunc,
   });
 </script>
+<style lang="less" scoped>
+  ///移除选择框默认样式（24px）否则超出默认宽度会造成页面样式错乱
+  ::v-deep(.ant-select-selector) {
+    padding-right: 0px !important;
+  }
+</style>
+
 <style>
   .active {
     color: #377dff;
--- a/src/views/rule/linkedge/cpns/action.vue
View file @9277d32
+++ b/src/views/rule/linkedge/cpns/action.vue
View file @9277d32
@@ -140,14 +140,25 @@
     setFieldsValue(fieldsValue);
   };
   const resetFieldsValueFunc = () => resetFields();
-  const updateFieldDeviceId = (deviceList) => {
+
+  //TODO-fengtao
+  const updateFieldDeviceId = (deviceList, e, i, masterList) => {
+    console.log(deviceList, e, i);
+    console.log(masterList.value);
+    const options = masterList.value.map((m) => {
+      return {
+        value: m.id,
+        label: m.name,
+      };
+    });
     updateSchema({
       field: 'deviceId',
       componentProps: {
-        options: deviceList,
+        options,
       },
     });
   };
+  //TODO-fengtao
   const updateEditFieldAlarmConfig = (alarmConfigList) => {
     updateSchema({
       field: 'alarm_config',