diff --git a/.vscode/settings.json b/.vscode/settings.json
index 518b70fb4..4336b650e 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -138,6 +138,7 @@
// "vetur.format.defaultFormatter.html": "prettyhtml",
"vetur.format.defaultFormatter.ts": "prettier-tslint",
"vetur.format.defaultFormatter.js": "prettier",
+ "vetur.languageFeatures.codeActions": false,
// "vetur.useWorkspaceDependencies": true,
"vetur.format.defaultFormatterOptions": {
"js-beautify-html": {
diff --git a/CHANGELOG.zh_CN.md b/CHANGELOG.zh_CN.md
index 36b19d221..09f3acb63 100644
--- a/CHANGELOG.zh_CN.md
+++ b/CHANGELOG.zh_CN.md
@@ -11,7 +11,8 @@
### 🎫 Chores
-- 更新 antdv 到`2.0.0-rc.1`
+- 更新 antdv 到`2.0.0-rc.1`(暂时还原到 beta15,rc1 菜单卡顿太严重.)
+- 添加部分注释
### 🐛 Bug Fixes
diff --git a/build/vite/plugin/context/transform.ts b/build/vite/plugin/context/transform.ts
index e3fd43d4d..49f5e01a8 100644
--- a/build/vite/plugin/context/transform.ts
+++ b/build/vite/plugin/context/transform.ts
@@ -1,7 +1,7 @@
-// 修改自
+// Modified from
// https://github.com/luxueyan/vite-transform-globby-import/blob/master/src/index.ts
-// TODO 目前还不能监听文件新增及删除 内容已经改变,缓存问题?
+// TODO Currently, it is not possible to monitor file addition and deletion. The content has been changed, the cache problem?
import { join } from 'path';
import { lstatSync } from 'fs';
import glob from 'glob';
diff --git a/mock/demo/account.ts b/mock/demo/account.ts
index 299f62499..45008744f 100644
--- a/mock/demo/account.ts
+++ b/mock/demo/account.ts
@@ -4,11 +4,11 @@ import { resultSuccess } from '../_util';
const userInfo = {
name: 'Vben',
userid: '00000001',
- email: 'antdesign@alipay.com',
+ email: 'test@gmail.com',
signature: '海纳百川,有容乃大',
introduction: '微笑着,努力着,欣赏着',
title: '交互专家',
- group: '蚂蚁集团11-某某某事业群-某某平台部-某某技术部-UED',
+ group: '某某某事业群-某某平台部-某某技术部-UED',
tags: [
{
key: '0',
@@ -38,7 +38,7 @@ const userInfo = {
notifyCount: 12,
unreadCount: 11,
country: 'China',
- address: '厦门市 77 号',
+ address: 'Xiamen City 77',
phone: '0592-268888888',
};
diff --git a/package.json b/package.json
index 79355d9a8..481c2ab8c 100644
--- a/package.json
+++ b/package.json
@@ -22,8 +22,8 @@
},
"dependencies": {
"@iconify/iconify": "^2.0.0-rc.2",
- "@vueuse/core": "^4.0.0-beta.41",
- "ant-design-vue": "^2.0.0-rc.1",
+ "@vueuse/core": "4.0.0-beta.41",
+ "ant-design-vue": "2.0.0-beta.15",
"apexcharts": "3.22.0",
"axios": "^0.21.0",
"echarts": "^4.9.0",
@@ -35,7 +35,7 @@
"qrcode": "^1.4.4",
"vditor": "^3.6.2",
"vue": "^3.0.2",
- "vue-i18n": "^9.0.0-beta.6",
+ "vue-i18n": "^9.0.0-beta.7",
"vue-router": "^4.0.0-rc.3",
"vuex": "^4.0.0-rc.1",
"vuex-module-decorators": "^1.0.1",
@@ -45,10 +45,10 @@
"devDependencies": {
"@commitlint/cli": "^11.0.0",
"@commitlint/config-conventional": "^11.0.0",
- "@iconify/json": "^1.1.258",
+ "@iconify/json": "^1.1.260",
"@ls-lint/ls-lint": "^1.9.2",
"@purge-icons/generated": "^0.4.1",
- "@types/echarts": "^4.9.0",
+ "@types/echarts": "^4.9.1",
"@types/fs-extra": "^9.0.4",
"@types/koa-static": "^4.0.1",
"@types/lodash-es": "^4.17.3",
@@ -56,10 +56,10 @@
"@types/nprogress": "^0.2.0",
"@types/qrcode": "^1.3.5",
"@types/rollup-plugin-visualizer": "^2.6.0",
- "@types/yargs": "^15.0.9",
+ "@types/yargs": "^15.0.10",
"@types/zxcvbn": "^4.4.0",
- "@typescript-eslint/eslint-plugin": "^4.6.1",
- "@typescript-eslint/parser": "^4.6.1",
+ "@typescript-eslint/eslint-plugin": "^4.8.1",
+ "@typescript-eslint/parser": "^4.8.1",
"@vue/compiler-sfc": "^3.0.2",
"@vuedx/typecheck": "^0.2.4-0",
"@vuedx/typescript-plugin-vue": "^0.2.4-0",
@@ -84,7 +84,7 @@
"prettier": "^2.1.2",
"rimraf": "^3.0.2",
"rollup-plugin-visualizer": "^4.1.2",
- "stylelint": "^13.7.2",
+ "stylelint": "^13.8.0",
"stylelint-config-prettier": "^8.0.2",
"stylelint-config-standard": "^20.0.0",
"stylelint-order": "^4.1.0",
diff --git a/prettier.config.js b/prettier.config.js
index e0f42b9d9..864a0ae5c 100644
--- a/prettier.config.js
+++ b/prettier.config.js
@@ -1,3 +1,7 @@
+/*
+ * @Author: Vben
+ * @Description:
+ */
module.exports = {
printWidth: 100,
tabWidth: 2,
diff --git a/public/resource/img/loading.svg b/public/resource/img/loading.svg
index 5214fd0cd..15395c62e 100644
--- a/public/resource/img/loading.svg
+++ b/public/resource/img/loading.svg
@@ -33,20 +33,17 @@
-
-
-
diff --git a/src/App.vue b/src/App.vue
index edcf4af5f..745205a8f 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,5 +1,5 @@
-
+
@@ -13,9 +13,8 @@
import moment from 'moment';
import 'moment/dist/locale/zh-cn';
- import { useConfigProvider, useInitAppConfigStore } from './useApp';
+ import { getConfigProvider, initAppConfigStore } from '/@/setup/Application';
import { useLockPage } from '/@/hooks/web/useLockPage';
- import { useSetting } from '/@/hooks/core/useSetting';
moment.locale('zh-cn');
@@ -23,26 +22,22 @@
name: 'App',
components: { ConfigProvider },
setup() {
- // Initialize application settings
- useInitAppConfigStore();
- // Initialize breakpoint monitoring
- createBreakpointListen();
- // Get system configuration
- const { projectSetting } = useSetting();
- // Get ConfigProvider configuration
- const { transformCellText } = useConfigProvider();
+ // Initialize vuex internal system configuration
+ initAppConfigStore();
- let lockOn = {};
- if (projectSetting.lockTime) {
- // Monitor the mouse or keyboard time, used to recalculate the lock screen time
- const { on } = useLockPage();
- lockOn = on;
- }
+ // Create a global breakpoint monitor
+ createBreakpointListen();
+
+ // Get ConfigProvider configuration
+ const { transformCellText } = getConfigProvider();
+
+ // Create a lock screen monitor
+ const lockEvent = useLockPage();
return {
transformCellText,
zhCN,
- lockOn,
+ lockEvent,
};
},
});
diff --git a/src/api/demo/account.ts b/src/api/demo/account.ts
index 049569b98..764dca47f 100644
--- a/src/api/demo/account.ts
+++ b/src/api/demo/account.ts
@@ -5,7 +5,7 @@ enum Api {
ACCOUNT_INFO = '/account/getAccountInfo',
}
-// 获取个人中心--基础设置内容
+// Get personal center-basic settings
export function accountInfoApi() {
return defHttp.request({
url: Api.ACCOUNT_INFO,
diff --git a/src/api/sys/menu.ts b/src/api/sys/menu.ts
index cd9509abf..b29f1ba75 100644
--- a/src/api/sys/menu.ts
+++ b/src/api/sys/menu.ts
@@ -7,7 +7,7 @@ enum Api {
}
/**
- * @description: 根据id获取用户菜单
+ * @description: Get user menu based on id
*/
export function getMenuListById(params: getMenuListByIdParams) {
return defHttp.request({
diff --git a/src/api/sys/model/menuModel.ts b/src/api/sys/model/menuModel.ts
index c6c8cdd8f..eac523538 100644
--- a/src/api/sys/model/menuModel.ts
+++ b/src/api/sys/model/menuModel.ts
@@ -11,13 +11,13 @@ export interface RouteItem {
}
/**
- * @description: 获取菜单接口
+ * @description: Get menu interface
*/
export interface getMenuListByIdParams {
id: number | string;
}
/**
- * @description: 获取菜单返回值
+ * @description: Get menu return value
*/
export type getMenuListByIdParamsResultModel = RouteItem[];
diff --git a/src/api/sys/upload.ts b/src/api/sys/upload.ts
index 2871d9394..1cdd5c48c 100644
--- a/src/api/sys/upload.ts
+++ b/src/api/sys/upload.ts
@@ -7,7 +7,7 @@ enum Api {
}
/**
- * @description: 上传接口
+ * @description: Upload interface
*/
export function uploadApi(
params: UploadFileParams,
diff --git a/src/components/Authority/index.ts b/src/components/Authority/index.ts
index 102b7af5b..364cca2a0 100644
--- a/src/components/Authority/index.ts
+++ b/src/components/Authority/index.ts
@@ -1,2 +1,8 @@
+import type { App } from 'vue';
import Authority from './src/index.vue';
-export default Authority;
+
+export default (app: App): void => {
+ app.component(Authority.name, Authority);
+};
+
+export { Authority };
diff --git a/src/components/Authority/src/index.vue b/src/components/Authority/src/index.vue
index f9f4735ce..f394f9979 100644
--- a/src/components/Authority/src/index.vue
+++ b/src/components/Authority/src/index.vue
@@ -1,17 +1,28 @@
+