Merge branch 'perf/permission-05-31' into 'v1.4.0_dev'

perf: 移除数据流转的组织，并且租户子管理员不能分配规则链转换脚本和规则链以及数据流转

See merge request yunteng/thingskit-front!1357

@@ -26,6 +26,8 @@ export enum DictEnum {
   DISABLED_TENANT_AUTH = 'disabled_tenant_auth',
   // 客户禁用的权限
   DISABLE_CUSTOMER_AUTH = 'disabled_customer_auth',
+  // 普通租户禁用的权限
+  DISABLE_COMMON_TENANT_AUTH = 'disabled_common_tenant_auth',
   // 寄存器数据格式
   REGISTER_DATA_FORMAT = 'register_data_format',
   // 消息类型 规则节点 Filter message type switch

@@ -3,6 +3,7 @@ export enum RoleEnum {
   PLATFORM_ADMIN = 'PLATFORM_ADMIN',
   TENANT_ADMIN = 'TENANT_ADMIN',
   CUSTOMER_USER = 'CUSTOMER_USER',
+  COMMON_TENANT = 'COMMON_TENANT',
 }
 
 export function isAdmin(role: string) {

-import { FormSchema, useComponentRegister } from '/@/components/Form';
+import { FormSchema } from '/@/components/Form';
 import { findDictItemByCode } from '/@/api/system/dict';
 import { getDeviceProfile } from '/@/api/alarm/position';
 import { BasicInfoFormField, DataSourceType } from '../enum';
 import { DeviceRecord } from '/@/api/device/model/deviceModel';
 import { useMessage } from '/@/hooks/web/useMessage';
-import { OrgTreeSelect } from '/@/views/common/OrgTreeSelect';
-
-useComponentRegister('OrgTreeSelect', OrgTreeSelect);
 
 export const stepConfig = ['选择流转方式', '完善配置参数'];
 
@@ -60,13 +57,6 @@ export const modeForm = (disabled: boolean): FormSchema[] => {
       },
     },
     {
-      required: true,
-      field: BasicInfoFormField.ORGANIZATION_ID,
-      label: '所属组织',
-      colProps: { span: 24 },
-      component: 'OrgTreeSelect',
-    },
-    {
       field: BasicInfoFormField.DATA_SOURCE_PRODUCT,
       label: '数据源产品',
       component: 'TransferModal',

@@ -129,13 +129,6 @@ export const formSchema: FormSchema[] = [
     },
   },
   {
-    required: true,
-    field: 'organizationId',
-    label: '所属组织',
-    colProps: { span: 24 },
-    component: 'OrgTreeSelect',
-  },
-  {
     field: 'remark',
     label: '说明',
     component: 'InputTextArea',

@@ -5,12 +5,15 @@
   import { BasicForm, useForm } from '/@/components/Form';
   import { searchFormSchema } from './config/config.data';
   import { nextTick, ref, unref } from 'vue';
+  import { usePermission } from '/@/hooks/web/usePermission';
 
   enum ActiveKey {
     RULE = 'rule',
     TCP = 'tco',
   }
 
+  const { hasPermission } = usePermission();
+
   const ruleChainTableRefEl = ref<Nullable<InstanceType<typeof RuleChainConversionScript>>>(null);
   const tcpTableRefEl = ref<Nullable<InstanceType<typeof TcpConversionScript>>>(null);
 
@@ -70,7 +73,18 @@
             class="p-4 bg-neutral-100 dark:bg-dark-700"
           />
         </Tabs.TabPane>
-        <Tabs.TabPane tab="规则链转换脚本" :key="ActiveKey.RULE">
+        <Tabs.TabPane
+          tab="规则链转换脚本"
+          v-if="
+            hasPermission([
+              'api:yt:convert:js:delete',
+              'api:yt:convert:js:post',
+              'api:yt:convert:js:update',
+              'api:yt:convert:js:get',
+            ])
+          "
+          :key="ActiveKey.RULE"
+        >
           <RuleChainConversionScript
             ref="ruleChainTableRefEl"
             :search-info="searchInfo"

@@ -16,6 +16,10 @@ export const RoleMenuDictEnum: Recordable<{ key: string; keyType: KeysTypeEnum }
   [RoleEnum.SYS_ADMIN]: { key: DictEnum.ENABLED_SYSADMIN_AUTH, keyType: KeysTypeEnum.ENABLED },
   [RoleEnum.TENANT_ADMIN]: { key: DictEnum.DISABLED_TENANT_AUTH, keyType: KeysTypeEnum.DISABLED },
   [RoleEnum.CUSTOMER_USER]: { key: DictEnum.DISABLE_CUSTOMER_AUTH, keyType: KeysTypeEnum.DISABLED },
+  [RoleEnum.COMMON_TENANT]: {
+    key: DictEnum.DISABLE_COMMON_TENANT_AUTH,
+    keyType: KeysTypeEnum.DISABLED,
+  },
 };
 
 export const columns: BasicColumn[] = [

@@ -16,6 +16,10 @@ export const RoleMenuDictEnum: Recordable<{ key: string; keyType: KeysTypeEnum }
   [RoleEnum.SYS_ADMIN]: { key: DictEnum.ENABLED_SYSADMIN_AUTH, keyType: KeysTypeEnum.ENABLED },
   [RoleEnum.TENANT_ADMIN]: { key: DictEnum.DISABLED_TENANT_AUTH, keyType: KeysTypeEnum.DISABLED },
   [RoleEnum.CUSTOMER_USER]: { key: DictEnum.DISABLE_CUSTOMER_AUTH, keyType: KeysTypeEnum.DISABLED },
+  [RoleEnum.COMMON_TENANT]: {
+    key: DictEnum.DISABLE_COMMON_TENANT_AUTH,
+    keyType: KeysTypeEnum.DISABLED,
+  },
 };
 
 export const columns: BasicColumn[] = [

@@ -109,6 +109,7 @@
         treeRef.value && treeRef.value?.setCheckedKeys([]);
         isUpdate.value = data.isUpdate;
         const roleType = RoleEnum.TENANT_ADMIN;
+        const commonTenantRoleType = RoleEnum.COMMON_TENANT;
         try {
           spinning.value = true;
 
@@ -120,10 +121,12 @@
             treeData.value = transformName(menuListModel as unknown as TreeData[]);
           }
           const keys = await getPermissionByRole(roleType);
+          const commonTenantkeys = await getPermissionByRole(commonTenantRoleType);
+          const mergeKeys = [...keys, ...commonTenantkeys];
           const { keyType } = RoleMenuDictEnum[roleType];
           treeData.value = filterPermissionTreeData(
             unref(treeData) as unknown as TreeData[],
-            keys,
+            mergeKeys,
             keyType
           );