Merge branch 'ft-dev' into 'main'

fix:检查修复了之前字段有些验证失效问题，修复了账号管理的租户管理员用户名需要显示已经存在问题，修复组织管理默认展开，修复了消息模板邮件里面的有些字段为数组问题

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

@@ -41,6 +41,8 @@ export interface TenantPageRequestParams extends BaseQueryParams {
 export interface TenantAdminPageRequestParams extends BaseQueryParams {
   realName?: string;
   tenantCode: string;
+  tenantId?: string;
+  roleType?: string;
 }
 
 export interface tenantProfileDTO {

@@ -33,7 +33,7 @@
             :before-upload="beforeUploadqrcodePic"
           >
             <img
-              style="text-align: center; border-radius: 50%; width: 10vw; height: 15vh"
+              style="text-align: center; border-radius: 50%; width: 8vw; height: 15vh"
               v-if="peresonalPic"
               :src="peresonalPic"
               alt="avatar"
@@ -92,6 +92,7 @@
   import { Upload } from 'ant-design-vue';
   import { PlusOutlined } from '@ant-design/icons-vue';
   import type { FileItem } from '/@/components/Upload/src/typing';
+  import { useUserStore } from '/@/store/modules/user';
 
   const schema: DescItem[] = [
     {
@@ -124,12 +125,16 @@
     components: { BasicModal, BasicForm, Description, Upload, PlusOutlined },
     emits: ['refreshPersonl', 'register'],
     setup(_, { emit }) {
+      // const userStore = useUserStore();
       const userInfo = getAuthCache(USER_INFO_KEY);
       const { createMessage } = useMessage();
       const getPersonalValue: any = ref({});
       const getPersonalDetailValue: any = ref({});
       const updatePersonalData: any = ref({});
       const getBackendV: any = ref({});
+      const getData: any = ref({});
+      const updataPersonlData: any = ref({});
+      // const getUpdateUserInfo: any = ref({});
       const [registerDesc] = useDescription({
         title: '个人详情',
         schema: schema,
@@ -164,16 +169,37 @@
         showActionButtonGroup: false,
         schemas: formSchema,
       });
+      const refreshCacheGetData = () => {
+        const getItem = window.localStorage.getItem('updateUserInfo');
+        const newItem = JSON.parse(getItem);
+        updataPersonlData.value = newItem;
+      };
 
       const [registerModal, { closeModal }] = useModalInner(async (data) => {
-        (peresonalPic.value = data.userInfo.avatar),
-          setFieldsValue({
-            realName: data.userInfo.realName,
-            phoneNumber: data.userInfo.phoneNumber,
-            email: data.userInfo.email,
-          });
-        if (data.userInfo) {
-          getPersonalDetailValue.value = data.userInfo;
+        refreshCacheGetData();
+        console.log(updataPersonlData.value);
+        try {
+          if (updataPersonlData.value != null) {
+            (peresonalPic.value = updataPersonlData.value.avatar),
+              setFieldsValue({
+                realName: updataPersonlData.value.realName,
+                phoneNumber: updataPersonlData.value.phoneNumber,
+                email: updataPersonlData.value.email,
+              });
+            getPersonalDetailValue.value = updataPersonlData.value;
+          } else {
+            if (data.userInfo) {
+              getPersonalDetailValue.value = data.userInfo;
+              peresonalPic.value = data.userInfo.avatar;
+              setFieldsValue({
+                realName: data.userInfo.realName,
+                phoneNumber: data.userInfo.phoneNumber,
+                email: data.userInfo.email,
+              });
+            }
+          }
+        } catch (e) {
+          return e;
         }
         if (Object.keys(updatePersonalData.value).length != 0) {
           getPersonalDetailValue.value = updatePersonalData.value;
@@ -191,9 +217,11 @@
         getPersonalValue.value.id = getUserInfo.userId;
         getPersonalValue.value.username = getBackendV.value.username;
         getPersonalValue.value.avatar = peresonalPic.value;
-        const data = await personalPut(getPersonalValue.value);
-        updatePersonalData.value = data;
+        getData.value = await personalPut(getPersonalValue.value);
+        updatePersonalData.value = getData.value;
         createMessage.success('修改成功');
+        const setUpdateUserInfo = JSON.stringify(getData.value);
+        window.localStorage.setItem('updateUserInfo', setUpdateUserInfo);
         closeModal();
         resetFields();
         emit('refreshPersonl', updatePersonalData.value);
@@ -221,7 +249,7 @@
     /deep/ .ant-upload-select-picture-card {
       display: inherit;
       float: none;
-      width: 10vw;
+      width: 8.6vw;
       height: 17vh;
       margin-right: 8px;
       margin-bottom: 8px;

@@ -3,11 +3,23 @@
     <span :class="[prefixCls, `${prefixCls}--${theme}`]" class="flex">
       <img
         :class="`${prefixCls}__header`"
-        :src="refreshPersonlData.avatar ? refreshPersonlData.avatar : getUserInfo.avatar"
+        :src="
+          refreshPersonlData.avatar
+            ? refreshPersonlData.avatar
+            : updataPersonlData.avatar
+            ? updataPersonlData.avatar
+            : getUserInfo.avatar
+        "
       />
       <span :class="`${prefixCls}__info hidden md:block`">
         <span :class="`${prefixCls}__name  `" class="truncate">
-          {{ refreshPersonlData.realName ? refreshPersonlData.realName : getUserInfo.realName }}
+          {{
+            refreshPersonlData.realName
+              ? refreshPersonlData.realName
+              : updataPersonlData.realName
+              ? updataPersonlData.realName
+              : getUserInfo.realName
+          }}
         </span>
       </span>
     </span>
@@ -78,6 +90,10 @@
         avatar: '',
         realName: '',
       });
+      const updataPersonlData = reactive({
+        avatar: '',
+        realName: '',
+      });
       const userInfo = getAuthCache(USER_INFO_KEY);
       const { proxy } = getCurrentInstance();
       const personalRef = ref(null);
@@ -132,6 +148,13 @@
           });
         }, 10);
       };
+      const refreshCacheGetData = () => {
+        const getItem = window.localStorage.getItem('updateUserInfo');
+        const newItem = JSON.parse(getItem);
+        updataPersonlData.avatar = newItem?.avatar;
+        updataPersonlData.realName = newItem?.realName;
+      };
+      refreshCacheGetData();
 
       const refreshPersonlFunc = (v) => {
         refreshPersonlData.avatar = v.avatar;
@@ -139,6 +162,7 @@
       };
 
       return {
+        updataPersonlData,
         refreshPersonlData,
         refreshPersonlFunc,
         personalRef,

-import type { UserInfo } from '/#/store';
+import type { UserInfo, UserUpdateInfo } from '/#/store';
 import type { ErrorMessageMode } from '/#/axios';
 import { defineStore } from 'pinia';
 import { store } from '/@/store';
@@ -30,6 +30,7 @@ interface UserState {
   platInfo: any;
   enterPriseInfo: any;
   userInfo: Nullable<UserInfo>;
+  userUpdateInfo?: Nullable<UserUpdateInfo>;
   token?: string;
   roleList: RoleEnum[];
   sessionTimeout?: boolean;
@@ -47,6 +48,7 @@ export const useUserStore = defineStore({
     enterPriseInfo: storage.get('enterPriseInfo') || null,
     // user info
     userInfo: null,
+    userUpdateInfo: null,
     // token
     jwtToken: undefined,
     //refresh Token
@@ -66,6 +68,9 @@ export const useUserStore = defineStore({
     getUserInfo(): UserInfo {
       return this.userInfo || getAuthCache<UserInfo>(USER_INFO_KEY) || {};
     },
+    getUserUpdateInfo(): UserUpdateInfo {
+      return this.userUpdateInfo || {};
+    },
     getJwtToken(): string {
       return this.jwtToken || getAuthCache<string>(JWT_TOKEN_KEY);
     },
@@ -108,6 +113,9 @@ export const useUserStore = defineStore({
       this.lastUpdateTime = new Date().getTime();
       setAuthCache(USER_INFO_KEY, info);
     },
+    setUserUpdateInfo(info: UserUpdateInfo) {
+      this.userUpdateInfo = info;
+    },
     setSessionTimeout(flag: boolean) {
       this.sessionTimeout = flag;
     },
@@ -194,6 +202,8 @@ export const useUserStore = defineStore({
       // this.setSessionTimeout(false);
       // goLogin && router.push(PageEnum.BASE_LOGIN);
       await router.push(PageEnum.BASE_LOGIN);
+      window.localStorage.clear();
+      window.localStorage.removeItem('updateUserInfo');
     },
 
     async doRefresh() {

@@ -41,7 +41,9 @@ export const formSchema: FormSchema[] = [
     label: '',
     component: 'Input',
     componentProps: {
+      maxLength: 255,
       placeholder: '请输入设备名称',
+      maxLength: 255,
     },
   },
   {

@@ -56,7 +56,9 @@ export const searchFormSchema: FormSchema[] = [
     component: 'Input',
     colProps: { span: 6 },
     componentProps: {
+      maxLength: 36,
       placeholder: '请输入联系人姓名',
+      maxLength: 36,
     },
   },
 ];
@@ -128,6 +130,7 @@ export const formSchema: FormSchema[] = [
     show: false,
     componentProps: {
       maxLength: 36,
+      placeholder: 'id',
     },
   },
 ];

 <template>
   <div class="bg-white m-4 mr-0 overflow-hidden">
     <BasicTree
+      v-if="treeData.length > 0"
       title="组织列表"
       toolbar
       search
       :clickRowToExpand="false"
       :treeData="treeData"
       :replaceFields="{ key: 'id', title: 'name' }"
+      v-model:expandedKeys="expandedKeys"
       v-model:selectedKeys="selectedKeys"
       @select="handleSelect"
+      :defaultExpandAll="true"
     />
   </div>
 </template>
@@ -24,8 +27,11 @@
 
     emits: ['select'],
     setup(_, { emit }) {
+      // const { proxy } = getCurrentInstance();
+      const getTreeRef: any = ref(null);
       const treeData = ref<TreeItem[]>([]);
       const selectedKeys = ref<string[]>();
+      const expandedKeys = ref<string[]>();
       async function fetch() {
         treeData.value = (await getOrganizationList()) as unknown as TreeItem[];
       }
@@ -40,7 +46,14 @@
       onMounted(() => {
         fetch();
       });
-      return { treeData, handleSelect, resetOrganization, selectedKeys };
+      return {
+        treeData,
+        handleSelect,
+        resetOrganization,
+        selectedKeys,
+        expandedKeys,
+        getTreeRef,
+      };
     },
   });
 </script>

@@ -28,11 +28,9 @@
   });
 
   const userInfo: any = getAuthCache(USER_INFO_KEY);
-  const role: string = userInfo.roles[0];
+  const role: string = userInfo?.roles[0];
   const loading = ref(true);
 
-  console.log(role);
-
   setTimeout(() => {
     loading.value = false;
   }, 1500);

@@ -3,11 +3,6 @@ import { findDictItemByCode } from '/@/api/system/dict';
 import { deviceProfile } from '/@/api/device/deviceManager';
 import { getOrganizationList } from '/@/api/system/system';
 import { copyTransFun } from '/@/utils/fnUtils';
-import {
-  DeviceNameMaxLength,
-  DeviceProfileIdMaxLength,
-  DeviceOrgIdMaxLength,
-} from '/@/utils/rules';
 
 // 第一步的表单
 export const step1Schemas: FormSchema[] = [
@@ -26,7 +21,6 @@ export const step1Schemas: FormSchema[] = [
       placeholder: '设备名称',
       maxLength: 30,
     },
-    rules: DeviceNameMaxLength,
   },
   {
     field: 'deviceType',
@@ -53,7 +47,6 @@ export const step1Schemas: FormSchema[] = [
       labelField: 'name',
       valueField: 'id',
     },
-    rules: DeviceProfileIdMaxLength,
   },
   {
     field: 'organizationId',
@@ -67,7 +60,6 @@ export const step1Schemas: FormSchema[] = [
         return data;
       },
     },
-    rules: DeviceOrgIdMaxLength,
   },
   {
     field: 'label',
@@ -128,19 +120,6 @@ export const step1Schemas: FormSchema[] = [
       maxLength: 36,
       placeholder: '请输入id',
     },
-    dynamicRules: () => {
-      return [
-        {
-          required: false,
-          validator: (_, value) => {
-            if (String(value).length > 36) {
-              return Promise.reject('字数不超过36个字');
-            }
-            return Promise.resolve();
-          },
-        },
-      ];
-    },
   },
   {
     field: 'tenantId',
@@ -174,19 +153,6 @@ export const step1Schemas: FormSchema[] = [
       maxLength: 36,
       placeholder: '请输入tbDeviceId',
     },
-    dynamicRules: () => {
-      return [
-        {
-          required: false,
-          validator: (_, value) => {
-            if (String(value).length > 36) {
-              return Promise.reject('字数不超过36个字');
-            }
-            return Promise.resolve();
-          },
-        },
-      ];
-    },
   },
 ];
 
@@ -341,19 +307,6 @@ export const step2Schemas: FormSchema[] = [
       maxLength: 36,
       placeholder: '请输入访问令牌',
     },
-    dynamicRules: () => {
-      return [
-        {
-          required: true,
-          validator: (_, value) => {
-            if (String(value).length > 36) {
-              return Promise.reject('字数不超过36个字');
-            }
-            return Promise.resolve();
-          },
-        },
-      ];
-    },
   },
   {
     label: 'RSA公钥',
@@ -365,19 +318,6 @@ export const step2Schemas: FormSchema[] = [
       maxLength: 36,
       placeholder: '请输入RSA公钥',
     },
-    dynamicRules: () => {
-      return [
-        {
-          required: true,
-          validator: (_, value) => {
-            if (String(value).length > 36) {
-              return Promise.reject('字数不超过36个字');
-            }
-            return Promise.resolve();
-          },
-        },
-      ];
-    },
   },
   {
     label: '客户端ID',
@@ -389,19 +329,6 @@ export const step2Schemas: FormSchema[] = [
       maxLength: 36,
       placeholder: '请输入客户端ID',
     },
-    dynamicRules: () => {
-      return [
-        {
-          required: true,
-          validator: (_, value) => {
-            if (String(value).length > 36) {
-              return Promise.reject('字数不超过36个字');
-            }
-            return Promise.resolve();
-          },
-        },
-      ];
-    },
   },
   {
     label: '用户名',
@@ -413,19 +340,6 @@ export const step2Schemas: FormSchema[] = [
       maxLength: 255,
       placeholder: '请输入用户名',
     },
-    dynamicRules: () => {
-      return [
-        {
-          required: true,
-          validator: (_, value) => {
-            if (String(value).length > 255) {
-              return Promise.reject('字数不超过255个字');
-            }
-            return Promise.resolve();
-          },
-        },
-      ];
-    },
   },
   {
     label: '密码',
@@ -591,19 +505,6 @@ export const TokenSchemas: FormSchema[] = [
       maxLength: 36,
       placeholder: '请输入访问令牌',
     },
-    dynamicRules: () => {
-      return [
-        {
-          required: false,
-          validator: (_, value) => {
-            if (String(value).length > 36) {
-              return Promise.reject('字数不超过36个字');
-            }
-            return Promise.resolve();
-          },
-        },
-      ];
-    },
   },
   {
     label: 'RSA公钥',
@@ -615,19 +516,6 @@ export const TokenSchemas: FormSchema[] = [
       maxLength: 36,
       placeholder: '请输入RSA公钥',
     },
-    dynamicRules: () => {
-      return [
-        {
-          required: true,
-          validator: (_, value) => {
-            if (String(value).length > 36) {
-              return Promise.reject('字数不超过36个字');
-            }
-            return Promise.resolve();
-          },
-        },
-      ];
-    },
   },
   {
     label: '客户端ID',
@@ -639,19 +527,6 @@ export const TokenSchemas: FormSchema[] = [
       maxLength: 36,
       placeholder: '请输入客户端ID',
     },
-    dynamicRules: () => {
-      return [
-        {
-          required: true,
-          validator: (_, value) => {
-            if (String(value).length > 36) {
-              return Promise.reject('字数不超过36个字');
-            }
-            return Promise.resolve();
-          },
-        },
-      ];
-    },
   },
   {
     label: '用户名',
@@ -663,19 +538,6 @@ export const TokenSchemas: FormSchema[] = [
       maxLength: 255,
       placeholder: '请输入用户名',
     },
-    dynamicRules: () => {
-      return [
-        {
-          required: true,
-          validator: (_, value) => {
-            if (String(value).length > 255) {
-              return Promise.reject('字数不超过255个字');
-            }
-            return Promise.resolve();
-          },
-        },
-      ];
-    },
   },
   {
     label: '密码',
@@ -709,19 +571,6 @@ export const TokenSchemas: FormSchema[] = [
       maxLength: 36,
       placeholder: '请输入id',
     },
-    dynamicRules: () => {
-      return [
-        {
-          required: false,
-          validator: (_, value) => {
-            if (String(value).length > 36) {
-              return Promise.reject('字数不超过36个字');
-            }
-            return Promise.resolve();
-          },
-        },
-      ];
-    },
   },
   {
     label: 'tbDeviceId',

@@ -89,6 +89,9 @@ export const alarmSearchSchemas: FormSchema[] = [
     label: '告警类型',
     component: 'Input',
     colProps: { span: 6 },
+    componentProps: {
+      maxLength: 36,
+    },
   },
   {
     field: 'endTime',
@@ -226,6 +229,7 @@ export const childDeviceSchemas: FormSchema[] = [
     colProps: { span: 12 },
     componentProps: {
       maxLength: 255,
+      placeholder: '请输入设备名称',
     },
   },
 ];

@@ -72,19 +72,6 @@ export const formSchema: FormSchema[] = [
       maxLength: 255,
       placeholder: '请输入配置名称',
     },
-    dynamicRules: () => {
-      return [
-        {
-          required: true,
-          validator: (_, value) => {
-            if (String(value).length > 255) {
-              return Promise.reject('字数不超过255个字');
-            }
-            return Promise.resolve();
-          },
-        },
-      ];
-    },
   },
   {
     field: 'messageType',
@@ -124,19 +111,7 @@ export const formSchema: FormSchema[] = [
       maxLength: 36,
       placeholder: '请输入accessKeyId',
     },
-    dynamicRules: () => {
-      return [
-        {
-          required: true,
-          validator: (_, value) => {
-            if (String(value).length > 36) {
-              return Promise.reject('字数不超过36个字');
-            }
-            return Promise.resolve();
-          },
-        },
-      ];
-    },
+
     ifShow: ({ values }) => isMessage(Reflect.get(values, 'messageType')),
   },
   {
@@ -148,19 +123,7 @@ export const formSchema: FormSchema[] = [
       maxLength: 36,
       placeholder: '请输入accessKeySecret',
     },
-    dynamicRules: () => {
-      return [
-        {
-          required: true,
-          validator: (_, value) => {
-            if (String(value).length > 36) {
-              return Promise.reject('字数不超过36个字');
-            }
-            return Promise.resolve();
-          },
-        },
-      ];
-    },
+
     ifShow: ({ values }) => isMessage(Reflect.get(values, 'messageType')),
   },
   {
@@ -173,19 +136,7 @@ export const formSchema: FormSchema[] = [
       maxLength: 36,
       placeholder: '请输入accessKeySecret',
     },
-    dynamicRules: () => {
-      return [
-        {
-          required: true,
-          validator: (_, value) => {
-            if (String(value).length > 36) {
-              return Promise.reject('字数不超过36个字');
-            }
-            return Promise.resolve();
-          },
-        },
-      ];
-    },
+
     ifShow: ({ values }) => isEmail(Reflect.get(values, 'messageType')),
   },
   {
@@ -211,19 +162,6 @@ export const formSchema: FormSchema[] = [
       maxLength: 255,
       placeholder: '请输入用户名',
     },
-    dynamicRules: () => {
-      return [
-        {
-          required: true,
-          validator: (_, value) => {
-            if (String(value).length > 255) {
-              return Promise.reject('字数不超过255个字');
-            }
-            return Promise.resolve();
-          },
-        },
-      ];
-    },
 
     ifShow: ({ values }) => isEmail(Reflect.get(values, 'messageType')),
   },
@@ -266,19 +204,6 @@ export const formSchema: FormSchema[] = [
       maxLength: 36,
       placeholder: '请输入主键',
     },
-    dynamicRules: () => {
-      return [
-        {
-          required: false,
-          validator: (_, value) => {
-            if (String(value).length > 36) {
-              return Promise.reject('字数不超过36个字');
-            }
-            return Promise.resolve();
-          },
-        },
-      ];
-    },
   },
   {
     field: 'status',

@@ -11,18 +11,5 @@ export const formSchema: FormSchema[] = [
       maxLength: 255,
       placeholder: '请输入报警详细信息',
     },
-    dynamicRules: () => {
-      return [
-        {
-          required: true,
-          validator: (_, value) => {
-            if (String(value).length > 255) {
-              return Promise.reject('字数不超过255个字');
-            }
-            return Promise.resolve();
-          },
-        },
-      ];
-    },
   },
 ];

@@ -16,19 +16,6 @@ export const step1Schemas: FormSchema[] = [
       maxLength: 255,
       placeholder: '请输入配置名称',
     },
-    dynamicRules: () => {
-      return [
-        {
-          required: true,
-          validator: (_, value) => {
-            if (String(value).length > 255) {
-              return Promise.reject('字数不超过255个字');
-            }
-            return Promise.resolve();
-          },
-        },
-      ];
-    },
   },
   //规则链(string)
   {

@@ -118,19 +118,6 @@ export const formSchema: FormSchema[] = [
       maxLength: 30,
       placeholder: '请输入配置名称',
     },
-    dynamicRules: () => {
-      return [
-        {
-          required: true,
-          validator: (_, value) => {
-            if (String(value).length > 30) {
-              return Promise.reject('字数不超过30个字');
-            }
-            return Promise.resolve();
-          },
-        },
-      ];
-    },
   },
   {
     field: 'messageType',
@@ -170,19 +157,7 @@ export const formSchema: FormSchema[] = [
       maxLength: 36,
       placeholder: '请输入accessKeyId',
     },
-    dynamicRules: () => {
-      return [
-        {
-          required: true,
-          validator: (_, value) => {
-            if (String(value).length > 36) {
-              return Promise.reject('字数不超过36个字');
-            }
-            return Promise.resolve();
-          },
-        },
-      ];
-    },
+
     ifShow: ({ values }) => isMessage(Reflect.get(values, 'messageType')),
   },
   {
@@ -193,19 +168,7 @@ export const formSchema: FormSchema[] = [
       maxLength: 36,
       placeholder: '请输入accessKeySecret',
     },
-    dynamicRules: () => {
-      return [
-        {
-          required: true,
-          validator: (_, value) => {
-            if (String(value).length > 36) {
-              return Promise.reject('字数不超过36个字');
-            }
-            return Promise.resolve();
-          },
-        },
-      ];
-    },
+
     component: 'Input',
     ifShow: ({ values }) => isMessage(Reflect.get(values, 'messageType')),
   },
@@ -219,19 +182,7 @@ export const formSchema: FormSchema[] = [
       maxLength: 36,
       placeholder: '请输入服务器地址',
     },
-    dynamicRules: () => {
-      return [
-        {
-          required: true,
-          validator: (_, value) => {
-            if (String(value).length > 36) {
-              return Promise.reject('字数不超过36个字');
-            }
-            return Promise.resolve();
-          },
-        },
-      ];
-    },
+
     ifShow: ({ values }) => isEmail(Reflect.get(values, 'messageType')),
   },
   {
@@ -243,19 +194,7 @@ export const formSchema: FormSchema[] = [
       maxLength: 36,
       placeholder: '请输入端口',
     },
-    dynamicRules: () => {
-      return [
-        {
-          required: true,
-          validator: (_, value) => {
-            if (String(value).length > 36) {
-              return Promise.reject('字数不超过36个字');
-            }
-            return Promise.resolve();
-          },
-        },
-      ];
-    },
+
     component: 'InputNumber',
     ifShow: ({ values }) => isEmail(Reflect.get(values, 'messageType')),
   },
@@ -267,19 +206,6 @@ export const formSchema: FormSchema[] = [
       maxLength: 255,
       placeholder: '请输入用户名',
     },
-    dynamicRules: () => {
-      return [
-        {
-          required: false,
-          validator: (_, value) => {
-            if (String(value).length > 255) {
-              return Promise.reject('字数不超过255个字');
-            }
-            return Promise.resolve();
-          },
-        },
-      ];
-    },
 
     component: 'Input',
     ifShow: ({ values }) => isEmail(Reflect.get(values, 'messageType')),
@@ -324,19 +250,6 @@ export const formSchema: FormSchema[] = [
       maxLength: 36,
       placeholder: '请输入主键',
     },
-    dynamicRules: () => {
-      return [
-        {
-          required: false,
-          validator: (_, value) => {
-            if (String(value).length > 36) {
-              return Promise.reject('字数不超过255个字');
-            }
-            return Promise.resolve();
-          },
-        },
-      ];
-    },
   },
   {
     field: 'status',
@@ -382,18 +295,5 @@ export const formSchema: FormSchema[] = [
       maxLength: 36,
       placeholder: '请输入租户ID',
     },
-    dynamicRules: () => {
-      return [
-        {
-          required: false,
-          validator: (_, value) => {
-            if (String(value).length > 36) {
-              return Promise.reject('字数不超过255个字');
-            }
-            return Promise.resolve();
-          },
-        },
-      ];
-    },
   },
 ];

@@ -52,6 +52,9 @@ export const searchFormSchema: FormSchema[] = [
     label: '发送手机',
     component: 'Input',
     colProps: { span: 6 },
+    componentProps: {
+      maxLength: 36,
+    },
   },
   {
     field: 'sendTime',

@@ -18,24 +18,38 @@
   import { useMessage } from '/@/hooks/web/useMessage';
   import { Tinymce } from '/@/components/Tinymce';
   import { sendEmail } from '/@/api/message/template';
+  import { emailRule } from '/@/utils/rules';
+
   const schemas: FormSchema[] = [
     {
       field: 'id',
       component: 'Input',
       label: 'id',
       show: false,
+      componentProps: {
+        maxLength: 36,
+        placeholder: '请输入id',
+      },
     },
     {
       field: 'templatePurpose',
       label: '用途',
       component: 'Input',
       show: false,
+      componentProps: {
+        maxLength: 255,
+        placeholder: '请输入用途',
+      },
     },
     {
       field: 'messageType',
       component: 'Input',
       label: 'messageType',
       show: false,
+      componentProps: {
+        maxLength: 255,
+        placeholder: '请输入messageType',
+      },
     },
     {
       field: 'subject',
@@ -45,6 +59,10 @@
       colProps: {
         span: 12,
       },
+      componentProps: {
+        maxLength: 255,
+        placeholder: '请输入邮件主题',
+      },
     },
     {
       field: 'to',
@@ -54,6 +72,11 @@
       colProps: {
         span: 12,
       },
+      rules: emailRule,
+      componentProps: {
+        maxLength: 255,
+        placeholder: '请输入主送',
+      },
     },
     {
       field: 'cc',
@@ -62,6 +85,11 @@
       colProps: {
         span: 12,
       },
+      rules: emailRule,
+      componentProps: {
+        maxLength: 255,
+        placeholder: '请输入抄送',
+      },
     },
     {
       field: 'bcc',
@@ -70,6 +98,11 @@
       colProps: {
         span: 12,
       },
+      rules: emailRule,
+      componentProps: {
+        maxLength: 255,
+        placeholder: '请输入密送',
+      },
     },
     {
       field: 'body',
@@ -111,17 +144,14 @@
         const cc = Reflect.get(values, 'cc');
         const bcc = Reflect.get(values, 'bcc');
         if (typeof cc != 'undefined') {
-          cc.split(',');
-          Reflect.set(values, 'cc', cc);
+          Reflect.set(values, 'cc', cc.split(','));
         }
         if (typeof bcc != 'undefined') {
-          bcc.split(',');
-          Reflect.set(values, 'bcc', bcc);
+          Reflect.set(values, 'bcc', bcc.split(','));
         }
         Reflect.set(values, 'to', to);
         Reflect.set(values, 'emailFormatEnum', 'HTML');
         await sendEmail(values);
-        console.log(values, 'values');
         closeModal();
         createMessage.success('发送成功');
       }

@@ -148,19 +148,6 @@ export const formSchema: FormSchema[] = [
       maxLength: 36,
       placeholder: '请输入主键',
     },
-    dynamicRules: () => {
-      return [
-        {
-          required: false,
-          validator: (_, value) => {
-            if (String(value).length > 36) {
-              return Promise.reject('字数不超过36个字');
-            }
-            return Promise.resolve();
-          },
-        },
-      ];
-    },
   },
   {
     field: 'messageType',
@@ -200,19 +187,6 @@ export const formSchema: FormSchema[] = [
       maxLength: 32,
       placeholder: '请输入模板名称',
     },
-    dynamicRules: () => {
-      return [
-        {
-          required: false,
-          validator: (_, value) => {
-            if (String(value).length > 32) {
-              return Promise.reject('字数不超过32个字');
-            }
-            return Promise.resolve();
-          },
-        },
-      ];
-    },
   },
   {
     field: 'templateCode',
@@ -223,19 +197,7 @@ export const formSchema: FormSchema[] = [
       maxLength: 20,
       placeholder: '请输入模板编号',
     },
-    dynamicRules: () => {
-      return [
-        {
-          required: false,
-          validator: (_, value) => {
-            if (String(value).length > 20) {
-              return Promise.reject('字数不超过20个字');
-            }
-            return Promise.resolve();
-          },
-        },
-      ];
-    },
+
     ifShow: ({ values }) => isMessage(Reflect.get(values, 'messageType')),
   },
   {
@@ -247,19 +209,6 @@ export const formSchema: FormSchema[] = [
       maxLength: 32,
       placeholder: '请输入签名',
     },
-    dynamicRules: () => {
-      return [
-        {
-          required: false,
-          validator: (_, value) => {
-            if (String(value).length > 32) {
-              return Promise.reject('字数不超过32个字');
-            }
-            return Promise.resolve();
-          },
-        },
-      ];
-    },
 
     ifShow: ({ values }) => isMessage(Reflect.get(values, 'messageType')),
   },
@@ -287,18 +236,5 @@ export const formSchema: FormSchema[] = [
       maxLength: 36,
       placeholder: '请输入租户ID',
     },
-    dynamicRules: () => {
-      return [
-        {
-          required: false,
-          validator: (_, value) => {
-            if (String(value).length > 36) {
-              return Promise.reject('字数不超过36个字');
-            }
-            return Promise.resolve();
-          },
-        },
-      ];
-    },
   },
 ];

@@ -108,6 +108,9 @@
       // function unique(arr) {
       //   return Array.from(new Set(arr));
       // }
+      const clearGetPushValueDataEmpty = () => {
+        getPushValueData.value.length = 0;
+      };
       function getAllFields(getV) {
         const values = getFieldsValue();
         getValueData.value = values;
@@ -368,7 +371,15 @@
         ]);
         n.value--;
       }
-      return { setFieldsFormValue, registerTrigger, add, del, getAllFields, funcResetFields };
+      return {
+        clearGetPushValueDataEmpty,
+        setFieldsFormValue,
+        registerTrigger,
+        add,
+        del,
+        getAllFields,
+        funcResetFields,
+      };
     },
   });
 </script>

@@ -150,19 +150,6 @@ export const formSchema: FormSchema[] = [
       maxLength: 36,
       placeholder: '请输入场景联动名称',
     },
-    dynamicRules: () => {
-      return [
-        {
-          required: true,
-          validator: (_, value) => {
-            if (String(value).length > 36) {
-              return Promise.reject('字数不超过36个字');
-            }
-            return Promise.resolve();
-          },
-        },
-      ];
-    },
   },
   {
     required: true,

@@ -101,6 +101,7 @@
           }
         } else {
           await resetFields();
+          proxy.$refs.getTriggerChildData.clearGetPushValueDataEmpty();
         }
       });
       const getTitle = computed(() => (!unref(isUpdate) ? '新增场景联动' : '编辑场景联动'));

@@ -5,7 +5,6 @@ import { Tinymce } from '/@/components/Tinymce/index';
 import { getOrganizationList } from '/@/api/system/system';
 import { copyTransFun } from '/@/utils/fnUtils';
 import { Tag } from 'ant-design-vue';
-import { NotificationTitleMaxLength } from '/@/utils/rules';
 
 export enum IsOrgEnum {
   IS_ORG_ENUM = '1',
@@ -98,7 +97,6 @@ export const formSchema: FormSchema[] = [
       placeholder: '请输入标题',
       maxLength: 200,
     },
-    rules: NotificationTitleMaxLength,
   },
   {
     field: 'content',

@@ -6,18 +6,21 @@
     :title="getTitle"
     @ok="handleSubmit"
   >
-    <BasicForm @register="registerForm">
-      <template #organizationId="{ model, field }">
-        <BasicTree
-          v-model:value="model[field]"
-          :treeData="organizationTreeData"
-          :checked-keys="checkGroup"
-          checkable
-          toolbar
-          title="所属组织"
-        />
-      </template>
-    </BasicForm>
+    <div style="height: 50vh">
+      <BasicForm @register="registerForm">
+        <template #organizationId="{ model, field }">
+          <BasicTree
+            v-model:value="model[field]"
+            :treeData="organizationTreeData"
+            :checked-keys="checkGroup"
+            :defaultExpandAll="true"
+            checkable
+            toolbar
+            title="所属组织"
+          />
+        </template>
+      </BasicForm>
+    </div>
   </BasicModal>
 </template>
 <script lang="ts">

@@ -45,6 +45,7 @@ export const searchFormSchema: FormSchema[] = [
     colProps: { span: 8 },
     componentProps: {
       maxLength: 255,
+      placeholder: '请输入用户名',
     },
     dynamicRules: () => {
       return [
@@ -67,6 +68,7 @@ export const searchFormSchema: FormSchema[] = [
     colProps: { span: 8 },
     componentProps: {
       maxLength: 255,
+      placeholder: '请输入姓名',
     },
     dynamicRules: () => {
       return [
@@ -93,19 +95,6 @@ export const accountFormSchema: FormSchema[] = [
     componentProps: {
       maxLength: 36,
     },
-    dynamicRules: () => {
-      return [
-        {
-          required: false,
-          validator: (_, value) => {
-            if (String(value).length > 36) {
-              return Promise.reject('字数不超过36个字');
-            }
-            return Promise.resolve();
-          },
-        },
-      ];
-    },
   },
   {
     field: 'username',
@@ -113,9 +102,14 @@ export const accountFormSchema: FormSchema[] = [
     component: 'Input',
     colProps: { span: 12 },
     dynamicDisabled: false,
+    componentProps: {
+      maxLength: 36,
+      placeholder: '请输入账号',
+    },
     dynamicRules: ({ values }) => {
       return [
         {
+          required: true,
           validator(_, value) {
             return new Promise((resolve, reject) => {
               if (value == '') {
@@ -159,19 +153,6 @@ export const accountFormSchema: FormSchema[] = [
     componentProps: {
       maxLength: 255,
     },
-    dynamicRules: () => {
-      return [
-        {
-          required: true,
-          validator: (_, value) => {
-            if (String(value).length > 255) {
-              return Promise.reject('字数不超过255个字');
-            }
-            return Promise.resolve();
-          },
-        },
-      ];
-    },
   },
   {
     label: '角色',
@@ -237,18 +218,5 @@ export const accountFormSchema: FormSchema[] = [
     componentProps: {
       maxLength: 36,
     },
-    dynamicRules: () => {
-      return [
-        {
-          required: false,
-          validator: (_, value) => {
-            if (String(value).length > 36) {
-              return Promise.reject('字数不超过36个字');
-            }
-            return Promise.resolve();
-          },
-        },
-      ];
-    },
   },
 ];

@@ -37,6 +37,7 @@ export const searchFormSchema: FormSchema[] = [
     colProps: { span: 6 },
     componentProps: {
       maxLength: 32,
+      placeholder: '请输入字典名称',
     },
     dynamicRules: () => {
       return [
@@ -59,6 +60,7 @@ export const searchFormSchema: FormSchema[] = [
     colProps: { span: 6 },
     componentProps: {
       maxLength: 32,
+      placeholder: '请输入字典编码',
     },
     dynamicRules: () => {
       return [
@@ -84,19 +86,7 @@ export const formSchema: FormSchema[] = [
     component: 'Input',
     componentProps: {
       maxLength: 32,
-    },
-    dynamicRules: () => {
-      return [
-        {
-          required: true,
-          validator: (_, value) => {
-            if (String(value).length > 32) {
-              return Promise.reject('字数不超过32个字');
-            }
-            return Promise.resolve();
-          },
-        },
-      ];
+      placeholder: '请输入字典名称',
     },
   },
   {
@@ -106,19 +96,7 @@ export const formSchema: FormSchema[] = [
     component: 'Input',
     componentProps: {
       maxLength: 32,
-    },
-    dynamicRules: () => {
-      return [
-        {
-          required: true,
-          validator: (_, value) => {
-            if (String(value).length > 32) {
-              return Promise.reject('字数不超过32个字');
-            }
-            return Promise.resolve();
-          },
-        },
-      ];
+      placeholder: '请输入字典编码',
     },
   },
   {
@@ -127,6 +105,7 @@ export const formSchema: FormSchema[] = [
     component: 'InputTextArea',
     componentProps: {
       maxLength: 255,
+      placeholder: '请输入备注',
     },
     dynamicRules: () => {
       return [

@@ -69,6 +69,7 @@ export const searchFormSchema: FormSchema[] = [
     colProps: { span: 6 },
     componentProps: {
       maxLength: 32,
+      placeholder: '请输入文本值',
     },
     dynamicRules: () => {
       return [
@@ -91,6 +92,7 @@ export const searchFormSchema: FormSchema[] = [
     show: false,
     componentProps: {
       maxLength: 36,
+      placeholder: '请输入文本值',
     },
     dynamicRules: () => {
       return [
@@ -116,19 +118,7 @@ export const formSchema: FormSchema[] = [
     component: 'Input',
     componentProps: {
       maxLength: 32,
-    },
-    dynamicRules: () => {
-      return [
-        {
-          required: true,
-          validator: (_, value) => {
-            if (String(value).length > 32) {
-              return Promise.reject('字数不超过32个字');
-            }
-            return Promise.resolve();
-          },
-        },
-      ];
+      placeholder: '请输入文本值',
     },
   },
   {
@@ -138,19 +128,7 @@ export const formSchema: FormSchema[] = [
     component: 'Input',
     componentProps: {
       maxLength: 32,
-    },
-    dynamicRules: () => {
-      return [
-        {
-          required: true,
-          validator: (_, value) => {
-            if (String(value).length > 32) {
-              return Promise.reject('字数不超过32个字');
-            }
-            return Promise.resolve();
-          },
-        },
-      ];
+      placeholder: '请输入字典值',
     },
   },
   {

@@ -142,19 +142,6 @@ export const formSchema: FormSchema[] = [
     componentProps: {
       maxLength: 255,
     },
-    dynamicRules: () => {
-      return [
-        {
-          required: true,
-          validator: (_, value) => {
-            if (String(value).length > 255) {
-              return Promise.reject('字数不超过255个字');
-            }
-            return Promise.resolve();
-          },
-        },
-      ];
-    },
   },
 
   {
@@ -179,19 +166,6 @@ export const formSchema: FormSchema[] = [
     componentProps: {
       maxLength: 32,
     },
-    dynamicRules: () => {
-      return [
-        {
-          required: true,
-          validator: (_, value) => {
-            if (String(value).length > 32) {
-              return Promise.reject('字数不超过32个字');
-            }
-            return Promise.resolve();
-          },
-        },
-      ];
-    },
   },
   {
     field: 'icon',
@@ -210,19 +184,6 @@ export const formSchema: FormSchema[] = [
     componentProps: {
       maxLength: 255,
     },
-    dynamicRules: () => {
-      return [
-        {
-          required: false,
-          validator: (_, value) => {
-            if (String(value).length > 255) {
-              return Promise.reject('字数不超过255个字');
-            }
-            return Promise.resolve();
-          },
-        },
-      ];
-    },
   },
   {
     field: 'component',

@@ -48,19 +48,6 @@ export const formSchema: FormSchema[] = [
     componentProps: {
       maxLength: 255,
     },
-    dynamicRules: () => {
-      return [
-        {
-          required: true,
-          validator: (_, value) => {
-            if (String(value).length > 255) {
-              return Promise.reject('字数不超过255个字');
-            }
-            return Promise.resolve();
-          },
-        },
-      ];
-    },
   },
   {
     field: 'sort',
@@ -70,19 +57,6 @@ export const formSchema: FormSchema[] = [
     componentProps: {
       maxLength: 32,
     },
-    dynamicRules: () => {
-      return [
-        {
-          required: true,
-          validator: (_, value) => {
-            if (String(value).length > 32) {
-              return Promise.reject('字数不超过32个字');
-            }
-            return Promise.resolve();
-          },
-        },
-      ];
-    },
   },
   {
     label: t('routes.common.common.remark'), //备注
@@ -113,18 +87,5 @@ export const formSchema: FormSchema[] = [
     componentProps: {
       maxLength: 36,
     },
-    dynamicRules: () => {
-      return [
-        {
-          required: false,
-          validator: (_, value) => {
-            if (String(value).length > 36) {
-              return Promise.reject('字数不超过36个字');
-            }
-            return Promise.resolve();
-          },
-        },
-      ];
-    },
   },
 ];

@@ -70,19 +70,6 @@ export const searchFormSchema: FormSchema[] = [
     componentProps: {
       maxLength: 255,
     },
-    dynamicRules: () => {
-      return [
-        {
-          required: false,
-          validator: (_, value) => {
-            if (String(value).length > 255) {
-              return Promise.reject('字数不超过255个字');
-            }
-            return Promise.resolve();
-          },
-        },
-      ];
-    },
   },
   {
     field: 'status',
@@ -106,19 +93,7 @@ export const formSchema: FormSchema[] = [
     component: 'Input',
     componentProps: {
       maxLength: 255,
-    },
-    dynamicRules: () => {
-      return [
-        {
-          required: true,
-          validator: (_, value) => {
-            if (String(value).length > 255) {
-              return Promise.reject('字数不超过255个字');
-            }
-            return Promise.resolve();
-          },
-        },
-      ];
+      placeholder: '请输入角色名称',
     },
   },
   {
@@ -139,19 +114,7 @@ export const formSchema: FormSchema[] = [
     component: 'InputTextArea',
     componentProps: {
       maxLength: 255,
-    },
-    dynamicRules: () => {
-      return [
-        {
-          required: false,
-          validator: (_, value) => {
-            if (String(value).length > 255) {
-              return Promise.reject('字数不超过255个字');
-            }
-            return Promise.resolve();
-          },
-        },
-      ];
+      placeholder: '请输入备注',
     },
   },
   {
@@ -162,18 +125,5 @@ export const formSchema: FormSchema[] = [
     componentProps: {
       maxLength: 255,
     },
-    dynamicRules: () => {
-      return [
-        {
-          required: false,
-          validator: (_, value) => {
-            if (String(value).length > 255) {
-              return Promise.reject('字数不超过255个字');
-            }
-            return Promise.resolve();
-          },
-        },
-      ];
-    },
   },
 ];

@@ -100,10 +100,18 @@
       const [tenantAdminFormDrawer, { openDrawer: openTenantAdminFormDrawer }] = useDrawer();
 
       const tenantId = ref('');
-      function handleCreateTenantAdmin() {
+      async function handleCreateTenantAdmin() {
+        const { items: getPageData } = await getTenantAdminPage({
+          page: 1,
+          pageSize: 1000,
+          tenantId: tenantId.value,
+          roleType: RoleEnum.TENANT_ADMIN,
+          tenantCode: '',
+        });
         openTenantAdminFormDrawer(true, {
           isUpdate: false,
           tenantId: tenantId.value,
+          judgeExistUserName: getPageData,
         });
       }
 

@@ -17,7 +17,7 @@
   import { saveTenantAdmin } from '/@/api/tenant/tenantApi';
   import { UserDTO } from '/@/api/tenant/tenantInfo';
   import { ChineseRegexp, EmailRegexp, emailRule, phoneRule } from '/@/utils/rules';
-  import { isAccountExist } from '/@/api/system/system';
+  // import { isAccountExist } from '/@/api/system/system';
 
   export default defineComponent({
     name: 'TenantAdminFormDrawer',
@@ -29,6 +29,7 @@
     setup(_, { emit }) {
       const isUpdate = ref(true);
       const tenantId = ref('');
+      const isJudgeUserNameExist: any = ref([]);
       const formSchema: FormSchema[] = [
         {
           field: 'id',
@@ -37,6 +38,7 @@
           component: 'Input',
           componentProps: {
             maxLength: 36,
+            placeholder: '请输入id',
           },
         },
         {
@@ -44,9 +46,14 @@
           required: true,
           label: '账号',
           component: 'Input',
-          dynamicRules: ({ values }) => {
+          componentProps: {
+            maxLength: 255,
+            placeholder: '请输入账号',
+          },
+          dynamicRules: () => {
             return [
               {
+                required: true,
                 validator(_, value) {
                   return new Promise((resolve, reject) => {
                     if (value == '') {
@@ -56,17 +63,19 @@
                     } else if (EmailRegexp.test(value)) {
                       reject('账号不能为电子邮箱格式');
                     } else {
-                      if (values.username != undefined && values.id == undefined) {
-                        isAccountExist(value).then((data) => {
-                          if (data.data != null) {
-                            reject('账号已存在');
-                          } else {
-                            resolve();
-                          }
+                      try {
+                        const findUserName = isJudgeUserNameExist.value.find((f) => {
+                          return f.username == value;
                         });
-                      } else {
-                        resolve();
+                        if (value == findUserName?.username) {
+                          reject('账号已存在');
+                        } else {
+                          return reject('');
+                        }
+                      } catch (e) {
+                        return e;
                       }
+                      resolve();
                     }
                   });
                 },
@@ -122,6 +131,7 @@
           await resetFields();
           isUpdate.value = !!data?.isUpdate;
           tenantId.value = data?.tenantId;
+          isJudgeUserNameExist.value = data.judgeExistUserName;
           if (unref(isUpdate)) {
             await updateSchema({ field: 'username', componentProps: { disabled: true } });
             await setFieldsValue({

@@ -49,19 +49,7 @@ export const tenantFormSchema: FormSchema[] = [
     componentProps: {
       maxLength: 36,
     },
-    dynamicRules: () => {
-      return [
-        {
-          required: false,
-          validator: (_, value) => {
-            if (String(value).length > 36) {
-              return Promise.reject('字数不超过36个字');
-            }
-            return Promise.resolve();
-          },
-        },
-      ];
-    },
+
     show: false,
   },
   {
@@ -116,19 +104,6 @@ export const tenantFormSchema: FormSchema[] = [
     componentProps: {
       maxLength: 255,
     },
-    dynamicRules: () => {
-      return [
-        {
-          required: false,
-          validator: (_, value) => {
-            if (String(value).length > 255) {
-              return Promise.reject('字数不超过255个字');
-            }
-            return Promise.resolve();
-          },
-        },
-      ];
-    },
   },
   {
     field: 'roleIds',

@@ -389,20 +389,7 @@ export const schemas: FormSchema[] = [
     show: false,
     componentProps: {
       maxLength: 36,
-      placeholder: '请输入平台名称',
-    },
-    dynamicRules: () => {
-      return [
-        {
-          required: false,
-          validator: (_, value) => {
-            if (String(value).length > 36) {
-              return Promise.reject('字数不超过36个字');
-            }
-            return Promise.resolve();
-          },
-        },
-      ];
+      placeholder: '请输入唯一id',
     },
   },
 ];

@@ -71,19 +71,6 @@ export const searchFormSchema: FormSchema[] = [
       maxLength: 255,
       placeholder: '请输入角色名称',
     },
-    dynamicRules: () => {
-      return [
-        {
-          required: false,
-          validator: (_, value) => {
-            if (String(value).length > 255) {
-              return Promise.reject('字数不超过255个字');
-            }
-            return Promise.resolve();
-          },
-        },
-      ];
-    },
   },
   {
     field: 'roleType',
@@ -95,19 +82,6 @@ export const searchFormSchema: FormSchema[] = [
     componentProps: {
       maxLength: 20,
     },
-    dynamicRules: () => {
-      return [
-        {
-          required: false,
-          validator: (_, value) => {
-            if (String(value).length > 20) {
-              return Promise.reject('字数不超过20个字');
-            }
-            return Promise.resolve();
-          },
-        },
-      ];
-    },
   },
   {
     field: 'status',
@@ -133,19 +107,6 @@ export const formSchema: FormSchema[] = [
       maxLength: 255,
       placeholder: '请输入角色名称',
     },
-    dynamicRules: () => {
-      return [
-        {
-          required: true,
-          validator: (_, value) => {
-            if (String(value).length > 255) {
-              return Promise.reject('字数不超过255个字');
-            }
-            return Promise.resolve();
-          },
-        },
-      ];
-    },
   },
   {
     field: 'status',
@@ -167,19 +128,6 @@ export const formSchema: FormSchema[] = [
       maxLength: 255,
       placeholder: '请输入备注',
     },
-    dynamicRules: () => {
-      return [
-        {
-          required: false,
-          validator: (_, value) => {
-            if (String(value).length > 255) {
-              return Promise.reject('字数不超过255个字');
-            }
-            return Promise.resolve();
-          },
-        },
-      ];
-    },
   },
   {
     label: ' ',
@@ -189,18 +137,5 @@ export const formSchema: FormSchema[] = [
     componentProps: {
       maxLength: 255,
     },
-    dynamicRules: () => {
-      return [
-        {
-          required: false,
-          validator: (_, value) => {
-            if (String(value).length > 255) {
-              return Promise.reject('字数不超过255个字');
-            }
-            return Promise.resolve();
-          },
-        },
-      ];
-    },
   },
 ];

@@ -66,19 +66,6 @@ export const formSchema: FormSchema[] = [
       maxLength: 255,
       placeholder: '请输入名称',
     },
-    dynamicRules: () => {
-      return [
-        {
-          required: true,
-          validator: (_, value) => {
-            if (String(value).length > 255) {
-              return Promise.reject('字数不超过255个字');
-            }
-            return Promise.resolve();
-          },
-        },
-      ];
-    },
   },
   {
     field: 'isolatedTbRuleEngine',

 import { ErrorTypeEnum } from '/@/enums/exceptionEnum';
 import { MenuModeEnum, MenuTypeEnum } from '/@/enums/menuEnum';
-import { PlainRoleInfo, RoleInfo } from '/@/api/sys/model/userModel';
+import { PlainRoleInfo } from '/@/api/sys/model/userModel';
 
 // Lock screen information
 export interface LockInfo {
@@ -31,14 +31,14 @@ export interface ErrorLogInfo {
 }
 
 export interface UserInfo {
-  userId: string | number;
-  username: string;
-  realName: string;
-  avatar: string;
+  userId?: string | number;
+  username?: string;
+  realName?: string;
+  avatar?: string;
   homePath?: string;
-  tenantCode: string;
-  tenantName: string;
-  roles: string[];
+  tenantCode?: string;
+  tenantName?: string;
+  roles?: string[];
   plainRoles?: PlainRoleInfo[];
 }
 
@@ -48,3 +48,22 @@ export interface BeforeMiniState {
   menuMode?: MenuModeEnum;
   menuType?: MenuTypeEnum;
 }
+
+export interface UserUpdateInfo {
+  activateToken?: string;
+  avatar?: string;
+  createTime?: string;
+  creator?: string;
+  email?: string;
+  enabled?: true;
+  hasPassword?: false;
+  id?: string;
+  level?: 2;
+  password?: string;
+  phoneNumber?: string;
+  realName?: string;
+  tenantId?: string;
+  updateTime?: string;
+  updater?: string;
+  username?: string;
+}