Skip to content

Commit

Permalink
Merge branch 'main' into pages
Browse files Browse the repository at this point in the history
  • Loading branch information
@xiaoxian521
xiaoxian521 committed Aug 13, 2024
2 parents c0d683c + 5fbb664 commit 190c3c6
Show file tree
Hide file tree
Showing 38 changed files with 1,574 additions and 1,237 deletions.
1 change: 1 addition & 0 deletions .vscode/settings.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@
"v-copy",
"v-longpress",
"v-optimize",
"v-perms",
"v-ripple"
],
"vscodeCustomCodeColor.highlightValueColor": "#b392f0",
Expand Down
2 changes: 2 additions & 0 deletions locales/en.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,8 @@ menus:
purePermission: Permission Manage
purePermissionPage: Page Permission
purePermissionButton: Button Permission
purePermissionButtonRouter: Route return button permission
purePermissionButtonLogin: Login interface return button permission
pureTabs: Tabs Operate
pureGuide: Guide
pureAble: Able
Expand Down
2 changes: 2 additions & 0 deletions locales/zh-CN.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,8 @@ menus:
purePermission: 权限管理
purePermissionPage: 页面权限
purePermissionButton: 按钮权限
purePermissionButtonRouter: 路由返回按钮权限
purePermissionButtonLogin: 登录接口返回按钮权限
pureTabs: 标签页操作
pureGuide: 引导页
pureAble: 功能
Expand Down
35 changes: 26 additions & 9 deletions mock/asyncRoutes.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -123,17 +123,34 @@ const permissionRouter = {
}
},
{
path: "/permission/button/index",
name: "PermissionButton",
path: "/permission/button",
meta: {
title: "menus.purePermissionButton",
roles: ["admin", "common"],
auths: [
"permission:btn:add",
"permission:btn:edit",
"permission:btn:delete"
]
}
roles: ["admin", "common"]
},
children: [
{
path: "/permission/button/router",
component: "permission/button/index",
name: "PermissionButtonRouter",
meta: {
title: "menus.purePermissionButtonRouter",
auths: [
"permission:btn:add",
"permission:btn:edit",
"permission:btn:delete"
]
}
},
{
path: "/permission/button/login",
component: "permission/button/perms",
name: "PermissionButtonLogin",
meta: {
title: "menus.purePermissionButtonLogin"
}
}
]
}
]
};
Expand Down
3 changes: 3 additions & 0 deletions mock/login.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ export default defineFakeRoute([
nickname: "小铭",
// 一个用户可能有多个角色
roles: ["admin"],
// 按钮级别权限
permissions: ["*:*:*"],
accessToken: "eyJhbGciOiJIUzUxMiJ9.admin",
refreshToken: "eyJhbGciOiJIUzUxMiJ9.adminRefresh",
expires: "2030/10/30 00:00:00"
Expand All @@ -28,6 +30,7 @@ export default defineFakeRoute([
username: "common",
nickname: "小林",
roles: ["common"],
permissions: ["permission:btn:add", "permission:btn:edit"],
accessToken: "eyJhbGciOiJIUzUxMiJ9.common",
refreshToken: "eyJhbGciOiJIUzUxMiJ9.commonRefresh",
expires: "2030/10/30 00:00:00"
Expand Down
126 changes: 123 additions & 3 deletions mock/system.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -696,7 +696,7 @@ export default defineFakeRoute([
menuType: 0,
title: "menus.purePermissionButton",
name: "PermissionButton",
path: "/permission/button/index",
path: "/permission/button",
component: "",
rank: null,
redirect: "",
Expand All @@ -717,6 +717,30 @@ export default defineFakeRoute([
{
parentId: 202,
id: 203,
menuType: 0,
title: "menus.purePermissionButtonRouter",
name: "PermissionButtonRouter",
path: "/permission/button/router",
component: "permission/button/index",
rank: null,
redirect: "",
icon: "",
extraIcon: "",
enterTransition: "",
leaveTransition: "",
activePath: "",
auths: "",
frameSrc: "",
frameLoading: true,
keepAlive: false,
hiddenTag: false,
fixedTag: false,
showLink: true,
showParent: false
},
{
parentId: 203,
id: 210,
menuType: 3,
title: "添加",
name: "",
Expand All @@ -738,9 +762,105 @@ export default defineFakeRoute([
showLink: true,
showParent: false
},
{
parentId: 203,
id: 211,
menuType: 3,
title: "修改",
name: "",
path: "",
component: "",
rank: null,
redirect: "",
icon: "",
extraIcon: "",
enterTransition: "",
leaveTransition: "",
activePath: "",
auths: "permission:btn:edit",
frameSrc: "",
frameLoading: true,
keepAlive: false,
hiddenTag: false,
fixedTag: false,
showLink: true,
showParent: false
},
{
parentId: 203,
id: 212,
menuType: 3,
title: "删除",
name: "",
path: "",
component: "",
rank: null,
redirect: "",
icon: "",
extraIcon: "",
enterTransition: "",
leaveTransition: "",
activePath: "",
auths: "permission:btn:delete",
frameSrc: "",
frameLoading: true,
keepAlive: false,
hiddenTag: false,
fixedTag: false,
showLink: true,
showParent: false
},
{
parentId: 202,
id: 204,
menuType: 0,
title: "menus.purePermissionButtonLogin",
name: "PermissionButtonLogin",
path: "/permission/button/login",
component: "permission/button/perms",
rank: null,
redirect: "",
icon: "",
extraIcon: "",
enterTransition: "",
leaveTransition: "",
activePath: "",
auths: "",
frameSrc: "",
frameLoading: true,
keepAlive: false,
hiddenTag: false,
fixedTag: false,
showLink: true,
showParent: false
},
{
parentId: 204,
id: 220,
menuType: 3,
title: "添加",
name: "",
path: "",
component: "",
rank: null,
redirect: "",
icon: "",
extraIcon: "",
enterTransition: "",
leaveTransition: "",
activePath: "",
auths: "permission:btn:add",
frameSrc: "",
frameLoading: true,
keepAlive: false,
hiddenTag: false,
fixedTag: false,
showLink: true,
showParent: false
},
{
parentId: 204,
id: 221,
menuType: 3,
title: "修改",
name: "",
Expand All @@ -763,8 +883,8 @@ export default defineFakeRoute([
showParent: false
},
{
parentId: 202,
id: 205,
parentId: 204,
id: 222,
menuType: 3,
title: "删除",
name: "",
Expand Down
68 changes: 34 additions & 34 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,26 +50,26 @@
"@amap/amap-jsapi-loader": "^1.0.1",
"@howdyjs/mouse-menu": "^2.1.3",
"@infectoone/vue-ganttastic": "^2.3.2",
"@logicflow/core": "^1.2.27",
"@logicflow/extension": "^1.2.27",
"@logicflow/core": "^1.2.28",
"@logicflow/extension": "^1.2.28",
"@pureadmin/descriptions": "^1.2.1",
"@pureadmin/table": "^3.1.2",
"@pureadmin/utils": "^2.4.7",
"@pureadmin/table": "^3.2.0",
"@pureadmin/utils": "^2.4.8",
"@vue-flow/background": "^1.3.0",
"@vue-flow/core": "^1.39.1",
"@vueuse/core": "^10.11.0",
"@vue-flow/core": "^1.39.3",
"@vueuse/core": "^10.11.1",
"@vueuse/motion": "^2.2.3",
"@wangeditor/editor": "^5.1.23",
"@wangeditor/editor-for-vue": "^5.1.12",
"@zxcvbn-ts/core": "^3.0.4",
"animate.css": "^4.1.1",
"axios": "^1.7.2",
"axios": "^1.7.3",
"china-area-data": "^5.0.1",
"cropperjs": "^1.6.2",
"dayjs": "^1.11.12",
"echarts": "^5.5.1",
"el-table-infinite-scroll": "^3.0.6",
"element-plus": "^2.7.8",
"element-plus": "^2.8.0",
"intro.js": "^7.2.0",
"js-cookie": "^3.0.5",
"jsbarcode": "^3.11.6",
Expand All @@ -79,23 +79,23 @@
"mqtt": "4.3.7",
"nprogress": "^0.2.0",
"path": "^0.12.7",
"pinia": "^2.2.0",
"pinyin-pro": "^3.24.0",
"plus-pro-components": "^0.1.13",
"qrcode": "^1.5.3",
"qs": "^6.12.3",
"pinia": "^2.2.1",
"pinyin-pro": "^3.24.2",
"plus-pro-components": "^0.1.14",
"qrcode": "^1.5.4",
"qs": "^6.13.0",
"responsive-storage": "^2.2.0",
"sortablejs": "^1.15.2",
"swiper": "^11.1.8",
"swiper": "^11.1.9",
"typeit": "^8.8.4",
"v-contextmenu": "^3.2.0",
"v3-infinite-loading": "^1.3.1",
"version-rocket": "^1.7.1",
"vue": "^3.4.34",
"version-rocket": "^1.7.2",
"vue": "^3.4.37",
"vue-i18n": "^9.13.1",
"vue-json-pretty": "^2.4.0",
"vue-pdf-embed": "^2.1.0",
"vue-router": "^4.4.0",
"vue-router": "^4.4.3",
"vue-tippy": "^6.4.4",
"vue-types": "^5.1.3",
"vue-virtual-scroller": "2.0.0-beta.8",
Expand All @@ -104,15 +104,15 @@
"vue3-puzzle-vcode": "^1.1.7",
"vuedraggable": "^4.1.0",
"vxe-table": "4.6.17",
"wavesurfer.js": "^7.8.2",
"wavesurfer.js": "^7.8.3",
"xgplayer": "^3.0.19",
"xlsx": "^0.18.5"
},
"devDependencies": {
"@commitlint/cli": "^19.3.0",
"@commitlint/cli": "^19.4.0",
"@commitlint/config-conventional": "^19.2.2",
"@commitlint/types": "^19.0.3",
"@eslint/js": "^9.8.0",
"@eslint/js": "^9.9.0",
"@faker-js/faker": "^8.4.1",
"@iconify-icons/ep": "^1.2.12",
"@iconify-icons/ri": "^1.2.10",
Expand All @@ -123,44 +123,44 @@
"@types/gradient-string": "^1.1.6",
"@types/intro.js": "^5.1.5",
"@types/js-cookie": "^3.0.6",
"@types/node": "^20.14.13",
"@types/node": "^20.14.15",
"@types/nprogress": "^0.2.3",
"@types/qrcode": "^1.5.5",
"@types/qs": "^6.9.15",
"@types/sortablejs": "^1.15.8",
"@typescript-eslint/eslint-plugin": "^7.17.0",
"@typescript-eslint/parser": "^7.17.0",
"@vitejs/plugin-vue": "^5.1.1",
"@typescript-eslint/eslint-plugin": "^7.18.0",
"@typescript-eslint/parser": "^7.18.0",
"@vitejs/plugin-vue": "^5.1.2",
"@vitejs/plugin-vue-jsx": "^4.0.0",
"autoprefixer": "^10.4.19",
"autoprefixer": "^10.4.20",
"boxen": "^7.1.1",
"cssnano": "^7.0.4",
"cssnano": "^7.0.5",
"dagre": "^0.8.5",
"eslint": "^9.8.0",
"eslint": "^9.9.0",
"eslint-config-prettier": "^9.1.0",
"eslint-define-config": "^2.1.0",
"eslint-plugin-prettier": "^5.2.1",
"eslint-plugin-vue": "^9.27.0",
"gradient-string": "^2.0.2",
"husky": "^9.1.3",
"lint-staged": "^15.2.7",
"postcss": "^8.4.40",
"husky": "^9.1.4",
"lint-staged": "^15.2.8",
"postcss": "^8.4.41",
"postcss-html": "^1.7.0",
"postcss-import": "^16.1.0",
"postcss-scss": "^4.0.9",
"prettier": "^3.3.3",
"rimraf": "^5.0.9",
"rimraf": "^5.0.10",
"rollup-plugin-visualizer": "^5.12.0",
"sass": "^1.77.8",
"stylelint": "^16.7.0",
"stylelint": "^16.8.1",
"stylelint-config-recess-order": "^5.0.1",
"stylelint-config-recommended-vue": "^1.5.0",
"stylelint-config-standard-scss": "^13.1.0",
"stylelint-prettier": "^5.0.2",
"svgo": "^3.3.2",
"tailwindcss": "^3.4.7",
"tailwindcss": "^3.4.9",
"typescript": "^5.5.4",
"vite": "^5.3.5",
"vite": "^5.4.0",
"vite-plugin-cdn-import": "^1.0.1",
"vite-plugin-checker": "^0.7.2",
"vite-plugin-compression": "^0.5.1",
Expand Down
Loading

0 comments on commit 190c3c6

Please sign in to comment.