diff --git a/packages/theme/package.json b/packages/theme/package.json index 0b428faa84..cbcf5f3fd9 100644 --- a/packages/theme/package.json +++ b/packages/theme/package.json @@ -1,6 +1,6 @@ { "name": "@opentiny/vue-theme", - "version": "3.18.2", + "version": "3.18.3", "description": "An enterprise-class UI component library, support both Vue.js 2 and Vue.js 3, as well as PC and mobile.", "author": "OpenTiny Team", "license": "MIT", diff --git a/packages/vue/src/dropdown-item/package.json b/packages/vue/src/dropdown-item/package.json index c6b98be360..601a06c553 100644 --- a/packages/vue/src/dropdown-item/package.json +++ b/packages/vue/src/dropdown-item/package.json @@ -1,7 +1,7 @@ { "name": "@opentiny/vue-dropdown-item", "type": "module", - "version": "3.18.0", + "version": "3.18.1", "description": "", "license": "MIT", "sideEffects": false, @@ -25,4 +25,4 @@ "@opentiny-internal/vue-test-utils": "workspace:*", "vitest": "^0.31.0" } -} \ No newline at end of file +} diff --git a/packages/vue/src/grid-toolbar/package.json b/packages/vue/src/grid-toolbar/package.json index 9e04f3227d..2470e9a2c9 100644 --- a/packages/vue/src/grid-toolbar/package.json +++ b/packages/vue/src/grid-toolbar/package.json @@ -1,50 +1,50 @@ { "name": "@opentiny/vue-grid-toolbar", - "version": "3.18.0", + "type": "module", + "version": "3.18.1", "description": "", + "license": "MIT", + "sideEffects": false, "main": "lib/index.js", "module": "index.ts", - "sideEffects": false, - "type": "module", - "devDependencies": { - "@opentiny-internal/vue-test-utils": "workspace:*", - "vitest": "^0.31.0" - }, "scripts": { "build": "pnpm -w build:ui $npm_package_name", "//postversion": "pnpm build" }, "dependencies": { - "@opentiny/vue-button": "workspace:~", - "@opentiny/vue-select": "workspace:~", - "@opentiny/vue-option": "workspace:~", - "@opentiny/vue-locale": "workspace:~", - "@opentiny/vue-modal": "workspace:~", - "@opentiny/vue-icon": "workspace:~", - "@opentiny/vue-grid": "workspace:~", - "@opentiny/vue-common": "workspace:~", - "@opentiny/vue-layout": "workspace:~", - "@opentiny/vue-row": "workspace:~", - "@opentiny/vue-col": "workspace:~", "@opentiny/vue-alert": "workspace:~", - "@opentiny/vue-dialog-box": "workspace:~", - "@opentiny/vue-renderless": "workspace:~", - "@opentiny/vue-split": "workspace:~", + "@opentiny/vue-button": "workspace:~", "@opentiny/vue-checkbox": "workspace:~", - "@opentiny/vue-radio": "workspace:~", "@opentiny/vue-checkbox-group": "workspace:~", - "@opentiny/vue-radio-group": "workspace:~", - "@opentiny/vue-search": "workspace:~", + "@opentiny/vue-col": "workspace:~", + "@opentiny/vue-common": "workspace:~", + "@opentiny/vue-dialog-box": "workspace:~", "@opentiny/vue-dropdown": "workspace:~", - "@opentiny/vue-dropdown-menu": "workspace:~", "@opentiny/vue-dropdown-item": "workspace:~", - "@opentiny/vue-tooltip": "workspace:~", - "@opentiny/vue-theme": "workspace:~", - "@opentiny/vue-tabs": "workspace:~", - "@opentiny/vue-tab-item": "workspace:~", + "@opentiny/vue-dropdown-menu": "workspace:~", + "@opentiny/vue-grid": "workspace:~", + "@opentiny/vue-icon": "workspace:~", "@opentiny/vue-input": "workspace:~", + "@opentiny/vue-layout": "workspace:~", + "@opentiny/vue-locale": "workspace:~", + "@opentiny/vue-modal": "workspace:~", + "@opentiny/vue-option": "workspace:~", "@opentiny/vue-popover": "workspace:~", + "@opentiny/vue-radio": "workspace:~", + "@opentiny/vue-radio-group": "workspace:~", + "@opentiny/vue-renderless": "workspace:~", + "@opentiny/vue-row": "workspace:~", + "@opentiny/vue-search": "workspace:~", + "@opentiny/vue-select": "workspace:~", + "@opentiny/vue-split": "workspace:~", + "@opentiny/vue-tab-item": "workspace:~", + "@opentiny/vue-tabs": "workspace:~", + "@opentiny/vue-theme": "workspace:~", + "@opentiny/vue-tooltip": "workspace:~", "@opentiny/vue-tree": "workspace:~" }, - "license": "MIT" -} \ No newline at end of file + "devDependencies": { + "@opentiny-internal/vue-test-utils": "workspace:*", + "vitest": "^0.31.0" + } +} diff --git a/packages/vue/src/grid-toolbar/src/index.ts b/packages/vue/src/grid-toolbar/src/index.ts index 0c4cf6ac46..d758794f4c 100644 --- a/packages/vue/src/grid-toolbar/src/index.ts +++ b/packages/vue/src/grid-toolbar/src/index.ts @@ -544,7 +544,6 @@ export default defineComponent({ }) } }, - // NEXT 未用到 updateColumn(fullColumn) { this.tableFullColumn = fullColumn }, diff --git a/packages/vue/src/grid/package.json b/packages/vue/src/grid/package.json index 0ca64d07e4..0b4dd19931 100644 --- a/packages/vue/src/grid/package.json +++ b/packages/vue/src/grid/package.json @@ -1,7 +1,7 @@ { "name": "@opentiny/vue-grid", "type": "module", - "version": "3.18.3", + "version": "3.18.5", "description": "", "main": "lib/index.js", "module": "index.ts", diff --git a/packages/vue/src/grid/src/column/src/column.ts b/packages/vue/src/grid/src/column/src/column.ts index 74cd25cf7a..775313249e 100644 --- a/packages/vue/src/grid/src/column/src/column.ts +++ b/packages/vue/src/grid/src/column/src/column.ts @@ -191,7 +191,9 @@ export default defineComponent({ const hasSubColumn = findTree( slotVnode, - ({ componentOptions, type }) => { + (node) => { + // 当使用jsx来写默认插槽时,vnode的children为[undefined], 使用fallback值防止解构报错 + const { componentOptions, type } = node || {} const componentName = (type && type.name) || (componentOptions && componentOptions.Ctor.extendOptions.name) return $table.isValidCustomColumn(componentName) diff --git a/packages/vue/src/grid/src/table/src/methods.ts b/packages/vue/src/grid/src/table/src/methods.ts index 031a92c127..5a1ea4b891 100644 --- a/packages/vue/src/grid/src/table/src/methods.ts +++ b/packages/vue/src/grid/src/table/src/methods.ts @@ -772,6 +772,12 @@ const Methods = { }) this.collectColumn = collectColumn } + + const toolbarVm = this.getVm('toolbar') + // 合并更新toolbar的Column配置 + if (toolbarVm) { + toolbarVm.updateColumn(fullColumn) + } this.$emit('update:customs', fullColumn) }, resetAll() {