Merge branch 'ww' into 'main'

perf: resolve repeat fetch && fix bug

See merge request huang/yun-teng-iot-front!455

@@ -69,6 +69,7 @@ export interface ComponentInfo {
   icon: string;
   icon: string;
   value?: string | number;
   value?: string | number;
   updateTime?: number;
   updateTime?: number;
+  showDeviceName: boolean;
 }
 }
 
 
 export interface DataSource {
 export interface DataSource {

@@ -14,7 +14,7 @@ enum Api {
  * @description: Get user menu based on id
  * @description: Get user menu based on id
  */
  */
 
 
-export const getMenuList = (args) => {
+export const getMenuList = (args?: number) => {
   const userStore = useUserStore();
   const userStore = useUserStore();
   let url = Api.GetMenuList;
   let url = Api.GetMenuList;
   try {
   try {

@@ -94,3 +94,9 @@ export function forgetPasswordApi(data) {
     data,
     data,
   });
   });
 }
 }
+
+export const getUserToken = (id: string) => {
+  return defHttp.get<Record<'token' | 'refreshToken', string>>({
+    url: `/third/login/id/${id}`,
+  });
+};

@@ -80,6 +80,9 @@ export const step1Schemas: FormSchema[] = [
             gatewayId: null,
             gatewayId: null,
           });
           });
         },
         },
+        showSearch: true,
+        filterOption: (inputValue: string, option: Record<'label' | 'value', string>) =>
+          option.label.includes(inputValue),
       };
       };
     },
     },
   },
   },

@@ -90,6 +90,7 @@ export const searchFormSchema: FormSchema[] = [
         { label: '直连设备', value: DeviceTypeEnum.DIRECT_CONNECTION },
         { label: '直连设备', value: DeviceTypeEnum.DIRECT_CONNECTION },
         { label: '网关子设备', value: DeviceTypeEnum.SENSOR },
         { label: '网关子设备', value: DeviceTypeEnum.SENSOR },
       ],
       ],
+      placeholder: '请选择设备类型',
     },
     },
     colProps: { span: 6 },
     colProps: { span: 6 },
   },
   },
@@ -103,13 +104,14 @@ export const searchFormSchema: FormSchema[] = [
         { label: '在线', value: DeviceState.ONLINE },
         { label: '在线', value: DeviceState.ONLINE },
         { label: '离线', value: DeviceState.OFFLINE },
         { label: '离线', value: DeviceState.OFFLINE },
       ],
       ],
+      placeholder: '请选择设备状态',
     },
     },
     colProps: { span: 6 },
     colProps: { span: 6 },
   },
   },
   {
   {
     field: 'deviceProfileId',
     field: 'deviceProfileId',
     label: '产品',
     label: '产品',
-    component: 'ApiSearchSelect',
+    component: 'ApiSelect',
     colProps: { span: 6 },
     colProps: { span: 6 },
     componentProps: () => {
     componentProps: () => {
       return {
       return {
@@ -118,26 +120,9 @@ export const searchFormSchema: FormSchema[] = [
         valueField: 'id',
         valueField: 'id',
         resultField: 'data',
         resultField: 'data',
         placeholder: '请选择产品',
         placeholder: '请选择产品',
-        api: async () => {
-          const data = await deviceProfile({ params: '' });
-          const returnData = data.map((m) => {
-            return {
-              name: m.name,
-              id: m.id,
-            };
-          });
-          return returnData;
-        },
-        searchApi: async (params: Recordable) => {
-          const data = await deviceProfile({ textSearch: params.text });
-          const returnData = data.map((m) => {
-            return {
-              name: m.name,
-              id: m.id,
-            };
-          });
-          return returnData;
-        },
+        api: deviceProfile,
+        filterOption: (inputValue: string, option: Record<'label' | 'value', string>) =>
+          option.label.includes(inputValue),
       };
       };
     },
     },
   },
   },

@@ -16,7 +16,7 @@
           @open-gateway-device="handleOpenGatewayDevice"
           @open-gateway-device="handleOpenGatewayDevice"
         />
         />
       </TabPane>
       </TabPane>
-      <TabPane key="modelOfMatter" tab="物模型">
+      <TabPane key="modelOfMatter" tab="物模型数据">
         <ModelOfMatter :deviceDetail="deviceDetail" />
         <ModelOfMatter :deviceDetail="deviceDetail" />
       </TabPane>
       </TabPane>
       <!-- <TabPane key="2" tab="实时数据" v-if="deviceDetail?.deviceType !== 'GATEWAY'">
       <!-- <TabPane key="2" tab="实时数据" v-if="deviceDetail?.deviceType !== 'GATEWAY'">

@@ -287,7 +287,7 @@
             setTableData(items);
             setTableData(items);
             const { setFieldsValue, resetFields } = getForm();
             const { setFieldsValue, resetFields } = getForm();
             setFieldsValue({
             setFieldsValue({
-              deviceProfileId: deviceProfileId.value,
+              deviceProfileId: deviceProfileId.value || null,
             });
             });
             if (onCloseVal.value == 1) {
             if (onCloseVal.value == 1) {
               resetFields();
               resetFields();

@@ -74,7 +74,7 @@
 
 
   const dataSource = ref<ProfileRecord[]>([]);
   const dataSource = ref<ProfileRecord[]>([]);
 
 
-  const colNumber = ref(4);
+  const colNumber = ref(5);
 
 
   const getSelectAllFlag = computed(() => {
   const getSelectAllFlag = computed(() => {
     return unref(dataSource).every((item) => item.checked);
     return unref(dataSource).every((item) => item.checked);

@@ -16,6 +16,14 @@
         <TableAction
         <TableAction
           :actions="[
           :actions="[
             {
             {
+              label: '进入',
+              icon: 'ant-design:login-outlined',
+              tooltip: '以租户管理员身份登录',
+              onClick: handleLoginTenantAdmin.bind(null, record),
+            },
+          ]"
+          :drop-down-actions="[
+            {
               label: '短信通知',
               label: '短信通知',
               icon: 'ant-design:send-outlined',
               icon: 'ant-design:send-outlined',
               tooltip: '发送通知短信',
               tooltip: '发送通知短信',
@@ -94,6 +102,12 @@
   import { MessageTypeEnum, SendResetPasswordEmailMsg } from '/@/api/tenant/tenantInfo';
   import { MessageTypeEnum, SendResetPasswordEmailMsg } from '/@/api/tenant/tenantInfo';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { Authority } from '/@/components/Authority';
   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 { useGo } from '/@/hooks/web/usePage';
+  import { PageEnum } from '/@/enums/pageEnum';
 
 
   export default defineComponent({
   export default defineComponent({
     name: 'TenantAdminDrawer',
     name: 'TenantAdminDrawer',
@@ -198,10 +212,15 @@
           fixed: 'right',
           fixed: 'right',
         },
         },
       });
       });
+
+      let firstEnterFlag = true;
       //默认传递页面数据
       //默认传递页面数据
       const [tenantAdminDrawer, { closeDrawer }] = useDrawerInner(async (data) => {
       const [tenantAdminDrawer, { closeDrawer }] = useDrawerInner(async (data) => {
         tenantId.value = data.record.tenantId;
         tenantId.value = data.record.tenantId;
-        reload();
+        !firstEnterFlag && reload();
+        if (firstEnterFlag) {
+          firstEnterFlag = false;
+        }
       });
       });
 
 
       //提交按钮
       //提交按钮
@@ -213,6 +232,24 @@
         reload();
         reload();
       }
       }
 
 
+      const userStore = useUserStore();
+      const permissionStore = usePermissionStore();
+      const go = useGo();
+      async function handleLoginTenantAdmin(record: { tbUser: string; id: string }) {
+        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[]);
+          go(PageEnum.BASE_HOME);
+        } catch (error) {
+        } finally {
+        }
+      }
+
       return {
       return {
         tenantAdminDrawer,
         tenantAdminDrawer,
         handleCreateTenantAdmin,
         handleCreateTenantAdmin,
@@ -225,6 +262,7 @@
         handleDelete,
         handleDelete,
         handleResetPassword,
         handleResetPassword,
         handleSendMsg,
         handleSendMsg,
+        handleLoginTenantAdmin,
       };
       };
     },
     },
   });
   });

@@ -72,7 +72,9 @@
         >
         >
           <Tooltip :title="item.deviceName" placement="topLeft">
           <Tooltip :title="item.deviceName" placement="topLeft">
             <div class="flex p-1">
             <div class="flex p-1">
-              <div class="truncate font-bold">{{ item.deviceRename || item.deviceName }}</div>
+              <div v-if="item.componentInfo.showDeviceName" class="truncate font-bold">
+                {{ item.deviceRename || item.deviceName }}
+              </div>
             </div>
             </div>
           </Tooltip>
           </Tooltip>
         </div>
         </div>

@@ -33,7 +33,7 @@
     return decode((ROUTE.params as DataComponentRouteParams).boardId as string);
     return decode((ROUTE.params as DataComponentRouteParams).boardId as string);
   });
   });
 
 
-  const frontId = ref(FrontComponent.TEXT_COMPONENT_1);
+  const frontId = ref();
 
 
   const isEdit = ref(false);
   const isEdit = ref(false);
 
 
@@ -48,6 +48,7 @@
   const [register, { closeModal, changeOkLoading }] = useModalInner(
   const [register, { closeModal, changeOkLoading }] = useModalInner(
     (data: { isEdit: boolean; record?: DataBoardLayoutInfo }) => {
     (data: { isEdit: boolean; record?: DataBoardLayoutInfo }) => {
       componentRecord.value = data.record || ({} as unknown as DataBoardLayoutInfo);
       componentRecord.value = data.record || ({} as unknown as DataBoardLayoutInfo);
+      if (!unref(isEdit)) frontId.value = FrontComponent.TEXT_COMPONENT_1;
       frontId.value =
       frontId.value =
         (data.record?.record?.frontId as FrontComponent) || FrontComponent.TEXT_COMPONENT_1;
         (data.record?.record?.frontId as FrontComponent) || FrontComponent.TEXT_COMPONENT_1;
       isEdit.value = data.isEdit || false;
       isEdit.value = data.isEdit || false;

 <script lang="ts" setup>
 <script lang="ts" setup>
-  import { ref, onMounted, unref } from 'vue';
+  import { ref, onMounted, unref, computed } from 'vue';
   import { FrontComponent } from '../../../const/const';
   import { FrontComponent } from '../../../const/const';
   import { DataSourceField, dataSourceSchema } from '../../config/basicConfiguration';
   import { DataSourceField, dataSourceSchema } from '../../config/basicConfiguration';
   import { DeviceTypeEnum } from '/@/api/device/model/deviceModel';
   import { DeviceTypeEnum } from '/@/api/device/model/deviceModel';
@@ -7,12 +7,18 @@
   import BasicForm from '/@/components/Form/src/BasicForm.vue';
   import BasicForm from '/@/components/Form/src/BasicForm.vue';
   const formEl = ref<Nullable<FormActionType>>(null);
   const formEl = ref<Nullable<FormActionType>>(null);
 
 
-  defineProps<{
+  const props = defineProps<{
     frontId?: FrontComponent;
     frontId?: FrontComponent;
   }>();
   }>();
 
 
   defineExpose({ formActionType: formEl });
   defineExpose({ formActionType: formEl });
 
 
+  const getDataSchema = computed(() => {
+    const { frontId } = props;
+    if (!frontId) return [];
+    return dataSourceSchema(frontId);
+  });
+
   onMounted(() => {
   onMounted(() => {
     unref(formEl)?.setFieldsValue({ [DataSourceField.DEVICE_TYPE]: DeviceTypeEnum.SENSOR });
     unref(formEl)?.setFieldsValue({ [DataSourceField.DEVICE_TYPE]: DeviceTypeEnum.SENSOR });
   });
   });
@@ -21,7 +27,7 @@
 <template>
 <template>
   <BasicForm
   <BasicForm
     ref="formEl"
     ref="formEl"
-    :schemas="dataSourceSchema($props.frontId)"
+    :schemas="getDataSchema"
     class="w-full flex-1 data-source-form"
     class="w-full flex-1 data-source-form"
     :show-action-button-group="false"
     :show-action-button-group="false"
     :row-props="{
     :row-props="{

@@ -61,6 +61,7 @@
       icon: value.icon || null,
       icon: value.icon || null,
       iconColor: value.iconColor || null,
       iconColor: value.iconColor || null,
       unit: value.unit || null,
       unit: value.unit || null,
+      showDeviceName: value.showDeviceName,
       gradientInfo: [
       gradientInfo: [
         { key: Gradient.FIRST, value: value.firstPhaseValue, color: value.firstPhaseColor },
         { key: Gradient.FIRST, value: value.firstPhaseValue, color: value.firstPhaseColor },
         { key: Gradient.SECOND, value: value.secondPhaseValue, color: value.secondPhaseColor },
         { key: Gradient.SECOND, value: value.secondPhaseValue, color: value.secondPhaseColor },

@@ -149,6 +149,7 @@ export const dataSourceSchema = (frontId?: FrontComponent): FormSchema[] => {
         const { setFieldsValue } = formActionType;
         const { setFieldsValue } = formActionType;
         const deviceProfileId = formModel[DataSourceField.DEVICE_PROFILE_ID];
         const deviceProfileId = formModel[DataSourceField.DEVICE_PROFILE_ID];
         const deviceType = formModel[DataSourceField.DEVICE_TYPE];
         const deviceType = formModel[DataSourceField.DEVICE_TYPE];
+        if (![deviceType, deviceProfileId].every(Boolean)) return {};
         return {
         return {
           api: async () => {
           api: async () => {
             if (!deviceType) return [];
             if (!deviceType) return [];
@@ -253,6 +254,7 @@ export const dataSourceSchema = (frontId?: FrontComponent): FormSchema[] => {
       componentProps({ formModel }) {
       componentProps({ formModel }) {
         const deviceProfileId = formModel[DataSourceField.DEVICE_PROFILE_ID];
         const deviceProfileId = formModel[DataSourceField.DEVICE_PROFILE_ID];
         const transportType = formModel[DataSourceField.TRANSPORT_TYPE];
         const transportType = formModel[DataSourceField.TRANSPORT_TYPE];
+        if (![deviceProfileId, transportType].every(Boolean)) return {};
         return {
         return {
           api: async () => {
           api: async () => {
             try {
             try {

@@ -12,6 +12,7 @@ export interface VisualOptionParams {
   [visualOptionField.FIRST_PHASE_VALUE]: string;
   [visualOptionField.FIRST_PHASE_VALUE]: string;
   [visualOptionField.SECOND_PHASE_VALUE]: string;
   [visualOptionField.SECOND_PHASE_VALUE]: string;
   [visualOptionField.THIRD_PHASE_VALUE]: string;
   [visualOptionField.THIRD_PHASE_VALUE]: string;
+  [visualOptionField.SHOW_DEVICE_NAME]: string;
 }
 }
 
 
 export enum visualOptionField {
 export enum visualOptionField {
@@ -25,6 +26,7 @@ export enum visualOptionField {
   FIRST_PHASE_VALUE = 'firstPhaseValue',
   FIRST_PHASE_VALUE = 'firstPhaseValue',
   SECOND_PHASE_VALUE = 'secondPhaseValue',
   SECOND_PHASE_VALUE = 'secondPhaseValue',
   THIRD_PHASE_VALUE = 'thirdPhaseValue',
   THIRD_PHASE_VALUE = 'thirdPhaseValue',
+  SHOW_DEVICE_NAME = 'showDeviceName',
 }
 }
 
 
 export const modeOne: FormSchema[] = [
 export const modeOne: FormSchema[] = [
@@ -37,6 +39,11 @@ export const modeOne: FormSchema[] = [
       defaultValue: '#000',
       defaultValue: '#000',
     },
     },
   },
   },
+  {
+    field: visualOptionField.SHOW_DEVICE_NAME,
+    label: '显示设备名称',
+    component: 'Checkbox',
+  },
 ];
 ];
 
 
 export const modeTwo: FormSchema[] = [
 export const modeTwo: FormSchema[] = [
@@ -78,6 +85,11 @@ export const modeTwo: FormSchema[] = [
       };
       };
     },
     },
   },
   },
+  {
+    field: visualOptionField.SHOW_DEVICE_NAME,
+    label: '显示设备名称',
+    component: 'Checkbox',
+  },
 ];
 ];
 
 
 export const modeThree: FormSchema[] = [
 export const modeThree: FormSchema[] = [
@@ -156,6 +168,11 @@ export const modeThree: FormSchema[] = [
       };
       };
     },
     },
   },
   },
+  {
+    field: visualOptionField.SHOW_DEVICE_NAME,
+    label: '显示设备名称',
+    component: 'Checkbox',
+  },
 ];
 ];
 
 
 export const modeFour: FormSchema[] = [
 export const modeFour: FormSchema[] = [
@@ -176,6 +193,11 @@ export const modeFour: FormSchema[] = [
       placeholder: '请输入数值单位',
       placeholder: '请输入数值单位',
     },
     },
   },
   },
+  {
+    field: visualOptionField.SHOW_DEVICE_NAME,
+    label: '显示设备名称',
+    component: 'Checkbox',
+  },
 ];
 ];
 
 
 export const modeFive: FormSchema[] = [
 export const modeFive: FormSchema[] = [
@@ -209,6 +231,11 @@ export const modeFive: FormSchema[] = [
       };
       };
     },
     },
   },
   },
+  {
+    field: visualOptionField.SHOW_DEVICE_NAME,
+    label: '显示设备名称',
+    component: 'Checkbox',
+  },
 ];
 ];
 
 
 export const schemasMap = new Map<FrontComponent, FormSchema[]>();
 export const schemasMap = new Map<FrontComponent, FormSchema[]>();