Merge branch 'main_dev' into ft

@@ -124,3 +124,20 @@ export class TenantPageRequest extends BaseQueryRequest {
     this.tenantName = tenantName;
   }
 }
+
+export interface TenantListItemRecord {
+  id: string;
+  createTime: string;
+  updateTime: string;
+  username: string;
+  realName: string;
+  activateToken: string;
+  phoneNumber: string;
+  tbUser: string;
+  enabled: boolean;
+  hasPassword: boolean;
+  tenantId: string;
+  tenantName: string;
+  userStatusEnum: string;
+  level: number;
+}

+import { RouteRecordRaw } from 'vue-router';
+import { getEntitiesId } from '/@/api/dashboard';
+import { getMyInfo, getPermCode, getUserToken } from '/@/api/sys/user';
+import { RoleEnum } from '/@/enums/roleEnum';
+import { usePermissionStore } from '/@/store/modules/permission';
+import { useUserStore } from '/@/store/modules/user';
+import { router } from '/@/router';
+import { PAGE_NOT_FOUND_ROUTE } from '/@/router/routes/basic';
+import { PageEnum } from '/@/enums/pageEnum';
+import { TenantListItemRecord } from '/@/api/tenant/tenantInfo';
+
+export const useFastEnter = async (record: TenantListItemRecord, go: Fn) => {
+  const userStore = useUserStore();
+  const permissionStore = usePermissionStore();
+
+  const { token, refreshToken } = await getUserToken(record.id);
+  userStore.storeToken(token, refreshToken);
+  const userInfo = await getMyInfo();
+  const permissionList = await getPermCode();
+  if (
+    ![RoleEnum.SYS_ADMIN, RoleEnum.PLATFORM_ADMIN].some(
+      (item) => item === userInfo?.roles?.[0] || ''
+    )
+  ) {
+    const res = await getEntitiesId();
+    const entityId = res.data[0]?.entityId;
+    window.localStorage.setItem('entityId', JSON.stringify(entityId));
+    window.sessionStorage.setItem('entityId', JSON.stringify(entityId));
+  }
+  permissionStore.setPermCodeList(permissionList);
+  userStore.setUserInfo(userInfo);
+  userStore.setRoleList(userInfo.roles as RoleEnum[]);
+  const routes = await permissionStore.buildRoutesAction();
+  routes.forEach((route) => {
+    router.addRoute(route as unknown as RouteRecordRaw);
+  });
+  router.addRoute(PAGE_NOT_FOUND_ROUTE as unknown as RouteRecordRaw);
+  permissionStore.setDynamicAddedRoute(true);
+  if (record?.hasPassword) go(PageEnum.BASE_HOME);
+  else go(PageEnum.SYSTEM_PASSWORD);
+};

@@ -103,17 +103,11 @@
   import { useGo } from '/@/hooks/web/usePage';
   import { useBatchDelete } from '/@/hooks/web/useBatchDelete';
   import { Authority } from '/@/components/Authority';
-  import { getMyInfo, getPermCode, getUserToken } from '/@/api/sys/user';
-  import { useUserStore } from '/@/store/modules/user';
-  import { usePermissionStore } from '/@/store/modules/permission';
-  import { router } from '/@/router';
-  import { RoleEnum } from '/@/enums/roleEnum';
-  import { RouteRecordRaw } from 'vue-router';
-  import { PAGE_NOT_FOUND_ROUTE } from '/@/router/routes/basic';
-  import { PageEnum } from '/@/enums/pageEnum';
   import { getAuthCache } from '/@/utils/auth';
   import { USER_INFO_KEY } from '/@/enums/cacheEnum';
   import { isAdmin } from '/@/enums/roleEnum';
+  import { TenantListItemRecord } from '/@/api/tenant/tenantInfo';
+  import { useFastEnter } from '/@/hooks/business/useFastEnter';
 
   export default defineComponent({
     name: 'AccountManagement',
@@ -190,29 +184,10 @@
       function handleView(record: Recordable) {
         go('/system/account_detail/' + record.id);
       }
-      const userStore = useUserStore();
 
-      const permissionStore = usePermissionStore();
-      async function handleLoginCustomAdmin(record: {
-        tbUser: string;
-        id: string;
-        hasPassword: boolean;
-      }) {
+      async function handleLoginCustomAdmin(record: TenantListItemRecord) {
         try {
-          const { token, refreshToken } = await getUserToken(record.id);
-          userStore.storeToken(token, refreshToken);
-          const userInfo = await getMyInfo();
-          const permissionList = await getPermCode();
-          permissionStore.setPermCodeList(permissionList);
-          userStore.setUserInfo(userInfo);
-          userStore.setRoleList(userInfo.roles as RoleEnum[]);
-          const routes = await permissionStore.buildRoutesAction();
-          routes.forEach((route) => {
-            router.addRoute(route as unknown as RouteRecordRaw);
-          });
-          router.addRoute(PAGE_NOT_FOUND_ROUTE as unknown as RouteRecordRaw);
-          permissionStore.setDynamicAddedRoute(true);
-          record.hasPassword ? go(PageEnum.BASE_HOME) : go(PageEnum.SYSTEM_PASSWORD);
+          useFastEnter(record, go);
         } catch (error) {
         } finally {
         }

@@ -99,18 +99,15 @@
   } from '/@/api/tenant/tenantApi';
   import { Tag } from 'ant-design-vue';
   import TenantAdminFormDrawer from './TenantAdminFormDrawer.vue';
-  import { MessageTypeEnum, SendResetPasswordEmailMsg } from '/@/api/tenant/tenantInfo';
+  import {
+    MessageTypeEnum,
+    SendResetPasswordEmailMsg,
+    TenantListItemRecord,
+  } from '/@/api/tenant/tenantInfo';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { Authority } from '/@/components/Authority';
-  import { getMyInfo, getPermCode, getUserToken } from '/@/api/sys/user';
-  import { useUserStore } from '/@/store/modules/user';
-  import { usePermissionStore } from '/@/store/modules/permission';
-  import { RoleEnum } from '/@/enums/roleEnum';
+  import { useFastEnter } from '/@/hooks/business/useFastEnter';
   import { useGo } from '/@/hooks/web/usePage';
-  import { PageEnum } from '/@/enums/pageEnum';
-  import { router } from '/@/router';
-  import { RouteRecordRaw } from 'vue-router';
-  import { PAGE_NOT_FOUND_ROUTE } from '/@/router/routes/basic';
 
   export default defineComponent({
     name: 'TenantAdminDrawer',
@@ -235,31 +232,12 @@
         reload();
       }
 
-      const userStore = useUserStore();
-      const permissionStore = usePermissionStore();
       const go = useGo();
-      async function handleLoginTenantAdmin(record: {
-        tbUser: string;
-        id: string;
-        hasPassword: boolean;
-      }) {
+      async function handleLoginTenantAdmin(record: TenantListItemRecord) {
         try {
-          const { token, refreshToken } = await getUserToken(record.id);
-          userStore.storeToken(token, refreshToken);
-          const userInfo = await getMyInfo();
-          const permissionList = await getPermCode();
-          permissionStore.setPermCodeList(permissionList);
-          userStore.setUserInfo(userInfo);
-          userStore.setRoleList(userInfo.roles as RoleEnum[]);
-          const routes = await permissionStore.buildRoutesAction();
-          routes.forEach((route) => {
-            router.addRoute(route as unknown as RouteRecordRaw);
-          });
-          router.addRoute(PAGE_NOT_FOUND_ROUTE as unknown as RouteRecordRaw);
-          permissionStore.setDynamicAddedRoute(true);
-          if (record?.hasPassword) go(PageEnum.BASE_HOME);
-          else go(PageEnum.SYSTEM_PASSWORD);
+          useFastEnter(record, go);
         } catch (error) {
+          throw error;
         } finally {
         }
       }

@@ -84,6 +84,7 @@
       currentRecord.value = record;
       if (mode === DataActionModeEnum.UPDATE) {
         const config = useGetComponentConfig(record.frontId);
+        if (!config) return;
         selectWidgetKeys.value = {
           componentKey: config.componentConfig.key,
           categoryKey: config.componentConfig.package,
@@ -124,8 +125,8 @@
           ...item,
           componentInfo: { ...unref(getComponentConfig).persetOption, ...item.componentInfo },
         }));
-        if (window.requestIdleCallback as unknown as boolean) {
-          requestIdleCallback(
+        if ((window as any).requestIdleCallback as unknown as boolean) {
+          (window as any).requestIdleCallback(
             () => {
               setFormValues({ dataSource: unref(dataSource) } as WidgetDataType);
             },

@@ -7,7 +7,7 @@ import { Component } from 'vue';
  */
 export const transformComponentKey = (string: string) => {
   const CONNECTION_SYMBOL = '-';
-  const needTransformFlag = string.includes(CONNECTION_SYMBOL);
+  const needTransformFlag = (string || '').includes(CONNECTION_SYMBOL);
 
   if (needTransformFlag) {
     return string

@@ -30,7 +30,6 @@
 
   const getComponentConfig = computed(() => {
     const { widthPx, heightPx, itemWidthRatio, itemHeightRatio, frontId } = props.sourceInfo;
-
     return useGetComponentConfig(frontId, {
       widthPx,
       heightPx,

@@ -12,3 +12,9 @@
     <slot name="footer"></slot>
   </section>
 </template>
+
+<style lang="less" scoped>
+  :deep(.ant-spin-spinning) {
+    @apply flex justify-center items-center w-full h-full;
+  }
+</style>

@@ -60,12 +60,25 @@ export const useDataSource = (propsRef: ComputedRef<Recordable>) => {
       loading.value = true;
       const { data } = await getDataBoradDetail();
       rawDataSource.value = data;
+      // const result: WidgetDataType[] = (data.componentData || []).map((item) => {
+      //   const { id } = item;
+
+      //   const layout =
+      //     (data.componentLayout || []).find((item) => item.id === id) ||
+      //     ({} as ComponentLayoutType);
+
+      //   return {
+      //     i: buildUUID(),
+      //     ...layout,
+      //     ...item,
+      //   } as WidgetDataType;
+      // });
       const result: WidgetDataType[] = data.componentLayout.map((item) => {
         const { id } = item;
         const dataSource =
-          data.componentData.find((item) => item.id == id) || ({} as ComponentDataType);
+          (data.componentData || []).find((item) => item.id == id) || ({} as ComponentDataType);
 
-        dataSource.dataSource = dataSource.dataSource.map((item) => ({
+        dataSource.dataSource = (dataSource.dataSource || []).map((item) => ({
           ...item,
           uuid: buildUUID(),
         }));