Merge branch 'ww' into 'main'

perf: create terant react set tenantProfileId field default select Default option

See merge request yunteng/thingskit-front!479

@@ -52,7 +52,7 @@ export const getTableTenantProfileApi = (params?: QueryTenantProfilesParam) => {
     ...params,
     orderFiled: 'createdTime',
   };
-  return defHttp.get<PaginationResult>({
+  return defHttp.get<PaginationResult<{ default: boolean; id: { id: string } }>>({
     url: Api.getTenantProfile,
     params: param,
   });

@@ -81,7 +81,7 @@
 <template>
   <BasicModal
     @register="register"
-    title="关于我们"
+    :title="handleDecode(t('routes.aboutSoftware.aboutSoftware'))"
     width="50%"
     cancel-text="关闭"
     :show-ok-btn="false"

@@ -37,7 +37,11 @@
           :text="t('layout.header.dropdownItemChangePassword')"
           icon="ant-design:unlock-twotone"
         />
-        <MenuItem key="aboutSoftware" text="关于软件" icon="ant-design:message-outline" />
+        <MenuItem
+          key="aboutSoftware"
+          :text="handleDecode(t('routes.aboutSoftware.aboutSoftware'))"
+          icon="ant-design:message-outline"
+        />
         <MenuItem
           v-if="getUseLockPage"
           key="lock"
@@ -77,6 +81,8 @@
   import { useRouter } from 'vue-router';
   import { usePermission } from '/@/hooks/web/usePermission';
   import AboutSoftwareModal from '../AboutSoftwareModal.vue';
+  import { AesEncryption } from '/@/utils/cipher';
+  import { cacheCipher } from '/@/settings/encryptionSetting';
 
   type MenuEvent = 'logout' | 'doc' | 'lock' | 'personal' | 'changePassword' | 'aboutSoftware';
 
@@ -176,7 +182,15 @@
         router.push('/system/changePassword');
       };
 
+      const encryption = new AesEncryption(cacheCipher);
+      const handleDecode = (string: string) => {
+        return encryption.decryptByAES(string);
+      };
+
+      console.log(encryption.encryptByAES('关于软件'));
+
       return {
+        handleDecode,
         updataPersonlData,
         refreshPersonlData,
         refreshPersonalFunc,

 export default {
+  aboutSoftware: 'M2e/fueM5gOxek1+Cqh5CA==',
   copyrightLabel: 'euVkVv2k+9lAoBFk2/IcAg==',
   websiteLabel: 'Lg18XskCEQMA57HJp/kFSg==',
   authorizationLabel: 'RgtDsxIoA+6FMp4Ani+utw==',

 export default {
+  aboutSoftware: 'M2e/fueM5gOxek1+Cqh5CA==',
   copyrightLabel: 'euVkVv2k+9lAoBFk2/IcAg==',
   websiteLabel: 'Lg18XskCEQMA57HJp/kFSg==',
   authorizationLabel: 'RgtDsxIoA+6FMp4Ani+utw==',

@@ -130,9 +130,9 @@ export const tenantFormSchema: FormSchema[] = [
       return {
         api: async (params: QueryTenantProfilesParam) => {
           const { items, total } = await getTableTenantProfileApi(params);
-          const firstRecord = items.at(0);
-          if (firstRecord) {
-            setFieldsValue({ tenantProfileId: firstRecord.id.id });
+          const defaultRecord = items.find((item) => item.default);
+          if (defaultRecord) {
+            setFieldsValue({ tenantProfileId: defaultRecord.id.id });
           }
           return { items, total };
         },