Skip to content

Commit 4322132

Browse files
kagolgimmyheheMomoPoppy
authored
Sync 3.18.0 to dev (#2294)
* fix(grid): [grid] toolbar simple setting fix (#2268) * fix(grid): [grid] toolbar simple setting fix * fix(grid): [grid] toolbar simple setting not sync * fix(dropdown-item): [dropdown] fix issues for v-auto-tip and add effect attr * fix(pager): [pager] fix pager css vars default value error * fix(grid): [grid] fix grid jsx default slot error (#2285) --------- Co-authored-by: gimmyhehe <975402925@qq.com> Co-authored-by: MomoPoppy <125256456+MomoPoppy@users.noreply.github.com>
1 parent 5ccd986 commit 4322132

File tree

7 files changed

+44
-37
lines changed

7 files changed

+44
-37
lines changed

‎packages/theme/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@opentiny/vue-theme",
3-
"version": "3.18.2",
3+
"version": "3.18.3",
44
"description": "An enterprise-class UI component library, support both Vue.js 2 and Vue.js 3, as well as PC and mobile.",
55
"author": "OpenTiny Team",
66
"license": "MIT",

‎packages/vue/src/dropdown-item/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@opentiny/vue-dropdown-item",
33
"type": "module",
4-
"version": "3.18.0",
4+
"version": "3.18.1",
55
"description": "",
66
"license": "MIT",
77
"sideEffects": false,
@@ -25,4 +25,4 @@
2525
"@opentiny-internal/vue-test-utils": "workspace:*",
2626
"vitest": "^0.31.0"
2727
}
28-
}
28+
}

‎packages/vue/src/grid-toolbar/package.json‎

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,50 @@
11
{
22
"name": "@opentiny/vue-grid-toolbar",
3-
"version": "3.18.0",
3+
"type": "module",
4+
"version": "3.18.1",
45
"description": "",
6+
"license": "MIT",
7+
"sideEffects": false,
58
"main": "lib/index.js",
69
"module": "index.ts",
7-
"sideEffects": false,
8-
"type": "module",
9-
"devDependencies": {
10-
"@opentiny-internal/vue-test-utils": "workspace:*",
11-
"vitest": "^0.31.0"
12-
},
1310
"scripts": {
1411
"build": "pnpm -w build:ui $npm_package_name",
1512
"//postversion": "pnpm build"
1613
},
1714
"dependencies": {
18-
"@opentiny/vue-button": "workspace:~",
19-
"@opentiny/vue-select": "workspace:~",
20-
"@opentiny/vue-option": "workspace:~",
21-
"@opentiny/vue-locale": "workspace:~",
22-
"@opentiny/vue-modal": "workspace:~",
23-
"@opentiny/vue-icon": "workspace:~",
24-
"@opentiny/vue-grid": "workspace:~",
25-
"@opentiny/vue-common": "workspace:~",
26-
"@opentiny/vue-layout": "workspace:~",
27-
"@opentiny/vue-row": "workspace:~",
28-
"@opentiny/vue-col": "workspace:~",
2915
"@opentiny/vue-alert": "workspace:~",
30-
"@opentiny/vue-dialog-box": "workspace:~",
31-
"@opentiny/vue-renderless": "workspace:~",
32-
"@opentiny/vue-split": "workspace:~",
16+
"@opentiny/vue-button": "workspace:~",
3317
"@opentiny/vue-checkbox": "workspace:~",
34-
"@opentiny/vue-radio": "workspace:~",
3518
"@opentiny/vue-checkbox-group": "workspace:~",
36-
"@opentiny/vue-radio-group": "workspace:~",
37-
"@opentiny/vue-search": "workspace:~",
19+
"@opentiny/vue-col": "workspace:~",
20+
"@opentiny/vue-common": "workspace:~",
21+
"@opentiny/vue-dialog-box": "workspace:~",
3822
"@opentiny/vue-dropdown": "workspace:~",
39-
"@opentiny/vue-dropdown-menu": "workspace:~",
4023
"@opentiny/vue-dropdown-item": "workspace:~",
41-
"@opentiny/vue-tooltip": "workspace:~",
42-
"@opentiny/vue-theme": "workspace:~",
43-
"@opentiny/vue-tabs": "workspace:~",
44-
"@opentiny/vue-tab-item": "workspace:~",
24+
"@opentiny/vue-dropdown-menu": "workspace:~",
25+
"@opentiny/vue-grid": "workspace:~",
26+
"@opentiny/vue-icon": "workspace:~",
4527
"@opentiny/vue-input": "workspace:~",
28+
"@opentiny/vue-layout": "workspace:~",
29+
"@opentiny/vue-locale": "workspace:~",
30+
"@opentiny/vue-modal": "workspace:~",
31+
"@opentiny/vue-option": "workspace:~",
4632
"@opentiny/vue-popover": "workspace:~",
33+
"@opentiny/vue-radio": "workspace:~",
34+
"@opentiny/vue-radio-group": "workspace:~",
35+
"@opentiny/vue-renderless": "workspace:~",
36+
"@opentiny/vue-row": "workspace:~",
37+
"@opentiny/vue-search": "workspace:~",
38+
"@opentiny/vue-select": "workspace:~",
39+
"@opentiny/vue-split": "workspace:~",
40+
"@opentiny/vue-tab-item": "workspace:~",
41+
"@opentiny/vue-tabs": "workspace:~",
42+
"@opentiny/vue-theme": "workspace:~",
43+
"@opentiny/vue-tooltip": "workspace:~",
4744
"@opentiny/vue-tree": "workspace:~"
4845
},
49-
"license": "MIT"
50-
}
46+
"devDependencies": {
47+
"@opentiny-internal/vue-test-utils": "workspace:*",
48+
"vitest": "^0.31.0"
49+
}
50+
}

‎packages/vue/src/grid-toolbar/src/index.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -544,7 +544,6 @@ export default defineComponent({
544544
})
545545
}
546546
},
547-
// NEXT 未用到
548547
updateColumn(fullColumn) {
549548
this.tableFullColumn = fullColumn
550549
},

‎packages/vue/src/grid/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@opentiny/vue-grid",
33
"type": "module",
4-
"version": "3.18.3",
4+
"version": "3.18.5",
55
"description": "",
66
"main": "lib/index.js",
77
"module": "index.ts",

‎packages/vue/src/grid/src/column/src/column.ts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,9 @@ export default defineComponent({
191191

192192
const hasSubColumn = findTree(
193193
slotVnode,
194-
({ componentOptions, type }) => {
194+
(node) => {
195+
// 当使用jsx来写默认插槽时，vnode的children为[undefined], 使用fallback值防止解构报错
196+
const { componentOptions, type } = node || {}
195197
const componentName = (type && type.name) || (componentOptions && componentOptions.Ctor.extendOptions.name)
196198

197199
return $table.isValidCustomColumn(componentName)

‎packages/vue/src/grid/src/table/src/methods.ts‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -772,6 +772,12 @@ const Methods = {
772772
})
773773
this.collectColumn = collectColumn
774774
}
775+
776+
const toolbarVm = this.getVm('toolbar')
777+
// 合并更新toolbar的Column配置
778+
if (toolbarVm) {
779+
toolbarVm.updateColumn(fullColumn)
780+
}
775781
this.$emit('update:customs', fullColumn)
776782
},
777783
resetAll() {

0 commit comments

Comments
 (0)