Merge branch 'fix/DEFECT-2063' into 'feat/account-role-manage'

fix: 修复子租户管理员新增组织可以创建平级组织

See merge request yunteng/thingskit-front!1313

@@ -25,6 +25,7 @@
               label: '编辑',
               label: '编辑',
               auth: 'api:yt:organization:update',
               auth: 'api:yt:organization:update',
               icon: 'clarity:note-edit-line',
               icon: 'clarity:note-edit-line',
+              disabled: record.isRoot && getIsChildTenant,
               onClick: handleEdit.bind(null, record),
               onClick: handleEdit.bind(null, record),
             },
             },
             {
             {
@@ -32,6 +33,7 @@
               auth: 'api:yt:organization:delete',
               auth: 'api:yt:organization:delete',
               icon: 'ant-design:delete-outlined',
               icon: 'ant-design:delete-outlined',
               color: 'error',
               color: 'error',
+              disabled: record.isRoot && getIsChildTenant,
               popConfirm: {
               popConfirm: {
                 title: getDeleteTitle(), //是否确认删除//getDeleteTitle()
                 title: getDeleteTitle(), //是否确认删除//getDeleteTitle()
                 confirm: handleDeleteOrBatchDelete.bind(null, record),
                 confirm: handleDeleteOrBatchDelete.bind(null, record),
@@ -45,7 +47,7 @@
   </div>
   </div>
 </template>
 </template>
 <script lang="ts">
 <script lang="ts">
-  import { computed, defineComponent, nextTick } from 'vue';
+  import { computed, defineComponent, nextTick, unref } from 'vue';
   import { BasicTable, useTable, TableAction } from '/@/components/Table';
   import { BasicTable, useTable, TableAction } from '/@/components/Table';
   // 加载自定义侧边弹出框 组件
   // 加载自定义侧边弹出框 组件
   import { useDrawer } from '/@/components/Drawer';
   import { useDrawer } from '/@/components/Drawer';
@@ -56,6 +58,8 @@
   import { useBatchDelete } from '/@/hooks/web/useBatchDelete';
   import { useBatchDelete } from '/@/hooks/web/useBatchDelete';
   import { Authority } from '/@/components/Authority';
   import { Authority } from '/@/components/Authority';
   import { Popconfirm } from 'ant-design-vue';
   import { Popconfirm } from 'ant-design-vue';
+  import { getJwtToken } from '/@/utils/auth';
+  import jwtDecode from 'jwt-decode';
 
 
   export default defineComponent({
   export default defineComponent({
     name: 'DeptManagement',
     name: 'DeptManagement',
@@ -65,6 +69,11 @@
       const { t } = useI18n(); // 加载国际化
       const { t } = useI18n(); // 加载国际化
       const getI18n = computed(() => t('routes.common.organization.toolCreateOrganization'));
       const getI18n = computed(() => t('routes.common.organization.toolCreateOrganization'));
 
 
+      const getIsChildTenant = computed(() => {
+        const token = getJwtToken();
+        return !!(jwtDecode(token as string) as Recordable)?.isCommonTenant;
+      });
+
       const [registerTable, { reload, expandAll, setProps }] = useTable({
       const [registerTable, { reload, expandAll, setProps }] = useTable({
         title: t('routes.common.organization.toolOrganizationList'),
         title: t('routes.common.organization.toolOrganizationList'),
         api: getOrganizationList,
         api: getOrganizationList,
@@ -76,6 +85,14 @@
         showTableSetting: true,
         showTableSetting: true,
         bordered: true,
         bordered: true,
         showIndexColumn: false,
         showIndexColumn: false,
+        afterFetch: (data: Recordable[]) => {
+          if (data && data.length) {
+            data.forEach((item) => {
+              item.isRoot = true;
+            });
+          }
+          return data;
+        },
         actionColumn: {
         actionColumn: {
           width: 200,
           width: 200,
           title: t('routes.common.common.operation'), //操作
           title: t('routes.common.common.operation'), //操作
@@ -91,7 +108,15 @@
         setProps
         setProps
       );
       );
       nextTick(() => {
       nextTick(() => {
-        setProps(selectionOptions);
+        setProps({
+          ...selectionOptions,
+          rowSelection: {
+            ...selectionOptions.rowSelection,
+            getCheckboxProps: (data) => {
+              return { disabled: data?.isRoot && unref(getIsChildTenant) };
+            },
+          },
+        });
       });
       });
       /**
       /**
        * 获得删除提示框的文字
        * 获得删除提示框的文字
@@ -124,6 +149,7 @@
       }
       }
 
 
       return {
       return {
+        getIsChildTenant,
         getI18n,
         getI18n,
         registerTable,
         registerTable,
         registerModal,
         registerModal,

+import jwtDecode from 'jwt-decode';
 import { BasicColumn } from '/@/components/Table';
 import { BasicColumn } from '/@/components/Table';
 import { FormSchema } from '/@/components/Table';
 import { FormSchema } from '/@/components/Table';
 import { useI18n } from '/@/hooks/web/useI18n';
 import { useI18n } from '/@/hooks/web/useI18n';
+import { getJwtToken } from '/@/utils/auth';
 import { createOrganizationSearch } from '/@/utils/organizationSearch';
 import { createOrganizationSearch } from '/@/utils/organizationSearch';
 const { t } = useI18n();
 const { t } = useI18n();
 
 
@@ -32,6 +34,12 @@ export const formSchema: FormSchema[] = [
     field: 'parentId',
     field: 'parentId',
     label: t('routes.common.organization.parentOrganization'),
     label: t('routes.common.organization.parentOrganization'),
     component: 'TreeSelect',
     component: 'TreeSelect',
+    dynamicRules: () => {
+      const token = getJwtToken();
+      const res = jwtDecode(token as string) as Record<'isCommonTenant', boolean>;
+      return [{ required: res?.isCommonTenant, message: '请选择上级组织' }];
+    },
+    rulesMessageJoinLabel: true,
     componentProps: {
     componentProps: {
       replaceFields: {
       replaceFields: {
         title: 'name',
         title: 'name',