vxe-table 4.15.0-beta.11 → 4.15.0-beta.13
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/grid/src/grid.js +38 -6
- package/es/style.css +1 -1
- package/es/table/module/edit/hook.js +5 -5
- package/es/table/src/body.js +7 -6
- package/es/table/src/table.js +14 -10
- package/es/ui/index.js +1 -1
- package/es/ui/src/log.js +1 -1
- package/lib/grid/src/grid.js +48 -6
- package/lib/grid/src/grid.min.js +1 -1
- package/lib/index.umd.js +67 -19
- package/lib/index.umd.min.js +1 -1
- package/lib/style.css +1 -1
- package/lib/table/module/edit/hook.js +5 -0
- package/lib/table/module/edit/hook.min.js +1 -1
- package/lib/table/src/body.js +7 -6
- package/lib/table/src/body.min.js +1 -1
- package/lib/table/src/table.js +5 -5
- package/lib/table/src/table.min.js +1 -1
- package/lib/ui/index.js +1 -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 +2 -2
- package/packages/grid/src/grid.ts +39 -6
- package/packages/table/module/edit/hook.ts +5 -5
- package/packages/table/src/body.ts +7 -6
- package/packages/table/src/table.ts +14 -10
- /package/es/{iconfont.1753525726129.ttf → iconfont.1753775832074.ttf} +0 -0
- /package/es/{iconfont.1753525726129.woff → iconfont.1753775832074.woff} +0 -0
- /package/es/{iconfont.1753525726129.woff2 → iconfont.1753775832074.woff2} +0 -0
- /package/lib/{iconfont.1753525726129.ttf → iconfont.1753775832074.ttf} +0 -0
- /package/lib/{iconfont.1753525726129.woff → iconfont.1753775832074.woff} +0 -0
- /package/lib/{iconfont.1753525726129.woff2 → iconfont.1753775832074.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.0-beta.
|
|
16
|
+
const version = exports.version = "4.15.0-beta.13";
|
|
17
17
|
_core.VxeUI.version = version;
|
|
18
18
|
_core.VxeUI.tableVersion = version;
|
|
19
19
|
_core.VxeUI.setConfig({
|
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.0-beta.
|
|
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.0-beta.13",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.0-beta.
|
|
11
|
+
const version = `table v${"4.15.0-beta.13"}`;
|
|
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.0-beta.
|
|
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.0-beta.13",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.0-beta.
|
|
3
|
+
"version": "4.15.0-beta.13",
|
|
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",
|
|
@@ -28,7 +28,7 @@
|
|
|
28
28
|
"style": "lib/style.css",
|
|
29
29
|
"typings": "types/index.d.ts",
|
|
30
30
|
"dependencies": {
|
|
31
|
-
"vxe-pc-ui": "^4.
|
|
31
|
+
"vxe-pc-ui": "^4.8.0"
|
|
32
32
|
},
|
|
33
33
|
"devDependencies": {
|
|
34
34
|
"@types/resize-observer-browser": "^0.1.11",
|
|
@@ -243,6 +243,11 @@ export default defineVxeComponent({
|
|
|
243
243
|
return pagerOpts.total
|
|
244
244
|
})
|
|
245
245
|
|
|
246
|
+
const computePageCount = computed(() => {
|
|
247
|
+
const { tablePage } = reactData
|
|
248
|
+
return Math.max(Math.ceil(tablePage.total / tablePage.pageSize), 1)
|
|
249
|
+
})
|
|
250
|
+
|
|
246
251
|
const computeIsLoading = computed(() => {
|
|
247
252
|
const { loading, proxyConfig } = props
|
|
248
253
|
const { tableLoading } = reactData
|
|
@@ -315,7 +320,7 @@ export default defineVxeComponent({
|
|
|
315
320
|
tablePage.pageSize = pageSize
|
|
316
321
|
}
|
|
317
322
|
if (total) {
|
|
318
|
-
tablePage.
|
|
323
|
+
tablePage.total = total
|
|
319
324
|
}
|
|
320
325
|
}
|
|
321
326
|
}
|
|
@@ -1261,6 +1266,9 @@ export default defineVxeComponent({
|
|
|
1261
1266
|
}
|
|
1262
1267
|
return nextTick()
|
|
1263
1268
|
},
|
|
1269
|
+
getParams () {
|
|
1270
|
+
return props.params
|
|
1271
|
+
},
|
|
1264
1272
|
zoom () {
|
|
1265
1273
|
if (reactData.isZMax) {
|
|
1266
1274
|
return gridMethods.revert()
|
|
@@ -1316,26 +1324,51 @@ export default defineVxeComponent({
|
|
|
1316
1324
|
return nextTick()
|
|
1317
1325
|
},
|
|
1318
1326
|
homePage () {
|
|
1327
|
+
const { tablePage } = reactData
|
|
1328
|
+
tablePage.currentPage = 1
|
|
1329
|
+
return nextTick()
|
|
1330
|
+
},
|
|
1331
|
+
homePageByEvent (evnt) {
|
|
1319
1332
|
const $pager = refPager.value
|
|
1320
1333
|
if ($pager) {
|
|
1321
|
-
|
|
1334
|
+
$pager.homePageByEvent(evnt)
|
|
1322
1335
|
}
|
|
1323
|
-
return nextTick()
|
|
1324
1336
|
},
|
|
1325
1337
|
endPage () {
|
|
1338
|
+
const { tablePage } = reactData
|
|
1339
|
+
const pageCount = computePageCount.value
|
|
1340
|
+
tablePage.currentPage = pageCount
|
|
1341
|
+
return nextTick()
|
|
1342
|
+
},
|
|
1343
|
+
endPageByEvent (evnt) {
|
|
1326
1344
|
const $pager = refPager.value
|
|
1327
1345
|
if ($pager) {
|
|
1328
|
-
|
|
1346
|
+
$pager.endPageByEvent(evnt)
|
|
1329
1347
|
}
|
|
1348
|
+
},
|
|
1349
|
+
setCurrentPage (currentPage) {
|
|
1350
|
+
const { tablePage } = reactData
|
|
1351
|
+
const pageCount = computePageCount.value
|
|
1352
|
+
tablePage.currentPage = Math.min(pageCount, Math.max(1, XEUtils.toNumber(currentPage)))
|
|
1330
1353
|
return nextTick()
|
|
1331
1354
|
},
|
|
1332
|
-
|
|
1355
|
+
setCurrentPageByEvent (evnt, currentPage) {
|
|
1333
1356
|
const $pager = refPager.value
|
|
1334
1357
|
if ($pager) {
|
|
1335
|
-
|
|
1358
|
+
$pager.setCurrentPageByEvent(evnt, currentPage)
|
|
1336
1359
|
}
|
|
1360
|
+
},
|
|
1361
|
+
setPageSize (pageSize) {
|
|
1362
|
+
const { tablePage } = reactData
|
|
1363
|
+
tablePage.pageSize = Math.max(1, XEUtils.toNumber(pageSize))
|
|
1337
1364
|
return nextTick()
|
|
1338
1365
|
},
|
|
1366
|
+
setPageSizeByEvent (evnt, pageSize) {
|
|
1367
|
+
const $pager = refPager.value
|
|
1368
|
+
if ($pager) {
|
|
1369
|
+
$pager.setPageSizeByEvent(evnt, pageSize)
|
|
1370
|
+
}
|
|
1371
|
+
},
|
|
1339
1372
|
getProxyInfo () {
|
|
1340
1373
|
const $xeTable = refTable.value
|
|
1341
1374
|
if (props.proxyConfig) {
|
|
@@ -88,7 +88,7 @@ hooks.add('tableEditModule', {
|
|
|
88
88
|
}
|
|
89
89
|
parentChilds[funcName](item)
|
|
90
90
|
mapChilds[funcName](item)
|
|
91
|
-
const rest = { row: item, rowid, seq: -1, index: -1, _index: -1, $index: -1, treeIndex: -1, items: parentChilds, parent: parentRow, level: parentLevel + 1, height: 0, resizeHeight: 0, oTop: 0, expandHeight: 0 }
|
|
91
|
+
const rest = { row: item, rowid, seq: -1, index: -1, _index: -1, $index: -1, treeIndex: -1, _tIndex: -1, items: parentChilds, parent: parentRow, level: parentLevel + 1, height: 0, resizeHeight: 0, oTop: 0, expandHeight: 0 }
|
|
92
92
|
fullDataRowIdData[rowid] = rest
|
|
93
93
|
fullAllDataRowIdData[rowid] = rest
|
|
94
94
|
} else {
|
|
@@ -97,7 +97,7 @@ hooks.add('tableEditModule', {
|
|
|
97
97
|
}
|
|
98
98
|
afterFullData[funcName](item)
|
|
99
99
|
tableFullTreeData[funcName](item)
|
|
100
|
-
const rest = { row: item, rowid, seq: -1, index: -1, _index: -1, $index: -1, treeIndex: -1, items: tableFullTreeData, parent: null, level: 0, height: 0, resizeHeight: 0, oTop: 0, expandHeight: 0 }
|
|
100
|
+
const rest = { row: item, rowid, seq: -1, index: -1, _index: -1, $index: -1, treeIndex: -1, _tIndex: -1, items: tableFullTreeData, parent: null, level: 0, height: 0, resizeHeight: 0, oTop: 0, expandHeight: 0 }
|
|
101
101
|
fullDataRowIdData[rowid] = rest
|
|
102
102
|
fullAllDataRowIdData[rowid] = rest
|
|
103
103
|
}
|
|
@@ -133,7 +133,7 @@ hooks.add('tableEditModule', {
|
|
|
133
133
|
} else {
|
|
134
134
|
newRecords.forEach(item => {
|
|
135
135
|
const rowid = getRowid($xeTable, item)
|
|
136
|
-
const rest = { row: item, rowid, seq: -1, index: -1, _index: -1, $index: -1, treeIndex: -1, items: afterFullData, parent: null, level: 0, height: 0, resizeHeight: 0, oTop: 0, expandHeight: 0 }
|
|
136
|
+
const rest = { row: item, rowid, seq: -1, index: -1, _index: -1, $index: -1, treeIndex: -1, _tIndex: -1, items: afterFullData, parent: null, level: 0, height: 0, resizeHeight: 0, oTop: 0, expandHeight: 0 }
|
|
137
137
|
fullDataRowIdData[rowid] = rest
|
|
138
138
|
fullAllDataRowIdData[rowid] = rest
|
|
139
139
|
afterFullData.unshift(item)
|
|
@@ -162,7 +162,7 @@ hooks.add('tableEditModule', {
|
|
|
162
162
|
} else {
|
|
163
163
|
newRecords.forEach(item => {
|
|
164
164
|
const rowid = getRowid($xeTable, item)
|
|
165
|
-
const rest = { row: item, rowid, seq: -1, index: -1, _index: -1, treeIndex: -1, $index: -1, items: afterFullData, parent: null, level: 0, height: 0, resizeHeight: 0, oTop: 0, expandHeight: 0 }
|
|
165
|
+
const rest = { row: item, rowid, seq: -1, index: -1, _index: -1, treeIndex: -1, _tIndex: -1, $index: -1, items: afterFullData, parent: null, level: 0, height: 0, resizeHeight: 0, oTop: 0, expandHeight: 0 }
|
|
166
166
|
fullDataRowIdData[rowid] = rest
|
|
167
167
|
fullAllDataRowIdData[rowid] = rest
|
|
168
168
|
afterFullData.push(item)
|
|
@@ -193,7 +193,7 @@ hooks.add('tableEditModule', {
|
|
|
193
193
|
targetIndex = targetIndex + 1
|
|
194
194
|
}
|
|
195
195
|
parentMapChilds.splice(targetIndex, 0, item)
|
|
196
|
-
const rest = { row: item, rowid, seq: -1, index: -1, _index: -1, $index: -1, treeIndex: -1, items: parentMapChilds, parent: parentRow, level: parentLevel + 1, height: 0, resizeHeight: 0, oTop: 0, expandHeight: 0 }
|
|
196
|
+
const rest = { row: item, rowid, seq: -1, index: -1, _index: -1, $index: -1, treeIndex: -1, _tIndex: -1, items: parentMapChilds, parent: parentRow, level: parentLevel + 1, height: 0, resizeHeight: 0, oTop: 0, expandHeight: 0 }
|
|
197
197
|
fullDataRowIdData[rowid] = rest
|
|
198
198
|
fullAllDataRowIdData[rowid] = rest
|
|
199
199
|
})
|
|
@@ -284,7 +284,7 @@ export default defineVxeComponent({
|
|
|
284
284
|
isDirty = $xeTable.isUpdateByRow(row, column.field)
|
|
285
285
|
}
|
|
286
286
|
|
|
287
|
-
const isVNAutoHeight =
|
|
287
|
+
const isVNAutoHeight = !hasEllipsis && (scrollYLoad || scrollXLoad)
|
|
288
288
|
let cellHeight = getCellRestHeight(rowRest, cellOpts, rowOpts, defaultRowHeight)
|
|
289
289
|
|
|
290
290
|
const isLastColumn = $columnIndex === columns.length - 1
|
|
@@ -324,7 +324,7 @@ export default defineVxeComponent({
|
|
|
324
324
|
}
|
|
325
325
|
tcStyle.width = `${column.renderWidth + mergeColWidth - cellOffsetWidth}px`
|
|
326
326
|
}
|
|
327
|
-
if (scrollYLoad || hasEllipsis || isCsHeight || isRsHeight) {
|
|
327
|
+
if (scrollYLoad || scrollXLoad || hasEllipsis || isCsHeight || isRsHeight) {
|
|
328
328
|
tcStyle.height = `${cellHeight}px`
|
|
329
329
|
} else {
|
|
330
330
|
tcStyle.minHeight = `${cellHeight}px`
|
|
@@ -509,14 +509,15 @@ export default defineVxeComponent({
|
|
|
509
509
|
}
|
|
510
510
|
}
|
|
511
511
|
if (rowRest) {
|
|
512
|
+
rowIndex = rowRest.index
|
|
513
|
+
_rowIndex = rowRest._index
|
|
512
514
|
rowLevel = rowRest.level
|
|
515
|
+
seq = rowRest.seq
|
|
513
516
|
if (hasRowGroupAggregate || (treeConfig && transform && seqMode === 'increasing')) {
|
|
514
517
|
seq = rowRest._index + 1
|
|
515
|
-
} else {
|
|
516
|
-
seq = rowRest.
|
|
518
|
+
} else if ((treeConfig && seqMode === 'fixed')) {
|
|
519
|
+
seq = rowRest._tIndex + 1
|
|
517
520
|
}
|
|
518
|
-
rowIndex = rowRest.index
|
|
519
|
-
_rowIndex = rowRest._index
|
|
520
521
|
}
|
|
521
522
|
const params = { $table: $xeTable, seq, rowid, fixed: fixedType, type: renderType, level: rowLevel, row, rowIndex, $rowIndex, _rowIndex }
|
|
522
523
|
// 行是否被展开
|
|
@@ -1920,7 +1920,7 @@ export default defineVxeComponent({
|
|
|
1920
1920
|
const { fullAllDataRowIdData } = internalData
|
|
1921
1921
|
const defaultRowHeight = computeDefaultRowHeight.value
|
|
1922
1922
|
const el = refElem.value
|
|
1923
|
-
if (!isAllOverflow && scrollYLoad && el) {
|
|
1923
|
+
if (!isAllOverflow && (scrollYLoad || scrollXLoad) && el) {
|
|
1924
1924
|
const { handleGetRowId } = createHandleGetRowId($xeTable)
|
|
1925
1925
|
el.setAttribute('data-calc-row', 'Y')
|
|
1926
1926
|
tableData.forEach(row => {
|
|
@@ -1971,7 +1971,7 @@ export default defineVxeComponent({
|
|
|
1971
1971
|
}
|
|
1972
1972
|
rowRest._index = index
|
|
1973
1973
|
} else {
|
|
1974
|
-
const rest = { row, rowid, seq, index: -1, $index: -1, _index: index, treeIndex: -1, items: [], parent: null, level: 0, height: 0, resizeHeight: 0, oTop: 0, expandHeight: 0 }
|
|
1974
|
+
const rest = { row, rowid, seq, index: -1, $index: -1, _index: index, treeIndex: -1, _tIndex: -1, items: [], parent: null, level: 0, height: 0, resizeHeight: 0, oTop: 0, expandHeight: 0 }
|
|
1975
1975
|
fullAllDataRowIdData[rowid] = rest
|
|
1976
1976
|
fullDataRowIdData[rowid] = rest
|
|
1977
1977
|
}
|
|
@@ -1992,6 +1992,7 @@ export default defineVxeComponent({
|
|
|
1992
1992
|
const childrenField = treeOpts.children || treeOpts.childrenField
|
|
1993
1993
|
const fullMaps: Record<string, any> = {}
|
|
1994
1994
|
if (treeConfig) {
|
|
1995
|
+
let _treeIndex = 0
|
|
1995
1996
|
const { handleGetRowId } = createHandleGetRowId($xeTable)
|
|
1996
1997
|
XEUtils.eachTree(afterTreeFullData, (row, index, items, path) => {
|
|
1997
1998
|
const rowid = handleGetRowId(row)
|
|
@@ -2000,11 +2001,13 @@ export default defineVxeComponent({
|
|
|
2000
2001
|
if (rowRest) {
|
|
2001
2002
|
rowRest.seq = seq
|
|
2002
2003
|
rowRest.treeIndex = index
|
|
2004
|
+
rowRest._tIndex = _treeIndex
|
|
2003
2005
|
} else {
|
|
2004
|
-
const rest = { row, rowid, seq, index: -1, $index: -1, _index: -1, treeIndex: -1, items: [], parent: null, level: 0, height: 0, resizeHeight: 0, oTop: 0, expandHeight: 0 }
|
|
2006
|
+
const rest = { row, rowid, seq, index: -1, $index: -1, _index: -1, treeIndex: -1, _tIndex: _treeIndex, items: [], parent: null, level: 0, height: 0, resizeHeight: 0, oTop: 0, expandHeight: 0 }
|
|
2005
2007
|
fullAllDataRowIdData[rowid] = rest
|
|
2006
2008
|
fullDataRowIdData[rowid] = rest
|
|
2007
2009
|
}
|
|
2010
|
+
_treeIndex++
|
|
2008
2011
|
fullMaps[rowid] = row
|
|
2009
2012
|
}, { children: transform ? treeOpts.mapChildrenField : childrenField })
|
|
2010
2013
|
if (transform) {
|
|
@@ -4506,7 +4509,7 @@ export default defineVxeComponent({
|
|
|
4506
4509
|
XEUtils.eachTree(rows, (childRow, index, items, path, parentItem, nodes) => {
|
|
4507
4510
|
const rowid = getRowid($xeTable, childRow)
|
|
4508
4511
|
const parentRow = parentItem || parentRest.row
|
|
4509
|
-
const rest = { row: childRow, rowid, seq: -1, index, _index: -1, $index: -1, treeIndex: -1, items, parent: parentRow, level: parentLevel + nodes.length, height: 0, resizeHeight: 0, oTop: 0, expandHeight: 0 }
|
|
4512
|
+
const rest = { row: childRow, rowid, seq: -1, index, _index: -1, $index: -1, treeIndex: -1, _tIndex: -1, items, parent: parentRow, level: parentLevel + nodes.length, height: 0, resizeHeight: 0, oTop: 0, expandHeight: 0 }
|
|
4510
4513
|
fullDataRowIdData[rowid] = rest
|
|
4511
4514
|
fullAllDataRowIdData[rowid] = rest
|
|
4512
4515
|
}, { children: childrenField })
|
|
@@ -7978,7 +7981,7 @@ export default defineVxeComponent({
|
|
|
7978
7981
|
const handleRowCache = (row: any, index: number, items: any, currIndex: number, parentRow: any, rowid: string, level: number, seq: string | number) => {
|
|
7979
7982
|
let rowRest = fullAllDataRowIdMaps[rowid]
|
|
7980
7983
|
if (!rowRest) {
|
|
7981
|
-
rowRest = { row, rowid, seq, index: -1, _index: -1, $index: -1, treeIndex: index, items, parent: parentRow, level, height: 0, resizeHeight: 0, oTop: 0, expandHeight: 0 }
|
|
7984
|
+
rowRest = { row, rowid, seq, index: -1, _index: -1, $index: -1, treeIndex: index, _tIndex: -1, items, parent: parentRow, level, height: 0, resizeHeight: 0, oTop: 0, expandHeight: 0 }
|
|
7982
7985
|
fullDataRowIdMaps[rowid] = rowRest
|
|
7983
7986
|
fullAllDataRowIdMaps[rowid] = rowRest
|
|
7984
7987
|
}
|
|
@@ -11266,15 +11269,16 @@ export default defineVxeComponent({
|
|
|
11266
11269
|
let rowIndex = -1
|
|
11267
11270
|
let $rowIndex = -1
|
|
11268
11271
|
if (rowRest) {
|
|
11272
|
+
rowIndex = rowRest.index
|
|
11273
|
+
$rowIndex = rowRest.$index
|
|
11274
|
+
_rowIndex = rowRest._index
|
|
11269
11275
|
rowLevel = rowRest.level
|
|
11276
|
+
seq = rowRest.seq
|
|
11270
11277
|
if (isRowGroupStatus || (treeConfig && transform && seqMode === 'increasing')) {
|
|
11271
11278
|
seq = rowRest._index + 1
|
|
11272
|
-
} else {
|
|
11273
|
-
seq = rowRest.
|
|
11279
|
+
} else if ((treeConfig && seqMode === 'fixed')) {
|
|
11280
|
+
seq = rowRest._tIndex + 1
|
|
11274
11281
|
}
|
|
11275
|
-
rowIndex = rowRest.index
|
|
11276
|
-
$rowIndex = rowRest.$index
|
|
11277
|
-
_rowIndex = rowRest._index
|
|
11278
11282
|
}
|
|
11279
11283
|
if (expandHeight) {
|
|
11280
11284
|
cellStyle.height = `${expandHeight}px`
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|