From bbf178f64b29d4576ba7de8afdce37d677f748e8 Mon Sep 17 00:00:00 2001 From: vben Date: Sun, 23 May 2021 23:45:21 +0800 Subject: [PATCH] fix(store): fix pinia typo --- package.json | 6 +++--- src/store/modules/app.ts | 16 ++++++++-------- src/store/modules/errorLog.ts | 4 ++-- src/store/modules/locale.ts | 4 ++-- src/store/modules/lock.ts | 2 +- src/store/modules/multipleTab.ts | 6 +++--- src/store/modules/permission.ts | 8 ++++---- src/store/modules/user.ts | 6 +++--- yarn.lock | 26 ++++++++++++++------------ 9 files changed, 40 insertions(+), 38 deletions(-) diff --git a/package.json b/package.json index 26f93b6fad2..4f88d52928e 100644 --- a/package.json +++ b/package.json @@ -47,7 +47,7 @@ "mockjs": "^1.1.0", "nprogress": "^0.2.0", "path-to-regexp": "^6.2.0", - "pinia": "2.0.0-alpha.13", + "pinia": "2.0.0-alpha.19", "print-js": "^1.6.0", "qrcode": "^1.4.4", "sortablejs": "^1.13.0", @@ -85,7 +85,7 @@ "commitizen": "^4.2.4", "conventional-changelog-cli": "^2.1.1", "cross-env": "^7.0.3", - "dotenv": "^9.0.2", + "dotenv": "^10.0.0", "eslint": "^7.27.0", "eslint-config-prettier": "^8.3.0", "eslint-define-config": "^1.0.8", @@ -127,7 +127,7 @@ "resolutions": { "//": "Used to install imagemin dependencies, because imagemin may not be installed in China. If it is abroad, you can delete it", "bin-wrapper": "npm:bin-wrapper-china", - "rollup": "^2.48.0" + "rollup": "^2.49.0" }, "repository": { "type": "git", diff --git a/src/store/modules/app.ts b/src/store/modules/app.ts index 5db45c51aeb..2358a6656f7 100644 --- a/src/store/modules/app.ts +++ b/src/store/modules/app.ts @@ -30,31 +30,31 @@ export const useAppStore = defineStore({ beforeMiniInfo: {}, }), getters: { - getPageLoading() { + getPageLoading(_) { return this.pageLoading; }, - getDarkMode(): 'light' | 'dark' | string { + getDarkMode(_): 'light' | 'dark' | string { return this.darkMode || localStorage.getItem(APP_DARK_MODE_KEY_) || darkMode; }, - getBeforeMiniInfo() { + getBeforeMiniInfo(_) { return this.beforeMiniInfo; }, - getProjectConfig(): ProjectConfig { + getProjectConfig(_): ProjectConfig { return this.projectConfig || ({} as ProjectConfig); }, - getHeaderSetting() { + getHeaderSetting(_) { return this.getProjectConfig.headerSetting; }, - getMenuSetting() { + getMenuSetting(_) { return this.getProjectConfig.menuSetting; }, - getTransitionSetting() { + getTransitionSetting(_) { return this.getProjectConfig.transitionSetting; }, - getMultiTabsSetting() { + getMultiTabsSetting(_) { return this.getProjectConfig.multiTabsSetting; }, }, diff --git a/src/store/modules/errorLog.ts b/src/store/modules/errorLog.ts index 6adde785b6c..4e3fa308f5f 100644 --- a/src/store/modules/errorLog.ts +++ b/src/store/modules/errorLog.ts @@ -20,10 +20,10 @@ export const useErrorLogStore = defineStore({ errorLogListCount: 0, }), getters: { - getErrorLogInfoList() { + getErrorLogInfoList(_) { return this.errorLogInfoList || []; }, - getErrorLogListCount() { + getErrorLogListCount(_) { return this.errorLogListCount; }, }, diff --git a/src/store/modules/locale.ts b/src/store/modules/locale.ts index a244c6f179c..41b400bf894 100644 --- a/src/store/modules/locale.ts +++ b/src/store/modules/locale.ts @@ -21,10 +21,10 @@ export const useLocaleStore = defineStore({ localInfo: lsLocaleSetting, }), getters: { - getShowPicker() { + getShowPicker(_) { return !!this.localInfo?.showPicker; }, - getLocale(): LocaleType { + getLocale(_): LocaleType { return this.localInfo?.locale ?? 'zh_CN'; }, }, diff --git a/src/store/modules/lock.ts b/src/store/modules/lock.ts index 8d19f9d656a..522c046cbf3 100644 --- a/src/store/modules/lock.ts +++ b/src/store/modules/lock.ts @@ -16,7 +16,7 @@ export const useLockStore = defineStore({ lockInfo: Persistent.getLocal(LOCK_INFO_KEY), }), getters: { - getLockInfo() { + getLockInfo(_) { return this.lockInfo; }, }, diff --git a/src/store/modules/multipleTab.ts b/src/store/modules/multipleTab.ts index 848b7b28652..008773d732a 100644 --- a/src/store/modules/multipleTab.ts +++ b/src/store/modules/multipleTab.ts @@ -38,13 +38,13 @@ export const useMultipleTabStore = defineStore({ lastDragEndIndex: 0, }), getters: { - getTabList() { + getTabList(_) { return this.tabList; }, - getCachedTabList(): string[] { + getCachedTabList(_): string[] { return Array.from(this.cacheTabList); }, - getLastDragEndIndex(): number { + getLastDragEndIndex(_): number { return this.lastDragEndIndex; }, }, diff --git a/src/store/modules/permission.ts b/src/store/modules/permission.ts index bdabc7e4857..47e66ce1b34 100644 --- a/src/store/modules/permission.ts +++ b/src/store/modules/permission.ts @@ -45,16 +45,16 @@ export const usePermissionStore = defineStore({ backMenuList: [], }), getters: { - getPermCodeList() { + getPermCodeList(_) { return this.permCodeList; }, - getBackMenuList() { + getBackMenuList(_) { return this.backMenuList; }, - getLastBuildMenuTime() { + getLastBuildMenuTime(_) { return this.lastBuildMenuTime; }, - getIsDynamicAddedRoute() { + getIsDynamicAddedRoute(_) { return this.isDynamicAddedRoute; }, }, diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts index 7481d5edde8..bae3e3538e5 100644 --- a/src/store/modules/user.ts +++ b/src/store/modules/user.ts @@ -38,13 +38,13 @@ export const useUserStore = defineStore({ roleList: [], }), getters: { - getUserInfo(): UserInfo { + getUserInfo(_): UserInfo { return this.userInfo || getAuthCache(USER_INFO_KEY) || {}; }, - getToken(): string { + getToken(_): string { return this.token || getAuthCache(TOKEN_KEY); }, - getRoleList(): RoleEnum[] { + getRoleList(_): RoleEnum[] { return this.roleList.length > 0 ? this.roleList : getAuthCache(ROLES_KEY); }, }, diff --git a/yarn.lock b/yarn.lock index 0f9f54818be..eeeb94ca8fa 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3937,10 +3937,10 @@ dot-prop@^5.1.0: dependencies: is-obj "^2.0.0" -dotenv@^9.0.2: - version "9.0.2" - resolved "https://registry.npmjs.org/dotenv/-/dotenv-9.0.2.tgz#dacc20160935a37dea6364aa1bef819fb9b6ab05" - integrity sha512-I9OvvrHp4pIARv4+x9iuewrWycX6CcZtoAu1XrzPxc5UygMJXJZYmBsynku8IkrJwgypE5DGNjDPmPRhDCptUg== +dotenv@^10.0.0: + version "10.0.0" + resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-10.0.0.tgz#3d4227b8fb95f81096cdd2b66653fb2c7085ba81" + integrity sha512-rlBi9d8jpv9Sf1klPjNfFAuWDjKLwTIJJ/VxtoTwIR6hnZxcEOQCZg2oIL3MWBYw5GpUDKOEnND7LXTbIpQ03Q== download@^6.2.2: version "6.2.5" @@ -7815,10 +7815,12 @@ pify@^4.0.1: resolved "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz#4b2cd25c50d598735c50292224fd8c6df41e3231" integrity sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g== -pinia@2.0.0-alpha.13: - version "2.0.0-alpha.13" - resolved "https://registry.npmjs.org/pinia/-/pinia-2.0.0-alpha.13.tgz#d48e6efec11d38201e20770bc02b168e2157a9f7" - integrity sha512-3r9fpUi5Uai48vjeTXzcHAvlDjYvx/9mNtWiO5QyWy4zqfn7YjvOiBCHXH9r1jwo4LakZzG/ppr5i6sr/63fYQ== +pinia@2.0.0-alpha.19: + version "2.0.0-alpha.19" + resolved "https://registry.yarnpkg.com/pinia/-/pinia-2.0.0-alpha.19.tgz#0a119c65585a67f7756d5995d11d4b1df4acfbeb" + integrity sha512-U/FvKm2tVUdqEuPorkYvD3oCgIj/u5EnF9TbX5dEpkNkoWKQM1i23e97QKtQFGuTxMSfzmBFFINv4A9VeVZ1wQ== + dependencies: + "@vue/devtools-api" "^6.0.0-beta.10" pinkie-promise@^2.0.0: version "2.0.1" @@ -8778,10 +8780,10 @@ rollup-plugin-visualizer@5.5.0: source-map "^0.7.3" yargs "^16.2.0" -rollup@^2.38.5, rollup@^2.43.1, rollup@^2.45.2, rollup@^2.48.0: - version "2.48.0" - resolved "https://registry.npmjs.org/rollup/-/rollup-2.48.0.tgz#fceb01ed771f991f29f7bd2ff7838146e55acb74" - integrity sha512-wl9ZSSSsi5579oscSDYSzGn092tCS076YB+TQrzsGuSfYyJeep8eEWj0eaRjuC5McuMNmcnR8icBqiE/FWNB1A== +rollup@^2.38.5, rollup@^2.43.1, rollup@^2.45.2, rollup@^2.49.0: + version "2.49.0" + resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.49.0.tgz#f0e5bb2b770ddf1be8cc30d4cce3457574c8c871" + integrity sha512-UnrCjMXICx9q0jF8L7OYs7LPk95dW0U5UYp/VANnWqfuhyr66FWi/YVlI34Oy8Tp4ZGLcaUDt4APJm80b9oPWQ== optionalDependencies: fsevents "~2.3.1"