Merge branch 'ft_local_dev' into 'main'

fix:修改Tembition上的问题 See merge request huang/yun-teng-iot-front!405

Merge branch 'ft_local_dev' into 'main'
fix:修改Tembition上的问题 See merge request huang/yun-teng-iot-front!405
xp.Huang
2 parents db38cf03 c11a5e9b
Showing 11 changed files with 211 additions and 237 deletions
src/api/ruleengine/ruleengineApi.ts
src/views/report/config/ReportConfigDrawer.vue
src/views/report/config/cpns/DeviceAttrCpns.vue
src/views/report/export/ReportPreviewModal.vue
src/views/rule/linkedge/SceneLinkAgeDrawer.vue
src/views/rule/linkedge/config/config.data.ts
src/views/rule/linkedge/config/formatData.ts
src/views/rule/linkedge/cpns/ClearAlarm.vue
src/views/rule/linkedge/cpns/Trigger-Condition.vue
src/views/rule/linkedge/cpns/action.vue
src/views/tenant/list/tenantBaseColumns.ts
--- a/src/api/ruleengine/ruleengineApi.ts
View file @7dec96f
+++ b/src/api/ruleengine/ruleengineApi.ts
View file @7dec96f
@@ -18,7 +18,8 @@ enum ScreenManagerApi {
   SCREEN_ORGANIZATION_URL = '/organization/me/list',
   SCREEN_CHANGE_STATUS = '/convert/update/scene',
   SCREEN_GET_BY_DEPTID = '/scene_linkage/device/',
-  GET_ATTRBUTELIST = '/device/keys',
+  // GET_ATTRBUTELIST = '/device/keys',
+  GET_ATTRBUTELIST = '/device/attributes/',
   ALARM_PROFILE = '/alarm/profile/',
   MASTER_GET_DEVICE = '/device/list/master',
 }
@@ -101,10 +102,16 @@ export const getOrganizationAlarmConfig = (params: { organizationId }) => {
 /**
  * 获取设备属性列表
  */
-export const getAttribute = (orgId, deviceIds) => {
-  const joinText = deviceIds == null ? [] : '?deviceIds=' + deviceIds;
+// export const getAttribute = (orgId, deviceIds) => {
+//   const joinText = deviceIds == null ? [] : '?deviceIds=' + deviceIds;
+//   return defHttp.get({
+//     url: ScreenManagerApi.GET_ATTRBUTELIST + '/' + orgId + joinText,
+//   });
+// };
+export const getAttribute = (orgId) => {
+  // const joinText = deviceIds == null ? [] : '?deviceIds=' + deviceIds;
   return defHttp.get({
-    url: ScreenManagerApi.GET_ATTRBUTELIST + '/' + orgId + joinText,
+    url: `${ScreenManagerApi.GET_ATTRBUTELIST}${orgId}`,
   });
 };
--- a/src/views/report/config/ReportConfigDrawer.vue
View file @7dec96f
+++ b/src/views/report/config/ReportConfigDrawer.vue
View file @7dec96f
@@ -55,7 +55,6 @@
   import { screenLinkPageByDeptIdGetDevice } from '/@/api/ruleengine/ruleengineApi';
   import { Select } from 'ant-design-vue';
   import DeviceAttrCpns from './cpns/DeviceAttrCpns.vue';
-  import { SelectTypes } from 'ant-design-vue/es/select';
   import { SchemaFiled } from './config.data';
   import { QueryWay } from '../../device/localtion/cpns/TimePeriodForm/config';
   import { AggregateDataEnum } from '../../device/localtion/cpns/TimePeriodForm/config';
@@ -68,6 +67,14 @@
     device?: string;
     name?: string;
     attributes?: string | undefined;
+    deviceProfileId?: string;
+    id?: string;
+  };
+  type TSelectOption = {
+    value?: string;
+    label?: string;
+    deviceProfileId?: string;
+    id?: string;
   };
   const emit = defineEmits(['success', 'register']);
   const bindDeviceRefObj = {
@@ -76,7 +83,7 @@
   const isUpdate = ref(true);
   const editId = ref('');
   const orgId = ref('');
-  const selectOptions: Ref<SelectTypes['options']> = ref([]);
+  const selectOptions: Ref<TSelectOption[]> = ref([]);
   const selectDevice = ref([]);
   const deviceList: Ref<TDeviceList[]> = ref([]);
   const editDeviceList: Ref<TDeviceList[]> = ref([]);
@@ -126,18 +133,20 @@
             return {
               label: item.name,
               value: item.tbDeviceId,
+              id: item.id,
+              deviceProfileId: item.deviceProfileId,
             };
         });
       }
     }
   );
   //设备Select选中
-  const handleDeviceChange = (e) => {
+  const handleDeviceChange = (_, o) => {
     if (unref(isUpdate)) {
       //编辑
       let temp: any = [];
       editDeviceAttr.value.forEach((f) => {
-        temp = [f, ...e];
+        temp = [f, ...o];
       });
       let deWeightThree = () => {
         let map = new Map();
@@ -150,11 +159,11 @@
       };
       temp = deWeightThree();
       deviceList.value = temp;
-      if (e.length !== 0) {
-        deviceList.value = e;
+      if (o.length !== 0) {
+        deviceList.value = o;
       }
     } else {
-      deviceList.value = e;
+      deviceList.value = o;
     }
   };
   //设备取消删除
@@ -284,6 +293,8 @@
           return {
             label: item.name,
             value: item.tbDeviceId,
+            id: item.id,
+            deviceProfileId: item.deviceProfileId,
           };
       });
       const deviceIds = editResData.data.executeAttributes.map((m) => {
@@ -295,7 +306,16 @@
       selectDevice.value = deviceIds;
       //回显设备属性
       editDeviceAttr.value = editResData.data.executeAttributes?.map((item) => {
+        const T = selectOptions.value.find((o) => {
+          if (item.device === o.value) {
+            return {
+              id: o.id,
+              deviceProfileId: o.deviceProfileId,
+            };
+          }
+        });
         return {
+          ...T,
           label: item.name,
           value: item.device,
           attributes: item.attributes,
--- a/src/views/report/config/cpns/DeviceAttrCpns.vue
View file @7dec96f
+++ b/src/views/report/config/cpns/DeviceAttrCpns.vue
View file @7dec96f
@@ -43,21 +43,23 @@
   });
   const selectOptions: any = ref([]);
   //获取对应设备属性
-  const getAttr = async (orgId, deviceId) => {
-    const res = await getAttribute(orgId, deviceId);
-    selectOptions.value = res.map((o) => {
-      let obj: any = {};
-      if (o !== null) {
-        obj = {
-          label: o,
-          value: o,
-        };
-        return obj;
-      }
-    });
-    //如果服务端返回的数组里含有null 过滤null值
-    const excludeNull = selectOptions.value.filter(Boolean);
-    selectOptions.value = excludeNull;
+  const getAttr = async (orgId, _) => {
+    const res = await getAttribute(orgId);
+    if (Array.isArray(res)) {
+      selectOptions.value = res.map((o) => {
+        let obj: any = {};
+        if (o?.identifier !== null) {
+          obj = {
+            label: o?.identifier,
+            value: o?.identifier,
+          };
+          return obj;
+        }
+      });
+      //如果服务端返回的数组里含有null 过滤null值
+      const excludeNull = selectOptions.value.filter(Boolean);
+      selectOptions.value = excludeNull;
+    }
   };
   //动态数据
   const dynamicInput: UnwrapRef<{ params: Params[] }> = reactive({ params: [] });
@@ -69,12 +71,12 @@
    * 初始化数值
    */
   async function initVal() {
-    if (props.orgId && props.value.value) {
-      await getAttr(props.orgId, props.value.value);
+    if (props.value) {
+      await getAttr(props.value?.deviceProfileId, props.value?.id);
       dynamicInput.params.push({
         name: props.value.label,
         device: props.value.value,
-        attributes: props.value.attributes == [] ? [] : props.value.attributes,
+        attributes: props.value?.attributes == [] ? [] : props.value.attributes,
       });
     }
   }
--- a/src/views/report/export/ReportPreviewModal.vue
View file @7dec96f
+++ b/src/views/report/export/ReportPreviewModal.vue
View file @7dec96f
@@ -271,10 +271,10 @@
   };
   const validateHasData = (record: Recordable) => {
-    notFoundData.value = false;
+    notFoundData.value = true;
     const { val = [], attr } = (record as unknown as ResponsData) || {};
     if (!attr || !val.length) {
-      notFoundData.value = true;
+      notFoundData.value = false;
     }
   };
--- a/src/views/rule/linkedge/SceneLinkAgeDrawer.vue
View file @7dec96f
+++ b/src/views/rule/linkedge/SceneLinkAgeDrawer.vue
View file @7dec96f
@@ -228,7 +228,7 @@
       // 回显触发器数据---此处是个闭包!
       triggers.forEach((trigger, index) => {
         nextTick(async () => {
-          const selectDeviceId = ref('');
+          const selectProductId = ref('');
           // 回显启用规则
           unref(skipUnwrap.triggerItemRefs)[index].currentIndex =
             map[trigger.triggerCondition.schedule.type];
@@ -245,18 +245,16 @@
             operationType: trigger?.triggerCondition?.condition?.condition[0]?.valueType,
             detail: trigger?.triggerCondition?.alarmDetails,
             entityId: trigger?.entityId,
+            deviceProfileId: trigger?.deviceProfileId,
             replaceValue: trigger?.triggerCondition?.condition?.spec?.predicate?.defaultValue,
             time: trigger?.triggerCondition?.condition?.spec?.predicate?.defaultValue,
             timeUnit: trigger?.triggerCondition?.condition?.spec?.unit,
           });
-          if (trigger.entityId != undefined) {
-            selectDeviceId.value = trigger?.entityId;
+          if (trigger.deviceProfileId != undefined) {
+            selectProductId.value = trigger?.deviceProfileId;
           }
           //fengtao-把设备id回传给子组件
-          unref(skipUnwrap.triggerItemRefs)[index].updateFieldAttributeFunc(
-            selectDeviceId.value,
-            provideOrgid.value
-          );
+          unref(skipUnwrap.triggerItemRefs)[index].updateFieldAttributeFunc(selectProductId.value);
           //fengtao
           // 设置值operationType
           unref(skipUnwrap.triggerItemRefs)[index].operationType =
@@ -309,7 +307,7 @@
       doConditions.forEach((condition, index) => {
         nextTick(async () => {
-          const selectDeviceId = ref('');
+          const selectProductId = ref('');
           // 回显启用规则
           unref(skipUnwrap.conditionItemRefs)[index].currentIndex =
             map[condition.triggerCondition.schedule.type];
@@ -327,17 +325,17 @@
             operationType: condition?.triggerCondition?.condition?.condition[0]?.valueType,
             detail: condition?.triggerCondition?.alarmDetails,
             entityId: condition?.entityId,
+            deviceProfileId: condition?.deviceProfileId,
             replaceValue: condition?.triggerCondition?.condition?.spec?.predicate?.defaultValue,
             time: condition?.triggerCondition?.condition?.spec?.predicate?.defaultValue,
             timeUnit: condition?.triggerCondition?.condition?.spec?.unit,
           });
-          if (condition?.entityId != undefined) {
-            selectDeviceId.value = condition?.entityId;
+          if (condition?.deviceProfileId != undefined) {
+            selectProductId.value = condition?.deviceProfileId;
           }
           //fengtao-把设备id回传给子组件
           unref(skipUnwrap.conditionItemRefs)[index].updateFieldAttributeFunc(
-            selectDeviceId.value,
-            provideOrgid.value
+            selectProductId.value
           );
           //fengtao
           // 设置值operationType
@@ -388,10 +386,9 @@
           });
         });
       });
-
       doActions.forEach((action, index) => {
         nextTick(() => {
-          const selectDeviceId = ref('');
+          const selectProductId = ref('');
           // 设置执行动作外层值
           unref(skipUnwrap.actionItemRefs)[index].setFieldsFormValueFun({
             ...action,
@@ -439,6 +436,7 @@
                         .valueType,
                     detail: action.doContext.clearRule[index].triggerCondition.alarmDetails,
                     entityId: action.doContext.clearRule[index].entityId,
+                    deviceProfileId: action.doContext.clearRule[index]?.deviceProfileId,
                     replaceValue:
                       action.doContext.clearRule[index].triggerCondition.condition.spec.predicate
                         .defaultValue,
@@ -447,17 +445,12 @@
                     timeUnit:
                       action.doContext.clearRule[index].triggerCondition.condition.spec.unit,
                   });
-                  if (action.doContext.clearRule[index].entityId != undefined) {
-                    selectDeviceId.value = action.doContext.clearRule[index].entityId;
+                  if (action.doContext.clearRule[index]?.deviceProfileId != undefined) {
+                    selectProductId.value = action.doContext.clearRule[index]?.deviceProfileId;
                   }
                   //fengtao-把设备id回传给子组件
-                  item.updateFieldAttributeFunc(selectDeviceId.value, provideOrgid.value);
-                  // item.updateFieldDeviceId(
-                  //   deviceList.value,
-                  //   provideOrgid.value,
-                  //   isUpdate.value,
-                  //   getMasterDeviceList.value
-                  // );
+                  item.updateFieldAttributeFunc(selectProductId.value);
+                  item.updateFieldDeviceId(deviceList.value, provideOrgid.value, isUpdate.value);
                   //fengtao
                   // 单独设置operationType值 操作符类型 NUMERIC|String|Boolean|DATE_TIME
                   item.operationType =
@@ -534,12 +527,12 @@
   });
   // 设置设备的options
-  const setEditFields = (_linkAge, _deviceList) => {
-    // unref(linkAge).map((item) => {
-    //TODO-fengtao
-    // item.updateFieldDeviceId(deviceList, orgId, isUpdate, getMasterDeviceList);
-    //TODO-fengtao
-    // });
+  const setEditFields = (linkAge, deviceList) => {
+    unref(linkAge).map((item) => {
+      // TODO-fengtao
+      item.updateFieldDeviceId(deviceList, orgId, isUpdate);
+      // TODO-fengtao
+    });
   };
   // 设置告警配置options
   const setEditAlarmConfig = (linkAge, alarmConfigList) => {
@@ -600,7 +593,7 @@
     unref(linkAge).map((item) => {
       isOrganizationChange && item.resetFieldsValueFunc();
       //TODO fengtao
-      // item.updateFieldDeviceId(deviceList, orgId, isUpdate, getMasterDeviceList);
+      item.updateFieldDeviceId(deviceList, orgId, isUpdate);
       if (isUpdate.value) {
         item.updateEditFieldAlarmConfig(editAlarmConfigData);
       } else {
--- a/src/views/rule/linkedge/config/config.data.ts
View file @7dec96f
+++ b/src/views/rule/linkedge/config/config.data.ts
View file @7dec96f
@@ -3,6 +3,7 @@ import { BasicColumn, FormSchema } from '/@/components/Table';
 import {
   byOrganizationIdGetMasterDevice,
   screenLinkOrganizationGetApi,
+  getAttribute,
 } from '/@/api/ruleengine/ruleengineApi';
 import { scheduleOptions } from './formatData';
 import { copyTransFun } from '/@/utils/fnUtils';
@@ -196,6 +197,52 @@ export const trigger_condition_schema: FormSchema[] = [
     colProps: { span: 6 },
   },
   {
+    field: 'deviceProfileId',
+    label: '',
+    component: 'ApiSelect',
+    colProps: { span: 6 },
+    componentProps: ({ formActionType }) => {
+      const { updateSchema, setFieldsValue } = formActionType;
+      return {
+        api: deviceProfile,
+        placeholder: '请选择产品',
+        labelField: 'name',
+        valueField: 'id',
+        getPopupContainer: () => document.body,
+        onChange: async (e) => {
+          if (e) {
+            setFieldsValue({ type2: '' });
+            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,
+                },
+              });
+            }
+          }
+        },
+      };
+    },
+  },
+  {
     field: 'device',
     label: '',
     component: 'Select',
@@ -208,6 +255,7 @@ export const trigger_condition_schema: FormSchema[] = [
     },
     colProps: { span: 6 },
   },
+
   {
     field: 'entityId',
     label: '',
@@ -219,6 +267,7 @@ export const trigger_condition_schema: FormSchema[] = [
     ifShow: ({ values }) => isPart(values.device),
     colProps: { span: 6 },
   },
+
   {
     field: 'time',
     label: '',
@@ -370,17 +419,19 @@ export const actionSchema: FormSchema[] = [
     component: 'ApiSelect',
     componentProps: ({ formModel }) => {
       const deviceProfileId = formModel['deviceProfileId'];
-      return {
-        placeholder: '请选择设备',
-        mode: 'multiple',
-        api: byOrganizationIdGetMasterDevice,
-        params: {
-          organizationId: unref(organizationId),
-          deviceProfileId,
-        },
-        labelField: 'name',
-        valueField: 'id',
-      };
+      if (unref(organizationId)) {
+        return {
+          placeholder: '请选择设备',
+          mode: 'multiple',
+          api: byOrganizationIdGetMasterDevice,
+          params: {
+            organizationId: unref(organizationId),
+            deviceProfileId,
+          },
+          labelField: 'name',
+          valueField: 'id',
+        };
+      }
     },
     ifShow: ({ values }) => isPart(values.device) && isDeviceOut(values.outTarget),
     colProps: { span: 6 },
@@ -394,7 +445,7 @@ export const actionSchema: FormSchema[] = [
     colProps: {
       span: 6,
     },
-    defaultValue: '0',
+    defaultValue: 0,
     componentProps: ({ formActionType }) => {
       const { setFieldsValue } = formActionType;
       return {
--- a/src/views/rule/linkedge/config/formatData.ts
View file @7dec96f
+++ b/src/views/rule/linkedge/config/formatData.ts
View file @7dec96f
@@ -17,6 +17,7 @@ export const genTriggerOrConditionData = (triggerData) => {
     time,
     timeUnit,
     replaceValue,
+    deviceProfileId,
   } = triggerData;
   const mapPredicate = predicate?.map((item) => {
     return {
@@ -40,6 +41,7 @@ export const genTriggerOrConditionData = (triggerData) => {
     };
   });
   return {
+    deviceProfileId,
     triggerType,
     entityType: device,
     entityId: entityId?.length ? entityId : null,
@@ -115,6 +117,7 @@ export const genActionData = (actionData) => {
       triggerType: item.triggerType,
       entityType: item.device,
       entityId: item.device === 'PART' ? item.entityId : null,
+      deviceProfileId: item.deviceProfileId,
       triggerCondition: {
         alarmDetails: item.detail,
         condition: {
--- a/src/views/rule/linkedge/cpns/ClearAlarm.vue
View file @7dec96f
+++ b/src/views/rule/linkedge/cpns/ClearAlarm.vue
View file @7dec96f
@@ -62,10 +62,10 @@
   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.ts';
+  import { trigger_condition_schema } from '../config/config.data';
   import { getAttribute } from '/@/api/ruleengine/ruleengineApi';
   import ConditionScreening from './ConditionScreening.vue';
-  import { scheduleOptions, timeUnitOptions, options } from '../config/formatData.ts';
+  import { scheduleOptions, timeUnitOptions, options } from '../config/formatData';
   import { Icon } from '/@/components/Icon';
   import AlarmSchedule from './AlarmSchedule.vue';
   import { useModal } from '/@/components/Modal';
@@ -99,22 +99,12 @@
     return { ...getFieldsValue(), predicate, schedule: alarmScheduleRef.value.scheduleData };
   };
-  const updateFieldDeviceId = (deviceList: any[], orgId, isUpdate) => {
+  const updateFieldDeviceId = (deviceList: any[], _, isUpdate) => {
     if (isUpdate) {
       updateSchema({
         field: 'entityId',
         componentProps: {
           options: deviceList,
-          onChange(e) {
-            if (e) {
-              if (isUpdate) {
-                setFieldsValue({ type2: '' });
-              }
-              //fengtao
-              updateFieldAttributeFunc(e, orgId);
-              //fengtao
-            }
-          },
         },
       });
     }
@@ -127,53 +117,15 @@
           { label: '部分', value: 'PART' },
         ],
         async onChange(e) {
-          setFieldsValue({ type2: '' });
           setFieldsValue({ entityId: [] });
-          //部分切换-清空或者重置为初始值
-          updateSchema({
-            field: 'type2',
-            componentProps: {
-              options: [],
-            },
-          });
           if (e) {
             //fengtao
             if (e == 'ALL') {
-              if (orgId) {
-                const data = await getAttribute(orgId, 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);
-              }
               updateSchema({
                 field: 'entityId',
                 componentProps: {
                   options: deviceList,
-                  onChange(e) {
-                    if (e) {
-                      setFieldsValue({ type2: '' });
-                      //fengtao
-                      updateFieldAttributeFunc(e, orgId);
-                      //fengtao
-                    }
-                  },
                 },
               });
             }
@@ -189,30 +141,32 @@
   const setFieldsFormValueFun = (fieldsValue) => {
     setFieldsValue(fieldsValue);
   };
-  //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, joinDeviceIds);
+  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 {
-      data = await getAttribute(orgId, null);
+      updateSchema({
+        field: 'type2',
+        componentProps: {
+          placeholder: '请选择属性',
+          options,
+        },
+      });
     }
-    //TODO-fengtao
-    const options = data.map((m) => {
-      return {
-        label: m,
-        value: m,
-      };
-    });
-    updateSchema({
-      field: 'type2',
-      componentProps: {
-        placeholder: '请选择属性',
-        options: options,
-      },
-    });
   };
   //TODO-fengtao
   const schedule = ref('ANY_TIME');
--- a/src/views/rule/linkedge/cpns/Trigger-Condition.vue
View file @7dec96f
+++ b/src/views/rule/linkedge/cpns/Trigger-Condition.vue
View file @7dec96f
@@ -62,16 +62,16 @@
   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.ts';
+  import { trigger_condition_schema } from '../config/config.data';
   import { getAttribute } from '/@/api/ruleengine/ruleengineApi';
   import ConditionScreening from './ConditionScreening.vue';
-  import { scheduleOptions, timeUnitOptions, options } from '../config/formatData.ts';
+  import { scheduleOptions, timeUnitOptions, options } from '../config/formatData';
   import AlarmSchedule from './AlarmSchedule.vue';
   import { useModal } from '/@/components/Modal';
   import { cloneDeep } from 'lodash-es';
   import { useMessage } from '/@/hooks/web/useMessage';
-  const props = defineProps({
+  defineProps({
     title: {
       type: String,
       required: true,
@@ -139,23 +139,13 @@
   };
   //TODO-fengtao
-  const updateFieldDeviceId = (deviceList: any[], orgId, isUpdate) => {
+  const updateFieldDeviceId = (deviceList: any[], _, isUpdate) => {
     //用于编辑回显
     if (isUpdate.value) {
       updateSchema({
         field: 'entityId',
         componentProps: {
           options: deviceList,
-          onChange(e) {
-            if (e) {
-              if (isUpdate.value) {
-                setFieldsValue({ type2: '' });
-              }
-              //fengtao
-              updateFieldAttributeFunc(e, orgId.value);
-              //fengtao
-            }
-          },
         },
       });
     }
@@ -168,52 +158,15 @@
           { label: '部分', value: 'PART' },
         ],
         async onChange(e) {
-          setFieldsValue({ type2: '' });
           setFieldsValue({ entityId: [] });
-          updateSchema({
-            field: 'type2',
-            componentProps: {
-              options: [],
-            },
-          });
           if (e) {
             //fengtao
             if (e == 'ALL') {
-              if (props.provideOrgid || orgId.value) {
-                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) {
-                      setFieldsValue({ type2: '' });
-                      //fengtao
-                      updateFieldAttributeFunc(e, orgId.value);
-                      //fengtao
-                    }
-                  },
                 },
               });
             }
@@ -233,29 +186,32 @@
     setFieldsValue(fieldsValue);
   };
   //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);
+  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 {
-      data = await getAttribute(orgId || props.provideOrgid, null);
+      updateSchema({
+        field: 'type2',
+        componentProps: {
+          placeholder: '请选择属性',
+          options,
+        },
+      });
     }
-    //TODO-fengtao
-    const options = data.map((m) => {
-      return {
-        label: m,
-        value: m,
-      };
-    });
-    updateSchema({
-      field: 'type2',
-      componentProps: {
-        placeholder: '请选择属性',
-        options: options,
-      },
-    });
   };
   //TODO-fengtao
   const handleDelete = (params: { index: number; title: string }) => {
--- a/src/views/rule/linkedge/cpns/action.vue
View file @7dec96f
+++ b/src/views/rule/linkedge/cpns/action.vue
View file @7dec96f
@@ -170,11 +170,10 @@
   const changeOutTarget = () => {
     emit('getActionFormArr');
   };
-  const [registerAction, { getFieldsValue, resetFields, updateSchema, setFieldsValue, validate }] =
-    useForm({
-      schemas: actionSchema,
-      showActionButtonGroup: false,
-    });
+  const [registerAction, { getFieldsValue, resetFields, setFieldsValue, validate }] = useForm({
+    schemas: actionSchema,
+    showActionButtonGroup: false,
+  });
   // 获取整个执行动作表单值
   const getFieldsValueFunc = () => {
@@ -274,26 +273,14 @@
   const isUpdateItem = ref('');
   const deviceListItem = ref([]);
-  //TODO-fengtao
-  const updateFieldDeviceId = (deviceList, orgId, isUpdate, getMasterDeviceList) => {
+  //update 2022-11-28
+  const updateFieldDeviceId = (deviceList, orgId, isUpdate) => {
     if (isUpdate.value) {
       orgIdItem.value = orgId.value;
     }
     orgIdItem.value = orgId.value;
     isUpdateItem.value = isUpdate.value;
-    const options = getMasterDeviceList.value.map((m) => {
-      return {
-        value: m.id,
-        label: m.name,
-      };
-    });
     deviceListItem.value = deviceList.value;
-    updateSchema({
-      field: 'deviceId',
-      componentProps: {
-        options,
-      },
-    });
   };
   //FT add 2022-10-27
   const updateEditFieldAlarmConfig = (alarmConfigList) => {
--- a/src/views/tenant/list/tenantBaseColumns.ts
View file @7dec96f
+++ b/src/views/tenant/list/tenantBaseColumns.ts
View file @7dec96f
@@ -125,6 +125,7 @@ export const tenantFormSchema: FormSchema[] = [
     label: '租户配置',
     component: 'ApiSelect',
     required: true,
+    defaultValue: 'Default',
     componentProps: {
       api: selectTenantProfileApi,
       showSearch: true,