Merge pull request #127 from suyuan32/dev

Dev
suyuan32 · Nov 6, 2023 · ebaa1a4 · ebaa1a4
2 parents 2b1b890 + f0b778d
commit ebaa1a4
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 20 deletions.
diff --git a/.husky/commit-msg b/.husky/commit-msg
@@ -5,4 +5,4 @@
 
 PATH="/usr/local/bin:$PATH"
 
-npx --no-install commitlint --edit "$1"
+# npx --no-install commitlint --edit "$1"
diff --git a/src/api/sys/user.ts b/src/api/sys/user.ts
@@ -204,16 +204,19 @@ export function registerBySms(params: RegisterBySmsReq, mode: ErrorMessageMode =
 export function getUserInfo() {
  return defHttp.get<BaseDataResp<GetUserInfoModel>>(
  { url: Api.GetUserInfo },
- { errorMessageMode: 'none' },
+ { errorMessageMode: 'notice' },
  );
 }
 
 export function getPermCode() {
- return defHttp.get<BaseDataResp<string[]>>({ url: Api.GetPermCode });
+ return defHttp.get<BaseDataResp<string[]>>(
+ { url: Api.GetPermCode },
+ { errorMessageMode: 'notice' },
+ );
 }
 
 export function doLogout() {
- return defHttp.get({ url: Api.Logout });
+ return defHttp.get({ url: Api.Logout }, { errorMessageMode: 'notice' });
 }
 
 /**
@@ -223,15 +226,15 @@ export function doLogout() {
 export function getUserProfile() {
  return defHttp.get<BaseDataResp<UserProfile>>(
  { url: Api.Profile },
- { errorMessageMode: 'message' },
+ { errorMessageMode: 'notice' },
  );
 }
 
 /**
  * author: Ryan Su
  * @description: update user profile
  */
-export function updateProfile(params: UserProfile, mode: ErrorMessageMode = 'message') {
+export function updateProfile(params: UserProfile, mode: ErrorMessageMode = 'notice') {
  return defHttp.post<BaseResp>(
  { url: Api.Profile, params },
  { errorMessageMode: mode, successMessageMode: mode },
@@ -246,7 +249,7 @@ export function updateProfile(params: UserProfile, mode: ErrorMessageMode = 'mes
 export function changePassword(params: ChangePasswordReq) {
  return defHttp.post<BaseResp>(
  { url: Api.ChangePassword, params },
- { errorMessageMode: 'message' },
+ { errorMessageMode: 'notice' },
  );
 }
 

diff --git a/src/components/Form/src/components/ApiMultipleSelect.vue b/src/components/Form/src/components/ApiMultipleSelect.vue
@@ -1,6 +1,6 @@
 <template>
  <Select
- @dropdown-visible-change="handleFetch"
+ @dropdownVisibleChange="handleFetch"
  v-bind="$attrs"
  @change="handleChange"
  :options="getOptions"

diff --git a/src/components/Form/src/components/ApiSelect.vue b/src/components/Form/src/components/ApiSelect.vue
@@ -1,6 +1,6 @@
 <template>
  <Select
- @dropdown-visible-change="handleFetch"
+ @dropdownVisibleChange="handleFetch"
  v-bind="$attrs"
  @change="handleChange"
  :options="getOptions"

diff --git a/src/components/Form/src/components/ApiTreeSelect.vue b/src/components/Form/src/components/ApiTreeSelect.vue
@@ -1,5 +1,5 @@
 <template>
- <a-tree-select v-bind="getAttrs" @change="handleChange">
+ <a-tree-select v-bind="getAttrs" @change="handleChange" @dropdownVisibleChange="fetch">
  <template #[item]="data" v-for="item in Object.keys($slots)">
  <slot :name="item" v-bind="data || {}"></slot>
  </template>
@@ -95,7 +95,7 @@
  isFirstLoaded.value = true;
  emit('options-change', treeData.value);
  }
- return { getAttrs, loading, handleChange };
+ return { getAttrs, loading, handleChange, fetch };
  },
  });
 </script>
diff --git a/src/locales/lang/en/layout.ts b/src/locales/lang/en/layout.ts
@@ -7,22 +7,22 @@ export default {
  profile: 'Profile',
 
  tooltipErrorLog: 'Error log',
- tooltipLock: 'Lock screen',
+ tooltipLock: 'Lock Screen',
  tooltipNotify: 'Notification',
 
  tooltipEntryFull: 'Full Screen',
  tooltipExitFull: 'Exit Full Screen',
 
  // lock
- lockScreenPassword: 'Lock screen password',
- lockScreen: 'Lock screen',
+ lockScreenPassword: 'Lock Screen With Password',
+ lockScreen: 'Lock Screen',
  lockScreenBtn: 'Locking',
 
  home: 'Home',
  },
  multipleTab: {
- reload: 'Refresh current',
- close: 'Close current',
+ reload: 'Refresh Current',
+ close: 'Close Current',
  closeLeft: 'Close Left',
  closeRight: 'Close Right',
  closeOther: 'Close Other',
@@ -37,13 +37,13 @@ export default {
  topMenuAlignRight: 'Center',
  topMenuAlignCenter: 'Right',
  // menu trigger
- menuTriggerNone: 'Not Show',
+ menuTriggerNone: 'Not show',
  menuTriggerBottom: 'Bottom',
  menuTriggerTop: 'Top',
  // menu type
  menuTypeSidebar: 'Left menu mode',
  menuTypeMixSidebar: 'Left menu mixed mode',
- menuTypeMix: 'Top Menu Mix mode',
+ menuTypeMix: 'Top menu mixed mode',
  menuTypeTopMenu: 'Top menu mode',
 
  on: 'On',
@@ -57,7 +57,7 @@ export default {
 
  copyBtn: 'Copy',
  clearBtn: 'Clear cache and to the login page',
- clearDictionaryCache: 'Clear dictionary caches',
+ clearDictionaryCache: 'Clear dictionary cache',
 
  drawerTitle: 'Configuration',
 
@@ -106,7 +106,7 @@ export default {
  notAutoScreenLock: 'Not auto lock',
 
  fixedHeader: 'Fixed header',
- fixedSideBar: 'Fixed Sidebar',
+ fixedSideBar: 'Fixed sidebar',
 
  mixSidebarTrigger: 'Mixed menu trigger',
  triggerHover: 'Hover',