Merge branch 'f-dev' into 'main'

fix：修改Teambition上所属问题

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

@@ -169,6 +169,8 @@
         organizationId,
         organizationId,
         triggers.map((m) => m.entityId).join(',')
         triggers.map((m) => m.entityId).join(',')
       );
       );
+      watchAttrList.value = await getAttribute(organizationId, null);
+
       // 生成回显时对应得组件数量
       // 生成回显时对应得组件数量
       triggerData.value = [...new Array(triggers.length).keys()];
       triggerData.value = [...new Array(triggers.length).keys()];
       conditionData.value = [...new Array(doConditions.length).keys()];
       conditionData.value = [...new Array(doConditions.length).keys()];
@@ -514,7 +516,7 @@
   // 监听组织变化更新设备列表
   // 监听组织变化更新设备列表
   const deviceList = ref([]);
   const deviceList = ref([]);
   const alarmConfigList = ref([]);
   const alarmConfigList = ref([]);
-  let watchAttrList = [];
+  const watchAttrList = ref([]);
   const deviceExcludeDoAction = ref([]);
   const deviceExcludeDoAction = ref([]);
   watch(organizationId, async (newValue: string) => {
   watch(organizationId, async (newValue: string) => {
     if (!newValue) return;
     if (!newValue) return;
@@ -526,7 +528,7 @@
       value: item.tbDeviceId,
       value: item.tbDeviceId,
     }));
     }));
     deviceList.value = items.map((item) => ({ label: item.name, value: item.id }));
     deviceList.value = items.map((item) => ({ label: item.name, value: item.id }));
-    watchAttrList = await getAttribute(newValue, null);
+    watchAttrList.value = await getAttribute(newValue, null);
     setFields(skipUnwrap.triggerItemRefs, true);
     setFields(skipUnwrap.triggerItemRefs, true);
     setFields(skipUnwrap.conditionItemRefs, true);
     setFields(skipUnwrap.conditionItemRefs, true);
     setFields(skipUnwrap.actionItemRefs, true);
     setFields(skipUnwrap.actionItemRefs, true);
@@ -541,10 +543,10 @@
       isOrganizationChange && item.resetFieldsValueFunc();
       isOrganizationChange && item.resetFieldsValueFunc();
       if (item.isTriggerAndConditionFlag == 'isTriggerAndConditionFlag') {
       if (item.isTriggerAndConditionFlag == 'isTriggerAndConditionFlag') {
         item.updateExcludeActionFieldDeviceId(deviceExcludeDoAction);
         item.updateExcludeActionFieldDeviceId(deviceExcludeDoAction);
+        item.updateFieldAttr(watchAttrList);
       } else {
       } else {
         item.updateFieldDeviceId(deviceList);
         item.updateFieldDeviceId(deviceList);
       }
       }
-      // item.updateFieldAttr(watchAttrList);
     });
     });
   }
   }
   function setAlarmConfig(linkAge, isOrganizationChange = false) {
   function setAlarmConfig(linkAge, isOrganizationChange = false) {

@@ -112,7 +112,7 @@
     });
     });
   };
   };
   const updateFieldAttr = (attrList: any[]) => {
   const updateFieldAttr = (attrList: any[]) => {
-    const attrMapList = attrList?.map((m) => {
+    const attrMapList = attrList.value?.map((m) => {
       return {
       return {
         label: m,
         label: m,
         value: m,
         value: m,

@@ -14,7 +14,7 @@
             v-model:value="model[field]"
             v-model:value="model[field]"
             :treeData="organizationTreeData"
             :treeData="organizationTreeData"
             :checked-keys="checkGroup"
             :checked-keys="checkGroup"
-            default-expand-all
+            :expandedKeys="treeExpandData"
             ref="basicTreeRef"
             ref="basicTreeRef"
             checkable
             checkable
             toolbar
             toolbar
@@ -46,6 +46,7 @@
       const organizationTreeData = ref<TreeItem[]>([]);
       const organizationTreeData = ref<TreeItem[]>([]);
       const basicTreeRef = ref();
       const basicTreeRef = ref();
       const checkGroup = ref<string[]>([]);
       const checkGroup = ref<string[]>([]);
+      const treeExpandData = ref([]);
       const olderPhoneNumber = ref();
       const olderPhoneNumber = ref();
       const postData = reactive({});
       const postData = reactive({});
       const singleEditPostPhoneNumber = reactive({
       const singleEditPostPhoneNumber = reactive({
@@ -63,6 +64,13 @@
           span: 18,
           span: 18,
         },
         },
       });
       });
+      //获取所有父级id
+      function findForAllId(data = [], arr = []) {
+        for (const item of data) {
+          arr.push(item.id);
+        }
+        return arr;
+      }
 
 
       const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
       const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
         await resetFields();
         await resetFields();
@@ -72,6 +80,9 @@
         if (!unref(organizationTreeData).length) {
         if (!unref(organizationTreeData).length) {
           copyTransTreeFun(groupListModel);
           copyTransTreeFun(groupListModel);
           organizationTreeData.value = groupListModel;
           organizationTreeData.value = groupListModel;
+          const getAllIds = findForAllId(organizationTreeData.value as any, []);
+          //设置要展开的id
+          treeExpandData.value = getAllIds;
         }
         }
         if (unref(isUpdate)) {
         if (unref(isUpdate)) {
           rowId.value = data.record.id;
           rowId.value = data.record.id;
@@ -149,6 +160,7 @@
         organizationTreeData,
         organizationTreeData,
         checkGroup,
         checkGroup,
         basicTreeRef,
         basicTreeRef,
+        treeExpandData,
       };
       };
     },
     },
   });
   });

@@ -71,7 +71,7 @@ export const columns: BasicColumn[] = [
     dataIndex: 'createdTime',
     dataIndex: 'createdTime',
     width: 180,
     width: 180,
     format: (_, record) => {
     format: (_, record) => {
-      return moment(record.createdTime).format('YYYY-MM-DD-HH-MM-ss');
+      return moment(record.createdTime).format('YYYY-MM-DD HH:MM:ss');
     },
     },
   },
   },
 ];
 ];

@@ -72,7 +72,7 @@ export const columns: BasicColumn[] = [
     dataIndex: 'createdTime',
     dataIndex: 'createdTime',
     width: 180,
     width: 180,
     format: (_, record) => {
     format: (_, record) => {
-      return moment(record.createdTime).format('YYYY-MM-DD-HH-MM-ss');
+      return moment(record.createdTime).format('YYYY-MM-DD HH:MM:ss');
     },
     },
   },
   },
 ];
 ];

@@ -42,6 +42,11 @@
         columns,
         columns,
         showIndexColumn: false,
         showIndexColumn: false,
         clickToRowSelect: false,
         clickToRowSelect: false,
+        beforeFetch: (T) => {
+          if (T.actionType == 'ALL') {
+            delete T.actionType;
+          }
+        },
         formConfig: {
         formConfig: {
           labelWidth: 120,
           labelWidth: 120,
           schemas: searchFormSchema,
           schemas: searchFormSchema,

@@ -40,7 +40,7 @@ export const columns: BasicColumn[] = [
     dataIndex: 'createdTime',
     dataIndex: 'createdTime',
     width: 180,
     width: 180,
     format: (_, record) => {
     format: (_, record) => {
-      return moment(record.createdTime).format('YYYY-MM-DD-HH-MM-ss');
+      return moment(record.createdTime).format('YYYY-MM-DD HH:MM:ss');
     },
     },
   },
   },
 ];
 ];