diff --git a/examples/main.ts b/examples/main.ts index 410cf8cb7..0e77f1bf1 100644 --- a/examples/main.ts +++ b/examples/main.ts @@ -2,20 +2,20 @@ import { createApp } from 'vue' import App from './App.vue' import router from './router' -// import VxeUI from 'vxe-pc-ui' -// import 'vxe-pc-ui/lib/style.css' +import VxeUI from 'vxe-pc-ui' +import 'vxe-pc-ui/lib/style.css' -// import enUS from 'vxe-pc-ui/packages/language/en-US' +import enUS from 'vxe-pc-ui/packages/language/en-US' import VxeTable from '../packages' import '../styles/all.scss' import './style/index.scss' -// VxeUI.setI18n('en-US', enUS) +VxeUI.setI18n('en-US', enUS) createApp(App) .use(router) - // .use(VxeUI) + .use(VxeUI) .use(VxeTable) .mount('#app') diff --git a/package.json b/package.json index d18e76354..874f8bac3 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "vxe-table", - "version": "4.7.55", + "version": "4.7.56", "description": "一个基于 vue 的 PC 端表格组件,支持增删改查、虚拟树、列拖拽,懒加载、快捷菜单、数据校验、树形结构、打印、导入导出、自定义模板、渲染器、JSON 配置式...", "scripts": { "update": "npm install --legacy-peer-deps", diff --git a/packages/table/src/column.ts b/packages/table/src/column.ts index 2bc469cbe..42454e0bd 100644 --- a/packages/table/src/column.ts +++ b/packages/table/src/column.ts @@ -1,5 +1,5 @@ import { defineComponent, h, onUnmounted, inject, ref, Ref, PropType, provide, onMounted } from 'vue' -import { XEColumnInstance, watchColumn, assemColumn, destroyColumn } from '../../table/src/util' +import { XEColumnInstance, watchColumn, assembleColumn, destroyColumn } from '../../table/src/util' import Cell from '../../table/src/cell' import type { VxeTableConstructor, VxeTablePrivateMethods, VxeColumnPropTypes, VxeColumnProps } from '../../../types' @@ -116,7 +116,7 @@ export default defineComponent({ watchColumn($xeTable, props, column) onMounted(() => { - assemColumn($xeTable, refElem.value, column, parentColgroup) + assembleColumn($xeTable, refElem.value, column, parentColgroup) }) onUnmounted(() => { diff --git a/packages/table/src/columnInfo.ts b/packages/table/src/columnInfo.ts index 7bfddbf4b..1ba28f2f3 100644 --- a/packages/table/src/columnInfo.ts +++ b/packages/table/src/columnInfo.ts @@ -156,7 +156,8 @@ export class ColumnInfo { } getKey () { - return this.field || (this.type ? `type=${this.type}` : null) + const { type } = this + return this.field || (type ? `type=${type}` : null) } update (name: string, value: any) { diff --git a/packages/table/src/group.ts b/packages/table/src/group.ts index a78035d02..63353b6dd 100644 --- a/packages/table/src/group.ts +++ b/packages/table/src/group.ts @@ -1,6 +1,6 @@ import { defineComponent, h, onUnmounted, provide, inject, ref, Ref, onMounted, Slot } from 'vue' import { columnProps } from './column' -import { XEColumnInstance, watchColumn, assemColumn, destroyColumn } from '../../table/src/util' +import { XEColumnInstance, watchColumn, assembleColumn, destroyColumn } from '../../table/src/util' import Cell from '../../table/src/cell' import type { VxeTableConstructor, VxeTablePrivateMethods } from '../../../types' @@ -27,7 +27,7 @@ export default defineComponent({ watchColumn($xeTable, props, column) onMounted(() => { - assemColumn($xeTable, refElem.value, column, parentColgroup) + assembleColumn($xeTable, refElem.value, column, parentColgroup) }) onUnmounted(() => { diff --git a/packages/table/src/table.ts b/packages/table/src/table.ts index 3f2adf672..d3b189119 100644 --- a/packages/table/src/table.ts +++ b/packages/table/src/table.ts @@ -2911,7 +2911,7 @@ export default defineComponent({ }, { children: childrenField }) row[childrenField] = rows if (transform) { - row[mapChildrenField] = rows + row[mapChildrenField] = XEUtils.clone(rows, false) } updateAfterDataIndex() return rows diff --git a/packages/table/src/util.ts b/packages/table/src/util.ts index 2066b088b..4bb3a275e 100644 --- a/packages/table/src/util.ts +++ b/packages/table/src/util.ts @@ -290,7 +290,7 @@ export function watchColumn ($xeTable: VxeTableConstructor & VxeTablePrivateMeth }) } -export function assemColumn ($xeTable: VxeTableConstructor & VxeTablePrivateMethods, elem: HTMLElement, column: ColumnInfo, colgroup: XEColumnInstance | null) { +export function assembleColumn ($xeTable: VxeTableConstructor & VxeTablePrivateMethods, elem: HTMLElement, column: ColumnInfo, colgroup: XEColumnInstance | null) { const { reactData } = $xeTable const { staticColumns } = reactData const parentElem = elem.parentNode