From 0cf4509c70db02c8302f4d9266a5c7ec459984cb Mon Sep 17 00:00:00 2001 From: fourteendp <53899166+fourteendp@users.noreply.github.com> Date: Tue, 29 Oct 2024 14:00:11 +0800 Subject: [PATCH 1/4] fix: czg configuration not effective (#4759) closed #4758 --- .commitlintrc.mjs => .commitlintrc.js | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .commitlintrc.mjs => .commitlintrc.js (100%) diff --git a/.commitlintrc.mjs b/.commitlintrc.js similarity index 100% rename from .commitlintrc.mjs rename to .commitlintrc.js From 1180291c1a7dc1f5cf128697e51c0cc12428ea61 Mon Sep 17 00:00:00 2001 From: Joy <49052328+AnonymXXX@users.noreply.github.com> Date: Tue, 29 Oct 2024 14:06:25 +0800 Subject: [PATCH 2/4] docs: typo (#4755) --- docs/src/guide/essentials/concept.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/src/guide/essentials/concept.md b/docs/src/guide/essentials/concept.md index 1a940fb9..8f9d8b56 100644 --- a/docs/src/guide/essentials/concept.md +++ b/docs/src/guide/essentials/concept.md @@ -1,6 +1,6 @@ # 基础概念 -新版本中，整体工程进行了重构，现在我们将会介绍一些基础概念，以便于你更好的理解整个文档。请务必仔先阅读这一部分。 +新版本中，整体工程进行了重构，现在我们将会介绍一些基础概念，以便于你更好的理解整个文档。请务必仔细阅读这一部分。 ## 大仓 From d23db32f04ab3a429dba9a52478e3256e4349e41 Mon Sep 17 00:00:00 2001 From: Joy <49052328+AnonymXXX@users.noreply.github.com> Date: Tue, 29 Oct 2024 21:49:15 +0800 Subject: [PATCH 3/4] docs: typo (#4748) --- docs/src/guide/introduction/quick-start.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/src/guide/introduction/quick-start.md b/docs/src/guide/introduction/quick-start.md index 96225d89..9863e0d4 100644 --- a/docs/src/guide/introduction/quick-start.md +++ b/docs/src/guide/introduction/quick-start.md @@ -74,7 +74,7 @@ pnpm install #### 选择项目 -执行以下命运行项目: +执行以下命令运行项目: ```bash # 启动项目 From e600d78cb93f333fe6e5b64d1aaaad3019256c94 Mon Sep 17 00:00:00 2001 From: Vben Date: Tue, 29 Oct 2024 22:47:15 +0800 Subject: [PATCH 4/4] chore: add vxe-table toolbar example (#4765) --- internal/node-utils/package.json | 1 - internal/node-utils/src/index.ts | 2 - package.json | 2 +- .../effects/plugins/src/vxe-table/init.ts | 15 +- .../effects/plugins/src/vxe-table/theme.css | 8 + .../plugins/src/vxe-table/use-vxe-grid.vue | 5 + .../src/views/examples/vxe-table/remote.vue | 12 +- pnpm-lock.yaml | 912 ++++++++++-------- pnpm-workspace.yaml | 21 +- 9 files changed, 548 insertions(+), 430 deletions(-) diff --git a/internal/node-utils/package.json b/internal/node-utils/package.json index 2567a0d3..06377d03 100644 --- a/internal/node-utils/package.json +++ b/internal/node-utils/package.json @@ -35,7 +35,6 @@ "dayjs": "catalog:", "execa": "catalog:", "find-up": "catalog:", - "nanoid": "catalog:", "ora": "catalog:", "pkg-types": "catalog:", "prettier": "catalog:", diff --git a/internal/node-utils/src/index.ts b/internal/node-utils/src/index.ts index cd9028d7..2e39ccff 100644 --- a/internal/node-utils/src/index.ts +++ b/internal/node-utils/src/index.ts @@ -13,8 +13,6 @@ export { default as colors } from 'chalk'; export { consola } from 'consola'; export * from 'execa'; -export { nanoid } from 'nanoid'; - export { default as fs } from 'node:fs/promises'; export { type PackageJson, readPackageJSON } from 'pkg-types'; diff --git a/package.json b/package.json index 03872f3d..eeb59afd 100644 --- a/package.json +++ b/package.json @@ -99,7 +99,7 @@ "node": ">=20.10.0", "pnpm": ">=9.5.0" }, - "packageManager": "pnpm@9.12.2", + "packageManager": "pnpm@9.12.3", "pnpm": { "peerDependencyRules": { "allowedVersions": { diff --git a/packages/effects/plugins/src/vxe-table/init.ts b/packages/effects/plugins/src/vxe-table/init.ts index d6728b17..bd731e74 100644 --- a/packages/effects/plugins/src/vxe-table/init.ts +++ b/packages/effects/plugins/src/vxe-table/init.ts @@ -7,13 +7,15 @@ import { useVbenForm } from '@vben-core/form-ui'; import { VxeButton, - VxeButtonGroup, + VxeCheckbox, + // VxeFormGather, // VxeForm, // VxeFormItem, VxeIcon, VxeInput, VxeLoading, + VxeModal, VxePager, // VxeList, // VxeModal, @@ -22,7 +24,7 @@ import { // VxePulldown, // VxeRadio, // VxeRadioButton, - // VxeRadioGroup, + VxeRadioGroup, VxeSelect, VxeTooltip, VxeUI, @@ -64,13 +66,12 @@ export function initVxeTable() { VxeUI.component(VxeTable); VxeUI.component(VxeColumn); VxeUI.component(VxeColgroup); - VxeUI.component(VxeLoading); VxeUI.component(VxeGrid); VxeUI.component(VxeToolbar); VxeUI.component(VxeButton); - VxeUI.component(VxeButtonGroup); - // VxeUI.component(VxeCheckbox); + // VxeUI.component(VxeButtonGroup); + VxeUI.component(VxeCheckbox); // VxeUI.component(VxeCheckboxGroup); VxeUI.component(createVirtualComponent('VxeForm')); // VxeUI.component(VxeFormGather); @@ -79,14 +80,14 @@ export function initVxeTable() { VxeUI.component(VxeInput); // VxeUI.component(VxeList); VxeUI.component(VxeLoading); - // VxeUI.component(VxeModal); + VxeUI.component(VxeModal); // VxeUI.component(VxeOptgroup); // VxeUI.component(VxeOption); VxeUI.component(VxePager); // VxeUI.component(VxePulldown); // VxeUI.component(VxeRadio); // VxeUI.component(VxeRadioButton); - // VxeUI.component(VxeRadioGroup); + VxeUI.component(VxeRadioGroup); VxeUI.component(VxeSelect); // VxeUI.component(VxeSwitch); // VxeUI.component(VxeTextarea); diff --git a/packages/effects/plugins/src/vxe-table/theme.css b/packages/effects/plugins/src/vxe-table/theme.css index d49b670d..a6e8ca1d 100644 --- a/packages/effects/plugins/src/vxe-table/theme.css +++ b/packages/effects/plugins/src/vxe-table/theme.css @@ -81,3 +81,11 @@ .vxe-pager--wrapper { @apply justify-center md:justify-end; } + +.vxe-tools--operate { + @apply ml-3; +} + +.vxe-table-custom--checkbox-option:hover { + background: none !important; +} diff --git a/packages/effects/plugins/src/vxe-table/use-vxe-grid.vue b/packages/effects/plugins/src/vxe-table/use-vxe-grid.vue index 7fab3b33..3a46a683 100644 --- a/packages/effects/plugins/src/vxe-table/use-vxe-grid.vue +++ b/packages/effects/plugins/src/vxe-table/use-vxe-grid.vue @@ -122,6 +122,11 @@ const options = computed(() => { toolbarOptions.value, toRaw(gridOptions.value), globalGridConfig, + { + // toolbarConfig: { + // tools: [], + // }, + } as VxeTableGridProps, ), ); diff --git a/playground/src/views/examples/vxe-table/remote.vue b/playground/src/views/examples/vxe-table/remote.vue index 066cca44..87b0661c 100644 --- a/playground/src/views/examples/vxe-table/remote.vue +++ b/playground/src/views/examples/vxe-table/remote.vue @@ -33,7 +33,6 @@ const gridOptions: VxeGridProps = { ], height: 'auto', keepSource: true, - pagerConfig: {}, proxyConfig: { ajax: { query: async ({ page }) => { @@ -44,9 +43,18 @@ const gridOptions: VxeGridProps = { }, }, }, + toolbarConfig: { + custom: true, + // export: true, + // import: true, + refresh: true, + zoom: true, + }, }; -const [Grid, gridApi] = useVbenVxeGrid({ gridOptions }); +const [Grid, gridApi] = useVbenVxeGrid({ + gridOptions, +});