vxe-table 4.17.14 → 4.17.16
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 +1 -1
- package/es/table/src/table.js +42 -25
- package/es/ui/index.js +1 -1
- package/es/ui/src/log.js +1 -1
- package/lib/index.umd.js +26 -17
- package/lib/index.umd.min.js +1 -1
- package/lib/style.css +1 -1
- package/lib/table/module/custom/hook.js +1 -1
- package/lib/table/module/custom/hook.min.js +1 -1
- package/lib/table/src/table.js +23 -14
- 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 +1 -1
- package/packages/table/module/custom/hook.ts +1 -1
- package/packages/table/src/table.ts +44 -25
- /package/es/{iconfont.1762844790572.ttf → iconfont.1763430415372.ttf} +0 -0
- /package/es/{iconfont.1762844790572.woff → iconfont.1763430415372.woff} +0 -0
- /package/es/{iconfont.1762844790572.woff2 → iconfont.1763430415372.woff2} +0 -0
- /package/lib/{iconfont.1762844790572.ttf → iconfont.1763430415372.ttf} +0 -0
- /package/lib/{iconfont.1762844790572.woff → iconfont.1763430415372.woff} +0 -0
- /package/lib/{iconfont.1762844790572.woff2 → iconfont.1763430415372.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.17.
|
|
16
|
+
const version = exports.version = "4.17.16";
|
|
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.17.
|
|
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.17.16",iconPrefix=(_core.VxeUI.version=version,_core.VxeUI.tableVersion=version,_core.VxeUI.setConfig({emptyCell:" ",table:{fit:!0,showHeader:!0,animat:!0,delayHover:250,autoResize:!0,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},headerTooltipConfig:{enterable:!0},footerTooltipConfig:{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"},menuConfig:{destroyOnClose:!0},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:{destroyOnClose:!0,multiple:!0,showIcon:!0},floatingFilterConfig:{},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,showRootLine:!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:{x:{visible:!0},y:{visible:!0}}},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:{},gantt:{}}),"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_MENU_OPTION_LOADING:iconPrefix+"repeat roll",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.17.
|
|
11
|
+
const version = `table v${"4.17.16"}`;
|
|
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.17.
|
|
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.17.16",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.17.
|
|
3
|
+
"version": "4.17.16",
|
|
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",
|
|
@@ -104,7 +104,7 @@ VxeUI.hooks.add('tableCustomModule', {
|
|
|
104
104
|
}
|
|
105
105
|
}
|
|
106
106
|
if (allowResizable) {
|
|
107
|
-
if (column.renderVisible && (!column.children || column.children.length)) {
|
|
107
|
+
if (column.renderVisible && (!column.children || !column.children.length)) {
|
|
108
108
|
if (column.renderResizeWidth !== column.renderWidth) {
|
|
109
109
|
column.resizeWidth = column.renderResizeWidth
|
|
110
110
|
column.renderWidth = column.renderResizeWidth
|
|
@@ -4516,7 +4516,7 @@ export default defineVxeComponent({
|
|
|
4516
4516
|
}
|
|
4517
4517
|
updateRowExpandStyle()
|
|
4518
4518
|
$xeTable.updateCellAreas()
|
|
4519
|
-
},
|
|
4519
|
+
}, 250)
|
|
4520
4520
|
}
|
|
4521
4521
|
|
|
4522
4522
|
const getWheelSpeed = (lastScrollTime: number) => {
|
|
@@ -4927,15 +4927,15 @@ export default defineVxeComponent({
|
|
|
4927
4927
|
if ($xeTable.isAggregateRecord(row)) {
|
|
4928
4928
|
return nextTick()
|
|
4929
4929
|
}
|
|
4930
|
-
const
|
|
4930
|
+
const rowkey = getRowkey($xeTable)
|
|
4931
|
+
const rowid = XEUtils.get(row, rowkey)
|
|
4932
|
+
const oRow = sourceDataRowIdData[rowid]
|
|
4931
4933
|
if (oRow && row) {
|
|
4932
4934
|
if (field) {
|
|
4933
4935
|
const newValue = XEUtils.clone(XEUtils.get(record || row, field), true)
|
|
4934
4936
|
XEUtils.set(row, field, newValue)
|
|
4935
4937
|
XEUtils.set(oRow, field, newValue)
|
|
4936
4938
|
} else {
|
|
4937
|
-
const rowkey = getRowkey($xeTable)
|
|
4938
|
-
const rowid = getRowid($xeTable, row)
|
|
4939
4939
|
const newRecord = XEUtils.clone(Object.assign({}, record), true)
|
|
4940
4940
|
XEUtils.set(newRecord, rowkey, rowid)
|
|
4941
4941
|
XEUtils.destructuring(oRow, Object.assign(row, newRecord))
|
|
@@ -5552,7 +5552,6 @@ export default defineVxeComponent({
|
|
|
5552
5552
|
}
|
|
5553
5553
|
}
|
|
5554
5554
|
const rest = $xeTable.handleRowDragSwapEvent(null, true, dragRow, prevDragRow, dragPos || defPos, dragToChild === true)
|
|
5555
|
-
clearRowDragData()
|
|
5556
5555
|
return rest
|
|
5557
5556
|
},
|
|
5558
5557
|
/**
|
|
@@ -8576,6 +8575,16 @@ export default defineVxeComponent({
|
|
|
8576
8575
|
reactData.dragCol = null
|
|
8577
8576
|
}
|
|
8578
8577
|
|
|
8578
|
+
const clearColDragData = () => {
|
|
8579
|
+
const el = refElem.value
|
|
8580
|
+
hideDropTip()
|
|
8581
|
+
clearColDropOrigin()
|
|
8582
|
+
clearColAnimate(el, ['.vxe-table--column'])
|
|
8583
|
+
internalData.prevDragToChild = false
|
|
8584
|
+
reactData.dragRow = null
|
|
8585
|
+
reactData.dragCol = null
|
|
8586
|
+
}
|
|
8587
|
+
|
|
8579
8588
|
/**
|
|
8580
8589
|
* 处理显示 tooltip
|
|
8581
8590
|
* @param {Event} evnt 事件
|
|
@@ -10397,6 +10406,8 @@ export default defineVxeComponent({
|
|
|
10397
10406
|
const isDragToChildFlag = isSelfToChildDrag && dragToChildMethod ? dragToChildMethod(dragParams) : prevDragToChild
|
|
10398
10407
|
return Promise.resolve(dEndMethod ? dEndMethod(dragParams) : true).then((status) => {
|
|
10399
10408
|
if (!status) {
|
|
10409
|
+
clearRowDragData()
|
|
10410
|
+
clearCrossTableDragStatus()
|
|
10400
10411
|
return errRest
|
|
10401
10412
|
}
|
|
10402
10413
|
|
|
@@ -10532,6 +10543,8 @@ export default defineVxeComponent({
|
|
|
10532
10543
|
afterFullData.splice(nafIndex, 0, dragRow)
|
|
10533
10544
|
tableFullData.splice(ntfIndex, 0, dragRow)
|
|
10534
10545
|
}
|
|
10546
|
+
clearRowDragData()
|
|
10547
|
+
clearCrossTableDragStatus()
|
|
10535
10548
|
|
|
10536
10549
|
$xeTable.handleTableData(treeConfig && transform)
|
|
10537
10550
|
$xeTable.cacheRowMap(false)
|
|
@@ -10646,6 +10659,10 @@ export default defineVxeComponent({
|
|
|
10646
10659
|
}
|
|
10647
10660
|
return Promise.resolve(errRest)
|
|
10648
10661
|
},
|
|
10662
|
+
handleCrossTableRowDragCancelEvent () {
|
|
10663
|
+
clearRowDragData()
|
|
10664
|
+
clearCrossTableDragStatus()
|
|
10665
|
+
},
|
|
10649
10666
|
/**
|
|
10650
10667
|
* 处理跨表拖拽完成
|
|
10651
10668
|
*/
|
|
@@ -10774,6 +10791,13 @@ export default defineVxeComponent({
|
|
|
10774
10791
|
}
|
|
10775
10792
|
Promise.resolve(dragEndMethod ? dragEndMethod(dragParams) : true).then((status) => {
|
|
10776
10793
|
if (!status) {
|
|
10794
|
+
if ($oldTable) {
|
|
10795
|
+
if ($oldTable.xID !== $xeTable.xID) {
|
|
10796
|
+
$oldTable.handleCrossTableRowDragCancelEvent(evnt)
|
|
10797
|
+
}
|
|
10798
|
+
}
|
|
10799
|
+
clearRowDragData()
|
|
10800
|
+
clearCrossTableDragStatus()
|
|
10777
10801
|
return errRest
|
|
10778
10802
|
}
|
|
10779
10803
|
let insertRest: Promise<any> = Promise.resolve()
|
|
@@ -10899,8 +10923,6 @@ export default defineVxeComponent({
|
|
|
10899
10923
|
} else {
|
|
10900
10924
|
$xeTable.handleRowDragSwapEvent(evnt, true, dragRow, prevDragRow, prevDragPos, prevDragToChild)
|
|
10901
10925
|
}
|
|
10902
|
-
clearRowDragData()
|
|
10903
|
-
clearCrossTableDragStatus()
|
|
10904
10926
|
},
|
|
10905
10927
|
handleRowDragDragoverEvent (evnt) {
|
|
10906
10928
|
const { treeConfig } = props
|
|
@@ -11046,6 +11068,8 @@ export default defineVxeComponent({
|
|
|
11046
11068
|
const isDragToChildFlag = isSelfToChildDrag && dragToChildMethod ? dragToChildMethod(dragParams) : prevDragToChild
|
|
11047
11069
|
return Promise.resolve(dragEndMethod ? dragEndMethod(dragParams) : true).then((status) => {
|
|
11048
11070
|
if (!status) {
|
|
11071
|
+
clearColDragData()
|
|
11072
|
+
clearCrossTableDragStatus()
|
|
11049
11073
|
return errRest
|
|
11050
11074
|
}
|
|
11051
11075
|
|
|
@@ -11195,6 +11219,9 @@ export default defineVxeComponent({
|
|
|
11195
11219
|
}
|
|
11196
11220
|
}
|
|
11197
11221
|
|
|
11222
|
+
clearColDragData()
|
|
11223
|
+
clearCrossTableDragStatus()
|
|
11224
|
+
|
|
11198
11225
|
if (evnt) {
|
|
11199
11226
|
dispatchEvent('column-dragend', {
|
|
11200
11227
|
oldColumn: dragColumn,
|
|
@@ -11310,15 +11337,7 @@ export default defineVxeComponent({
|
|
|
11310
11337
|
handleHeaderCellDragDragendEvent (evnt) {
|
|
11311
11338
|
const { dragCol } = reactData
|
|
11312
11339
|
const { prevDragCol, prevDragPos, prevDragToChild } = internalData
|
|
11313
|
-
const el = refElem.value
|
|
11314
11340
|
$xeTable.handleColDragSwapEvent(evnt, true, dragCol, prevDragCol, prevDragPos, prevDragToChild)
|
|
11315
|
-
hideDropTip()
|
|
11316
|
-
clearColDropOrigin()
|
|
11317
|
-
clearColAnimate(el, ['.vxe-table--column'])
|
|
11318
|
-
internalData.prevDragToChild = false
|
|
11319
|
-
reactData.dragRow = null
|
|
11320
|
-
reactData.dragCol = null
|
|
11321
|
-
clearCrossTableDragStatus()
|
|
11322
11341
|
},
|
|
11323
11342
|
handleHeaderCellDragDragoverEvent (evnt) {
|
|
11324
11343
|
const { dragCol } = reactData
|
|
@@ -13308,7 +13327,7 @@ export default defineVxeComponent({
|
|
|
13308
13327
|
handleUpdateRowGroup(groupFields)
|
|
13309
13328
|
|
|
13310
13329
|
nextTick(() => {
|
|
13311
|
-
const { exportConfig, importConfig, treeConfig
|
|
13330
|
+
const { exportConfig, importConfig, treeConfig } = props
|
|
13312
13331
|
const { scrollXStore, scrollYStore } = internalData
|
|
13313
13332
|
const editOpts = computeEditOpts.value
|
|
13314
13333
|
const treeOpts = computeTreeOpts.value
|
|
@@ -13320,9 +13339,9 @@ export default defineVxeComponent({
|
|
|
13320
13339
|
const mouseOpts = computeMouseOpts.value
|
|
13321
13340
|
const exportOpts = computeExportOpts.value
|
|
13322
13341
|
const importOpts = computeImportOpts.value
|
|
13323
|
-
const currentRowOpts = computeCurrentRowOpts.value
|
|
13324
|
-
const currentColumnOpts = computeCurrentColumnOpts.value
|
|
13325
|
-
const keyboardOpts = computeKeyboardOpts.value
|
|
13342
|
+
// const currentRowOpts = computeCurrentRowOpts.value
|
|
13343
|
+
// const currentColumnOpts = computeCurrentColumnOpts.value
|
|
13344
|
+
// const keyboardOpts = computeKeyboardOpts.value
|
|
13326
13345
|
const aggregateOpts = computeAggregateOpts.value
|
|
13327
13346
|
const rowDragOpts = computeRowDragOpts.value
|
|
13328
13347
|
|
|
@@ -13486,12 +13505,12 @@ export default defineVxeComponent({
|
|
|
13486
13505
|
if (columnOpts.currentMethod) {
|
|
13487
13506
|
warnLog('vxe.error.delProp', ['row-config.currentMethod', 'current-column-config.beforeSelectMethod'])
|
|
13488
13507
|
}
|
|
13489
|
-
if ((rowOpts.isCurrent || highlightCurrentRow) && props.keyboardConfig && keyboardOpts.isArrow && !XEUtils.isBoolean(currentRowOpts.isFollowSelected)) {
|
|
13490
|
-
|
|
13491
|
-
}
|
|
13492
|
-
if ((columnOpts.isCurrent || highlightCurrentColumn) && props.keyboardConfig && keyboardOpts.isArrow && !XEUtils.isBoolean(currentColumnOpts.isFollowSelected)) {
|
|
13493
|
-
|
|
13494
|
-
}
|
|
13508
|
+
// if ((rowOpts.isCurrent || highlightCurrentRow) && props.keyboardConfig && keyboardOpts.isArrow && !XEUtils.isBoolean(currentRowOpts.isFollowSelected)) {
|
|
13509
|
+
// warnLog('vxe.error.notConflictProp', ['row-config.isCurrent & keyboard-config.isArrow', 'current-row-config.isFollowSelected'])
|
|
13510
|
+
// }
|
|
13511
|
+
// if ((columnOpts.isCurrent || highlightCurrentColumn) && props.keyboardConfig && keyboardOpts.isArrow && !XEUtils.isBoolean(currentColumnOpts.isFollowSelected)) {
|
|
13512
|
+
// warnLog('vxe.error.notConflictProp', ['column-config.isCurrent & keyboard-config.isArrow', 'current-column-config.isFollowSelected'])
|
|
13513
|
+
// }
|
|
13495
13514
|
|
|
13496
13515
|
// 如果不支持虚拟滚动
|
|
13497
13516
|
// if (props.spanMethod) {
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|