diff --git a/.vscode/settings.json b/.vscode/settings.json index ed5df1889..477a696c0 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -2,7 +2,7 @@ "typescript.tsdk": "./node_modules/typescript/lib", "volar.tsPlugin": true, "volar.tsPluginStatus": false, - "npm.packageManager": "pnpm", + "npm.packageManager": "yarn", "editor.tabSize": 2, "editor.defaultFormatter": "esbenp.prettier-vscode", "files.eol": "\n", @@ -107,4 +107,4 @@ "vue", "react" ] -} +} \ No newline at end of file diff --git a/package.json b/package.json index 5264b516f..4b7787e43 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,7 @@ "@vueuse/core": "^7.3.0", "ant-design-vue": "3.0.0-alpha.15", "axios": "^0.24.0", - "core-js": "^3.19.3", + "core-js": "^3.20.0", "dayjs": "^1.10.7", "lodash": "^4.17.21", "mitt": "^3.0.0", @@ -35,7 +35,7 @@ "@commitlint/cli": "^15.0.0", "@commitlint/config-conventional": "^15.0.0", "@types/lodash": "^4.14.178", - "@types/node": "^16.11.13", + "@types/node": "^17.0.0", "@types/webpack-env": "^1.16.3", "@typescript-eslint/eslint-plugin": "^5.7.0", "@typescript-eslint/parser": "^5.7.0", @@ -50,7 +50,7 @@ "babel-plugin-import": "^1.13.3", "babel-plugin-lodash": "^3.3.4", "commitizen": "^4.2.4", - "compression-webpack-plugin": "^9.1.2", + "compression-webpack-plugin": "^9.2.0", "eslint": "^8.4.1", "eslint-config-prettier": "^8.3.0", "eslint-plugin-prettier": "^4.0.0", diff --git a/src/api/system/user/index.ts b/src/api/system/user/index.ts index 6c0689e09..5c19e0ab1 100644 --- a/src/api/system/user/index.ts +++ b/src/api/system/user/index.ts @@ -1,18 +1,12 @@ import { request } from '@/utils/request'; import Api from '@/core/permission/modules/sys/user'; -import { generatePermCode } from '@/core/permission/modules'; export function getUserListPage(data: API.PageParams<{ departmentIds: number[] }>) { - return request>( - { - url: Api.page, - method: 'post', - data, - }, - { - permCode: generatePermCode(Api.page), - }, - ); + return request>({ + url: Api.page, + method: 'post', + data, + }); } export function createUser(data: API.CreateUserParams) { @@ -23,23 +17,17 @@ export function createUser(data: API.CreateUserParams) { data, }, { - permCode: generatePermCode(Api.add), successMsg: '创建用户成功', }, ); } export function getUserInfo(query: { userId: number }) { - return request( - { - url: Api.info, - method: 'get', - params: query, - }, - { - permCode: generatePermCode(Api.info), - }, - ); + return request({ + url: Api.info, + method: 'get', + params: query, + }); } export function updateUser(data: API.UpdateAdminInfoParams) { @@ -50,34 +38,23 @@ export function updateUser(data: API.UpdateAdminInfoParams) { data, }, { - permCode: generatePermCode(Api.update), successMsg: '修改用户成功', }, ); } export function updateUserPassword(data: API.UpdateAdminUserPassword) { - return request( - { - url: Api.password, - method: 'post', - data, - }, - { - permCode: generatePermCode(Api.password), - }, - ); + return request({ + url: Api.password, + method: 'post', + data, + }); } export function deleteUsers(data: { userIds: number[] }) { - return request( - { - url: Api.delete, - method: 'post', - data, - }, - { - permCode: generatePermCode(Api.delete), - }, - ); + return request({ + url: Api.delete, + method: 'post', + data, + }); } diff --git a/src/components/basic/BasicHelp.vue b/src/components/basic/BasicHelp.vue index 7d50191ad..744508f6e 100644 --- a/src/components/basic/BasicHelp.vue +++ b/src/components/basic/BasicHelp.vue @@ -86,3 +86,9 @@ }, }); + + diff --git a/src/components/check-box/index.vue b/src/components/check-box/index.vue new file mode 100644 index 000000000..18f259a7b --- /dev/null +++ b/src/components/check-box/index.vue @@ -0,0 +1,56 @@ + + + + + diff --git a/src/components/dynamic-table/components/table-settings/column-setting.vue b/src/components/dynamic-table/components/table-settings/column-setting.vue index e552340b1..e9ca34d80 100644 --- a/src/components/dynamic-table/components/table-settings/column-setting.vue +++ b/src/components/dynamic-table/components/table-settings/column-setting.vue @@ -1,7 +1,7 @@ -