fix: set product profile button permission

ww
1 parent 7880b723
Showing 6 changed files with 138 additions and 65 deletions
src/assets/icons/product-default.svg
src/views/configuration/center/center.data.ts
src/views/configuration/center/index.vue
src/views/device/profiles/CardMode.vue
src/views/device/profiles/TableMode.vue
src/views/device/profiles/device.profile.data.ts
--- a/src/assets/icons/product-default.svg 0 → 100644
View file @95e6bb2
+++ b/src/assets/icons/product-default.svg 0 → 100644
View file @95e6bb2
+<svg t="1671442803003" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4002" width="200" height="200"><path d="M0 0m178.086957 0l667.826086 0q178.086957 0 178.086957 178.086957l0 667.826086q0 178.086957-178.086957 178.086957l-667.826086 0q-178.086957 0-178.086957-178.086957l0-667.826086q0-178.086957 178.086957-178.086957Z" fill="#2E7BFC" p-id="4003"></path><path d="M758.717217 394.373565v268.866783l-238.191304 134.455652v-268.911304l124.14887-70.054957v94.497391l51.956869-29.985391V429.412174l62.107826-35.038609z m-493.434434 0l238.191304 134.433392v268.866782l-238.191304-134.433391V394.373565zM512 226.304l246.717217 139.241739L512 504.787478l-246.717217-139.241739L512 226.326261z" fill="#FFFFFF" p-id="4004"></path></svg>
--- a/src/views/configuration/center/center.data.ts
View file @95e6bb2
+++ b/src/views/configuration/center/center.data.ts
View file @95e6bb2
@@ -9,6 +9,14 @@ export enum Platform {
   PC = 'pc',
 }
+export enum ConfigurationPermission {
+  CREATE = 'api:yt:configuration:center:post',
+  UPDATE = 'api:yt:configuration:center:update',
+  DELETE = 'api:yt:configuration:center:delete',
+  DESIGN = 'api:yt:configuration:center:get_configuration_info:design',
+  PREVIEW = 'api:yt:configuration:center:get_configuration_info:preview',
+}
+
 export const PC_DEFAULT_CONTENT =
   '<mxfile><diagram>dZHBDsIgDIafhvuEzOh5Tr142sEzGXWQsHVhmKFP7xbAidMT5fv/UtoSVrTuZHgvLyhAE5oJR9iBUMrybT4dM3l4stnTzJPGKBHYAir1hACj7a4EDInRImqr+hTW2HVQ24RxY3BMbTfUadWeN7ACVc31ml6VsPK7jVk4g2pkLJ3tgtLy6A5gkFzg+IFYSVhhEK2PWleAnscXB+Pzjn/U988MdPZHwhQsb0+XZEesfAE=</diagram></mxfile>';
--- a/src/views/configuration/center/index.vue
View file @95e6bb2
+++ b/src/views/configuration/center/index.vue
View file @95e6bb2
@@ -7,7 +7,7 @@
     EditOutlined,
     EllipsisOutlined,
   } from '@ant-design/icons-vue';
-  import { onMounted, reactive, ref, unref } from 'vue';
+  import { computed, onMounted, reactive, ref, unref } from 'vue';
   import { OrganizationIdTree, useResetOrganizationTree } from '../../common/organizationIdTree';
   import {
     deleteConfigurationCenter,
@@ -17,7 +17,7 @@
   import { PageWrapper } from '/@/components/Page';
   import { Dropdown } from '/@/components/Dropdown';
   import { BasicForm, useForm } from '/@/components/Form';
-  import { searchFormSchema } from './center.data';
+  import { ConfigurationPermission, searchFormSchema } from './center.data';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { Authority } from '/@/components/Authority';
   import { isDevMode } from '/@/utils/env';
@@ -98,6 +98,16 @@
   const [registerDrawer, { openDrawer }] = useDrawer();
+  const { hasPermission } = usePermission();
+
+  const getPreviewFlag = computed(() => {
+    return hasPermission(ConfigurationPermission.PREVIEW);
+  });
+
+  const getDesignFlag = computed(() => {
+    return hasPermission(ConfigurationPermission.DESIGN);
+  });
+
   const handleCreateOrUpdate = (record?: ConfigurationCenterItemsModal) => {
     if (record) {
       openDrawer(true, {
@@ -114,15 +124,15 @@
   const { configurationPrefix } = useGlobSetting();
   const isDev = isDevMode();
-  const { hasPermission } = usePermission();
   const handlePreview = (record: ConfigurationCenterItemsModal) => {
-    if (!hasPermission('api:yt:configuration:center:get_configuration_info:get')) return;
+    if (!unref(getPreviewFlag)) return;
     window.open(
       `${configurationPrefix}/${isDev ? '?dev=1&' : '?'}configurationId=${record!.id}&lightbox=1`
     );
   };
   const handleDesign = (record: ConfigurationCenterItemsModal) => {
+    if (!unref(getDesignFlag)) return;
     window.open(`${configurationPrefix}/${isDev ? '?dev=1&' : '?'}configurationId=${record!.id}`);
   };
@@ -175,7 +185,9 @@
       >
         <template #header>
           <div class="flex gap-3 justify-end">
-            <Button type="primary" @click="handleCreateOrUpdate()">新增组态</Button>
+            <Authority :value="ConfigurationPermission.CREATE">
+              <Button type="primary" @click="handleCreateOrUpdate()">新增组态</Button>
+            </Authority>
             <Popover :trigger="['hover']">
               <template #content>
                 <div class="w-50">
@@ -214,29 +226,35 @@
                 </div>
               </template>
               <template class="ant-card-actions" #actions>
-                <Authority value="api:yt:configuration:center:get_configuration_info:get">
-                  <Tooltip title="预览">
-                    <EyeOutlined key="setting" @click="handlePreview(item)" />
-                  </Tooltip>
-                </Authority>
-                <Authority value="api:yt:configuration:center:get_configuration_info:get">
-                  <Tooltip title="设计">
-                    <EditOutlined key="edit" @click="handleDesign(item)" />
-                  </Tooltip>
-                </Authority>
+                <Tooltip title="预览">
+                  <EyeOutlined
+                    :class="getPreviewFlag ? '' : '!cursor-not-allowed !text-gray-200'"
+                    key="setting"
+                    @click="handlePreview(item)"
+                  />
+                </Tooltip>
+                <Tooltip title="设计">
+                  <EditOutlined
+                    :class="getDesignFlag ? '' : '!cursor-not-allowed !text-gray-200'"
+                    key="edit"
+                    @click="handleDesign(item)"
+                  />
+                </Tooltip>
                 <Dropdown
                   :dropMenuList="[
                     {
                       text: '编辑',
-                      auth: 'api:yt:configuration:center:update',
+                      auth: ConfigurationPermission.UPDATE,
                       icon: 'clarity:note-edit-line',
+                      event: '',
                       onClick: handleCreateOrUpdate.bind(null, item),
                     },
                     {
                       text: '删除',
-                      auth: 'api:yt:configuration:center:delete',
+                      auth: ConfigurationPermission.DELETE,
                       icon: 'ant-design:delete-outlined',
                       color: 'error',
+                      event: '',
                       onClick: handleDelete.bind(null, item),
                     },
                   ]"
--- a/src/views/device/profiles/CardMode.vue
View file @95e6bb2
+++ b/src/views/device/profiles/CardMode.vue
View file @95e6bb2
@@ -13,16 +13,23 @@
   } from '/@/api/device/deviceConfigApi';
   import { ProfileRecord } from '/@/api/device/model/deviceConfigModel';
   import { Dropdown } from '/@/components/Dropdown';
-  import { defaultObj, searchFormSchema, DeviceTypeName } from './device.profile.data';
+  import {
+    defaultObj,
+    searchFormSchema,
+    DeviceTypeName,
+    ProductPermission,
+  } from './device.profile.data';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { useSyncConfirm } from '/@/hooks/component/useSyncConfirm';
   import DeviceProfileModal from './DeviceProfileModal.vue';
   import DeviceProfileDrawer from './DeviceProfileDrawer.vue';
   import { useModal } from '/@/components/Modal';
   import { useDrawer } from '/@/components/Drawer';
+  import productDefault from '/@/assets/icons/product-default.svg';
+  import { usePermission } from '/@/hooks/web/usePermission';
   defineProps<{
-    mode: Mode;
+    mode: EnumTableCardMode;
   }>();
   const emit = defineEmits(['changeMode']);
@@ -31,8 +38,7 @@
     SET_DEFAULT = 'setDefault',
     DELETE = 'delete',
   }
-  const IMAGE_FALLBACK =
-    'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMIAAADDCAYAAADQvc6UAAABRWlDQ1BJQ0MgUHJvZmlsZQAAKJFjYGASSSwoyGFhYGDIzSspCnJ3UoiIjFJgf8LAwSDCIMogwMCcmFxc4BgQ4ANUwgCjUcG3awyMIPqyLsis7PPOq3QdDFcvjV3jOD1boQVTPQrgSkktTgbSf4A4LbmgqISBgTEFyFYuLykAsTuAbJEioKOA7DkgdjqEvQHEToKwj4DVhAQ5A9k3gGyB5IxEoBmML4BsnSQk8XQkNtReEOBxcfXxUQg1Mjc0dyHgXNJBSWpFCYh2zi+oLMpMzyhRcASGUqqCZ16yno6CkYGRAQMDKMwhqj/fAIcloxgHQqxAjIHBEugw5sUIsSQpBobtQPdLciLEVJYzMPBHMDBsayhILEqEO4DxG0txmrERhM29nYGBddr//5/DGRjYNRkY/l7////39v///y4Dmn+LgeHANwDrkl1AuO+pmgAAADhlWElmTU0AKgAAAAgAAYdpAAQAAAABAAAAGgAAAAAAAqACAAQAAAABAAAAwqADAAQAAAABAAAAwwAAAAD9b/HnAAAHlklEQVR4Ae3dP3PTWBSGcbGzM6GCKqlIBRV0dHRJFarQ0eUT8LH4BnRU0NHR0UEFVdIlFRV7TzRksomPY8uykTk/zewQfKw/9znv4yvJynLv4uLiV2dBoDiBf4qP3/ARuCRABEFAoBEgghggQAQZQKAnYEaQBAQaASKIAQJEkAEEegJmBElAoBEgghggQAQZQKAnYEaQBAQaASKIAQJEkAEEegJmBElAoBEgghggQAQZQKAnYEaQBAQaASKIAQJEkAEEegJmBElAoBEgghggQAQZQKAnYEaQBAQaASKIAQJEkAEEegJmBElAoBEgghggQAQZQKAnYEaQBAQaASKIAQJEkAEEegJmBElAoBEgghggQAQZQKAnYEaQBAQaASKIAQJEkAEEegJmBElAoBEgghggQAQZQKAnYEaQBAQaASKIAQJEkAEEegJmBElAoBEgghggQAQZQKAnYEaQBAQaASKIAQJEkAEEegJmBElAoBEgghggQAQZQKAnYEaQBAQaASKIAQJEkAEEegJmBElAoBEgghggQAQZQKAnYEaQBAQaASKIAQJEkAEEegJmBElAoBEgghggQAQZQKAnYEaQBAQaASKIAQJEkAEEegJmBElAoBEgghggQAQZQKAnYEaQBAQaASKIAQJEkAEEegJmBElAoBEgghgg0Aj8i0JO4OzsrPv69Wv+hi2qPHr0qNvf39+iI97soRIh4f3z58/u7du3SXX7Xt7Z2enevHmzfQe+oSN2apSAPj09TSrb+XKI/f379+08+A0cNRE2ANkupk+ACNPvkSPcAAEibACyXUyfABGm3yNHuAECRNgAZLuYPgEirKlHu7u7XdyytGwHAd8jjNyng4OD7vnz51dbPT8/7z58+NB9+/bt6jU/TI+AGWHEnrx48eJ/EsSmHzx40L18+fLyzxF3ZVMjEyDCiEDjMYZZS5wiPXnyZFbJaxMhQIQRGzHvWR7XCyOCXsOmiDAi1HmPMMQjDpbpEiDCiL358eNHurW/5SnWdIBbXiDCiA38/Pnzrce2YyZ4//59F3ePLNMl4PbpiL2J0L979+7yDtHDhw8vtzzvdGnEXdvUigSIsCLAWavHp/+qM0BcXMd/q25n1vF57TYBp0a3mUzilePj4+7k5KSLb6gt6ydAhPUzXnoPR0dHl79WGTNCfBnn1uvSCJdegQhLI1vvCk+fPu2ePXt2tZOYEV6/fn31dz+shwAR1sP1cqvLntbEN9MxA9xcYjsxS1jWR4AIa2Ibzx0tc44fYX/16lV6NDFLXH+YL32jwiACRBiEbf5KcXoTIsQSpzXx4N28Ja4BQoK7rgXiydbHjx/P25TaQAJEGAguWy0+2Q8PD6/Ki4R8EVl+bzBOnZY95fq9rj9zAkTI2SxdidBHqG9+skdw43borCXO/ZcJdraPWdv22uIEiLA4q7nvvCug8WTqzQveOH26fodo7g6uFe/a17W3+nFBAkRYENRdb1vkkz1CH9cPsVy/jrhr27PqMYvENYNlHAIesRiBYwRy0V+8iXP8+/fvX11Mr7L7ECueb/r48eMqm7FuI2BGWDEG8cm+7G3NEOfmdcTQw4h9/55lhm7DekRYKQPZF2ArbXTAyu4kDYB2YxUzwg0gi/41ztHnfQG26HbGel/crVrm7tNY+/1btkOEAZ2M05r4FB7r9GbAIdxaZYrHdOsgJ/wCEQY0J74TmOKnbxxT9n3FgGGWWsVdowHtjt9Nnvf7yQM2aZU/TIAIAxrw6dOnAWtZZcoEnBpNuTuObWMEiLAx1HY0ZQJEmHJ3HNvGCBBhY6jtaMoEiJB0Z29vL6ls58vxPcO8/zfrdo5qvKO+d3Fx8Wu8zf1dW4p/cPzLly/dtv9Ts/EbcvGAHhHyfBIhZ6NSiIBTo0LNNtScABFyNiqFCBChULMNNSdAhJyNSiECRCjUbEPNCRAhZ6NSiAARCjXbUHMCRMjZqBQiQIRCzTbUnAARcjYqhQgQoVCzDTUnQIScjUohAkQo1GxDzQkQIWejUogAEQo121BzAkTI2agUIkCEQs021JwAEXI2KoUIEKFQsw01J0CEnI1KIQJEKNRsQ80JECFno1KIABEKNdtQcwJEyNmoFCJAhELNNtScABFyNiqFCBChULMNNSdAhJyNSiECRCjUbEPNCRAhZ6NSiAARCjXbUHMCRMjZqBQiQIRCzTbUnAARcjYqhQgQoVCzDTUnQIScjUohAkQo1GxDzQkQIWejUogAEQo121BzAkTI2agUIkCEQs021JwAEXI2KoUIEKFQsw01J0CEnI1KIQJEKNRsQ80JECFno1KIABEKNdtQcwJEyNmoFCJAhELNNtScABFyNiqFCBChULMNNSdAhJyNSiECRCjUbEPNCRAhZ6NSiAARCjXbUHMCRMjZqBQiQIRCzTbUnAARcjYqhQgQoVCzDTUnQIScjUohAkQo1GxDzQkQIWejUogAEQo121BzAkTI2agUIkCEQs021JwAEXI2KoUIEKFQsw01J0CEnI1KIQJEKNRsQ80JECFno1KIABEKNdtQcwJEyNmoFCJAhELNNtScABFyNiqFCBChULMNNSdAhJyNSiEC/wGgKKC4YMA4TAAAAABJRU5ErkJggg==';
+  const IMAGE_FALLBACK = productDefault;
   const { createMessage } = useMessage();
   const { createSyncConfirm } = useSyncConfirm();
@@ -94,6 +100,40 @@
     }
   };
+  const { hasPermission } = usePermission();
+
+  const getHasDeleteFlag = computed(() => {
+    return hasPermission(ProductPermission.DELETE);
+  });
+
+  const getHasDetailFlag = computed(() => {
+    return hasPermission(ProductPermission.DETAIL);
+  });
+
+  const getHasUpdateFlag = computed(() => {
+    return hasPermission(ProductPermission.UPDATE);
+  });
+
+  const getDropDownList = (record: ProfileRecord) => {
+    const list = [
+      {
+        text: '默认',
+        event: DropMenuEvent.SET_DEFAULT,
+        icon: 'ant-design:unordered-list-outlined',
+        onClick: handleSetDefault.bind(null, record),
+      },
+    ];
+    if (unref(getHasDeleteFlag)) {
+      list.push({
+        text: '删除',
+        event: DropMenuEvent.DELETE,
+        icon: 'ant-design:delete-outlined',
+        onClick: handleDelete.bind(null, [record.id]),
+      });
+    }
+    return list;
+  };
+
   const handleModeChange = (mode: EnumTableCardMode) => {
     emit('changeMode', mode);
   };
@@ -118,10 +158,12 @@
   };
   const handleShowDetail = (record: ProfileRecord) => {
+    if (!unref(getHasDetailFlag)) return;
     openDrawer(true, { record });
   };
   const handleUpdate = (record: ProfileRecord) => {
+    if (!unref(getHasUpdateFlag)) return;
     openModal(true, {
       record,
       isUpdate: true,
@@ -173,20 +215,27 @@
       >
         <template #header>
           <div class="flex gap-3 justify-end">
-            <Button type="primary" @click="handleCreate">新增产品</Button>
+            <Authority :value="ProductPermission.CREATE">
+              <Button type="primary" @click="handleCreate">新增产品</Button>
+            </Authority>
+
             <Button type="primary" @click="handleSelectAll">
               {{ getSelectAllFlag ? '反选' : '全选' }}
             </Button>
-            <Button
-              type="primary"
-              danger
-              :disabled="!getCheckedRecord.length"
-              @click="handleDelete(getCheckedRecord)"
-            >
-              批量删除
-            </Button>
+            <Authority :value="ProductPermission.DELETE">
+              <Button
+                type="primary"
+                danger
+                :disabled="!getCheckedRecord.length"
+                @click="handleDelete(getCheckedRecord)"
+              >
+                批量删除
+              </Button>
+            </Authority>
+
             <ModeSwitchButton :value="$props.mode" @change="handleModeChange" />
             <CardLayoutButton v-model:value="colNumber" @change="getDataSource" />
+
             <Tooltip title="刷新">
               <Button type="primary" @click="getDataSource">
                 <ReloadOutlined :spin="loading" />
@@ -213,33 +262,21 @@
                 </div>
               </template>
               <template class="ant-card-actions" #actions>
-                <Authority>
-                  <Tooltip title="详情">
-                    <EyeOutlined key="setting" @click.stop="handleShowDetail(item)" />
-                  </Tooltip>
-                </Authority>
-                <Authority>
-                  <Tooltip title="编辑">
-                    <FormOutlined key="edit" @click.stop="handleUpdate(item)" />
-                  </Tooltip>
-                </Authority>
-                <Dropdown
-                  :trigger="['hover']"
-                  :drop-menu-list="[
-                    {
-                      text: '默认',
-                      event: DropMenuEvent.SET_DEFAULT,
-                      icon: 'ant-design:unordered-list-outlined',
-                      onClick: handleSetDefault.bind(null, item),
-                    },
-                    {
-                      text: '删除',
-                      event: DropMenuEvent.DELETE,
-                      icon: 'ant-design:delete-outlined',
-                      onClick: handleDelete.bind(null, [item.id]),
-                    },
-                  ]"
-                >
+                <Tooltip title="详情">
+                  <EyeOutlined
+                    :class="getHasDetailFlag ? '' : '!cursor-not-allowed !text-gray-200'"
+                    key="setting"
+                    @click.stop="handleShowDetail(item)"
+                  />
+                </Tooltip>
+                <Tooltip title="编辑">
+                  <FormOutlined
+                    :class="getHasUpdateFlag ? '' : '!cursor-not-allowed !text-gray-200'"
+                    key="edit"
+                    @click.stop="handleUpdate(item)"
+                  />
+                </Tooltip>
+                <Dropdown :trigger="['hover']" :drop-menu-list="getDropDownList(item)">
                   <MoreOutlined @click.stop class="transform rotate-90" />
                 </Dropdown>
               </template>
--- a/src/views/device/profiles/TableMode.vue
View file @95e6bb2
+++ b/src/views/device/profiles/TableMode.vue
View file @95e6bb2
@@ -7,15 +7,15 @@
       :clickToRowSelect="false"
     >
       <template #toolbar>
-        <Authority value="api:yt:deviceProfile:post">
+        <Authority :value="ProductPermission.CREATE">
           <a-button type="primary" @click="handleCreate"> 新增产品 </a-button>
         </Authority>
-        <Authority value="api:yt:deviceProfile:import">
+        <Authority :value="ProductPermission.IMPORT">
           <ImpExcel @success="loadDataSuccess" dateFormat="YYYY-MM-DD">
             <a-button @click="handleImport"> 导入产品 </a-button>
           </ImpExcel>
         </Authority>
-        <Authority value="api:yt:deviceProfile:delete">
+        <Authority :value="ProductPermission.DELETE">
           <Popconfirm
             title="您确定要批量删除数据"
             ok-text="确定"
@@ -44,13 +44,13 @@
           :actions="[
             {
               label: '详情',
-              auth: 'api:yt:deviceProfile:get',
+              auth: ProductPermission.DETAIL,
               icon: 'ant-design:eye-outlined',
               onClick: handleDetailView.bind(null, record),
             },
             {
               label: '编辑',
-              auth: 'api:yt:deviceProfile:update',
+              auth: ProductPermission.UPDATE,
               icon: 'clarity:note-edit-line',
               onClick: handleEdit.bind(null, record),
               ifShow: () => {
@@ -69,13 +69,13 @@
             },
             {
               label: '导出',
-              auth: 'api:yt:deviceProfile:export',
+              auth: ProductPermission.EXPORT,
               icon: 'ant-design:login-outlined',
               onClick: handleExport.bind(null, record),
             },
             {
               label: '删除',
-              auth: 'api:yt:deviceProfile:delete',
+              auth: ProductPermission.DELETE,
               icon: 'ant-design:delete-outlined',
               color: 'error',
               popConfirm: {
@@ -102,7 +102,7 @@
 <script lang="ts" setup>
   import { ref, nextTick, onUnmounted } from 'vue';
   import { BasicTable, TableImg, useTable, TableAction, BasicColumn } from '/@/components/Table';
-  import { columns, searchFormSchema, defaultObj } from './device.profile.data';
+  import { columns, searchFormSchema, defaultObj, ProductPermission } from './device.profile.data';
   import { useMessage } from '/@/hooks/web/useMessage';
   import {
     deviceConfigGetQuery,
--- a/src/views/device/profiles/device.profile.data.ts
View file @95e6bb2
+++ b/src/views/device/profiles/device.profile.data.ts
View file @95e6bb2
@@ -19,6 +19,15 @@ export enum DeviceTypeName {
   GATEWAY = '网关设备',
   SENSOR = '网关子设备',
 }
+export enum ProductPermission {
+  DETAIL = 'api:yt:deviceProfile:get',
+  CREATE = 'api:yt:deviceProfile:post',
+  UPDATE = 'api:yt:deviceProfile:update',
+  DELETE = 'api:yt:deviceProfile:delete',
+  SET_DEFAULT = '',
+  IMPORT = 'api:yt:deviceProfile:import',
+  EXPORT = 'api:yt:deviceProfile:export',
+}
 export enum ModelOfMatterPermission {
   CREATE = 'api:yt:things_model:post',