vxe-table 3.12.0-beta.3 → 3.12.0-beta.5

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.
@@ -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.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="3.12.0-beta.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,padding:!0,minHeight:144,resizeConfig:{},resizableConfig:{dragMode:"auto",showDragTip:!0},radioConfig:{strict:!0},rowDragConfig:{showIcon:!0,animation:!0,showGuidesStatus:!0},columnDragConfig:{showIcon:!0,animation:!0,showGuidesStatus:!0},checkboxConfig:{strict:!0},tooltipConfig:{enterable:!0},validConfig:{showMessage:!0,autoClear:!0,autoPos:!0,message:"inline",msgMode:"single",theme:"beautify"},columnConfig:{maxFixedSize:4},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,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},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},clipConfig:{isCopy:!0,isCut:!0,isPaste:!0},fnrConfig:{isFind:!0,isReplace:!0},scrollX:{gt:60},scrollY:{gt:100}},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,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;
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.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="3.12.0-beta.5",iconPrefix=(_core.VxeUI.version=version,_core.VxeUI.tableVersion=version,_core.VxeUI.setConfig({emptyCell:" ",table:{fit:!0,showHeader:!0,animat:!0,delayHover:250,autoResize:!0,padding:!0,minHeight:144,resizeConfig:{},resizableConfig:{dragMode:"auto",showDragTip:!0},radioConfig:{strict:!0},rowDragConfig:{showIcon:!0,animation:!0,showGuidesStatus:!0},columnDragConfig:{showIcon:!0,animation:!0,showGuidesStatus:!0},checkboxConfig:{strict:!0},tooltipConfig:{enterable:!0},validConfig:{showMessage:!0,autoClear:!0,autoPos:!0,message:"inline",msgMode:"single",theme:"beautify"},columnConfig:{maxFixedSize:4},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,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},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},clipConfig:{isCopy:!0,isCut:!0,isPaste:!0},fnrConfig:{isFind:!0,isReplace:!0},scrollX:{gt:60},scrollY:{gt:100}},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,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${"3.12.0-beta.3"}`;
11
+ const version = `table v${"3.12.0-beta.5"}`;
12
12
  const warnLog = exports.warnLog = log.create('warn', version);
13
13
  const errLog = exports.errLog = log.create('error', version);
@@ -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 v3.12.0-beta.3",warnLog=exports.warnLog=log.create("warn",version),errLog=exports.errLog=log.create("error",version);
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 v3.12.0-beta.5",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": "3.12.0-beta.3",
3
+ "version": "3.12.0-beta.5",
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": "^3.3.47"
31
+ "vxe-pc-ui": "^3.3.48"
32
32
  },
33
33
  "devDependencies": {
34
34
  "@babel/plugin-transform-modules-commonjs": "^7.25.7",
@@ -54,7 +54,7 @@ function renderLine (h: CreateElement, _vm: any, $xetable: any, params: any) {
54
54
  /**
55
55
  * 渲染列
56
56
  */
57
- function renderColumn (h: any, _vm: any, $xetable: any, seq: any, rowid: any, fixedType: any, rowLevel: any, row: any, rowIndex: any, $rowIndex: any, _rowIndex: any, column: any, $columnIndex: any, columns: any, items: any) {
57
+ function renderColumn (h: any, _vm: any, $xeTable: any, seq: any, rowid: any, fixedType: any, rowLevel: any, row: any, rowIndex: any, $rowIndex: any, _rowIndex: any, column: any, $columnIndex: any, columns: any, items: any) {
58
58
  const {
59
59
  $listeners: tableListeners,
60
60
  fullAllDataRowIdData,
@@ -92,11 +92,11 @@ function renderColumn (h: any, _vm: any, $xetable: any, seq: any, rowid: any, fi
92
92
  mouseOpts,
93
93
  areaOpts,
94
94
  validErrorMaps
95
- } = $xetable
96
- const rowDragOpts = $xetable.computeRowDragOpts
95
+ } = $xeTable
96
+ const rowDragOpts = $xeTable.computeRowDragOpts
97
97
  const { disabledMethod: dragDisabledMethod } = rowDragOpts
98
98
  const { selectCellToRow } = areaOpts
99
- const cellOpts = $xetable.computeCellOpts
99
+ const cellOpts = $xeTable.computeCellOpts
100
100
  const { type, cellRender, editRender, align, showOverflow, className, treeNode, slots } = column
101
101
  const { verticalAlign } = cellOpts
102
102
  const { actived } = editStore
@@ -107,8 +107,8 @@ function renderColumn (h: any, _vm: any, $xetable: any, seq: any, rowid: any, fi
107
107
  const compCellClassName = compConf ? (compConf.tableCellClassName || compConf.cellClassName) : ''
108
108
  const compCellStyle = compConf ? (compConf.tableCellStyle || compConf.cellStyle) : ''
109
109
  const showAllTip = tooltipOpts.showAll || tooltipOpts.enabled
110
- const columnIndex = $xetable.getColumnIndex(column)
111
- const _columnIndex = $xetable.getVTColumnIndex(column)
110
+ const columnIndex = $xeTable.getColumnIndex(column)
111
+ const _columnIndex = $xeTable.getVTColumnIndex(column)
112
112
  const isEdit = isEnableConf(editRender)
113
113
  let fixedHiddenColumn = fixedType ? column.fixed !== fixedType : column.fixed && overflowX
114
114
  const cellOverflow = (XEUtils.isUndefined(showOverflow) || XEUtils.isNull(showOverflow)) ? allColumnOverflow : showOverflow
@@ -127,52 +127,56 @@ function renderColumn (h: any, _vm: any, $xetable: any, seq: any, rowid: any, fi
127
127
  const bindMouseenter = tableListeners['cell-mouseenter']
128
128
  const bindMouseleave = tableListeners['cell-mouseleave']
129
129
  const triggerDblclick = (editRender && editConfig && editOpts.trigger === 'dblclick')
130
- const params = { $table: $xetable, $grid: $xetable.$xegrid, isEdit: false, seq, rowid, row, rowIndex, $rowIndex, _rowIndex, column, columnIndex, $columnIndex, _columnIndex, fixed: fixedType, type: renderType, isHidden: fixedHiddenColumn, level: rowLevel, visibleData: afterFullData, data: tableData, items }
131
- let isColDragCell = false
130
+ const params = { $table: $xeTable, $grid: $xeTable.$xegrid, isEdit: false, seq, rowid, row, rowIndex, $rowIndex, _rowIndex, column, columnIndex, $columnIndex, _columnIndex, fixed: fixedType, type: renderType, isHidden: fixedHiddenColumn, level: rowLevel, visibleData: afterFullData, data: tableData, items }
131
+ let isRowDragCell = false
132
132
  let isDisabledDrag = false
133
133
  if (rowOpts.drag) {
134
- isColDragCell = rowDragOpts.trigger === 'row' || (column.dragSort && rowDragOpts.trigger === 'cell')
134
+ isRowDragCell = rowDragOpts.trigger === 'row' || (column.dragSort && rowDragOpts.trigger === 'cell')
135
135
  }
136
- if (isColDragCell) {
136
+ if (isRowDragCell) {
137
137
  isDisabledDrag = !!(dragDisabledMethod && dragDisabledMethod(params))
138
138
  }
139
139
  // hover 进入事件
140
140
  if (showTitle || showTooltip || showAllTip || bindMouseenter || tooltipConfig) {
141
141
  tdOns.mouseenter = (evnt: any) => {
142
- if (isVMScrollProcess($xetable)) {
142
+ if (isVMScrollProcess($xeTable)) {
143
143
  return
144
144
  }
145
145
  if (showTitle) {
146
146
  updateCellTitle(evnt.currentTarget, column)
147
147
  } else if (showTooltip || showAllTip) {
148
148
  // 如果配置了显示 tooltip
149
- $xetable.triggerBodyTooltipEvent(evnt, params)
149
+ $xeTable.triggerBodyTooltipEvent(evnt, params)
150
150
  }
151
151
  if (bindMouseenter) {
152
- $xetable.emitEvent('cell-mouseenter', Object.assign({ cell: evnt.currentTarget }, params), evnt)
152
+ $xeTable.emitEvent('cell-mouseenter', Object.assign({ cell: evnt.currentTarget }, params), evnt)
153
153
  }
154
154
  }
155
155
  }
156
156
  // hover 退出事件
157
157
  if (showTooltip || showAllTip || bindMouseleave || tooltipConfig) {
158
158
  tdOns.mouseleave = (evnt: any) => {
159
- if (isVMScrollProcess($xetable)) {
159
+ if (isVMScrollProcess($xeTable)) {
160
160
  return
161
161
  }
162
162
  if (showTooltip || showAllTip) {
163
- $xetable.handleTargetLeaveEvent(evnt)
163
+ $xeTable.handleTargetLeaveEvent(evnt)
164
164
  }
165
165
  if (bindMouseleave) {
166
- $xetable.emitEvent('cell-mouseleave', Object.assign({ cell: evnt.currentTarget }, params), evnt)
166
+ $xeTable.emitEvent('cell-mouseleave', Object.assign({ cell: evnt.currentTarget }, params), evnt)
167
167
  }
168
168
  }
169
169
  }
170
170
  // 按下事件处理
171
- if (isColDragCell || checkboxOpts.range || mouseConfig) {
171
+ if (isRowDragCell || checkboxOpts.range || mouseConfig) {
172
172
  tdOns.mousedown = (evnt: any) => {
173
- $xetable.triggerCellMousedownEvent(evnt, params)
173
+ $xeTable.triggerCellMousedownEvent(evnt, params)
174
174
  }
175
175
  }
176
+ // 拖拽列事件
177
+ if (isRowDragCell) {
178
+ tdOns.mouseup = $xeTable.triggerCellMouseupEvent
179
+ }
176
180
  // 点击事件处理
177
181
  if ((rowOpts.isCurrent || highlightCurrentRow) ||
178
182
  tableListeners['cell-click'] ||
@@ -182,13 +186,13 @@ function renderColumn (h: any, _vm: any, $xetable: any, seq: any, rowid: any, fi
182
186
  (checkboxOpts.trigger === 'row' || (column.type === 'checkbox' && checkboxOpts.trigger === 'cell')) ||
183
187
  (treeOpts.trigger === 'row' || (column.treeNode && treeOpts.trigger === 'cell'))) {
184
188
  tdOns.click = (evnt: any) => {
185
- $xetable.triggerCellClickEvent(evnt, params)
189
+ $xeTable.triggerCellClickEvent(evnt, params)
186
190
  }
187
191
  }
188
192
  // 双击事件处理
189
193
  if (triggerDblclick || tableListeners['cell-dblclick']) {
190
194
  tdOns.dblclick = (evnt: any) => {
191
- $xetable.triggerCellDblclickEvent(evnt, params)
195
+ $xeTable.triggerCellDblclickEvent(evnt, params)
192
196
  }
193
197
  }
194
198
  // 合并行或列
@@ -227,7 +231,7 @@ function renderColumn (h: any, _vm: any, $xetable: any, seq: any, rowid: any, fi
227
231
  }
228
232
  // 如果编辑列开启显示状态
229
233
  if (!fixedHiddenColumn && editConfig && (editRender || cellRender) && (editOpts.showStatus || editOpts.showUpdateStatus)) {
230
- isDirty = $xetable.isUpdateByRow(row, column.field)
234
+ isDirty = $xeTable.isUpdateByRow(row, column.field)
231
235
  }
232
236
  const tdVNs = []
233
237
  if (fixedHiddenColumn && (allColumnOverflow ? isAllOverflow : allColumnOverflow)) {
@@ -246,7 +250,7 @@ function renderColumn (h: any, _vm: any, $xetable: any, seq: any, rowid: any, fi
246
250
  } else {
247
251
  // 渲染单元格
248
252
  tdVNs.push(
249
- ...renderLine(h, _vm, $xetable, params),
253
+ ...renderLine(h, _vm, $xeTable, params),
250
254
  h('div', {
251
255
  class: ['vxe-cell', {
252
256
  'c--title': showTitle,
@@ -257,7 +261,7 @@ function renderColumn (h: any, _vm: any, $xetable: any, seq: any, rowid: any, fi
257
261
  maxHeight: hasEllipsis && (scrollYRHeight || rowHeight) ? `${scrollYRHeight || rowHeight}px` : ''
258
262
  },
259
263
  attrs: {
260
- title: showTitle ? $xetable.getCellLabel(row, column) : null
264
+ title: showTitle ? $xeTable.getCellLabel(row, column) : null
261
265
  }
262
266
  }, column.renderCell(h, params))
263
267
  )
@@ -278,7 +282,7 @@ function renderColumn (h: any, _vm: any, $xetable: any, seq: any, rowid: any, fi
278
282
  class: `vxe-cell--valid-error-wrapper vxe-cell--valid-error-theme-${validOpts.theme || 'normal'}`
279
283
  }, [
280
284
  validSlot
281
- ? $xetable.callSlot(validSlot, validParams, h)
285
+ ? $xeTable.callSlot(validSlot, validParams, h)
282
286
  : [
283
287
  h('span', {
284
288
  class: 'vxe-cell--valid-error-msg'
@@ -326,7 +330,7 @@ function renderColumn (h: any, _vm: any, $xetable: any, seq: any, rowid: any, fi
326
330
  'col--ellipsis': hasEllipsis,
327
331
  'fixed--width': !isAutoCellWidth,
328
332
  'fixed--hidden': fixedHiddenColumn,
329
- 'is--drag-cell': isColDragCell,
333
+ 'is--drag-cell': isRowDragCell,
330
334
  'is--drag-disabled': isDisabledDrag,
331
335
  'col--dirty': isDirty,
332
336
  'col--active': editConfig && isEdit && (actived.row === row && (actived.column === column || editOpts.mode === 'row')),
@@ -351,6 +351,21 @@ function getOrderField (_vm: any, column: any) {
351
351
  }
352
352
  }
353
353
 
354
+ function clearDragStatus ($xeTable: any) {
355
+ const reactData = $xeTable
356
+
357
+ const { dragRow, dragCol } = reactData
358
+ if (dragRow || dragCol) {
359
+ clearColDropOrigin($xeTable)
360
+ clearRowDropOrigin($xeTable)
361
+ hideDropTip($xeTable)
362
+ reactData.dragRow = null
363
+ reactData.dragCol = null
364
+ reactData.isDragColMove = false
365
+ reactData.isDragRowMove = false
366
+ }
367
+ }
368
+
354
369
  function clearRowDropOrigin ($xeTable: any) {
355
370
  const el = $xeTable.$el
356
371
  if (el) {
@@ -5212,6 +5227,11 @@ const Methods = {
5212
5227
  $xeTable.closeMenu()
5213
5228
  }
5214
5229
  },
5230
+ triggerCellMouseupEvent () {
5231
+ const $xeTable = this
5232
+
5233
+ clearDragStatus($xeTable)
5234
+ },
5215
5235
  /**
5216
5236
  * 行拖拽
5217
5237
  */
@@ -5476,13 +5496,8 @@ const Methods = {
5476
5496
  },
5477
5497
  handleCellDragMouseupEvent () {
5478
5498
  const $xeTable = this
5479
- const reactData = $xeTable
5480
5499
 
5481
- clearRowDropOrigin($xeTable)
5482
- hideDropTip($xeTable)
5483
- reactData.dragRow = null
5484
- reactData.dragCol = null
5485
- reactData.isDragRowMove = false
5500
+ clearDragStatus($xeTable)
5486
5501
  },
5487
5502
  /**
5488
5503
  * 列拖拽