From 52a167c647b54c4a710440020b0518d41b8b8c25 Mon Sep 17 00:00:00 2001 From: GitHub Actions Bot Date: Thu, 9 Mar 2023 19:24:01 +0000 Subject: [PATCH] =?UTF-8?q?=F0=9F=94=B1:=20[client]=20sync=20upgrade=20wit?= =?UTF-8?q?h=209=20commits=20[trident-sync]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit perf: 完善文档,完善部分types perf: 优化d.ts类型 perf: 日期增加week、month、year、quarter类型 feat: resetCrudOptions 示例 feat: tabs快捷查询组件 fix: 行编辑支持多级表头 https://github.com/fast-crud/fast-crud/issues/143 perf: antdv 增加自定义表头示例 https://github.com/fast-crud/fast-crud/issues/141 perf: 表单下方按钮支持context https://github.com/fast-crud/fast-crud/issues/142 --- packages/ui/certd-client/.eslintrc.js | 7 +- packages/ui/certd-client/package.json | 96 +++++++------- packages/ui/certd-client/src/App.vue | 12 +- .../src/layout/layout-framework.vue | 7 +- packages/ui/certd-client/src/mock/index.js | 6 +- .../src/plugin/fast-crud/index.tsx | 60 ++++----- .../certd-client/src/plugin/iconfont/index.ts | 2 +- packages/ui/certd-client/src/plugin/index.ts | 2 +- .../directive/{index.js => index.ts} | 10 +- .../{permission.js => permission.ts} | 2 +- .../src/plugin/permission/index.ts | 4 +- .../src/plugin/permission/store.permission.ts | 8 +- .../plugin/permission/use-crud-permission.ts | 14 ++- .../src/plugin/permission/util.permission.ts | 4 +- .../src/router/source/modules/crud.ts | 26 +++- packages/ui/certd-client/src/store/index.ts | 2 +- .../ui/certd-client/src/store/modules/page.ts | 41 +++--- .../src/store/modules/resource.ts | 22 ++-- .../src/store/modules/settings.ts | 2 +- .../ui/certd-client/src/style/common.less | 10 ++ .../ui/certd-client/src/types/global.d.ts | 16 +-- .../ui/certd-client/src/utils/util.common.ts | 6 +- .../ui/certd-client/src/utils/util.env.ts | 16 +-- .../ui/certd-client/src/utils/util.site.ts | 2 +- .../ui/certd-client/src/utils/util.storage.ts | 2 +- .../advanced/from-backend/{api.js => api.ts} | 0 .../{crud-backend.js => crud-backend.ts} | 2 +- .../views/crud/advanced/from-backend/crud.jsx | 27 ---- .../views/crud/advanced/from-backend/crud.tsx | 49 ++++++++ .../crud/advanced/from-backend/index.vue | 33 ++--- .../from-backend/{mock.js => mock.ts} | 5 +- .../crud/advanced/linkage/{api.js => api.ts} | 10 +- .../advanced/linkage/{crud.jsx => crud.tsx} | 20 +-- .../src/views/crud/advanced/linkage/index.vue | 27 ++-- .../advanced/linkage/{mock.js => mock.ts} | 15 +-- .../column-merge-plugin/{api.js => api.ts} | 10 +- .../{crud.jsx => crud.tsx} | 12 +- .../crud/basis/column-merge-plugin/index.vue | 7 +- .../column-merge-plugin/{mock.js => mock.ts} | 3 +- .../views/crud/basis/columns-set/index.vue | 13 +- .../views/crud/basis/compute-more/index.vue | 3 + .../src/views/crud/basis/compute/crud.jsx | 4 +- .../src/views/crud/basis/compute/index.vue | 2 +- .../src/views/crud/basis/first/api.ts | 42 +++++++ .../src/views/crud/basis/first/crud.ts | 54 ++++++++ .../src/views/crud/basis/first/index.vue | 115 +++++------------ .../src/views/crud/basis/first/mock.ts | 22 ++++ .../src/views/crud/basis/helloworld/index.vue | 119 ++++++++++++++++++ .../src/views/crud/basis/i18n/index.vue | 10 +- .../src/views/crud/basis/layout-card/crud.jsx | 35 ++++-- .../views/crud/basis/layout-card/index.vue | 10 ++ .../views/crud/basis/layout-custom/crud.jsx | 7 +- .../basis/layout-custom/custom-layout.vue | 7 ++ .../views/crud/basis/layout-custom/index.vue | 18 ++- .../src/views/crud/basis/reset/api.ts | 42 +++++++ .../src/views/crud/basis/reset/crud.tsx | 54 ++++++++ .../src/views/crud/basis/reset/index.vue | 53 ++++++++ .../src/views/crud/basis/reset/mock.ts | 23 ++++ .../views/crud/basis/value-change/index.vue | 3 + .../src/views/crud/component/date/crud.jsx | 49 +++++++- .../src/views/crud/component/date/mock.js | 4 + .../src/views/crud/dict/cloneable/index.vue | 15 ++- .../src/views/crud/dict/prototype/index.vue | 15 ++- .../dict/shared/manager/{api.js => api.ts} | 10 +- .../views/crud/dict/shared/manager/crud.tsx | 13 +- .../views/crud/dict/shared/manager/index.vue | 18 +-- .../dict/shared/manager/{mock.js => mock.ts} | 3 +- .../src/views/crud/dict/shared/shared-dict.ts | 2 +- .../crud/dict/shared/use/{api.js => api.ts} | 10 +- .../dict/shared/use/{crud.jsx => crud.tsx} | 14 ++- .../src/views/crud/dict/shared/use/index.vue | 19 +-- .../crud/dict/shared/use/{mock.js => mock.ts} | 3 +- .../src/views/crud/dict/single/index.vue | 11 +- .../crud/feature/column-resize/index.vue | 13 +- .../views/crud/feature/column-sort/index.vue | 16 ++- .../views/crud/feature/columns-set/index.vue | 12 +- .../views/crud/feature/editable-row/crud.jsx | 40 +++--- .../views/crud/feature/editable-row/index.vue | 4 + .../src/views/crud/feature/editable/crud.jsx | 40 +++--- .../src/views/crud/feature/editable/index.vue | 4 + .../src/views/crud/feature/expand/crud.jsx | 2 +- .../src/views/crud/feature/expand/index.vue | 32 +---- .../src/views/crud/feature/header/api.ts | 50 ++++++++ .../src/views/crud/feature/header/crud.tsx | 48 +++++++ .../src/views/crud/feature/header/index.vue | 27 ++++ .../src/views/crud/feature/header/mock.ts | 14 +++ .../src/views/crud/feature/search/crud.jsx | 39 +++--- .../src/views/crud/feature/search/index.vue | 4 +- .../src/views/crud/feature/tabs/api.ts | 42 +++++++ .../src/views/crud/feature/tabs/crud.tsx | 85 +++++++++++++ .../src/views/crud/feature/tabs/index.vue | 60 +++++++++ .../src/views/crud/feature/tabs/mock.ts | 20 +++ .../src/views/crud/form/base/crud.jsx | 11 ++ .../src/views/crud/form/base/index.vue | 5 +- .../views/crud/form/single-column/index.vue | 5 +- .../authority/permission/{api.js => api.ts} | 10 +- .../permission/{crud.jsx => crud.tsx} | 20 +-- .../views/sys/authority/permission/index.vue | 21 +--- packages/ui/certd-client/tsconfig.json | 3 +- packages/ui/certd-client/vite.config.ts | 2 + 100 files changed, 1465 insertions(+), 585 deletions(-) rename packages/ui/certd-client/src/plugin/permission/directive/{index.js => index.ts} (57%) rename packages/ui/certd-client/src/plugin/permission/directive/{permission.js => permission.ts} (84%) rename packages/ui/certd-client/src/views/crud/advanced/from-backend/{api.js => api.ts} (100%) rename packages/ui/certd-client/src/views/crud/advanced/from-backend/{crud-backend.js => crud-backend.ts} (94%) delete mode 100644 packages/ui/certd-client/src/views/crud/advanced/from-backend/crud.jsx create mode 100644 packages/ui/certd-client/src/views/crud/advanced/from-backend/crud.tsx rename packages/ui/certd-client/src/views/crud/advanced/from-backend/{mock.js => mock.ts} (89%) rename packages/ui/certd-client/src/views/crud/advanced/linkage/{api.js => api.ts} (76%) rename packages/ui/certd-client/src/views/crud/advanced/linkage/{crud.jsx => crud.tsx} (80%) rename packages/ui/certd-client/src/views/crud/advanced/linkage/{mock.js => mock.ts} (91%) rename packages/ui/certd-client/src/views/crud/basis/column-merge-plugin/{api.js => api.ts} (77%) rename packages/ui/certd-client/src/views/crud/basis/column-merge-plugin/{crud.jsx => crud.tsx} (71%) rename packages/ui/certd-client/src/views/crud/basis/column-merge-plugin/{mock.js => mock.ts} (92%) create mode 100644 packages/ui/certd-client/src/views/crud/basis/first/api.ts create mode 100644 packages/ui/certd-client/src/views/crud/basis/first/crud.ts create mode 100644 packages/ui/certd-client/src/views/crud/basis/first/mock.ts create mode 100644 packages/ui/certd-client/src/views/crud/basis/helloworld/index.vue create mode 100644 packages/ui/certd-client/src/views/crud/basis/reset/api.ts create mode 100644 packages/ui/certd-client/src/views/crud/basis/reset/crud.tsx create mode 100644 packages/ui/certd-client/src/views/crud/basis/reset/index.vue create mode 100644 packages/ui/certd-client/src/views/crud/basis/reset/mock.ts rename packages/ui/certd-client/src/views/crud/dict/shared/manager/{api.js => api.ts} (77%) rename packages/ui/certd-client/src/views/crud/dict/shared/manager/{mock.js => mock.ts} (90%) rename packages/ui/certd-client/src/views/crud/dict/shared/use/{api.js => api.ts} (76%) rename packages/ui/certd-client/src/views/crud/dict/shared/use/{crud.jsx => crud.tsx} (59%) rename packages/ui/certd-client/src/views/crud/dict/shared/use/{mock.js => mock.ts} (87%) create mode 100644 packages/ui/certd-client/src/views/crud/feature/header/api.ts create mode 100644 packages/ui/certd-client/src/views/crud/feature/header/crud.tsx create mode 100644 packages/ui/certd-client/src/views/crud/feature/header/index.vue create mode 100644 packages/ui/certd-client/src/views/crud/feature/header/mock.ts create mode 100644 packages/ui/certd-client/src/views/crud/feature/tabs/api.ts create mode 100644 packages/ui/certd-client/src/views/crud/feature/tabs/crud.tsx create mode 100644 packages/ui/certd-client/src/views/crud/feature/tabs/index.vue create mode 100644 packages/ui/certd-client/src/views/crud/feature/tabs/mock.ts rename packages/ui/certd-client/src/views/sys/authority/permission/{api.js => api.ts} (76%) rename packages/ui/certd-client/src/views/sys/authority/permission/{crud.jsx => crud.tsx} (82%) diff --git a/packages/ui/certd-client/.eslintrc.js b/packages/ui/certd-client/.eslintrc.js index a10cc42d..ccaf6a64 100644 --- a/packages/ui/certd-client/.eslintrc.js +++ b/packages/ui/certd-client/.eslintrc.js @@ -16,12 +16,7 @@ module.exports = { tsx: true } }, - extends: [ - "plugin:vue/vue3-recommended", - "plugin:@typescript-eslint/recommended", - "plugin:prettier/recommended", - "prettier" - ], + extends: ["plugin:vue/vue3-recommended", "plugin:@typescript-eslint/recommended", "plugin:prettier/recommended", "prettier"], rules: { //"max-len": [0, 200, 2, { ignoreUrls: true }], "@typescript-eslint/ban-ts-ignore": "off", diff --git a/packages/ui/certd-client/package.json b/packages/ui/certd-client/package.json index 21c3fd76..de7cc897 100644 --- a/packages/ui/certd-client/package.json +++ b/packages/ui/certd-client/package.json @@ -20,91 +20,93 @@ "author": "Greper", "license": "MIT", "dependencies": { - "@ant-design/colors": "^6.0.0", - "@ant-design/icons-vue": "^6.0.1", - "@fast-crud/fast-crud": "^1.9.2", - "@fast-crud/fast-extends": "^1.9.2", - "@fast-crud/ui-antdv": "^1.9.2", - "@iconify/iconify": "^3.0.1", - "@iconify/json": "^2.1.151", + "@ant-design/colors": "^7.0.0", + "@ant-design/icons-vue": "^6.1.0", + "@fast-crud/fast-crud": "workspace:^1.9.2", + "@fast-crud/fast-extends": "workspace:^1.9.2", + "@fast-crud/ui-antdv": "workspace:^1.9.2", + "@iconify/iconify": "^3.1.0", + "@iconify/json": "^2.2.32", "@purge-icons/generated": "^0.9.0", "@soerenmartius/vue3-clipboard": "^0.1.2", "ant-design-vue": "^3.2.15", - "axios": "^1.2.1", + "axios": "^1.3.4", "axios-mock-adapter": "^1.21.2", "base64-js": "^1.5.1", "better-scroll": "^2.5.0", - "china-division": "^2.4.0", - "core-js": "^3.26.1", - "cos-js-sdk-v5": "^1.4.15-beta.0", + "china-division": "^2.6.0", + "core-js": "^3.29.0", + "cos-js-sdk-v5": "^1.4.16", "cropperjs": "^1.5.13", "dayjs": "^1.11.7", - "deepdash-es": "5.3.5", + "deepdash-es": "5.3.9", "highlight.js": "^11.7.0", - "lodash-es": "^4.17.15", + "lodash-es": "^4.17.21", "mitt": "^3.0.0", "nprogress": "^0.2.0", "object-assign": "^4.1.1", - "pinia": "2.0.28", + "pinia": "2.0.33", "qiniu-js": "^3.4.1", - "sortablejs": "^1.14.0", - "vue": "^3.2.45", + "sortablejs": "^1.15.0", + "vue": "^3.2.47", "vue-cropperjs": "^5.0.0", "vue-i18n": "^9.2.2", - "vue-router": "^4.1.5", - "vuedraggable": "^4.0.1" + "vue-router": "^4.1.6", + "vuedraggable": "^2.24.3" }, "devDependencies": { - "@rollup/plugin-commonjs": "^23.0.4", + "@rollup/plugin-commonjs": "^24.0.1", "@rollup/plugin-node-resolve": "^15.0.1", "@types/chai": "^4.3.4", "@types/lodash-es": "^4.17.6", "@types/mocha": "^10.0.1", - "@types/node": "^18.11.15", - "@typescript-eslint/eslint-plugin": "^5.46.1", - "@typescript-eslint/parser": "^5.46.1", - "@vitejs/plugin-legacy": "^3.0.1", + "@types/node": "^18.14.6", + "@types/nprogress": "^0.2.0", + "@typescript-eslint/eslint-plugin": "^5.54.1", + "@typescript-eslint/parser": "^5.54.1", + "@vitejs/plugin-legacy": "^4.0.1", "@vitejs/plugin-vue": "^4.0.0", "@vitejs/plugin-vue-jsx": "^3.0.0", - "@vue/compiler-sfc": "^3.2.45", + "@vue/compiler-sfc": "^3.2.47", "@vue/eslint-config-typescript": "^11.0.2", - "@vue/test-utils": "^2.2.6", - "autoprefixer": "^10.4.12", + "@vue/test-utils": "^2.3.1", + "autoprefixer": "^10.4.13", "caller-path": "^4.0.0", "chai": "^4.3.7", - "eslint": "8.29.0", - "eslint-config-prettier": "^8.1.0", - "eslint-plugin-import": "^2.26.0", + "eslint": "8.35.0", + "eslint-config-prettier": "^8.7.0", + "eslint-plugin-import": "^2.27.5", "eslint-plugin-node": "^11.1.0", "eslint-plugin-prettier": "^4.2.1", - "eslint-plugin-promise": "^6.0.1", - "eslint-plugin-vue": "^9.8.0", + "eslint-plugin-promise": "^6.1.1", + "eslint-plugin-vue": "^9.9.0", "esno": "^0.16.3", - "husky": "^8.0.2", + "husky": "^8.0.3", "less": "^4.1.3", - "less-loader": "^11.0.0", - "lint-staged": "^13.1.0", - "postcss": "^8.4.20", - "prettier": "2.8.1", + "less-loader": "^11.1.0", + "lint-staged": "^13.1.2", + "postcss": "^8.4.21", + "prettier": "2.8.4", "pretty-quick": "^3.1.3", - "rimraf": "^3.0.2", - "rollup": "^3.7.4", - "rollup-plugin-visualizer": "^5.8.2", - "stylelint": "^14.16.0", - "stylelint-config-prettier": "^9.0.4", - "stylelint-order": "^5.0.0", - "tailwindcss": "^3.2.4", + "rimraf": "^4.4.0", + "rollup": "^3.18.0", + "rollup-plugin-visualizer": "^5.9.0", + "stylelint": "^15.2.0", + "stylelint-config-prettier": "^9.0.5", + "stylelint-order": "^6.0.3", + "tailwindcss": "^3.2.7", "ts-node": "^10.9.1", - "typescript": "4.9.4", - "vite": "^4.0.1", + "typescript": "4.9.5", + "unplugin-vue-define-options": "^1.2.3", + "vite": "^4.1.4", "vite-plugin-compression": "^0.5.1", "vite-plugin-optimize-persist": "^0.1.2", "vite-plugin-package-config": "^0.1.1", "vite-plugin-purge-icons": "^0.9.2", - "vite-plugin-theme": "^0.8.1", + "vite-plugin-theme": "^0.8.6", "vite-plugin-windicss": "^1.8.10", "vue-eslint-parser": "^9.1.0", - "vue-tsc": "^0.40.13", + "vue-tsc": "^1.2.0", "windicss": "^3.5.6" }, "husky": { diff --git a/packages/ui/certd-client/src/App.vue b/packages/ui/certd-client/src/App.vue index 5059cfa5..414d5081 100644 --- a/packages/ui/certd-client/src/App.vue +++ b/packages/ui/certd-client/src/App.vue @@ -11,9 +11,9 @@ import { provide, ref, nextTick } from "vue"; import { usePageStore } from "/src/store/modules/page"; import { useResourceStore } from "/src/store/modules/resource"; import { useSettingStore } from "/@/store/modules/settings"; -import 'dayjs/locale/zh-cn'; -import 'dayjs/locale/en'; -import dayjs from 'dayjs' +import "dayjs/locale/zh-cn"; +import "dayjs/locale/en"; +import dayjs from "dayjs"; export default { name: "App", setup() { @@ -29,13 +29,13 @@ export default { console.log("locale changed:", value); if (value === "zh-cn") { locale.value = zhCN; - dayjs.locale('zh-cn'); + dayjs.locale("zh-cn"); } else if (value === "en") { locale.value = enUS; - dayjs.locale('en'); + dayjs.locale("en"); } } - localeChanged('zh-cn') + localeChanged("zh-cn"); provide("fn:router.reload", reload); provide("fn:locale.changed", localeChanged); diff --git a/packages/ui/certd-client/src/layout/layout-framework.vue b/packages/ui/certd-client/src/layout/layout-framework.vue index f719a0a8..2592d62e 100644 --- a/packages/ui/certd-client/src/layout/layout-framework.vue +++ b/packages/ui/certd-client/src/layout/layout-framework.vue @@ -1,4 +1,4 @@ -