vxe-table 4.15.0 → 4.15.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/es/style.css +1 -1
- package/es/table/module/custom/hook.js +7 -0
- package/es/table/module/custom/panel.js +1 -1
- package/es/table/src/table.js +51 -10
- package/es/ui/index.js +2 -1
- package/es/ui/src/log.js +1 -1
- package/lib/index.umd.js +20 -6
- package/lib/index.umd.min.js +1 -1
- package/lib/style.css +1 -1
- package/lib/table/module/custom/hook.js +9 -0
- package/lib/table/module/custom/hook.min.js +1 -1
- package/lib/table/module/custom/panel.js +1 -1
- package/lib/table/module/custom/panel.min.js +1 -1
- package/lib/table/src/table.js +7 -3
- package/lib/table/src/table.min.js +1 -1
- package/lib/ui/index.js +2 -1
- package/lib/ui/index.min.js +1 -1
- package/lib/ui/src/log.js +1 -1
- package/lib/ui/src/log.min.js +1 -1
- package/package.json +1 -1
- package/packages/table/module/custom/hook.ts +7 -0
- package/packages/table/module/custom/panel.ts +1 -1
- package/packages/table/src/table.ts +51 -10
- package/packages/ui/index.ts +1 -0
- /package/es/{iconfont.1753928735749.ttf → iconfont.1754370048998.ttf} +0 -0
- /package/es/{iconfont.1753928735749.woff → iconfont.1754370048998.woff} +0 -0
- /package/es/{iconfont.1753928735749.woff2 → iconfont.1754370048998.woff2} +0 -0
- /package/lib/{iconfont.1753928735749.ttf → iconfont.1754370048998.ttf} +0 -0
- /package/lib/{iconfont.1753928735749.woff → iconfont.1754370048998.woff} +0 -0
- /package/lib/{iconfont.1753928735749.woff2 → iconfont.1754370048998.woff2} +0 -0
package/lib/ui/index.js
CHANGED
|
@@ -13,7 +13,7 @@ Object.defineProperty(exports, "VxeUI", {
|
|
|
13
13
|
exports.version = exports.validators = exports.use = exports.t = exports.setup = exports.setTheme = exports.setLanguage = exports.setIcon = exports.setI18n = exports.setConfig = exports.saveFile = exports.renderer = exports.readFile = exports.print = exports.modal = exports.menus = exports.log = exports.interceptor = exports.hooks = exports.globalResize = exports.globalEvents = exports.getTheme = exports.getIcon = exports.getI18n = exports.getConfig = exports.formats = exports.default = exports.config = exports.commands = exports.clipboard = exports._t = void 0;
|
|
14
14
|
var _core = require("@vxe-ui/core");
|
|
15
15
|
var _utils = require("./src/utils");
|
|
16
|
-
const version = exports.version = "4.15.
|
|
16
|
+
const version = exports.version = "4.15.2";
|
|
17
17
|
_core.VxeUI.version = version;
|
|
18
18
|
_core.VxeUI.tableVersion = version;
|
|
19
19
|
_core.VxeUI.setConfig({
|
|
@@ -238,6 +238,7 @@ _core.VxeUI.setConfig({
|
|
|
238
238
|
},
|
|
239
239
|
virtualYConfig: {
|
|
240
240
|
// enabled: false,
|
|
241
|
+
// mode: 'wheel',
|
|
241
242
|
gt: 100,
|
|
242
243
|
preSize: 1,
|
|
243
244
|
oSize: 0
|
package/lib/ui/index.min.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
Object.defineProperty(exports,"__esModule",{value:!0}),exports.VXETable=void 0,Object.defineProperty(exports,"VxeUI",{enumerable:!0,get:function(){return _core.VxeUI}}),exports.version=exports.validators=exports.use=exports.t=exports.setup=exports.setTheme=exports.setLanguage=exports.setIcon=exports.setI18n=exports.setConfig=exports.saveFile=exports.renderer=exports.readFile=exports.print=exports.modal=exports.menus=exports.log=exports.interceptor=exports.hooks=exports.globalResize=exports.globalEvents=exports.getTheme=exports.getIcon=exports.getI18n=exports.getConfig=exports.formats=exports.default=exports.config=exports.commands=exports.clipboard=exports._t=void 0;var _core=require("@vxe-ui/core"),_utils=require("./src/utils");let version=exports.version="4.15.
|
|
1
|
+
Object.defineProperty(exports,"__esModule",{value:!0}),exports.VXETable=void 0,Object.defineProperty(exports,"VxeUI",{enumerable:!0,get:function(){return _core.VxeUI}}),exports.version=exports.validators=exports.use=exports.t=exports.setup=exports.setTheme=exports.setLanguage=exports.setIcon=exports.setI18n=exports.setConfig=exports.saveFile=exports.renderer=exports.readFile=exports.print=exports.modal=exports.menus=exports.log=exports.interceptor=exports.hooks=exports.globalResize=exports.globalEvents=exports.getTheme=exports.getIcon=exports.getI18n=exports.getConfig=exports.formats=exports.default=exports.config=exports.commands=exports.clipboard=exports._t=void 0;var _core=require("@vxe-ui/core"),_utils=require("./src/utils");let version=exports.version="4.15.2",iconPrefix=(_core.VxeUI.version=version,_core.VxeUI.tableVersion=version,_core.VxeUI.setConfig({emptyCell:" ",table:{fit:!0,showHeader:!0,animat:!0,delayHover:250,autoResize:!0,minHeight:144,resizeConfig:{},resizableConfig:{dragMode:"auto",showDragTip:!0,isSyncAutoHeight:!0,isSyncAutoWidth:!0,minHeight:18},radioConfig:{strict:!0},rowDragConfig:{showIcon:!0,animation:!0,showGuidesStatus:!0,showDragTip:!0},columnDragConfig:{showIcon:!0,animation:!0,showGuidesStatus:!0,showDragTip:!0},checkboxConfig:{strict:!0},tooltipConfig:{enterable:!0},validConfig:{showMessage:!0,autoClear:!0,autoPos:!0,message:"inline",msgMode:"single",theme:"beautify"},columnConfig:{autoOptions:{isCalcHeader:!0,isCalcBody:!0,isCalcFooter:!0},maxFixedSize:4},cellConfig:{padding:!0},headerCellConfig:{height:"unset"},footerCellConfig:{height:"unset"},customConfig:{allowVisible:!0,allowResizable:!0,allowFixed:!0,allowSort:!0,showFooter:!0,placement:"top-right",storeOptions:{visible:!0,resizable:!0,sort:!0,fixed:!0},modalOptions:{showMaximize:!0,mask:!0,lockView:!0,resize:!0,escClosable:!0},drawerOptions:{mask:!0,lockView:!0,escClosable:!0,resize:!0}},sortConfig:{showIcon:!0,allowClear:!0,allowBtn:!0,iconLayout:"vertical"},filterConfig:{multiple:!0,showIcon:!0},aggregateConfig:{padding:!0,rowField:"id",parentField:"_X_ROW_PARENT_KEY",childrenField:"_X_ROW_CHILDREN",mapChildrenField:"_X_ROW_CHILD_LIST",indent:20,showIcon:!0,maxGroupSize:4,showAggFuncTitle:!0},treeConfig:{padding:!0,rowField:"id",parentField:"parentId",childrenField:"children",hasChildField:"hasChild",mapChildrenField:"_X_ROW_CHILD",indent:20,showIcon:!0},expandConfig:{showIcon:!0,mode:"fixed"},editConfig:{showIcon:!0,showAsterisk:!0,autoFocus:!0},importConfig:{_typeMaps:{csv:1,html:1,xml:1,txt:1}},exportConfig:{_typeMaps:{csv:1,html:1,xml:1,txt:1}},printConfig:{},mouseConfig:{extension:!0},keyboardConfig:{isAll:!0,isEsc:!0},areaConfig:{autoClear:!0,selectCellByHeader:!0,selectCellByBody:!0,extendDirection:{top:!0,left:!0,bottom:!0,right:!0}},clipConfig:{isCopy:!0,isCut:!0,isPaste:!0},fnrConfig:{isFind:!0,isReplace:!0},virtualXConfig:{gt:24,preSize:1,oSize:0},virtualYConfig:{gt:100,preSize:1,oSize:0},scrollbarConfig:{}},grid:{formConfig:{enabled:!0},pagerConfig:{enabled:!0},toolbarConfig:{enabled:!0},proxyConfig:{enabled:!0,autoLoad:!0,showLoading:!0,showResponseMsg:!0,showActionMsg:!0,response:{list:null,result:"result",total:"page.total",message:"message"}}},toolbar:{}}),"vxe-table-icon-"),setTheme=(_core.VxeUI.setIcon({TABLE_SORT_ASC:iconPrefix+"caret-up",TABLE_SORT_DESC:iconPrefix+"caret-down",TABLE_FILTER_NONE:iconPrefix+"funnel",TABLE_FILTER_MATCH:iconPrefix+"funnel",TABLE_EDIT:iconPrefix+"edit",TABLE_TITLE_PREFIX:iconPrefix+"question-circle-fill",TABLE_TITLE_SUFFIX:iconPrefix+"question-circle-fill",TABLE_TREE_LOADED:iconPrefix+"spinner roll",TABLE_TREE_OPEN:iconPrefix+"caret-right rotate90",TABLE_TREE_CLOSE:iconPrefix+"caret-right",TABLE_EXPAND_LOADED:iconPrefix+"spinner roll",TABLE_EXPAND_OPEN:iconPrefix+"arrow-right rotate90",TABLE_EXPAND_CLOSE:iconPrefix+"arrow-right",TABLE_CHECKBOX_CHECKED:iconPrefix+"checkbox-checked-fill",TABLE_CHECKBOX_UNCHECKED:iconPrefix+"checkbox-unchecked",TABLE_CHECKBOX_INDETERMINATE:iconPrefix+"checkbox-indeterminate-fill",TABLE_CHECKBOX_DISABLED_UNCHECKED:iconPrefix+"checkbox-unchecked-fill",TABLE_RADIO_CHECKED:iconPrefix+"radio-checked-fill",TABLE_RADIO_UNCHECKED:iconPrefix+"radio-unchecked",TABLE_RADIO_DISABLED_UNCHECKED:iconPrefix+"radio-unchecked-fill",TABLE_CUSTOM_SORT:iconPrefix+"drag-handle",TABLE_MENU_OPTIONS:iconPrefix+"arrow-right",TABLE_DRAG_ROW:iconPrefix+"drag-handle",TABLE_DRAG_COLUMN:iconPrefix+"drag-handle",TABLE_DRAG_STATUS_ROW:iconPrefix+"sort",TABLE_DRAG_STATUS_SUB_ROW:iconPrefix+"add-sub",TABLE_DRAG_STATUS_AGG_GROUP:iconPrefix+"grouping",TABLE_DRAG_STATUS_AGG_VALUES:iconPrefix+"values",TABLE_DRAG_STATUS_COLUMN:iconPrefix+"swap",TABLE_DRAG_DISABLED:iconPrefix+"no-drop",TABLE_ROW_GROUP_OPEN:iconPrefix+"arrow-right rotate90",TABLE_ROW_GROUP_CLOSE:iconPrefix+"arrow-right",TABLE_AGGREGATE_GROUPING:iconPrefix+"grouping",TABLE_AGGREGATE_VALUES:iconPrefix+"values",TABLE_AGGREGATE_SORT:iconPrefix+"drag-handle",TABLE_AGGREGATE_DELETE:iconPrefix+"close",TOOLBAR_TOOLS_REFRESH:iconPrefix+"repeat",TOOLBAR_TOOLS_REFRESH_LOADING:iconPrefix+"repeat roll",TOOLBAR_TOOLS_IMPORT:iconPrefix+"upload",TOOLBAR_TOOLS_EXPORT:iconPrefix+"download",TOOLBAR_TOOLS_PRINT:iconPrefix+"print",TOOLBAR_TOOLS_FULLSCREEN:iconPrefix+"fullscreen",TOOLBAR_TOOLS_MINIMIZE:iconPrefix+"minimize",TOOLBAR_TOOLS_CUSTOM:iconPrefix+"custom-column",TOOLBAR_TOOLS_FIXED_LEFT:iconPrefix+"fixed-left",TOOLBAR_TOOLS_FIXED_LEFT_ACTIVE:iconPrefix+"fixed-left-fill",TOOLBAR_TOOLS_FIXED_RIGHT:iconPrefix+"fixed-right",TOOLBAR_TOOLS_FIXED_RIGHT_ACTIVE:iconPrefix+"fixed-right-fill"}),exports.setTheme=_core.VxeUI.setTheme),getTheme=exports.getTheme=_core.VxeUI.getTheme,setConfig=exports.setConfig=_core.VxeUI.setConfig,getConfig=exports.getConfig=_core.VxeUI.getConfig,setIcon=exports.setIcon=_core.VxeUI.setIcon,getIcon=exports.getIcon=_core.VxeUI.getIcon,setLanguage=exports.setLanguage=_core.VxeUI.setLanguage,setI18n=exports.setI18n=_core.VxeUI.setI18n,getI18n=exports.getI18n=_core.VxeUI.getI18n,globalEvents=exports.globalEvents=_core.VxeUI.globalEvents,globalResize=exports.globalResize=_core.VxeUI.globalResize,renderer=exports.renderer=_core.VxeUI.renderer,validators=exports.validators=_core.VxeUI.validators,menus=exports.menus=_core.VxeUI.menus,formats=exports.formats=_core.VxeUI.formats,commands=exports.commands=_core.VxeUI.commands,interceptor=exports.interceptor=_core.VxeUI.interceptor,clipboard=exports.clipboard=_core.VxeUI.clipboard,log=exports.log=_core.VxeUI.log,hooks=exports.hooks=_core.VxeUI.hooks,use=exports.use=_core.VxeUI.use,setup=e=>_core.VxeUI.setConfig(e),config=(exports.setup=setup,_core.VxeUI.setup=setup,e=>_core.VxeUI.setConfig(e)),t=(exports.config=config,_core.VxeUI.config=config,(e,o)=>_core.VxeUI.getI18n(e,o)),_t=(exports.t=t,_core.VxeUI.t=t,(e,o)=>(0,_utils.getFuncText)(e,o)),VXETable=(exports._t=_t,_core.VxeUI._t=_t,exports.VXETable=_core.VxeUI),saveFile=e=>_core.VxeUI.saveFile(e),readFile=(exports.saveFile=saveFile,e=>_core.VxeUI.readFile(e)),print=(exports.readFile=readFile,e=>_core.VxeUI.print(e)),modal=(exports.print=print,exports.modal={get(e){return _core.VxeUI.modal.get(e)},close(e){return _core.VxeUI.modal.close(e)},open(e){return _core.VxeUI.modal.open(e)},alert(e,o,r){return _core.VxeUI.modal.alert(e,o,r)},confirm(e,o,r){return _core.VxeUI.modal.confirm(e,o,r)},message(e,o){return _core.VxeUI.modal.message(e,o)},notification(e,o,r){return _core.VxeUI.modal.notification(e,o,r)}});var _default=exports.default=_core.VxeUI;
|
package/lib/ui/src/log.js
CHANGED
|
@@ -8,6 +8,6 @@ var _core = require("@vxe-ui/core");
|
|
|
8
8
|
const {
|
|
9
9
|
log
|
|
10
10
|
} = _core.VxeUI;
|
|
11
|
-
const version = `table v${"4.15.
|
|
11
|
+
const version = `table v${"4.15.2"}`;
|
|
12
12
|
const warnLog = exports.warnLog = log.create('warn', version);
|
|
13
13
|
const errLog = exports.errLog = log.create('error', version);
|
package/lib/ui/src/log.min.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
Object.defineProperty(exports,"__esModule",{value:!0}),exports.warnLog=exports.errLog=void 0;var _core=require("@vxe-ui/core");let log=_core.VxeUI.log,version="table v4.15.
|
|
1
|
+
Object.defineProperty(exports,"__esModule",{value:!0}),exports.warnLog=exports.errLog=void 0;var _core=require("@vxe-ui/core");let log=_core.VxeUI.log,version="table v4.15.2",warnLog=exports.warnLog=log.create("warn",version),errLog=exports.errLog=log.create("error",version);
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "vxe-table",
|
|
3
|
-
"version": "4.15.
|
|
3
|
+
"version": "4.15.2",
|
|
4
4
|
"description": "A PC-end table component based on Vxe UI, supporting copy-paste, data pivot table, and high-performance virtual list table solution.",
|
|
5
5
|
"scripts": {
|
|
6
6
|
"update": "npm install --legacy-peer-deps",
|
|
@@ -125,6 +125,9 @@ VxeUI.hooks.add('tableCustomModule', {
|
|
|
125
125
|
$xeTable.handleUpdateAggData()
|
|
126
126
|
}
|
|
127
127
|
}
|
|
128
|
+
if (allowSort) {
|
|
129
|
+
internalData.collectColumn = customColumnList
|
|
130
|
+
}
|
|
128
131
|
return $xeTable.saveCustomStore('confirm')
|
|
129
132
|
}
|
|
130
133
|
|
|
@@ -195,6 +198,10 @@ VxeUI.hooks.add('tableCustomModule', {
|
|
|
195
198
|
}
|
|
196
199
|
|
|
197
200
|
const customMethods: TableCustomMethods = {
|
|
201
|
+
getCustomVisible () {
|
|
202
|
+
const { customStore } = reactData
|
|
203
|
+
return customStore.visible
|
|
204
|
+
},
|
|
198
205
|
openCustom,
|
|
199
206
|
closeCustom,
|
|
200
207
|
toggleCustom,
|
|
@@ -514,11 +514,39 @@ export default defineVxeComponent({
|
|
|
514
514
|
})
|
|
515
515
|
|
|
516
516
|
const computeVirtualXOpts = computed(() => {
|
|
517
|
-
|
|
517
|
+
const { virtualXConfig, scrollX } = props
|
|
518
|
+
const globalVirtualXConfig = getConfig().table.virtualXConfig
|
|
519
|
+
const globalScrollX = getConfig().table.scrollX
|
|
520
|
+
if (virtualXConfig) {
|
|
521
|
+
return Object.assign({}, globalVirtualXConfig, virtualXConfig) as VxeTablePropTypes.VirtualXConfig & { gt: number }
|
|
522
|
+
}
|
|
523
|
+
if (scrollX) {
|
|
524
|
+
// 已废弃，保留兼容
|
|
525
|
+
return Object.assign({}, globalScrollX, scrollX) as VxeTablePropTypes.VirtualXConfig & { gt: number }
|
|
526
|
+
}
|
|
527
|
+
if (globalVirtualXConfig) {
|
|
528
|
+
return Object.assign({}, globalVirtualXConfig, virtualXConfig) as VxeTablePropTypes.VirtualXConfig & { gt: number }
|
|
529
|
+
}
|
|
530
|
+
// 已废弃，保留兼容
|
|
531
|
+
return Object.assign({}, globalScrollX, scrollX) as VxeTablePropTypes.VirtualXConfig & { gt: number }
|
|
518
532
|
})
|
|
519
533
|
|
|
520
534
|
const computeVirtualYOpts = computed(() => {
|
|
521
|
-
|
|
535
|
+
const { virtualYConfig, scrollY } = props
|
|
536
|
+
const globalVirtualYConfig = getConfig().table.virtualYConfig
|
|
537
|
+
const globalScrollY = getConfig().table.scrollY
|
|
538
|
+
if (virtualYConfig) {
|
|
539
|
+
return Object.assign({}, globalVirtualYConfig, virtualYConfig) as VxeTablePropTypes.VirtualYConfig & { gt: number }
|
|
540
|
+
}
|
|
541
|
+
if (scrollY) {
|
|
542
|
+
// 已废弃，保留兼容
|
|
543
|
+
return Object.assign({}, globalScrollY, scrollY) as VxeTablePropTypes.VirtualYConfig & { gt: number }
|
|
544
|
+
}
|
|
545
|
+
if (globalVirtualYConfig) {
|
|
546
|
+
return Object.assign({}, globalVirtualYConfig, virtualYConfig) as VxeTablePropTypes.VirtualYConfig & { gt: number }
|
|
547
|
+
}
|
|
548
|
+
// 已废弃，保留兼容
|
|
549
|
+
return Object.assign({}, globalScrollY, scrollY) as VxeTablePropTypes.VirtualYConfig & { gt: number }
|
|
522
550
|
})
|
|
523
551
|
|
|
524
552
|
const computeScrollbarOpts = computed(() => {
|
|
@@ -1669,8 +1697,8 @@ export default defineVxeComponent({
|
|
|
1669
1697
|
*/
|
|
1670
1698
|
const cacheColumnMap = () => {
|
|
1671
1699
|
const { tableFullColumn, collectColumn } = internalData
|
|
1672
|
-
const
|
|
1673
|
-
const
|
|
1700
|
+
const fullColIdData: Record<string, VxeTableDefines.ColumnCacheItem> = internalData.fullColumnIdData = {}
|
|
1701
|
+
const fullColFieldData: Record<string, VxeTableDefines.ColumnCacheItem> = internalData.fullColumnFieldData = {}
|
|
1674
1702
|
const mouseOpts = computeMouseOpts.value
|
|
1675
1703
|
const expandOpts = computeExpandOpts.value
|
|
1676
1704
|
const columnOpts = computeColumnOpts.value
|
|
@@ -1693,10 +1721,10 @@ export default defineVxeComponent({
|
|
|
1693
1721
|
const { id: colid, field, fixed, type, treeNode, rowGroupNode } = column
|
|
1694
1722
|
const rest = { $index: -1, _index: -1, column, colid, index, items, parent: parentColumn || null, width: 0, oLeft: 0 }
|
|
1695
1723
|
if (field) {
|
|
1696
|
-
if (
|
|
1724
|
+
if (fullColFieldData[field]) {
|
|
1697
1725
|
errLog('vxe.error.colRepet', ['field', field])
|
|
1698
1726
|
}
|
|
1699
|
-
|
|
1727
|
+
fullColFieldData[field] = rest
|
|
1700
1728
|
} else {
|
|
1701
1729
|
if ((storage && !type) || (columnOpts.drag && (isCrossDrag || isSelfToChildDrag))) {
|
|
1702
1730
|
errLog('vxe.error.reqProp', [`${column.getTitle() || type || ''} -> column.field=?`])
|
|
@@ -1750,10 +1778,10 @@ export default defineVxeComponent({
|
|
|
1750
1778
|
if (isAllOverflow && column.showOverflow === false) {
|
|
1751
1779
|
isAllOverflow = false
|
|
1752
1780
|
}
|
|
1753
|
-
if (
|
|
1781
|
+
if (fullColIdData[colid]) {
|
|
1754
1782
|
errLog('vxe.error.colRepet', ['colId', colid])
|
|
1755
1783
|
}
|
|
1756
|
-
|
|
1784
|
+
fullColIdData[colid] = rest
|
|
1757
1785
|
}
|
|
1758
1786
|
if (isGroup) {
|
|
1759
1787
|
XEUtils.eachTree(collectColumn, (column, index, items, path, parentColumn, nodes) => {
|
|
@@ -1773,10 +1801,10 @@ export default defineVxeComponent({
|
|
|
1773
1801
|
|
|
1774
1802
|
if (htmlColumn) {
|
|
1775
1803
|
if (!columnOpts.useKey) {
|
|
1776
|
-
errLog('vxe.error.
|
|
1804
|
+
errLog('vxe.error.notSupportProp', ['column.type=html', 'column-config.useKey=false', 'column-config.useKey=true'])
|
|
1777
1805
|
}
|
|
1778
1806
|
if (!rowOpts.useKey) {
|
|
1779
|
-
errLog('vxe.error.
|
|
1807
|
+
errLog('vxe.error.notSupportProp', ['column.type=html', 'row-config.useKey=false', 'row-config.useKey=true'])
|
|
1780
1808
|
}
|
|
1781
1809
|
}
|
|
1782
1810
|
|
|
@@ -3822,15 +3850,28 @@ export default defineVxeComponent({
|
|
|
3822
3850
|
|
|
3823
3851
|
const initColumnHierarchy = () => {
|
|
3824
3852
|
const { collectColumn } = internalData
|
|
3853
|
+
const fullColIdData: Record<string, VxeTableDefines.ColumnCacheItem> = {}
|
|
3854
|
+
const fullColFieldData: Record<string, VxeTableDefines.ColumnCacheItem> = {}
|
|
3825
3855
|
let sortIndex = 1
|
|
3826
3856
|
XEUtils.eachTree(collectColumn, (column, index, items, path, parentColumn) => {
|
|
3857
|
+
const { id: colid, field } = column
|
|
3827
3858
|
const parentId = parentColumn ? parentColumn.id : null
|
|
3859
|
+
const rest = { $index: -1, _index: -1, column, colid, index, items, parent: parentColumn || null, width: 0, oLeft: 0 }
|
|
3828
3860
|
column.parentId = parentId
|
|
3829
3861
|
column.defaultParentId = parentId
|
|
3830
3862
|
column.sortNumber = sortIndex
|
|
3831
3863
|
column.renderSortNumber = sortIndex
|
|
3832
3864
|
sortIndex++
|
|
3865
|
+
if (field) {
|
|
3866
|
+
if (fullColFieldData[field]) {
|
|
3867
|
+
errLog('vxe.error.colRepet', ['field', field])
|
|
3868
|
+
}
|
|
3869
|
+
fullColFieldData[field] = rest
|
|
3870
|
+
}
|
|
3871
|
+
fullColIdData[colid] = rest
|
|
3833
3872
|
})
|
|
3873
|
+
internalData.fullColumnIdData = fullColIdData
|
|
3874
|
+
internalData.fullColumnFieldData = fullColFieldData
|
|
3834
3875
|
}
|
|
3835
3876
|
|
|
3836
3877
|
const handleInitColumn = (collectColumn: VxeTableDefines.ColumnInfo[]) => {
|
package/packages/ui/index.ts
CHANGED
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|