Merge branch 'fix/category-class-role' into 'main_dev'

fix: 修复产品品类权限接口问题

See merge request yunteng/thingskit-front!1391

@@ -48,7 +48,10 @@
     rowSelection: {
     rowSelection: {
       type: 'checkbox',
       type: 'checkbox',
       getCheckboxProps: (record: any) => {
       getCheckboxProps: (record: any) => {
-        return { disabled: !!record.status };
+        return {
+          disabled:
+            getAuthCache(USER_INFO_KEY).tenantId === record.tenantId ? !!record.status : true,
+        };
       },
       },
     },
     },
   });
   });
@@ -86,12 +89,14 @@
 
 
   // 详情
   // 详情
   const registerDetailRecord = ref<any>({});
   const registerDetailRecord = ref<any>({});
+  const isCurrentTenant = ref<Boolean>(false);
   const handleDetail = (record?: any) => {
   const handleDetail = (record?: any) => {
     openDrawer(true);
     openDrawer(true);
     registerDetailRecord.value = {
     registerDetailRecord.value = {
       ...record,
       ...record,
       ifShowClass: true,
       ifShowClass: true,
     };
     };
+    isCurrentTenant.value = getAuthCache(USER_INFO_KEY).tenantId === record.tenantId;
   };
   };
 
 
   // 状态->编辑
   // 状态->编辑
@@ -145,6 +150,7 @@
         <Switch
         <Switch
           @click="(e) => handleSwitch(e, record)"
           @click="(e) => handleSwitch(e, record)"
           :loading="switchLoading"
           :loading="switchLoading"
+          :disabled="getAuthCache(USER_INFO_KEY).tenantId !== record.tenantId"
           v-model:checked="record.status"
           v-model:checked="record.status"
           checked-children="启用"
           checked-children="启用"
           un-checked-children="禁用"
           un-checked-children="禁用"
@@ -165,14 +171,17 @@
               label: '编辑',
               label: '编辑',
               auth: 'api:yt:product:category:update',
               auth: 'api:yt:product:category:update',
               icon: 'clarity:note-edit-line',
               icon: 'clarity:note-edit-line',
-              ifShow: authBtn(role),
+              ifShow: authBtn(role) && getAuthCache(USER_INFO_KEY).tenantId === record.tenantId,
               onClick: handleEdit.bind(null, record),
               onClick: handleEdit.bind(null, record),
             },
             },
             {
             {
               label: '删除',
               label: '删除',
               auth: 'api:yt:product:category:delete',
               auth: 'api:yt:product:category:delete',
               icon: 'ant-design:delete-outlined',
               icon: 'ant-design:delete-outlined',
-              ifShow: authBtn(role) && !record.status,
+              ifShow:
+                authBtn(role) &&
+                !record.status &&
+                getAuthCache(USER_INFO_KEY).tenantId === record.tenantId,
               color: 'error',
               color: 'error',
               popConfirm: {
               popConfirm: {
                 title: '是否确认删除',
                 title: '是否确认删除',
@@ -185,7 +194,10 @@
     </BasicTable>
     </BasicTable>
     <classModal @register="registerModal" @handleReload="handleReload" />
     <classModal @register="registerModal" @handleReload="handleReload" />
     <BasicDrawer title="物模型" @register="registerDetailDrawer" width="60%" destroy-on-close>
     <BasicDrawer title="物模型" @register="registerDetailDrawer" width="60%" destroy-on-close>
-      <PhysicalModelManagementStep :record="registerDetailRecord" />
+      <PhysicalModelManagementStep
+        :isCurrentTenant="isCurrentTenant"
+        :record="registerDetailRecord"
+      />
     </BasicDrawer>
     </BasicDrawer>
   </div>
   </div>
 </template>
 </template>

@@ -20,7 +20,7 @@
         key="modelOfMatter"
         key="modelOfMatter"
         tab="物模型管理"
         tab="物模型管理"
       >
       >
-        <PhysicalModelManagementStep :record="record" />
+        <PhysicalModelManagementStep :record="record" :isCurrentTenant="true" />
       </Tabs.TabPane>
       </Tabs.TabPane>
     </Tabs>
     </Tabs>
   </BasicDrawer>
   </BasicDrawer>

@@ -8,7 +8,7 @@
     >
     >
       <template #toolbar>
       <template #toolbar>
         <div class="flex-auto">
         <div class="flex-auto">
-          <div class="mb-2">
+          <div class="mb-2" v-if="isCurrentTenant">
             <Alert type="info" show-icon>
             <Alert type="info" show-icon>
               <template #message>
               <template #message>
                 <span v-if="!isShowBtn">
                 <span v-if="!isShowBtn">
@@ -39,6 +39,7 @@
                 <Button type="primary" @click="handleExport" :loading="loading">导出物模型</Button>
                 <Button type="primary" @click="handleExport" :loading="loading">导出物模型</Button>
               </Authority>
               </Authority>
               <Authority
               <Authority
+                v-if="isCurrentTenant"
                 :value="[
                 :value="[
                   'api:yt:things_model:import',
                   'api:yt:things_model:import',
                   'api:yt:things_model:category:import',
                   'api:yt:things_model:category:import',
@@ -47,7 +48,10 @@
               >
               >
                 <Button type="primary" @click="handleSelectImport">导入物模型</Button>
                 <Button type="primary" @click="handleSelectImport">导入物模型</Button>
               </Authority>
               </Authority>
-              <Button type="primary" v-if="!isShowBtn" @click="handleEditPhysicalModel"
+              <Button
+                type="primary"
+                v-if="!isShowBtn && isCurrentTenant"
+                @click="handleEditPhysicalModel"
                 >编辑物模型</Button
                 >编辑物模型</Button
               >
               >
             </div>
             </div>
@@ -159,11 +163,12 @@
   import { DataActionModeEnum } from '/@/enums/toolEnum';
   import { DataActionModeEnum } from '/@/enums/toolEnum';
   import { DeviceProfileDetail } from '/@/api/device/model/deviceConfigModel';
   import { DeviceProfileDetail } from '/@/api/device/model/deviceConfigModel';
 
 
-  const { isPlatformAdmin, isSysadmin } = useRole();
+  const { isPlatformAdmin, isSysadmin, isTenantAdmin } = useRole();
   defineEmits(['register']);
   defineEmits(['register']);
 
 
   const props = defineProps<{
   const props = defineProps<{
     record: DeviceProfileDetail;
     record: DeviceProfileDetail;
+    isCurrentTenant: Boolean;
   }>();
   }>();
 
 
   const { createMessage } = useMessage();
   const { createMessage } = useMessage();
@@ -224,7 +229,8 @@
 
 
   const handleDeleteOrBatchDelete = async (record?: ModelOfMatterItemRecordType) => {
   const handleDeleteOrBatchDelete = async (record?: ModelOfMatterItemRecordType) => {
     const deleteFn =
     const deleteFn =
-      props.record.ifShowClass && (unref(isPlatformAdmin) || unref(isSysadmin))
+      (props.record.ifShowClass && (unref(isPlatformAdmin) || unref(isSysadmin))) ||
+      unref(isTenantAdmin)
         ? deleteModelCategory
         ? deleteModelCategory
         : deleteModel;
         : deleteModel;
 
 
@@ -265,7 +271,10 @@
   const handleSelectImport = () => {
   const handleSelectImport = () => {
     openModalSelect(true, {
     openModalSelect(true, {
       id: props.record.id,
       id: props.record.id,
-      isCateGory: (unref(isPlatformAdmin) || unref(isSysadmin)) && props.record.ifShowClass,
+      isCateGory:
+        unref(isPlatformAdmin) ||
+        unref(isSysadmin) ||
+        (unref(isTenantAdmin) && props.record.ifShowClass),
     });
     });
   };
   };
 
 

@@ -31,7 +31,7 @@
   import { DataActionModeEnum, DataActionModeNameEnum } from '/@/enums/toolEnum';
   import { DataActionModeEnum, DataActionModeNameEnum } from '/@/enums/toolEnum';
   import { DeviceProfileDetail } from '/@/api/device/model/deviceConfigModel';
   import { DeviceProfileDetail } from '/@/api/device/model/deviceConfigModel';
 
 
-  const { isPlatformAdmin, isSysadmin } = useRole();
+  const { isPlatformAdmin, isSysadmin, isTenantAdmin } = useRole();
 
 
   const emit = defineEmits(['register', 'success']);
   const emit = defineEmits(['register', 'success']);
 
 
@@ -77,7 +77,9 @@
       const value = unref(objectModelElRef)!.getFieldsValue();
       const value = unref(objectModelElRef)!.getFieldsValue();
 
 
       const isCategoryAction =
       const isCategoryAction =
-        (unref(isSysadmin) || unref(isPlatformAdmin)) && props.record.ifShowClass;
+        unref(isSysadmin) ||
+        unref(isPlatformAdmin) ||
+        (unref(isTenantAdmin) && props.record.ifShowClass);
 
 
       const submitFn =
       const submitFn =
         unref(openModalMode) === DataActionModeEnum.CREATE
         unref(openModalMode) === DataActionModeEnum.CREATE