From 082fc22c684ffd43b6fe0aa67b5b29e9c8730157 Mon Sep 17 00:00:00 2001 From: DaxPay Date: Tue, 9 Jul 2024 13:50:34 +0800 Subject: [PATCH] =?UTF-8?q?feat=20vxetable=E9=9B=86=E6=88=90=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 3 +- pnpm-lock.yaml | 59 +-- src/components/Bootx/Query/BQuery.vue | 2 +- src/components/VxeTable/index.ts | 62 ++- src/components/VxeTable/src/VxeBasicTable.tsx | 126 ------ src/components/VxeTable/src/componentMap.ts | 59 --- src/components/VxeTable/src/componentType.ts | 22 - .../VxeTable/src/components/AApiSelect.tsx | 20 - .../src/components/AApiTreeSelect.tsx | 20 - .../VxeTable/src/components/AAutoComplete.tsx | 16 - .../VxeTable/src/components/AButton.tsx | 120 ----- .../VxeTable/src/components/AButtonGroup.tsx | 59 --- .../VxeTable/src/components/ACascader.tsx | 42 -- .../src/components/ACheckboxGroup.tsx | 5 - .../VxeTable/src/components/ADatePicker.tsx | 33 -- .../VxeTable/src/components/AEmpty.tsx | 27 -- .../VxeTable/src/components/AInput.tsx | 16 - .../VxeTable/src/components/AInputNumber.tsx | 16 - .../VxeTable/src/components/AInputSearch.tsx | 17 - .../VxeTable/src/components/AMonthPicker.tsx | 18 - .../VxeTable/src/components/ARadioGroup.tsx | 5 - .../VxeTable/src/components/ARangePicker.tsx | 30 -- .../VxeTable/src/components/ARate.tsx | 15 - .../VxeTable/src/components/ASelect.tsx | 271 ----------- .../VxeTable/src/components/ASwitch.tsx | 53 --- .../VxeTable/src/components/ATimePicker.tsx | 18 - .../VxeTable/src/components/ATreeSelect.tsx | 35 -- .../VxeTable/src/components/AWeekPicker.tsx | 18 - .../VxeTable/src/components/AYearPicker.tsx | 18 - .../VxeTable/src/components/common.tsx | 427 ------------------ .../VxeTable/src/components/index.tsx | 114 ----- src/components/VxeTable/src/const.ts | 9 - src/components/VxeTable/src/css/common.scss | 8 - .../VxeTable/src/css/component.scss | 123 ----- src/components/VxeTable/src/css/index.scss | 5 - src/components/VxeTable/src/css/toolbar.scss | 26 -- src/components/VxeTable/src/css/variable.scss | 54 --- src/components/VxeTable/src/emits.ts | 17 - src/components/VxeTable/src/helper.ts | 29 -- src/components/VxeTable/src/methods.ts | 171 ------- src/components/VxeTable/src/props.ts | 52 --- src/components/VxeTable/src/setting.ts | 4 - src/components/VxeTable/src/types.ts | 7 - src/design/components/antdv.less | 22 + src/design/components/global.less | 16 + src/design/components/index.less | 3 + src/design/components/vxeTable.less | 28 ++ src/design/index.less | 1 + src/logics/theme/dark.ts | 4 + src/main.ts | 5 +- src/settings/componentSetting.ts | 62 --- 51 files changed, 170 insertions(+), 2222 deletions(-) delete mode 100644 src/components/VxeTable/src/VxeBasicTable.tsx delete mode 100644 src/components/VxeTable/src/componentMap.ts delete mode 100644 src/components/VxeTable/src/componentType.ts delete mode 100644 src/components/VxeTable/src/components/AApiSelect.tsx delete mode 100644 src/components/VxeTable/src/components/AApiTreeSelect.tsx delete mode 100644 src/components/VxeTable/src/components/AAutoComplete.tsx delete mode 100644 src/components/VxeTable/src/components/AButton.tsx delete mode 100644 src/components/VxeTable/src/components/AButtonGroup.tsx delete mode 100644 src/components/VxeTable/src/components/ACascader.tsx delete mode 100644 src/components/VxeTable/src/components/ACheckboxGroup.tsx delete mode 100644 src/components/VxeTable/src/components/ADatePicker.tsx delete mode 100644 src/components/VxeTable/src/components/AEmpty.tsx delete mode 100644 src/components/VxeTable/src/components/AInput.tsx delete mode 100644 src/components/VxeTable/src/components/AInputNumber.tsx delete mode 100644 src/components/VxeTable/src/components/AInputSearch.tsx delete mode 100644 src/components/VxeTable/src/components/AMonthPicker.tsx delete mode 100644 src/components/VxeTable/src/components/ARadioGroup.tsx delete mode 100644 src/components/VxeTable/src/components/ARangePicker.tsx delete mode 100644 src/components/VxeTable/src/components/ARate.tsx delete mode 100644 src/components/VxeTable/src/components/ASelect.tsx delete mode 100644 src/components/VxeTable/src/components/ASwitch.tsx delete mode 100644 src/components/VxeTable/src/components/ATimePicker.tsx delete mode 100644 src/components/VxeTable/src/components/ATreeSelect.tsx delete mode 100644 src/components/VxeTable/src/components/AWeekPicker.tsx delete mode 100644 src/components/VxeTable/src/components/AYearPicker.tsx delete mode 100644 src/components/VxeTable/src/components/common.tsx delete mode 100644 src/components/VxeTable/src/components/index.tsx delete mode 100644 src/components/VxeTable/src/const.ts delete mode 100644 src/components/VxeTable/src/css/common.scss delete mode 100644 src/components/VxeTable/src/css/component.scss delete mode 100644 src/components/VxeTable/src/css/index.scss delete mode 100644 src/components/VxeTable/src/css/toolbar.scss delete mode 100644 src/components/VxeTable/src/css/variable.scss delete mode 100644 src/components/VxeTable/src/emits.ts delete mode 100644 src/components/VxeTable/src/helper.ts delete mode 100644 src/components/VxeTable/src/methods.ts delete mode 100644 src/components/VxeTable/src/props.ts delete mode 100644 src/components/VxeTable/src/setting.ts delete mode 100644 src/components/VxeTable/src/types.ts create mode 100644 src/design/components/antdv.less create mode 100644 src/design/components/global.less create mode 100644 src/design/components/index.less create mode 100644 src/design/components/vxeTable.less diff --git a/package.json b/package.json index c4760b0f7..933ecbb05 100644 --- a/package.json +++ b/package.json @@ -83,7 +83,8 @@ "vue-router": "^4.4.0", "vue-types": "^5.1.2", "vuedraggable": "^4.1.0", - "vxe-table": "^4.7.40", + "vxe-table": "^v4.7", + "vxe-pc-ui": "^4.0.51", "xe-utils": "^3.5.28" }, "devDependencies": { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 45deb33ad..7641022aa 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -95,8 +95,11 @@ importers: vuedraggable: specifier: ^4.1.0 version: 4.1.0(vue@3.4.31(typescript@5.5.3)) + vxe-pc-ui: + specifier: ^4.0.51 + version: 4.0.51 vxe-table: - specifier: ^4.7.40 + specifier: ^v4.7 version: 4.7.40 xe-utils: specifier: ^3.5.28 @@ -6586,8 +6589,8 @@ packages: peerDependencies: vue: ^3.0.1 - vxe-pc-ui@4.0.44: - resolution: {integrity: sha512-wiauFMmSvEkVKa/AsKGb5CMi91Ojts+Ydcn+iespgl3xMBD01BR/CGzeCI478P3XAFBsiN4gWlgxHmGP5TR8UA==} + vxe-pc-ui@4.0.51: + resolution: {integrity: sha512-h3rMvvbcABq4GIu6AbsIFVR4RhgfM4rMoCpi8gekRPce13kSCVoWNFPiu1rKWSyqePErP6o8fbLgs226KnasZQ==} vxe-table@4.7.40: resolution: {integrity: sha512-y9VC3oLJgusxFj3xZ28G4gU+YClBuDIV8oM75Dx3doYJ7vanXZnSf70XJ+W5xEKflamUmjGre66XZ2b4XuqtMw==} @@ -6825,7 +6828,7 @@ snapshots: '@babel/traverse': 7.24.1 '@babel/types': 7.24.0 convert-source-map: 2.0.0 - debug: 4.3.4 + debug: 4.3.5 gensync: 1.0.0-beta.2 json5: 2.2.3 semver: 6.3.1 @@ -7203,7 +7206,7 @@ snapshots: '@babel/helper-split-export-declaration': 7.22.6 '@babel/parser': 7.24.7 '@babel/types': 7.24.0 - debug: 4.3.4 + debug: 4.3.5 globals: 11.12.0 transitivePeerDependencies: - supports-color @@ -7590,7 +7593,7 @@ snapshots: '@eslint/eslintrc@2.1.4': dependencies: ajv: 6.12.6 - debug: 4.3.4 + debug: 4.3.5 espree: 9.6.1 globals: 13.24.0 ignore: 5.3.1 @@ -7606,7 +7609,7 @@ snapshots: '@humanwhocodes/config-array@0.11.14': dependencies: '@humanwhocodes/object-schema': 2.0.3 - debug: 4.3.4 + debug: 4.3.5 minimatch: 3.1.2 transitivePeerDependencies: - supports-color @@ -7639,7 +7642,7 @@ snapshots: '@antfu/install-pkg': 0.1.1 '@antfu/utils': 0.7.7 '@iconify/types': 2.0.0 - debug: 4.3.4 + debug: 4.3.5 kolorist: 1.8.0 local-pkg: 0.5.0 mlly: 1.6.1 @@ -7806,7 +7809,7 @@ snapshots: '@pm2/pm2-version-check@1.0.4': dependencies: - debug: 4.3.4 + debug: 4.3.5 transitivePeerDependencies: - supports-color @@ -7815,8 +7818,8 @@ snapshots: '@purge-icons/core@0.10.0': dependencies: '@iconify/iconify': 2.1.2 - axios: 0.26.1(debug@4.3.4) - debug: 4.3.4 + axios: 0.26.1(debug@4.3.5) + debug: 4.3.5 fast-glob: 3.3.2 fs-extra: 10.1.0 transitivePeerDependencies: @@ -8236,7 +8239,7 @@ snapshots: dependencies: '@typescript-eslint/typescript-estree': 7.7.0(typescript@5.5.3) '@typescript-eslint/utils': 7.7.0(eslint@8.57.0)(typescript@5.5.3) - debug: 4.3.4 + debug: 4.3.5 eslint: 8.57.0 ts-api-utils: 1.3.0(typescript@5.5.3) optionalDependencies: @@ -8250,7 +8253,7 @@ snapshots: dependencies: '@typescript-eslint/types': 7.7.0 '@typescript-eslint/visitor-keys': 7.7.0 - debug: 4.3.4 + debug: 4.3.5 globby: 11.1.0 is-glob: 4.0.3 minimatch: 9.0.4 @@ -8827,7 +8830,7 @@ snapshots: agent-base@7.1.1: dependencies: - debug: 4.3.4 + debug: 4.3.5 transitivePeerDependencies: - supports-color @@ -9050,15 +9053,15 @@ snapshots: dependencies: possible-typed-array-names: 1.0.0 - axios@0.26.1(debug@4.3.4): + axios@0.26.1(debug@4.3.5): dependencies: - follow-redirects: 1.15.6(debug@4.3.4) + follow-redirects: 1.15.6(debug@4.3.5) transitivePeerDependencies: - debug axios@1.7.2: dependencies: - follow-redirects: 1.15.6(debug@4.3.4) + follow-redirects: 1.15.6(debug@4.3.5) form-data: 4.0.0 proxy-from-env: 1.1.0 transitivePeerDependencies: @@ -10371,6 +10374,10 @@ snapshots: optionalDependencies: debug: 4.3.4 + follow-redirects@1.15.6(debug@4.3.5): + optionalDependencies: + debug: 4.3.5 + for-each@0.3.3: dependencies: is-callable: 1.2.7 @@ -10472,7 +10479,7 @@ snapshots: dependencies: basic-ftp: 5.0.5 data-uri-to-buffer: 6.0.2 - debug: 4.3.4 + debug: 4.3.5 fs-extra: 11.2.0 transitivePeerDependencies: - supports-color @@ -10729,14 +10736,14 @@ snapshots: http-proxy-agent@7.0.2: dependencies: agent-base: 7.1.1 - debug: 4.3.4 + debug: 4.3.5 transitivePeerDependencies: - supports-color https-proxy-agent@7.0.4: dependencies: agent-base: 7.1.1 - debug: 4.3.4 + debug: 4.3.5 transitivePeerDependencies: - supports-color @@ -11747,7 +11754,7 @@ snapshots: dependencies: '@tootallnate/quickjs-emscripten': 0.23.0 agent-base: 7.1.1 - debug: 4.3.4 + debug: 4.3.5 get-uri: 6.0.3 http-proxy-agent: 7.0.2 https-proxy-agent: 7.0.4 @@ -12244,7 +12251,7 @@ snapshots: proxy-agent@6.3.1: dependencies: agent-base: 7.1.1 - debug: 4.3.4 + debug: 4.3.5 http-proxy-agent: 7.0.2 https-proxy-agent: 7.0.4 lru-cache: 7.18.3 @@ -12341,7 +12348,7 @@ snapshots: require-in-the-middle@5.2.0: dependencies: - debug: 4.3.4 + debug: 4.3.5 module-details-from-path: 1.0.3 resolve: 1.22.8 transitivePeerDependencies: @@ -12642,7 +12649,7 @@ snapshots: socks-proxy-agent@8.0.3: dependencies: agent-base: 7.1.1 - debug: 4.3.4 + debug: 4.3.5 socks: 2.8.3 transitivePeerDependencies: - supports-color @@ -13690,13 +13697,13 @@ snapshots: sortablejs: 1.14.0 vue: 3.4.31(typescript@5.5.3) - vxe-pc-ui@4.0.44: + vxe-pc-ui@4.0.51: dependencies: '@vxe-ui/core': 1.0.12 vxe-table@4.7.40: dependencies: - vxe-pc-ui: 4.0.44 + vxe-pc-ui: 4.0.51 warning@4.0.3: dependencies: diff --git a/src/components/Bootx/Query/BQuery.vue b/src/components/Bootx/Query/BQuery.vue index 91fd04ad6..a43886caf 100644 --- a/src/components/Bootx/Query/BQuery.vue +++ b/src/components/Bootx/Query/BQuery.vue @@ -1,5 +1,5 @@