Merge branch 'ft' into 'main_dev'

fix: 修改Teambition上的问题

See merge request yunteng/thingskit-front!849

@@ -34,6 +34,7 @@ enum Api {
   GetAllRoleList = '/role/find/list',
   GetAllRoleList = '/role/find/list',
   BaseUserUrl = '/user',
   BaseUserUrl = '/user',
   BaseOrganization = '/organization',
   BaseOrganization = '/organization',
+  RESET_USER_PASSWORD = '/user/reset_password/',
 }
 }
 
 
 export const getAccountInfo = (userId: string) =>
 export const getAccountInfo = (userId: string) =>
@@ -172,3 +173,12 @@ export const resetPassword = (params: ChangeAccountParams) =>
     url: Api.BaseUserUrl + '/reset',
     url: Api.BaseUserUrl + '/reset',
     params: params,
     params: params,
   });
   });
+
+/**
+ * 清除密码
+ * @param params
+ */
+export const clearUserPassword = (userId: string) =>
+  defHttp.post({
+    url: Api.RESET_USER_PASSWORD + userId,
+  });

@@ -273,6 +273,7 @@
                       event: DropMenuEvent.SET_DEFAULT,
                       event: DropMenuEvent.SET_DEFAULT,
                       icon: 'ant-design:unordered-list-outlined',
                       icon: 'ant-design:unordered-list-outlined',
                       onClick: handleSetDefault.bind(null, item),
                       onClick: handleSetDefault.bind(null, item),
+                      disabled: item.default,
                     },
                     },
                     {
                     {
                       text: '删除',
                       text: '删除',
@@ -283,6 +284,7 @@
                         title: '是否确认删除操作?',
                         title: '是否确认删除操作?',
                         onConfirm: handleDelete.bind(null, [item.id]),
                         onConfirm: handleDelete.bind(null, [item.id]),
                       },
                       },
+                      disabled: item.default,
                     },
                     },
                   ]"
                   ]"
                 />
                 />

@@ -47,12 +47,12 @@
         {{ t('sys.login.loginButton') }}
         {{ t('sys.login.loginButton') }}
       </Button>
       </Button>
     </FormItem>
     </FormItem>
-    <ARow class="enter-x flex justify-between">
-      <ACol :md="11" :xs="24">
+    <ARow class="enter-x flex justify-center">
+      <!-- <ACol :md="11" :xs="24">
         <Button block @click="setLoginState(LoginStateEnum.LOGIN)">
         <Button block @click="setLoginState(LoginStateEnum.LOGIN)">
           {{ t('sys.login.userNameInFormTitle') }}
           {{ t('sys.login.userNameInFormTitle') }}
         </Button>
         </Button>
-      </ACol>
+      </ACol> -->
       <ACol :md="11" :xs="24">
       <ACol :md="11" :xs="24">
         <Button block @click="setLoginState(LoginStateEnum.MOBILE)">
         <Button block @click="setLoginState(LoginStateEnum.MOBILE)">
           {{ t('sys.login.mobileSignInFormTitle') }}
           {{ t('sys.login.mobileSignInFormTitle') }}

@@ -81,6 +81,17 @@
                   confirm: handleDeleteOrBatchDelete.bind(null, record),
                   confirm: handleDeleteOrBatchDelete.bind(null, record),
                 },
                 },
               },
               },
+              {
+                label: '清除密码',
+                auth: 'api:yt:user:resetPassword',
+                icon: 'ant-design:delete-outlined',
+                color: 'error',
+                tooltip: '清除密码',
+                popConfirm: {
+                  title: '是否确认清除密码',
+                  confirm: handleClearPassword.bind(null, record),
+                },
+              },
             ]"
             ]"
           />
           />
         </template>
         </template>
@@ -107,6 +118,8 @@
   import { isAdmin } from '/@/enums/roleEnum';
   import { isAdmin } from '/@/enums/roleEnum';
   import { TenantListItemRecord } from '/@/api/tenant/tenantInfo';
   import { TenantListItemRecord } from '/@/api/tenant/tenantInfo';
   import { useFastEnter } from '/@/hooks/business/useFastEnter';
   import { useFastEnter } from '/@/hooks/business/useFastEnter';
+  import { clearUserPassword } from '/@/api/system/system';
+  import { useMessage } from '/@/hooks/web/useMessage';
 
 
   export default defineComponent({
   export default defineComponent({
     name: 'AccountManagement',
     name: 'AccountManagement',
@@ -121,6 +134,7 @@
       Popconfirm,
       Popconfirm,
     },
     },
     setup() {
     setup() {
+      const { createMessage } = useMessage();
       const userInfo: any = getAuthCache(USER_INFO_KEY);
       const userInfo: any = getAuthCache(USER_INFO_KEY);
       const role: string = userInfo?.roles[0];
       const role: string = userInfo?.roles[0];
 
 
@@ -192,6 +206,13 @@
         }
         }
       }
       }
 
 
+      const handleClearPassword = async (record: Recordable) => {
+        const { id } = record;
+        if (!id) return;
+        const { message } = await clearUserPassword(id);
+        createMessage.success(message);
+      };
+
       return {
       return {
         handleLoginCustomAdmin,
         handleLoginCustomAdmin,
         registerTable,
         registerTable,
@@ -206,6 +227,7 @@
         handleDeleteOrBatchDelete,
         handleDeleteOrBatchDelete,
         isAdmin,
         isAdmin,
         role,
         role,
+        handleClearPassword,
       };
       };
     },
     },
   });
   });

@@ -5,14 +5,26 @@ export const formSchema: FormSchema[] = [
     field: 'passwordOld',
     field: 'passwordOld',
     label: '当前密码',
     label: '当前密码',
     component: 'InputPassword',
     component: 'InputPassword',
+    componentProps: {
+      placeholder: '请输入当前密码',
+    },
     required: true,
     required: true,
   },
   },
   {
   {
     field: 'passwordNew',
     field: 'passwordNew',
     label: '新密码',
     label: '新密码',
-    component: 'StrengthMeter',
-    componentProps: {
-      placeholder: '新密码',
+    component: 'InputPassword',
+    componentProps({ formModel, formActionType }) {
+      return {
+        placeholder: '请输入新密码',
+        onInput({ target }) {
+          const { value } = target;
+          const { confirmPassword } = formModel;
+          if (value === confirmPassword) {
+            formActionType.clearValidate('confirmPassword');
+          }
+        },
+      };
     },
     },
     rules: [
     rules: [
       {
       {
@@ -25,7 +37,9 @@ export const formSchema: FormSchema[] = [
     field: 'confirmPassword',
     field: 'confirmPassword',
     label: '确认密码',
     label: '确认密码',
     component: 'InputPassword',
     component: 'InputPassword',
-
+    componentProps: {
+      placeholder: '请输入确认密码',
+    },
     dynamicRules: ({ values }) => {
     dynamicRules: ({ values }) => {
       return [
       return [
         {
         {
@@ -37,7 +51,6 @@ export const formSchema: FormSchema[] = [
             if (value !== values.passwordNew) {
             if (value !== values.passwordNew) {
               return Promise.reject('两次输入的密码不一致!');
               return Promise.reject('两次输入的密码不一致!');
             }
             }
-
             const pwdRegex = new RegExp(InputRegExp.PASSWORD_INPUT);
             const pwdRegex = new RegExp(InputRegExp.PASSWORD_INPUT);
             if (!pwdRegex.test(value)) {
             if (!pwdRegex.test(value)) {
               return Promise.reject(
               return Promise.reject(

@@ -124,6 +124,8 @@
           let ids = record?.id?.id;
           let ids = record?.id?.id;
           await deleteTenantProfileApi(ids);
           await deleteTenantProfileApi(ids);
           createMessage.success('删除成功');
           createMessage.success('删除成功');
+          selectedRowKeys.length = 0;
+          disabled.value = true;
           reload();
           reload();
         } else {
         } else {
           createMessage.warning(message);
           createMessage.warning(message);
@@ -148,9 +150,6 @@
           createMessage.success('删除成功');
           createMessage.success('删除成功');
           reload();
           reload();
           selectedRowKeys.length = 0;
           selectedRowKeys.length = 0;
-          setTimeout(() => {
-            disabled.value = false;
-          }, 3000);
         });
         });
       };
       };
 
 

@@ -46,7 +46,7 @@
           label: '账号',
           label: '账号',
           component: 'Input',
           component: 'Input',
           componentProps: {
           componentProps: {
-            maxLength: 255,
+            maxLength: 64,
             placeholder: '请输入账号',
             placeholder: '请输入账号',
           },
           },
           dynamicRules: ({ values }) => {
           dynamicRules: ({ values }) => {
@@ -87,7 +87,7 @@
           required: true,
           required: true,
           component: 'Input',
           component: 'Input',
           componentProps: {
           componentProps: {
-            maxLength: 255,
+            maxLength: 64,
             placeholder: '请输入真实名字',
             placeholder: '请输入真实名字',
           },
           },
           rules: chineseAndEnlishRule,
           rules: chineseAndEnlishRule,
@@ -97,12 +97,20 @@
           label: '电话号码',
           label: '电话号码',
           required: true,
           required: true,
           component: 'Input',
           component: 'Input',
+          componentProps: {
+            maxLength: 11,
+            placeholder: '请输入电话号码',
+          },
           rules: phoneRule,
           rules: phoneRule,
         },
         },
         {
         {
           field: 'email',
           field: 'email',
           label: '邮件',
           label: '邮件',
           component: 'Input',
           component: 'Input',
+          componentProps: {
+            maxLength: 64,
+            placeholder: '请输入邮件',
+          },
           rules: emailRule,
           rules: emailRule,
         },
         },
         {
         {

@@ -44,6 +44,7 @@
               icon: 'ant-design:usergroup-add-outlined',
               icon: 'ant-design:usergroup-add-outlined',
               label: '租户管理员',
               label: '租户管理员',
               onClick: handleTenantAdminDrawer.bind(null, record),
               onClick: handleTenantAdminDrawer.bind(null, record),
+              disabled: record.enabled === false,
             },
             },
             {
             {
               icon: 'clarity:note-edit-line',
               icon: 'clarity:note-edit-line',