Merge branch 'ww' into 'main_dev'

fix: 修复bug See merge request yunteng/thingskit-front!560

Merge branch 'ww' into 'main_dev'
fix: 修复bug See merge request yunteng/thingskit-front!560
xp.Huang
2 parents 83e269fe bc2a43c9
Showing 13 changed files with 164 additions and 67 deletions
src/api/sys/menu.ts
src/components/Widget/AuthIcon.vue
src/enums/dictEnum.ts
src/hooks/business/useRole.ts
src/views/configuration/center/index.vue
src/views/dataview/index.vue
src/views/system/role/RoleDrawer.vue
src/views/system/role/role.data.ts
src/views/tenant/role/RoleDrawer.vue
src/views/visual/board/components/WidgetHeader/BaseWidgetHeader.vue
src/views/visual/board/detail/components/BasicConfiguration.vue
src/views/visual/board/detail/index.vue
src/views/visual/board/index.vue
--- a/src/api/sys/menu.ts
View file @4488b4c
+++ b/src/api/sys/menu.ts
View file @4488b4c
@@ -30,6 +30,38 @@ export const getMenuList = (args?: number) => {
   } catch (e) {}
 };
+/**
+ * @description 获取自身的权限
+ * @param args
+ * @returns
+ */
+export const getMeMenuList = (args?: number) => {
+  try {
+    return defHttp.get<getMenuListResultModel>({
+      url: Api.GetMenuList,
+      params: {
+        needButton: args == 1 ? false : null,
+      },
+    });
+  } catch (e) {}
+};
+
+/**
+ * @description 获取超级管理员菜单
+ * @param args
+ * @returns
+ */
+export const getAdminMenuList = (args?: number) => {
+  try {
+    return defHttp.get<getMenuListResultModel>({
+      url: Api.SysAdminMenuList,
+      params: {
+        needButton: args == 1 ? false : null,
+      },
+    });
+  } catch (e) {}
+};
+
 export const delMenu = (menuIds: string[]) => {
   const url = Api.BaseMenuUrl;
   return defHttp.delete({ url: url, data: menuIds });
--- a/src/components/Widget/AuthIcon.vue
View file @4488b4c
+++ b/src/components/Widget/AuthIcon.vue
View file @4488b4c
@@ -31,6 +31,6 @@
   <Icon
     v-bind="getBindProps"
     class="justify-center items-center"
-    :class="getHasPermission ? '' : '!cursor-not-allowed !text-gray-200'"
+    :class="getHasPermission ? '' : '!cursor-not-allowed !text-gray-200 !dark:text-gray-700'"
   />
 </template>
--- a/src/enums/dictEnum.ts
View file @4488b4c
+++ b/src/enums/dictEnum.ts
View file @4488b4c
@@ -9,6 +9,8 @@ export enum DictEnum {
   DEVICE_TYPE = 'device_type',
   // 平台管理员启用的权限
   ENABLED_PLATFORM_ADMIN_AUTH = 'enabled_platform_admin_auth',
+  // 平台管理员禁用的权限
+  DISABLED_PLATFORM_ADMIN_AUTH = 'disabled_platform_admin_auth',
   // 系统管理员启用的权限
   ENABLED_SYSADMIN_AUTH = 'enabled_sysadmin_auth',
   // 租户禁用的权限
--- a/src/hooks/business/useRole.ts 0 → 100644
View file @4488b4c
+++ b/src/hooks/business/useRole.ts 0 → 100644
View file @4488b4c
+import { computed, unref } from 'vue';
+import { useUserStore } from '/@/store/modules/user';
+import { RoleEnum } from '/@/enums/roleEnum';
+
+export const useRole = () => {
+  const userStore = useUserStore();
+
+  const getRole = computed(() => {
+    return userStore.userInfo?.roles![0] as RoleEnum;
+  });
+
+  const isPlatformAdmin = computed(() => {
+    return unref(getRole) === RoleEnum.PLATFORM_ADMIN;
+  });
+
+  const isCustomerUser = computed(() => {
+    return unref(getRole) === RoleEnum.CUSTOMER_USER;
+  });
+
+  const isTenantAdmin = computed(() => {
+    return unref(getRole) === RoleEnum.TENANT_ADMIN;
+  });
+
+  const isSysadmin = computed(() => {
+    return unref(getRole) === RoleEnum.SYS_ADMIN;
+  });
+
+  return { getRole, isPlatformAdmin, isCustomerUser, isTenantAdmin, isSysadmin };
+};
--- a/src/views/configuration/center/index.vue
View file @4488b4c
+++ b/src/views/configuration/center/index.vue
View file @4488b4c
@@ -29,11 +29,14 @@
   import { useModal } from '/@/components/Modal';
   import { useCopyToClipboard } from '/@/hooks/web/useCopyToClipboard';
   import { ViewType } from '../../visual/board/config/panelDetail';
+  import { useRole } from '/@/hooks/business/useRole';
   const listColumn = ref(5);
   const { createMessage } = useMessage();
+  const { isCustomerUser } = useRole();
+
   const organizationId = ref<Nullable<number>>(null);
   const pagination = reactive<PaginationProps>({
@@ -219,7 +222,7 @@
       >
         <template #header>
           <div class="flex gap-3 justify-end">
-            <Authority :value="ConfigurationPermission.CREATE">
+            <Authority v-if="!isCustomerUser" :value="ConfigurationPermission.CREATE">
               <Button type="primary" @click="handleCreateOrUpdate()">新增组态</Button>
             </Authority>
             <CardLayoutButton v-model:value="listColumn" @change="handleCardLayoutChange" />
@@ -265,7 +268,7 @@
                     @click="handlePreview(item)"
                   />
                 </Tooltip>
-                <Tooltip title="设计">
+                <Tooltip v-if="!isCustomerUser" title="设计">
                   <AuthIcon
                     :auth="ConfigurationPermission.DESIGN"
                     class="!text-lg"
@@ -283,6 +286,7 @@
                   />
                 </Tooltip>
                 <AuthDropDown
+                  v-if="!isCustomerUser"
                   :dropMenuList="[
                     {
                       text: '分享',
--- a/src/views/dataview/index.vue
View file @4488b4c
+++ b/src/views/dataview/index.vue
View file @4488b4c
@@ -32,6 +32,7 @@
   import { ViewType } from '../visual/board/config/panelDetail';
   import { useUserStore } from '/@/store/modules/user';
   import { RoleEnum } from '/@/enums/roleEnum';
+  import { useRole } from '/@/hooks/business/useRole';
   const listColumn = ref(5);
@@ -51,6 +52,7 @@
   });
   const loading = ref(false);
+  const { isCustomerUser } = useRole();
   const dataSource = ref<BigScreenCenterItemsModel[]>([]);
@@ -218,8 +220,8 @@
       >
         <template #header>
           <div class="flex gap-3 justify-end">
-            <Authority :value="ConfigurationPermission.CREATE">
-              <Button type="primary" @click="handleCreateOrUpdate()">新增大屏</Button>
+            <Authority v-if="!isCustomerUser" :value="ConfigurationPermission.CREATE">
+              <Button type="primary" @click="handleCreateOrUpdate()"> 新增大屏 </Button>
             </Authority>
             <Authority v-if="hasPublicInterfacePermission" :value="ConfigurationPermission.CREATE">
               <Button type="primary" @click="handleCreateOrUpdatePublicApi()">公共接口管理</Button>
@@ -281,7 +283,7 @@
                     @click="handlePreview(item)"
                   />
                 </Tooltip>
-                <Tooltip title="设计">
+                <Tooltip v-if="!isCustomerUser" title="设计">
                   <AuthIcon
                     :disabled="item.state === 1"
                     icon="ant-design:edit-outlined"
@@ -298,6 +300,7 @@
                   />
                 </Tooltip>
                 <AuthDropDown
+                  v-if="!isCustomerUser"
                   :dropMenuList="[
                     {
                       text: '分享',
--- a/src/views/system/role/RoleDrawer.vue
View file @4488b4c
+++ b/src/views/system/role/RoleDrawer.vue
View file @4488b4c
@@ -35,14 +35,15 @@
   import { useMessage } from '/@/hooks/web/useMessage';
   const { t } = useI18n(); //加载国际化
   // 加载菜单数据
-  import { getMenuList, getMenusIdsByRoleId } from '/@/api/sys/menu';
+  import { getMeMenuList, getMenusIdsByRoleId } from '/@/api/sys/menu';
   import { useI18n } from '/@/hooks/web/useI18n';
   import { MenuRecord } from '/@/api/sys/model/menuModel';
   import { saveOrUpdateRoleInfoWithMenu } from '/@/api/system/system';
   import { findDictItemByCode } from '/@/api/system/dict';
   import { RoleEnum } from '/@/enums/roleEnum';
   import { Spin } from 'ant-design-vue';
-  import { useUserStore } from '/@/store/modules/user';
+  import { useRole } from '/@/hooks/business/useRole';
+  import { RoleListItem } from '/@/api/system/model/systemModel';
   type TreeData = MenuRecord & TreeItem;
@@ -76,56 +77,72 @@
         });
       };
-      const userStore = useUserStore();
-      const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => {
-        allCheckedKeys.value = [];
-        resetFields();
-        roleId.value = '';
-        // 在打开弹窗时清除所有选择的菜单
-        treeRef.value && treeRef.value?.setCheckedKeys([]);
-        isUpdate.value = data.isUpdate;
-        let roleType = (userStore.getUserInfo.roles![0] as RoleEnum) || RoleEnum.SYS_ADMIN;
-        // 租户管理员创建角色时 菜单分配为客户菜单
-        if (roleType === RoleEnum.TENANT_ADMIN) {
-          roleType = RoleEnum.CUSTOMER_USER;
-        }
-        try {
-          spinning.value = true;
-          // 需要在setFieldsValue之前先填充treeData，否则Tree组件可能会报key not exist警告
+      const { isTenantAdmin, isSysadmin, getRole } = useRole();
+      const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(
+        async (data: { isUpdate: boolean; record: RoleListItem }) => {
+          allCheckedKeys.value = [];
+          resetFields();
+          roleId.value = '';
+          // 在打开弹窗时清除所有选择的菜单
+          treeRef.value && treeRef.value?.setCheckedKeys([]);
+          isUpdate.value = data.isUpdate;
+          let roleType = unref(getRole) || RoleEnum.SYS_ADMIN;
+
+          // 租户管理员创建角色时 菜单分配为客户菜单
+          if (unref(isTenantAdmin)) {
+            roleType = RoleEnum.CUSTOMER_USER;
+          }
+
+          try {
+            spinning.value = true;
+            // 需要在setFieldsValue之前先填充treeData，否则Tree组件可能会报key not exist警告
-          if (!unref(treeData).length) {
+            // if (!unref(treeData).length) {
             // 获取全部的菜单
-            const menuListModel = await getMenuList();
+            const menuListModel = await getMeMenuList();
             treeData.value = transformName(menuListModel as unknown as TreeData[]);
-          }
+            // }
-          const keys = await getPermissionByRole(roleType);
-          const { keyType } = RoleMenuDictEnum[roleType];
-          treeData.value = filterPermissionTreeData(
-            unref(treeData) as unknown as TreeData[],
-            keys,
-            keyType
-          );
+            const keys = await getPermissionByRole(roleType);
+            const { keyType } = RoleMenuDictEnum[roleType];
+            treeData.value = filterPermissionTreeData(
+              unref(treeData) as unknown as TreeData[],
+              keys,
+              keyType
+            );
-          // 更新
-          if (unref(isUpdate)) {
-            checked.value = [];
-            roleId.value = data.record.id;
+            // 如果编辑的是超级管理员 则不再过滤平台管理员禁用的权限
+            // 如果是超级管理员创建角色 创建角色属于平台管理员 因此过滤平台管理员禁用的权限
+            if (data?.record?.roleType !== RoleEnum.SYS_ADMIN && unref(isSysadmin)) {
+              const keys = await getPermissionByRole(RoleEnum.PLATFORM_ADMIN);
+              const { keyType } = RoleMenuDictEnum[RoleEnum.PLATFORM_ADMIN];
+              treeData.value = filterPermissionTreeData(
+                unref(treeData) as unknown as TreeData[],
+                keys,
+                keyType
+              );
+            }
+
+            // 更新
+            if (unref(isUpdate)) {
+              checked.value = [];
+              roleId.value = data.record.id;
-            //通过角色id去获取角色对应的菜单的ids
-            allCheckedKeys.value = roleMenus.value = await getMenusIdsByRoleId(data.record.id);
-            excludeHalfCheckedKeys(unref(treeData));
-            await nextTick();
-            treeRef.value.setCheckedKeys(roleMenus.value);
-            setFieldsValue(data.record);
-          } else {
+              //通过角色id去获取角色对应的菜单的ids
+              allCheckedKeys.value = roleMenus.value = await getMenusIdsByRoleId(data.record.id);
+              excludeHalfCheckedKeys(unref(treeData));
+              await nextTick();
+              treeRef.value.setCheckedKeys(roleMenus.value);
+              setFieldsValue(data.record);
+            } else {
+            }
+          } catch (error) {
+            throw error;
+          } finally {
+            spinning.value = false;
           }
-        } catch (error) {
-          throw error;
-        } finally {
-          spinning.value = false;
         }
-      });
+      );
       const getTitle = computed(() => (!unref(isUpdate) ? '新增角色' : '编辑角色'));
--- a/src/views/system/role/role.data.ts
View file @4488b4c
+++ b/src/views/system/role/role.data.ts
View file @4488b4c
@@ -10,8 +10,8 @@ export enum KeysTypeEnum {
 export const RoleMenuDictEnum: Recordable<{ key: string; keyType: KeysTypeEnum }> = {
   [RoleEnum.PLATFORM_ADMIN]: {
-    key: DictEnum.ENABLED_PLATFORM_ADMIN_AUTH,
-    keyType: KeysTypeEnum.ENABLED,
+    key: DictEnum.DISABLED_PLATFORM_ADMIN_AUTH,
+    keyType: KeysTypeEnum.DISABLED,
   },
   [RoleEnum.SYS_ADMIN]: { key: DictEnum.ENABLED_SYSADMIN_AUTH, keyType: KeysTypeEnum.ENABLED },
   [RoleEnum.TENANT_ADMIN]: { key: DictEnum.DISABLED_TENANT_AUTH, keyType: KeysTypeEnum.DISABLED },
--- a/src/views/tenant/role/RoleDrawer.vue
View file @4488b4c
+++ b/src/views/tenant/role/RoleDrawer.vue
View file @4488b4c
@@ -34,7 +34,7 @@
   import { BasicTree, TreeItem } from '/@/components/Tree';
   const { t } = useI18n(); //加载国际化
   // 加载菜单数据
-  import { getMenuList, getMenusIdsByRoleId } from '/@/api/sys/menu';
+  import { getAdminMenuList, getMenuList, getMenusIdsByRoleId } from '/@/api/sys/menu';
   import { useI18n } from '/@/hooks/web/useI18n';
   import { MenuRecord } from '/@/api/sys/model/menuModel';
   import { saveOrUpdateRoleInfoWithMenu } from '/@/api/system/system';
@@ -43,7 +43,7 @@
   import { KeysTypeEnum, RoleMenuDictEnum } from '../../system/role/role.data';
   import { findDictItemByCode } from '/@/api/system/dict';
   import { Spin } from 'ant-design-vue';
-  import { useUserStore } from '/@/store/modules/user';
+  import { useRole } from '/@/hooks/business/useRole';
   type TreeData = MenuRecord & TreeItem;
@@ -77,7 +77,7 @@
         });
       };
-      const userStore = useUserStore();
+      const { isPlatformAdmin } = useRole();
       const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => {
         allCheckedKeys.value = [];
         resetFields();
@@ -85,18 +85,16 @@
         // 在打开弹窗时清除所有选择的菜单
         treeRef.value && treeRef.value?.setCheckedKeys([]);
         isUpdate.value = data.isUpdate;
-        let roleType = (userStore.getUserInfo.roles![0] as RoleEnum) || RoleEnum.SYS_ADMIN;
-        // 平台管理员创建角色时 菜单分配为租户管理员可分配的菜单
-        if (roleType === RoleEnum.PLATFORM_ADMIN) {
-          roleType = RoleEnum.TENANT_ADMIN;
-        }
+        const roleType = RoleEnum.TENANT_ADMIN;
         try {
           spinning.value = true;
           // 需要在setFieldsValue之前先填充treeData，否则Tree组件可能会报key not exist警告
           if (!unref(treeData).length) {
             // 获取全部的菜单
-            const menuListModel = await getMenuList();
+            const menuListModel = unref(isPlatformAdmin)
+              ? await getAdminMenuList()
+              : await getMenuList();
             treeData.value = transformName(menuListModel as unknown as TreeData[]);
           }
           const keys = await getPermissionByRole(roleType);
--- a/src/views/visual/board/components/WidgetHeader/BaseWidgetHeader.vue
View file @4488b4c
+++ b/src/views/visual/board/components/WidgetHeader/BaseWidgetHeader.vue
View file @4488b4c
@@ -12,6 +12,7 @@
   import { usePermission } from '/@/hooks/web/usePermission';
   import { DataSource } from '/@/api/dataBoard/model';
   import { useRoute } from 'vue-router';
+  import { useRole } from '/@/hooks/business/useRole';
   const emit = defineEmits(['action']);
   const props = defineProps<{
@@ -19,6 +20,7 @@
     record: DataSource[];
     panelName?: string;
   }>();
+  const { isCustomerUser } = useRole();
   const { hasPermission } = usePermission();
   const dropMenuList = computed<DropMenu[]>(() => {
     const basicMenu: DropMenu[] = [];
@@ -82,7 +84,7 @@
       <div class="flex items-center gap-5">
         <slot name="moreAction"></slot>
         <Dropdown
-          v-if="dropMenuList.length"
+          v-if="!isCustomerUser && dropMenuList.length"
           :drop-menu-list="dropMenuList"
           :trigger="['click']"
           @menu-event="handleMenuEvent"
--- a/src/views/visual/board/detail/components/BasicConfiguration.vue
View file @4488b4c
+++ b/src/views/visual/board/detail/components/BasicConfiguration.vue
View file @4488b4c
@@ -337,7 +337,7 @@
         v-for="item in dataSource"
         :data-id="item.id"
         :key="item.id"
-        class="flex bg-neutral-100 dark:text-gray-300 dark:bg-dark-700"
+        class="flex bg-light-50 dark:text-gray-300 dark:bg-dark-700"
       >
         <div class="w-24 text-right flex justify-end" style="flex: 0 0 96px"> 选择设备 </div>
         <div class="pl-2 flex-auto">
--- a/src/views/visual/board/detail/index.vue
View file @4488b4c
+++ b/src/views/visual/board/detail/index.vue
View file @4488b4c
@@ -47,6 +47,7 @@
   import { useScript } from '/@/hooks/web/useScript';
   import { BAI_DU_MAP_GL_LIB, BAI_DU_MAP_TRACK_ANIMATION } from '/@/utils/fnUtils';
   import { useAppStore } from '/@/store/modules/app';
+  import { useRole } from '/@/hooks/business/useRole';
   const userStore = useAppStore();
@@ -60,6 +61,7 @@
   const ROUTER = useRouter();
+  const { isCustomerUser } = useRole();
   const { toPromise: injectBaiDuMapLib } = useScript({ src: BAI_DU_MAP_GL_LIB });
   const { toPromise: injectBaiDuMapTrackAniMationLib } = useScript({
     src: BAI_DU_MAP_TRACK_ANIMATION,
@@ -400,7 +402,11 @@
       </template>
       <template #extra>
         <Authority :value="VisualComponentPermission.CREATE">
-          <Button v-if="!getIsSharePage" type="primary" @click="handleOpenCreatePanel">
+          <Button
+            v-if="!getIsSharePage && !isCustomerUser"
+            type="primary"
+            @click="handleOpenCreatePanel"
+          >
             创建组件
           </Button>
         </Authority>
@@ -456,7 +462,7 @@
                   @action="handleMoreAction"
                 >
                   <template #moreAction>
-                    <Tooltip title="趋势">
+                    <Tooltip v-if="!isCustomerUser" title="趋势">
                       <img
                         :src="trendIcon"
                         v-if="!getIsSharePage && hasHistoryTrend(item)"
--- a/src/views/visual/board/index.vue
View file @4488b4c
+++ b/src/views/visual/board/index.vue
View file @4488b4c
@@ -24,6 +24,7 @@
   import { ShareModal } from '/@/views/common/ShareModal';
   import { ModalParamsType } from '/#/utils';
   import { DataActionModeEnum } from '/@/enums/toolEnum';
+  import { useRole } from '/@/hooks/business/useRole';
   const ListItem = List.Item;
   const router = useRouter();
@@ -92,6 +93,7 @@
     unref(clipboardRef) ? createMessage.success('复制成功') : createMessage.error('未找到分享链接');
   };
+  const { isCustomerUser } = useRole();
   const { hasPermission } = usePermission();
   const dropMenuList = computed<DropMenu[]>(() => {
     const hasUpdatePermission = hasPermission(VisualBoardPermission.UPDATE);
@@ -213,7 +215,9 @@
     <div class="flex items-center mb-3 bg-light-100 h-78px dark:text-gray-300 dark:bg-dark-900">
       <div class="text-lg ml-30px mr-9px font-bold">自定义看板</div>
       <Authority value="api:yt:data_board:add:post">
-        <Button type="primary" @click="handleOpenDetailModal">创建看板</Button>
+        <Button v-if="!isCustomerUser" type="primary" @click="handleOpenDetailModal"
+          >创建看板</Button
+        >
       </Authority>
     </div>
     <div class="bg-light-100 mb-6 w-full p-3 search-form dark:text-gray-300 dark:bg-dark-900">
@@ -235,7 +239,7 @@
               </template>
               <template #extra>
                 <Dropdown
-                  v-if="dropMenuList.length"
+                  v-if="!isCustomerUser && dropMenuList.length"
                   :trigger="['click']"
                   @menu-event="(event) => handleMenuEvent(event, item)"
                   :drop-menu-list="dropMenuList"