Merge branch 'f-dev' into 'main'

fix：修改teambition的问题 See merge request huang/yun-teng-iot-front!232

Merge branch 'f-dev' into 'main'
fix：修改teambition的问题 See merge request huang/yun-teng-iot-front!232
xp.Huang
2 parents 1eab6b97 5e0cf7dc
Showing 7 changed files with 37 additions and 11 deletions
src/store/modules/permission.ts
src/views/rule/dataFlow/index.vue
src/views/rule/linkedge/SceneLinkAgeDrawer.vue
src/views/system/customize/config/enterPriseInfo.config.ts
src/views/system/customize/cpns/AppDraw.vue
src/views/system/role/RoleDrawer.vue
src/views/tenant/role/RoleDrawer.vue
--- a/src/store/modules/permission.ts
View file @e307339
+++ b/src/store/modules/permission.ts
View file @e307339
@@ -110,6 +110,7 @@ export const usePermissionStore = defineStore({
        * 否则不是超级管理员-获取对应角色的权限列表
        */
       const codeList = await getPermCode();
+      // console.log('codeList', codeList);
       this.setPermCodeList(codeList);
       /**
        * 如果是超级管理员则获取对应权限列表
--- a/src/views/rule/dataFlow/index.vue
View file @e307339
+++ b/src/views/rule/dataFlow/index.vue
View file @e307339
@@ -16,7 +16,7 @@
             type="primary"
             color="error"
             @click="handleDeleteOrBatchDelete(null)"
-            :disabled="hasBatchDelete"
+            :disabled="singleStopDeleteStatus || hasBatchDelete"
           >
             批量删除
           </a-button>
@@ -117,6 +117,7 @@
         convertIds: [],
         status: 0,
       });
+      const singleStopDeleteStatus = ref(false);
       const disabledStatus1 = ref(true);
       const disabledStatus2 = ref(true);
       const disabledStatus3 = ref(true);
@@ -314,6 +315,7 @@
             setLoading(false);
             reload();
             disabledStatus1.value = true;
+            singleStopDeleteStatus.value = true;
           } else {
             createMessage.error('流转配置多项启用失败');
           }
@@ -342,6 +344,7 @@
         handleDisable,
         hasBatchDelete,
         handleDeleteOrBatchDelete,
+        singleStopDeleteStatus,
       };
     },
   });
--- a/src/views/rule/linkedge/SceneLinkAgeDrawer.vue
View file @e307339
+++ b/src/views/rule/linkedge/SceneLinkAgeDrawer.vue
View file @e307339
@@ -212,7 +212,7 @@
           unref(skipUnwrap.triggerItemRefs)[index].isUpdate = true;
           unref(skipUnwrap.triggerItemRefs)[index].alarmScheduleRef.scheduleData =
             trigger.triggerCondition.schedule;
-          const getAttrKeyOption = trigger?.triggerCondition?.condition?.condition.map(
+          const getAttrKeyOption = trigger?.triggerCondition?.condition?.condition?.map(
             (m) => m.key.key
           );
           unref(skipUnwrap.triggerItemRefs)[index].setFieldsFormValueFun({
@@ -287,7 +287,7 @@
           unref(skipUnwrap.conditionItemRefs)[index].isUpdate = true;
           unref(skipUnwrap.conditionItemRefs)[index].alarmScheduleRef.scheduleData =
             condition.triggerCondition.schedule;
-          const getAttrKeyOption = condition?.triggerCondition?.condition?.condition.map(
+          const getAttrKeyOption = condition?.triggerCondition?.condition?.condition?.map(
             (m) => m.key.key
           );
           unref(skipUnwrap.conditionItemRefs)[index].setFieldsFormValueFun({
@@ -521,7 +521,7 @@
     unref(linkAge).map((item) => {
       isOrganizationChange && item.resetFieldsValueFunc();
       item.updateFieldDeviceId(deviceList);
-      item.updateFieldAttr(watchAttrList);
+      // item.updateFieldAttr(watchAttrList);
     });
   }
   function setAlarmConfig(linkAge, isOrganizationChange = false) {
--- a/src/views/system/customize/config/enterPriseInfo.config.ts
View file @e307339
+++ b/src/views/system/customize/config/enterPriseInfo.config.ts
View file @e307339
@@ -123,7 +123,7 @@ export const schemas: FormSchema[] = [
     field: 'prov',
     label: '所在城市',
     required: true,
-    component: 'Input',
+    component: 'Select',
     colProps: {
       span: 24,
     },
@@ -172,7 +172,7 @@ export const schemas: FormSchema[] = [
     field: 'qrcode',
     label: '联系我们',
     required: true,
-    component: 'Input',
+    component: 'Select',
     colProps: {
       span: 24,
     },
--- a/src/views/system/customize/cpns/AppDraw.vue
View file @e307339
+++ b/src/views/system/customize/cpns/AppDraw.vue
View file @e307339
@@ -62,6 +62,7 @@
             @preview="handlePreview"
             :customRequest="customUploadHomeSwiper"
             :before-upload="beforeUploadHomeSwiper"
+            @change="handleChange"
           >
             <div v-if="fileList.length < 5">
               <div style="margin-top: 1.875rem">
@@ -147,9 +148,6 @@
         previewImage.value = file.url || file.preview;
         previewVisible.value = true;
       };
-      const handleChange = ({ fileList: newFileList }: FileInfo) => {
-        fileList.value = newFileList;
-      };
       // logo图片上传
       const logoPic = ref();
@@ -232,6 +230,11 @@
         }
         return isJpgOrPng && isLt2M;
       };
+      const handleChange = (info: FileInfo) => {
+        if (info.file.status !== 'uploading') {
+          fileList.value = info.fileList.filter((f: any) => !f.size);
+        }
+      };
       const handleUpdateInfo = async () => {
         try {
--- a/src/views/system/role/RoleDrawer.vue
View file @e307339
+++ b/src/views/system/role/RoleDrawer.vue
View file @e307339
@@ -10,10 +10,10 @@
     <BasicForm @register="registerForm">
       <template #menu>
         <BasicTree
+          v-if="treeData.length"
           checkable
           toolbar
-          defaultExpandAll
-          v-if="treeData.length"
+          autoExpandParent
           ref="treeRef"
           :treeData="treeData"
           :replaceFields="{ title: 'menuName' }"
@@ -69,8 +69,16 @@
           }
         });
       }
+      // function lookForAllId(data = [], arr = []) {
+      //   for (const item of data) {
+      //     arr.push(item.parentId);
+      //     if (item.children && item.children.length > 0) lookForAllId(item.children, arr);
+      //   }
+      //   return arr;
+      // }
       const originMenus = ref();
       const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => {
+        allCheckedKeys.value = [];
         resetFields();
         roleId.value = '';
         // 在打开弹窗时清除所有选择的菜单
@@ -85,6 +93,7 @@
         }
         // 更新
         if (unref(isUpdate)) {
+          allCheckedKeys.value = [];
           checked.value = [];
           //通过角色id去获取角色对应的菜单的ids
           roleMenus.value = await getMenusIdsByRoleId(data.record.id);
@@ -107,6 +116,8 @@
           }
           nextTick(() => {
             treeRef.value.setCheckedKeys(checked.value);
+            // const expandTreeIds = lookForAllId(treeData.value);
+            // treeRef.value.setExpandedKeys(expandTreeIds);
           });
           roleId.value = data.record.id;
           setFieldsValue(data.record);
@@ -127,6 +138,9 @@
             status: values.status,
             menu: allCheckedKeys.value.length ? allCheckedKeys.value : originMenus.value,
           };
+          console.log(allCheckedKeys.value);
+          if (allCheckedKeys.value.length == 0) return createMessage.error('请勾选权限菜单');
+          if (req.menu == undefined) return createMessage.error('请勾选权限菜单');
           saveOrUpdateRoleInfoWithMenu(req).then(() => {
             closeDrawer();
             emit('success');
--- a/src/views/tenant/role/RoleDrawer.vue
View file @e307339
+++ b/src/views/tenant/role/RoleDrawer.vue
View file @e307339
@@ -12,6 +12,7 @@
         <BasicTree
           v-if="treeData.length > 0"
           :treeData="treeData"
+          autoExpandParent
           :replaceFields="{ title: 'menuName' }"
           :checkedKeys="roleMenus"
           @check="handleCheckClick"
@@ -74,6 +75,7 @@
       const originMenus = ref();
       const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => {
         setDrawerProps({ confirmLoading: false });
+        allCheckedKeys.value = [];
         resetFields();
         roleId.value = '';
         // 在打开弹窗时清除所有选择的菜单
@@ -88,6 +90,7 @@
         }
         // 更新
         if (unref(isUpdate)) {
+          allCheckedKeys.value = [];
           checked.value = [];
           //通过角色id去获取角色对应的菜单的ids
           roleMenus.value = await getMenusIdsByRoleId(data.record.id);
@@ -131,6 +134,8 @@
             roleType: RoleEnum.TENANT_ADMIN,
             menu: allCheckedKeys.value.length ? allCheckedKeys.value : originMenus.value,
           };
+          if (allCheckedKeys.value.length == 0) return createMessage.error('请勾选权限菜单');
+          if (req.menu == undefined) return createMessage.error('请勾选权限菜单');
           saveOrUpdateRoleInfoWithMenu(req).then(() => {
             closeDrawer();
             emit('success');