Skip to content

fix(grid): [grid] toolbar simple setting fix #2268

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 16, 2024
Merged

fix(grid): [grid] toolbar simple setting fix #2268

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7467544
fix(grid): [grid] toolbar simple setting fix
gimmyhehe Oct 15, 2024
d3e4eba
fix(grid): [grid] toolbar simple setting not sync
gimmyhehe Oct 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 31 additions & 31 deletions packages/vue/src/grid-toolbar/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
}
"devDependencies": {
"@opentiny-internal/vue-test-utils": "workspace:*",
"vitest": "^0.31.0"
}
}
4 changes: 3 additions & 1 deletion packages/vue/src/grid-toolbar/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -423,6 +423,9 @@ export default defineComponent({
custom && custom.updateSelectedTemplate(val)
},
settingBtnClick() {
if (this.setting?.simple) {
return
}
return this.setting && this.setting.customSetting
? this.setting.settingBtnClickFn()
: this.handleClickCustomEvent()
Expand Down Expand Up @@ -540,7 +543,6 @@ export default defineComponent({
})
}
},
// NEXT 未用到
updateColumn(fullColumn) {
this.tableFullColumn = fullColumn
},
Expand Down
2 changes: 1 addition & 1 deletion packages/vue/src/grid/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@opentiny/vue-grid",
"type": "module",
"version": "3.18.3",
"version": "3.18.4",
"description": "",
"license": "MIT",
"sideEffects": false,
Expand Down
6 changes: 6 additions & 0 deletions packages/vue/src/grid/src/table/src/methods.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
Loading