Merge pull request #63 from suyuan32/dev

Dev
suyuan32 · Jun 16, 2023 · 0062cf4 · 0062cf4
2 parents d4d77e0 + 9bf5991
commit 0062cf4
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 8 deletions.
diff --git a/src/locales/lang/en/common.ts b/src/locales/lang/en/common.ts
@@ -52,7 +52,7 @@ export default {
   delete: 'Delete',
   // notification
   deleteConfirm: 'Confirm the deletion?',
-  operateSucess: 'Successful operation',
+  operateSuccess: 'Successful operation',
   operateFailed: 'The operation failed',
   updateSuccess: 'Update successfully',
   updateFailed: 'Update failed',

diff --git a/src/locales/lang/zh-CN/common.ts b/src/locales/lang/zh-CN/common.ts
@@ -52,7 +52,7 @@ export default {
   delete: '删除',
   // notification
   deleteConfirm: '是否确认删除？',
-  operateSucess: '操作成功',
+  operateSuccess: '操作成功',
   operateFailed: '操作失败',
   updateSuccess: '更新成功',
   updateFailed: '更新失败',

diff --git a/src/views/dashboard/workbench/components/data.ts b/src/views/dashboard/workbench/components/data.ts
@@ -52,5 +52,5 @@ export const navItems: NavItem[] = [
 
 export const systemInfoData = [
   ['sys.sys.Name', 'Simple Admin'],
-  ['sys.sys.version', 'V 1.0.7'],
+  ['sys.sys.version', 'V 1.0.9'],
 ];
diff --git a/src/views/sys/user/UserDrawer.vue b/src/views/sys/user/UserDrawer.vue
@@ -55,11 +55,7 @@
       async function handleSubmit() {
         const values = await validate();
         setDrawerProps({ confirmLoading: true });
-        if (unref(isUpdate)) {
-          if (values['password'] === undefined) {
-            values['password'] = '';
-          }
-        } else {
+        if (!unref(isUpdate)) {
           if (values['password'] === undefined) {
             createMessage.warning(t('sys.login.passwordPlaceholder'));
             setDrawerProps({ confirmLoading: false });