vxe-table 4.12.2 → 4.12.3
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/menu/hook.js +1 -1
- package/es/table/src/table.js +41 -22
- package/es/ui/index.js +1 -1
- package/es/ui/src/log.js +1 -1
- package/lib/index.umd.js +40 -21
- package/lib/index.umd.min.js +1 -1
- package/lib/style.css +1 -1
- package/lib/table/module/menu/hook.js +1 -1
- package/lib/table/module/menu/hook.min.js +1 -1
- package/lib/table/src/table.js +37 -18
- 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/table/module/menu/hook.ts +1 -1
- package/packages/table/src/table.ts +42 -22
- /package/es/{iconfont.1743125693758.ttf → iconfont.1743389164894.ttf} +0 -0
- /package/es/{iconfont.1743125693758.woff → iconfont.1743389164894.woff} +0 -0
- /package/es/{iconfont.1743125693758.woff2 → iconfont.1743389164894.woff2} +0 -0
- /package/lib/{iconfont.1743125693758.ttf → iconfont.1743389164894.ttf} +0 -0
- /package/lib/{iconfont.1743125693758.woff → iconfont.1743389164894.woff} +0 -0
- /package/lib/{iconfont.1743125693758.woff2 → iconfont.1743389164894.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.12.
|
|
16
|
+
const version = exports.version = "4.12.3";
|
|
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.12.
|
|
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.12.3",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:{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",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:{showIcon:!0},treeConfig:{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:{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:{enabled:!0,gt:60,preSize:1,oSize:0},virtualYConfig:{enabled:!0,gt:100,preSize:1,oSize:0},scrollbarConfig:{}},grid:{formConfig:{enabled:!0},pagerConfig:{enabled:!0},toolbarConfig:{enabled:!0},proxyConfig:{enabled:!0,autoLoad:!0,showResponseMsg:!0,showActiveMsg:!0,props:{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_RADIO_CHECKED:iconPrefix+"radio-checked-fill",TABLE_RADIO_UNCHECKED:iconPrefix+"radio-unchecked",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_COLUMN:iconPrefix+"swap",TABLE_DRAG_DISABLED:iconPrefix+"no-drop",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.12.
|
|
11
|
+
const version = `table v${"4.12.3"}`;
|
|
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.12.
|
|
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.12.3",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.12.
|
|
3
|
+
"version": "4.12.3",
|
|
4
4
|
"description": "一个基于 vue 的 PC 端表格组件,支持增删改查、虚拟树、拖拽排序,懒加载、快捷菜单、数据校验、树形结构、打印、导入导出、自定义模板、渲染器、JSON 配置式...",
|
|
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.5.
|
|
31
|
+
"vxe-pc-ui": "^4.5.8"
|
|
32
32
|
},
|
|
33
33
|
"devDependencies": {
|
|
34
34
|
"@types/resize-observer-browser": "^0.1.11",
|
|
@@ -140,7 +140,7 @@ hooks.add('tableMenuModule', {
|
|
|
140
140
|
}
|
|
141
141
|
ctxMenuStore[property] = selectItem || menuList[0]
|
|
142
142
|
} else if (ctxMenuStore[property] && (globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.ENTER) || globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.SPACEBAR))) {
|
|
143
|
-
|
|
143
|
+
$xeTable.ctxMenuLinkEvent(evnt, ctxMenuStore[property])
|
|
144
144
|
}
|
|
145
145
|
},
|
|
146
146
|
handleOpenMenuEvent,
|
|
@@ -1951,11 +1951,11 @@ export default defineComponent({
|
|
|
1951
1951
|
}
|
|
1952
1952
|
if (xLeftCornerEl) {
|
|
1953
1953
|
xLeftCornerEl.style.width = scrollbarXToTop ? `${osbWidth}px` : ''
|
|
1954
|
-
xLeftCornerEl.style.display = scrollbarXToTop ? (
|
|
1954
|
+
xLeftCornerEl.style.display = scrollbarXToTop ? (overflowX && osbHeight ? 'block' : '') : ''
|
|
1955
1955
|
}
|
|
1956
1956
|
if (xRightCornerEl) {
|
|
1957
1957
|
xRightCornerEl.style.width = scrollbarXToTop ? '' : `${osbWidth}px`
|
|
1958
|
-
xRightCornerEl.style.display = scrollbarXToTop ? '' : (
|
|
1958
|
+
xRightCornerEl.style.display = scrollbarXToTop ? '' : (overflowX && osbHeight ? 'block' : '')
|
|
1959
1959
|
}
|
|
1960
1960
|
|
|
1961
1961
|
const scrollYVirtualEl = refScrollYVirtualElem.value
|
|
@@ -1967,7 +1967,7 @@ export default defineComponent({
|
|
|
1967
1967
|
const yTopCornerEl = refScrollYTopCornerElem.value
|
|
1968
1968
|
if (yTopCornerEl) {
|
|
1969
1969
|
yTopCornerEl.style.height = `${headerHeight}px`
|
|
1970
|
-
yTopCornerEl.style.display = headerHeight ? 'block' : ''
|
|
1970
|
+
yTopCornerEl.style.display = overflowY && headerHeight ? 'block' : ''
|
|
1971
1971
|
}
|
|
1972
1972
|
const yWrapperEl = refScrollYWrapperElem.value
|
|
1973
1973
|
if (yWrapperEl) {
|
|
@@ -1978,7 +1978,7 @@ export default defineComponent({
|
|
|
1978
1978
|
if (yBottomCornerEl) {
|
|
1979
1979
|
yBottomCornerEl.style.height = `${footerHeight}px`
|
|
1980
1980
|
yBottomCornerEl.style.top = `${headerHeight + bodyHeight}px`
|
|
1981
|
-
yBottomCornerEl.style.display = footerHeight ? 'block' : ''
|
|
1981
|
+
yBottomCornerEl.style.display = overflowY && footerHeight ? 'block' : ''
|
|
1982
1982
|
}
|
|
1983
1983
|
|
|
1984
1984
|
const rowExpandEl = refRowExpandElem.value
|
|
@@ -6231,8 +6231,8 @@ export default defineComponent({
|
|
|
6231
6231
|
const handleGlobalKeydownEvent = (evnt: KeyboardEvent) => {
|
|
6232
6232
|
// 该行为只对当前激活的表格有效
|
|
6233
6233
|
if (internalData.isActivated) {
|
|
6234
|
-
|
|
6235
|
-
const { mouseConfig, keyboardConfig, treeConfig, editConfig, highlightCurrentRow } = props
|
|
6234
|
+
$xeTable.preventEvent(evnt, 'event.keydown', null, () => {
|
|
6235
|
+
const { mouseConfig, keyboardConfig, treeConfig, editConfig, highlightCurrentRow, highlightCurrentColumn } = props
|
|
6236
6236
|
const { ctxMenuStore, editStore, currentRow } = reactData
|
|
6237
6237
|
const { afterFullData } = internalData
|
|
6238
6238
|
const isMenu = computeIsMenu.value
|
|
@@ -6243,6 +6243,7 @@ export default defineComponent({
|
|
|
6243
6243
|
const treeOpts = computeTreeOpts.value
|
|
6244
6244
|
const menuList = computeMenuList.value
|
|
6245
6245
|
const rowOpts = computeRowOpts.value
|
|
6246
|
+
const columnOpts = computeColumnOpts.value
|
|
6246
6247
|
const { selected, actived } = editStore
|
|
6247
6248
|
const childrenField = treeOpts.children || treeOpts.childrenField
|
|
6248
6249
|
const keyCode = evnt.keyCode
|
|
@@ -6281,7 +6282,7 @@ export default defineComponent({
|
|
|
6281
6282
|
if ($xeTable.closeMenu) {
|
|
6282
6283
|
$xeTable.closeMenu()
|
|
6283
6284
|
}
|
|
6284
|
-
|
|
6285
|
+
$xeTable.closeFilter()
|
|
6285
6286
|
if (keyboardConfig && keyboardOpts.isEsc) {
|
|
6286
6287
|
// 如果是激活编辑状态,则取消编辑
|
|
6287
6288
|
if (actived.row) {
|
|
@@ -6387,20 +6388,29 @@ export default defineComponent({
|
|
|
6387
6388
|
const params = {
|
|
6388
6389
|
$table: $xeTable,
|
|
6389
6390
|
row: targetRow,
|
|
6390
|
-
rowIndex:
|
|
6391
|
-
$rowIndex:
|
|
6391
|
+
rowIndex: $xeTable.getRowIndex(targetRow),
|
|
6392
|
+
$rowIndex: $xeTable.getVMRowIndex(targetRow)
|
|
6392
6393
|
}
|
|
6393
|
-
|
|
6394
|
-
.then(() =>
|
|
6395
|
-
.then(() =>
|
|
6394
|
+
$xeTable.setTreeExpand(currentRow, true)
|
|
6395
|
+
.then(() => $xeTable.scrollToRow(targetRow))
|
|
6396
|
+
.then(() => $xeTable.triggerCurrentRowEvent(evnt, params))
|
|
6396
6397
|
}
|
|
6397
6398
|
}
|
|
6398
6399
|
}
|
|
6399
6400
|
} else if (operArrow && keyboardConfig && keyboardOpts.isArrow) {
|
|
6400
6401
|
if (!isEditStatus) {
|
|
6401
6402
|
// 如果按下了方向键
|
|
6402
|
-
if (selected.row && selected.column) {
|
|
6403
|
+
if (mouseOpts.selected && selected.row && selected.column) {
|
|
6403
6404
|
$xeTable.moveArrowSelected(selected.args, isLeftArrow, isUpArrow, isRightArrow, isDwArrow, evnt)
|
|
6405
|
+
} else {
|
|
6406
|
+
// 当前行按键上下移动
|
|
6407
|
+
if ((isUpArrow || isDwArrow) && (rowOpts.isCurrent || highlightCurrentRow)) {
|
|
6408
|
+
$xeTable.moveCurrentRow(isUpArrow, isDwArrow, evnt)
|
|
6409
|
+
}
|
|
6410
|
+
// 当前行按键左右移动
|
|
6411
|
+
if ((isLeftArrow || isRightArrow) && (columnOpts.isCurrent || highlightCurrentColumn)) {
|
|
6412
|
+
$xeTable.moveCurrentColumn(isLeftArrow, isRightArrow, evnt)
|
|
6413
|
+
}
|
|
6404
6414
|
}
|
|
6405
6415
|
}
|
|
6406
6416
|
} else if (isTab && keyboardConfig && keyboardOpts.isTab) {
|
|
@@ -6441,9 +6451,9 @@ export default defineComponent({
|
|
|
6441
6451
|
if (keyboardOpts.isDel && isEnableConf(editConfig) && (selected.row || selected.column)) {
|
|
6442
6452
|
const params = {
|
|
6443
6453
|
row: selected.row,
|
|
6444
|
-
rowIndex:
|
|
6454
|
+
rowIndex: $xeTable.getRowIndex(selected.row),
|
|
6445
6455
|
column: selected.column,
|
|
6446
|
-
columnIndex:
|
|
6456
|
+
columnIndex: $xeTable.getColumnIndex(selected.column),
|
|
6447
6457
|
$table: $xeTable,
|
|
6448
6458
|
$grid: $xeGrid
|
|
6449
6459
|
}
|
|
@@ -6466,14 +6476,14 @@ export default defineComponent({
|
|
|
6466
6476
|
evnt.preventDefault()
|
|
6467
6477
|
const params = {
|
|
6468
6478
|
row: parentRow,
|
|
6469
|
-
rowIndex:
|
|
6470
|
-
$rowIndex:
|
|
6479
|
+
rowIndex: $xeTable.getRowIndex(parentRow),
|
|
6480
|
+
$rowIndex: $xeTable.getVMRowIndex(parentRow),
|
|
6471
6481
|
$table: $xeTable,
|
|
6472
6482
|
$grid: $xeGrid
|
|
6473
6483
|
}
|
|
6474
|
-
|
|
6475
|
-
.then(() =>
|
|
6476
|
-
.then(() =>
|
|
6484
|
+
$xeTable.setTreeExpand(parentRow, false)
|
|
6485
|
+
.then(() => $xeTable.scrollToRow(parentRow))
|
|
6486
|
+
.then(() => $xeTable.triggerCurrentRowEvent(evnt, params))
|
|
6477
6487
|
}
|
|
6478
6488
|
} else if (keyboardConfig && isEnableConf(editConfig) && keyboardOpts.isEdit && !hasCtrlKey && !hasMetaKey && (isSpacebar || (keyCode >= 48 && keyCode <= 57) || (keyCode >= 65 && keyCode <= 90) || (keyCode >= 96 && keyCode <= 111) || (keyCode >= 186 && keyCode <= 192) || (keyCode >= 219 && keyCode <= 222))) {
|
|
6479
6489
|
const { editMode, editMethod } = keyboardOpts
|
|
@@ -6486,9 +6496,9 @@ export default defineComponent({
|
|
|
6486
6496
|
const beforeEditMethod = editOpts.beforeEditMethod || editOpts.activeMethod
|
|
6487
6497
|
const params = {
|
|
6488
6498
|
row: selected.row,
|
|
6489
|
-
rowIndex:
|
|
6499
|
+
rowIndex: $xeTable.getRowIndex(selected.row),
|
|
6490
6500
|
column: selected.column,
|
|
6491
|
-
columnIndex:
|
|
6501
|
+
columnIndex: $xeTable.getColumnIndex(selected.column),
|
|
6492
6502
|
$table: $xeTable,
|
|
6493
6503
|
$grid: $xeGrid
|
|
6494
6504
|
}
|
|
@@ -9354,6 +9364,7 @@ export default defineComponent({
|
|
|
9354
9364
|
updateScrollXSpace () {
|
|
9355
9365
|
const { isGroup, scrollXLoad, overflowX, scrollXWidth } = reactData
|
|
9356
9366
|
const { visibleColumn, scrollXStore, elemStore, fullColumnIdData } = internalData
|
|
9367
|
+
const mouseOpts = computeMouseOpts.value
|
|
9357
9368
|
const tableBody = refTableBody.value
|
|
9358
9369
|
const tableBodyElem = tableBody ? tableBody.$el as HTMLDivElement : null
|
|
9359
9370
|
if (tableBodyElem) {
|
|
@@ -9417,6 +9428,10 @@ export default defineComponent({
|
|
|
9417
9428
|
if (scrollXSpaceEl) {
|
|
9418
9429
|
scrollXSpaceEl.style.width = `${ySpaceWidth}px`
|
|
9419
9430
|
}
|
|
9431
|
+
|
|
9432
|
+
if (isScrollXBig && mouseOpts.area) {
|
|
9433
|
+
errLog('vxe.error.notProp', ['mouse-config.area'])
|
|
9434
|
+
}
|
|
9420
9435
|
nextTick(() => {
|
|
9421
9436
|
updateStyle()
|
|
9422
9437
|
})
|
|
@@ -9427,6 +9442,7 @@ export default defineComponent({
|
|
|
9427
9442
|
const { isAllOverflow, scrollYLoad, expandColumn } = reactData
|
|
9428
9443
|
const { scrollYStore, elemStore, isResizeCellHeight, afterFullData, fullAllDataRowIdData, rowExpandedMaps } = internalData
|
|
9429
9444
|
const { startIndex } = scrollYStore
|
|
9445
|
+
const mouseOpts = computeMouseOpts.value
|
|
9430
9446
|
const expandOpts = computeExpandOpts.value
|
|
9431
9447
|
const rowOpts = computeRowOpts.value
|
|
9432
9448
|
const cellOpts = computeCellOpts.value
|
|
@@ -9508,6 +9524,10 @@ export default defineComponent({
|
|
|
9508
9524
|
reactData.scrollYTop = scrollYTop
|
|
9509
9525
|
reactData.scrollYHeight = scrollYHeight
|
|
9510
9526
|
reactData.isScrollYBig = isScrollYBig
|
|
9527
|
+
|
|
9528
|
+
if (isScrollYBig && mouseOpts.area) {
|
|
9529
|
+
errLog('vxe.error.notProp', ['mouse-config.area'])
|
|
9530
|
+
}
|
|
9511
9531
|
return nextTick().then(() => {
|
|
9512
9532
|
updateStyle()
|
|
9513
9533
|
})
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|