Merge branch 'fix/permission-issues-zfl' into 'main_dev'

新增部分权限标识和租户管理员编辑新增租户角色字段

See merge request yunteng/thingskit-front!826

@@ -17,7 +17,8 @@ export enum ConfigurationPermission {
   UPDATE = 'api:yt:dataview:center:update',
   UPDATE = 'api:yt:dataview:center:update',
   DELETE = 'api:yt:dataview:center:delete',
   DELETE = 'api:yt:dataview:center:delete',
   SHARE = 'api:yt:dataview:center:share',
   SHARE = 'api:yt:dataview:center:share',
-  DESIGN = 'api:yt:dataview:center:get_configuration_info:design',
+  // DESIGN = 'api:yt:dataview:center:get_configuration_info:design',
+  DESIGN = 'api:yt:dataview:center:get_dataview_info:design',
   PREVIEW = 'api:yt:dataview:center:get_configuration_info:preview',
   PREVIEW = 'api:yt:dataview:center:get_configuration_info:preview',
   PUBLISH = 'api:yt:dataview:center:publish',
   PUBLISH = 'api:yt:dataview:center:publish',
   // CANCEL_PUBLISH = 'api:yt:dataview:center:cancel_publish',
   // CANCEL_PUBLISH = 'api:yt:dataview:center:cancel_publish',

@@ -280,6 +280,7 @@
                 </Tooltip>
                 </Tooltip>
                 <Tooltip v-if="!isCustomerUser" title="设计">
                 <Tooltip v-if="!isCustomerUser" title="设计">
                   <AuthIcon
                   <AuthIcon
+                    :auth="ConfigurationPermission.DESIGN"
                     :disabled="item.state === 1"
                     :disabled="item.state === 1"
                     icon="ant-design:edit-outlined"
                     icon="ant-design:edit-outlined"
                     @click="handleDesign(item)"
                     @click="handleDesign(item)"

@@ -33,9 +33,15 @@
                 </Button>
                 </Button>
               </Authority>
               </Authority>
               <Button type="primary" @click="handleOpenTsl"> 物模型TSL </Button>
               <Button type="primary" @click="handleOpenTsl"> 物模型TSL </Button>
-              <Upload v-if="isShowBtn" :show-upload-list="false" :customRequest="handleImportModel">
-                <Button type="primary" :loading="importLoading"> 导入物模型 </Button>
-              </Upload>
+              <Authority value="api:yt:things_model:import">
+                <Upload
+                  v-if="isShowBtn"
+                  :show-upload-list="false"
+                  :customRequest="handleImportModel"
+                >
+                  <Button type="primary" :loading="importLoading"> 导入物模型 </Button>
+                </Upload>
+              </Authority>
             </div>
             </div>
             <div class="flex gap-2">
             <div class="flex gap-2">
               <Authority :value="ModelOfMatterPermission.RELEASE">
               <Authority :value="ModelOfMatterPermission.RELEASE">

@@ -18,6 +18,9 @@
   import { UserDTO } from '/@/api/tenant/tenantInfo';
   import { UserDTO } from '/@/api/tenant/tenantInfo';
   import { ChineseRegexp, EmailRegexp, emailRule, phoneRule } from '/@/utils/rules';
   import { ChineseRegexp, EmailRegexp, emailRule, phoneRule } from '/@/utils/rules';
   import { chineseAndEnlishRule } from '/@/utils/rules';
   import { chineseAndEnlishRule } from '/@/utils/rules';
+  import { findCurrentUserRelation, getAllRoleList } from '/@/api/system/system';
+  import { RoleEnum } from '/@/enums/roleEnum';
+  import { RoleOrOrganizationParam } from '/@/api/system/model/systemModel';
 
 
   export default defineComponent({
   export default defineComponent({
     name: 'TenantAdminFormDrawer',
     name: 'TenantAdminFormDrawer',
@@ -99,6 +102,22 @@
           component: 'Input',
           component: 'Input',
           rules: phoneRule,
           rules: phoneRule,
         },
         },
+
+        {
+          field: 'roleIds',
+          label: '租户角色',
+          component: 'ApiSelect',
+          required: true,
+          componentProps: {
+            mode: 'multiple',
+            api: getAllRoleList,
+            params: {
+              roleType: RoleEnum.TENANT_ADMIN,
+            },
+            labelField: 'name',
+            valueField: 'id',
+          },
+        },
         {
         {
           field: 'email',
           field: 'email',
           label: '邮件',
           label: '邮件',
@@ -132,9 +151,12 @@
           tenantId.value = data?.tenantId;
           tenantId.value = data?.tenantId;
           isJudgeUserNameExist.value = data.judgeExistUserName;
           isJudgeUserNameExist.value = data.judgeExistUserName;
           if (unref(isUpdate)) {
           if (unref(isUpdate)) {
+            const roleParams = new RoleOrOrganizationParam(data.record.id, true, false);
+            const roleIds = await findCurrentUserRelation(roleParams);
             await updateSchema({ field: 'username', componentProps: { disabled: true } });
             await updateSchema({ field: 'username', componentProps: { disabled: true } });
             await setFieldsValue({
             await setFieldsValue({
               ...data.record,
               ...data.record,
+              roleIds,
             });
             });
           } else {
           } else {
             await updateSchema({ field: 'username', componentProps: { disabled: false } });
             await updateSchema({ field: 'username', componentProps: { disabled: false } });
@@ -159,6 +181,7 @@
                 ? values.tenantExpireTime.format('YYYY-MM-DD HH:mm:ss')
                 ? values.tenantExpireTime.format('YYYY-MM-DD HH:mm:ss')
                 : null,
                 : null,
             tenantId: tenantId.value,
             tenantId: tenantId.value,
+            roleIds: values.roleIds,
           };
           };
           await saveTenantAdmin(requestParams as any as UserDTO);
           await saveTenantAdmin(requestParams as any as UserDTO);
           closeDrawer(); //关闭侧框
           closeDrawer(); //关闭侧框