From 7d610e95b110a5d41816ba70b72c526888b56966 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=86=9B?= <510423039@qq.com>
Date: Sat, 26 Feb 2022 15:24:25 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=91=20=E5=A4=9A=E7=A7=9F=E6=88=B7?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91Bug=20=E2=9C=A8=20=E7=94=A8=E6=88=B7=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E5=AF=86=E7=A0=81=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../user-dropdown/ChangePassword.vue          | 94 +++++++++++++++++++
 .../header/components/user-dropdown/index.vue | 21 +++--
 vben271/src/locales/lang/en/routes/admin.ts   |  6 +-
 vben271/src/locales/lang/en/routes/tenant.ts  |  2 +
 .../src/locales/lang/zh-CN/routes/admin.ts    |  6 +-
 .../src/locales/lang/zh-CN/routes/tenant.ts   |  2 +
 vben271/src/views/admin/users/AbpUser.ts      |  4 +-
 .../views/tenants/EditConnectionString.vue    |  1 +
 vben271/src/views/tenants/EditTenant.vue      |  1 +
 vben271/src/views/tenants/Tenant.ts           | 10 +-
 vben271/src/views/tenants/Tenant.vue          | 37 +-------
 11 files changed, 133 insertions(+), 51 deletions(-)
 create mode 100644 vben271/src/layouts/default/header/components/user-dropdown/ChangePassword.vue

diff --git a/vben271/src/layouts/default/header/components/user-dropdown/ChangePassword.vue b/vben271/src/layouts/default/header/components/user-dropdown/ChangePassword.vue
new file mode 100644
index 00000000..0887a602
--- /dev/null
+++ b/vben271/src/layouts/default/header/components/user-dropdown/ChangePassword.vue
@@ -0,0 +1,94 @@
+<template>
+  <BasicModal
+    title="修改密码"
+    v-bind="$attrs"
+    @register="register"
+    :canFullscreen="false"
+    @ok="submit"
+    minHeight="100"
+  >
+    <BasicForm @register="registerForm" />
+  </BasicModal>
+</template>
+<script lang="ts">
+  import { defineComponent } from 'vue';
+  import { useI18n } from '/@/hooks/web/useI18n';
+  import { BasicModal, useModalInner } from '/@/components/Modal/index';
+  import { BasicForm, useForm } from '/@/components/Form/index';
+  import { UsersServiceProxy, ChangePasswordInput } from '/@/services/ServiceProxies';
+  import { message } from 'ant-design-vue';
+
+  export default defineComponent({
+    name: 'DefaultWarehouse',
+    components: { BasicModal, BasicForm },
+
+    setup() {
+      const { t } = useI18n();
+      //const userStore = useUserStore();
+
+      const [register, { changeOkLoading, closeModal }] = useModalInner();
+
+      const [registerForm, { getFieldsValue, validate, resetFields }] = useForm({
+        showActionButtonGroup: false,
+        schemas: [
+          {
+            field: 'currentPassword',
+            label: t('routes.admin.currentPassword'),
+            component: 'InputPassword',
+            required: true,
+            labelWidth: 110,
+            colProps: {
+              span: 22,
+            },
+          },
+          {
+            field: 'newPassword',
+            label: t('routes.admin.newPassword'),
+            component: 'InputPassword',
+            required: true,
+            labelWidth: 110,
+            colProps: {
+              span: 22,
+            },
+          },
+          {
+            field: 'confirmPassword',
+            label: t('routes.admin.confirmPassword'),
+            component: 'InputPassword',
+            required: true,
+            labelWidth: 110,
+            colProps: {
+              span: 22,
+            },
+          },
+        ],
+      });
+      const submit = async () => {
+        try {
+          changeOkLoading(true);
+          await validate();
+          const request = getFieldsValue();
+          if (request.newPassword != request.confirmPassword) {
+            message.error(t('editPasswordMessage'));
+            changeOkLoading(false);
+            return;
+          }
+          const _userServiceProxy = new UsersServiceProxy();
+
+          await _userServiceProxy.changePassword(request as ChangePasswordInput);
+          changeOkLoading(false);
+          closeModal();
+          resetFields();
+        } catch (error) {
+          changeOkLoading(false);
+        }
+      };
+      return {
+        t,
+        register,
+        registerForm,
+        submit,
+      };
+    },
+  });
+</script>
diff --git a/vben271/src/layouts/default/header/components/user-dropdown/index.vue b/vben271/src/layouts/default/header/components/user-dropdown/index.vue
index 2c3669a4..cf612845 100644
--- a/vben271/src/layouts/default/header/components/user-dropdown/index.vue
+++ b/vben271/src/layouts/default/header/components/user-dropdown/index.vue
@@ -11,13 +11,7 @@
 
     <template #overlay>
       <Menu @click="handleMenuClick">
-        <MenuItem
-          key="doc"
-          :text="t('layout.header.dropdownItemDoc')"
-          icon="ion:document-text-outline"
-          v-if="getShowDoc"
-        />
-        <MenuDivider v-if="getShowDoc" />
+        <MenuItem key="password" text="修改密码" icon="ant-design:info-circle-outlined" />
         <MenuItem
           v-if="getUseLockPage"
           key="lock"
@@ -33,6 +27,7 @@
     </template>
   </Dropdown>
   <LockAction @register="register" />
+  <PasswordAction @register="registerChangePasswordModal" />
 </template>
 <script lang="ts">
   // components
@@ -54,7 +49,7 @@
 
   import { createAsyncComponent } from '/@/utils/factory/createAsyncComponent';
 
-  type MenuEvent = 'logout' | 'doc' | 'lock';
+  type MenuEvent = 'logout' | 'doc' | 'lock' | 'password';
 
   export default defineComponent({
     name: 'UserDropdown',
@@ -64,6 +59,7 @@
       MenuItem: createAsyncComponent(() => import('./DropMenuItem.vue')),
       MenuDivider: Menu.Divider,
       LockAction: createAsyncComponent(() => import('../lock/LockModal.vue')),
+      PasswordAction: createAsyncComponent(() => import('./ChangePassword.vue')),
     },
     props: {
       theme: propTypes.oneOf(['dark', 'light']),
@@ -80,7 +76,10 @@
       });
 
       const [register, { openModal }] = useModal();
-
+      const [registerChangePasswordModal, { openModal: openChangePasswordModal }] = useModal();
+      function handleChangePassword() {
+        openChangePasswordModal(true);
+      }
       function handleLock() {
         openModal(true);
       }
@@ -100,6 +99,9 @@
           case 'logout':
             handleLoginOut();
             break;
+          case 'password':
+            handleChangePassword();
+            break;
           case 'doc':
             openDoc();
             break;
@@ -117,6 +119,7 @@
         getShowDoc,
         register,
         getUseLockPage,
+        registerChangePasswordModal,
       };
     },
   });
diff --git a/vben271/src/locales/lang/en/routes/admin.ts b/vben271/src/locales/lang/en/routes/admin.ts
index 88bf6ee9..84dc35d5 100644
--- a/vben271/src/locales/lang/en/routes/admin.ts
+++ b/vben271/src/locales/lang/en/routes/admin.ts
@@ -11,7 +11,7 @@ export default {
   userManagement_create_user: 'Create User',
   userManagement_edit_user: 'Edit User',
   userManagement_password: 'Password',
-  userManagement_comfirm_password: 'Password(Confirm)',
+  userManagement_confirm_password: 'Password(Confirm)',
   userManagement_userInfo: 'UserInfo',
   userManagement_role: 'Role',
 
@@ -62,4 +62,8 @@ export default {
   nonZeroMessage: 'Please enter a non-zero positive integer',
   fileName: 'FileName',
   fileNameManagement: 'FileNameManagement',
+  currentPassword: 'CurrentPassword',
+  newPassword: 'NewPassword',
+  confirmPassword: 'ConfirmPassword',
+  editPasswordMessage: 'The passwords entered twice are inconsistent. Procedure',
 };
diff --git a/vben271/src/locales/lang/en/routes/tenant.ts b/vben271/src/locales/lang/en/routes/tenant.ts
index 0311f108..5e227b5b 100644
--- a/vben271/src/locales/lang/en/routes/tenant.ts
+++ b/vben271/src/locales/lang/en/routes/tenant.ts
@@ -3,4 +3,6 @@ export default {
   connectionString: 'ConnectionString',
   tenantManagement: 'TenantManagement',
   tenantList: 'TenantList',
+  adminPassword: 'AdminPassword',
+  adminEmailAddress: 'AdminEmailAddress',
 };
diff --git a/vben271/src/locales/lang/zh-CN/routes/admin.ts b/vben271/src/locales/lang/zh-CN/routes/admin.ts
index d9419ca3..1b74fb31 100644
--- a/vben271/src/locales/lang/zh-CN/routes/admin.ts
+++ b/vben271/src/locales/lang/zh-CN/routes/admin.ts
@@ -9,7 +9,7 @@ export default {
   userManagement_phone: '手机号码',
   userManagement_createTime: '创建时间',
   userManagement_password: '密码',
-  userManagement_comfirm_password: '密码(再次确认)',
+  userManagement_confirm_password: '密码(再次确认)',
   userManagement_create_user: '新增用户',
   userManagement_edit_user: '编辑用户',
   userManagement_userInfo: '用户信息',
@@ -61,4 +61,8 @@ export default {
   nonZeroMessage: '请输入非零的正整数',
   fileName: '文件名称',
   fileNameManagement: '文件管理',
+  currentPassword: '当前密码',
+  newPassword: '新密码',
+  confirmPassword: '确认密码',
+  editPasswordMessage: '输入的2次密码不一致',
 };
diff --git a/vben271/src/locales/lang/zh-CN/routes/tenant.ts b/vben271/src/locales/lang/zh-CN/routes/tenant.ts
index 1f8b25ca..9549d920 100644
--- a/vben271/src/locales/lang/zh-CN/routes/tenant.ts
+++ b/vben271/src/locales/lang/zh-CN/routes/tenant.ts
@@ -3,4 +3,6 @@ export default {
   connectionString: '连接字符串',
   tenantManagement: '租户管理',
   tenantList: '租户列表',
+  adminPassword: '管理员密码',
+  adminEmailAddress: '管理员邮箱',
 };
diff --git a/vben271/src/views/admin/users/AbpUser.ts b/vben271/src/views/admin/users/AbpUser.ts
index dd7649db..68a8d8d7 100644
--- a/vben271/src/views/admin/users/AbpUser.ts
+++ b/vben271/src/views/admin/users/AbpUser.ts
@@ -126,7 +126,7 @@ export const createFormSchema: FormSchema[] = [
     componentProps: {
       autocomplete: 'off',
     },
-    label: t('routes.admin.userManagement_comfirm_password'),
+    label: t('routes.admin.userManagement_confirm_password'),
     required: true,
     labelWidth: 130,
     colProps: {
@@ -193,7 +193,7 @@ export const editFormSchema: FormSchema[] = [
   {
     field: 'confirmPassword',
     component: 'InputPassword',
-    label: t('routes.admin.userManagement_comfirm_password'),
+    label: t('routes.admin.userManagement_confirm_password'),
     required: false,
     labelWidth: 130,
     colProps: {
diff --git a/vben271/src/views/tenants/EditConnectionString.vue b/vben271/src/views/tenants/EditConnectionString.vue
index 5446f3fc..f1dec3da 100644
--- a/vben271/src/views/tenants/EditConnectionString.vue
+++ b/vben271/src/views/tenants/EditConnectionString.vue
@@ -5,6 +5,7 @@
     @ok="submit"
     @cancel="cancel"
     @register="registerModal"
+    minHeight="100"
   >
     <BasicForm @register="registerApiScopeForm" />
   </BasicModal>
diff --git a/vben271/src/views/tenants/EditTenant.vue b/vben271/src/views/tenants/EditTenant.vue
index f2cb7030..d0a44187 100644
--- a/vben271/src/views/tenants/EditTenant.vue
+++ b/vben271/src/views/tenants/EditTenant.vue
@@ -5,6 +5,7 @@
     @ok="submit"
     @cancel="cancel"
     @register="registerModal"
+    minHeight="100"
   >
     <BasicForm @register="registerApiScopeForm" />
   </BasicModal>
diff --git a/vben271/src/views/tenants/Tenant.ts b/vben271/src/views/tenants/Tenant.ts
index 23783421..d08b7aa0 100644
--- a/vben271/src/views/tenants/Tenant.ts
+++ b/vben271/src/views/tenants/Tenant.ts
@@ -25,7 +25,7 @@ export const tableColumns: BasicColumn[] = [
 export const createFormSchema: FormSchema[] = [
   {
     field: 'name',
-    label: 'Name',
+    label: t('routes.tenant.name'),
     component: 'Input',
     required: true,
     labelWidth: 150,
@@ -33,7 +33,7 @@ export const createFormSchema: FormSchema[] = [
   },
   {
     field: 'adminEmailAddress',
-    label: 'AdminEmailAddress',
+    label: t('routes.tenant.adminEmailAddress'),
     component: 'Input',
     required: true,
     labelWidth: 150,
@@ -41,7 +41,7 @@ export const createFormSchema: FormSchema[] = [
   },
   {
     field: 'adminPassword',
-    label: 'AdminPassword',
+    label: t('routes.tenant.adminPassword'),
     component: 'InputPassword',
     required: true,
     labelWidth: 150,
@@ -60,7 +60,7 @@ export const editFormSchema: FormSchema[] = [
   },
   {
     field: 'name',
-    label: 'Name',
+    label: t('routes.tenant.name'),
     component: 'Input',
     required: true,
     labelWidth: 150,
@@ -79,7 +79,7 @@ export const updateConnectionStringFormSchema: FormSchema[] = [
   },
   {
     field: 'connectionString',
-    label: 'ConnectionString',
+    label: t('routes.tenant.connectionString'),
     component: 'Input',
     labelWidth: 150,
     colProps: { span: 20 },
diff --git a/vben271/src/views/tenants/Tenant.vue b/vben271/src/views/tenants/Tenant.vue
index 34d2bae4..0634e183 100644
--- a/vben271/src/views/tenants/Tenant.vue
+++ b/vben271/src/views/tenants/Tenant.vue
@@ -12,7 +12,7 @@
         </a-button>
       </template>
 
-      <template #action="{ action }">
+      <template #action="{ record }">
         <TableAction
           :actions="[
             {
@@ -36,34 +36,6 @@
           ]"
         />
       </template>
-
-      <!-- <template #action="{ record }">
-        <a-button
-          type="link"
-          size="small"
-          @click="handleEdit(record)"
-          v-auth="'AbpTenantManagement.Tenants.Update'"
-        >
-          {{ t('common.editText') }}
-        </a-button>
-
-        <a-button
-          type="link"
-          size="small"
-          @click="handleDelete(record)"
-          v-auth="'AbpTenantManagement.Tenants.Delete'"
-        >
-          {{ t('common.delText') }}
-        </a-button>
-        <a-button
-          type="link"
-          size="small"
-          @click="handleConnectionString(record)"
-          v-auth="'AbpTenantManagement.Tenants.ManageConnectionStrings'"
-        >
-          {{ t('routes.tenant.connectionString') }}
-        </a-button>
-      </template> -->
     </BasicTable>
     <EditTenant
       @register="registerEditTenantModal"
@@ -86,7 +58,7 @@
 <script lang="ts">
   import { defineComponent } from 'vue';
   import { useI18n } from '/@/hooks/web/useI18n';
-  import { BasicModal, useModal } from '/@/components/Modal';
+  import { useModal } from '/@/components/Modal';
   import { BasicTable, useTable, TableAction } from '/@/components/Table';
 
   import { getTenantListAsync, tableColumns, searchFormSchema, deleteTenantAsync } from './Tenant';
@@ -99,7 +71,6 @@
     name: 'Tenant',
     components: {
       BasicTable,
-      BasicModal,
       TableAction,
       CreateTenant,
       EditTenant,
@@ -135,12 +106,12 @@
         },
       });
       const { createConfirm } = useMessage();
-      // 编辑用户
+      // 编辑
       const handleEdit = (record: Recordable) => {
         openEditTenantModal(true, { record: record });
       };
 
-      // 删除用户
+      // 删除
       const handleDelete = async (record: Recordable) => {
         let msg = t('common.askDelete');
         createConfirm({