vxe-table 4.10.6-beta.30 → 4.10.6-beta.32
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/src/body.js +6 -6
- package/es/table/src/cell.js +13 -9
- package/es/table/src/footer.js +2 -2
- package/es/table/src/header.js +2 -2
- package/es/table/src/props.js +8 -2
- package/es/table/src/table.js +14 -7
- package/es/ui/index.js +3 -1
- package/es/ui/src/log.js +1 -1
- package/lib/index.umd.js +45 -21
- package/lib/index.umd.min.js +1 -1
- package/lib/style.css +1 -1
- package/lib/table/src/body.js +7 -4
- package/lib/table/src/body.min.js +1 -1
- package/lib/table/src/cell.js +5 -4
- package/lib/table/src/cell.min.js +1 -1
- package/lib/table/src/footer.js +2 -1
- package/lib/table/src/footer.min.js +1 -1
- package/lib/table/src/header.js +2 -1
- package/lib/table/src/header.min.js +1 -1
- package/lib/table/src/props.js +8 -2
- package/lib/table/src/table.js +17 -7
- package/lib/table/src/table.min.js +1 -1
- package/lib/ui/index.js +3 -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/src/body.ts +10 -10
- package/packages/table/src/cell.ts +13 -9
- package/packages/table/src/footer.ts +2 -2
- package/packages/table/src/header.ts +2 -2
- package/packages/table/src/props.ts +8 -3
- package/packages/table/src/table.ts +14 -7
- package/packages/ui/index.ts +2 -0
- /package/es/{iconfont.1737460213413.ttf → iconfont.1738648607811.ttf} +0 -0
- /package/es/{iconfont.1737460213413.woff → iconfont.1738648607811.woff} +0 -0
- /package/es/{iconfont.1737460213413.woff2 → iconfont.1738648607811.woff2} +0 -0
- /package/lib/{iconfont.1737460213413.ttf → iconfont.1738648607811.ttf} +0 -0
- /package/lib/{iconfont.1737460213413.woff → iconfont.1738648607811.woff} +0 -0
- /package/lib/{iconfont.1737460213413.woff2 → iconfont.1738648607811.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.10.6-beta.
|
|
16
|
+
const version = exports.version = "4.10.6-beta.32";
|
|
17
17
|
_core.VxeUI.version = version;
|
|
18
18
|
_core.VxeUI.tableVersion = version;
|
|
19
19
|
_core.VxeUI.setConfig({
|
|
@@ -126,6 +126,8 @@ _core.VxeUI.setConfig({
|
|
|
126
126
|
// orders: ['asc', 'desc', null],
|
|
127
127
|
// sortMethod: null,
|
|
128
128
|
showIcon: true,
|
|
129
|
+
allowClear: true,
|
|
130
|
+
allowBtn: true,
|
|
129
131
|
iconLayout: 'vertical'
|
|
130
132
|
},
|
|
131
133
|
filterConfig: {
|
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.10.6-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.10.6-beta.32",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},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},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},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:0,oSize:1},virtualYConfig:{enabled:!0,gt:100,preSize:1,oSize:2},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.10.6-beta.
|
|
11
|
+
const version = `table v${"4.10.6-beta.32"}`;
|
|
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.10.6-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.10.6-beta.32",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.10.6-beta.
|
|
3
|
+
"version": "4.10.6-beta.32",
|
|
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.3.
|
|
31
|
+
"vxe-pc-ui": "^4.3.79"
|
|
32
32
|
},
|
|
33
33
|
"devDependencies": {
|
|
34
34
|
"@types/resize-observer-browser": "^0.1.11",
|
|
@@ -423,7 +423,7 @@ export default defineComponent({
|
|
|
423
423
|
|
|
424
424
|
const renderRows = (fixedType: VxeColumnPropTypes.Fixed, isOptimizeMode: boolean, tableData: any[], tableColumn: VxeTableDefines.ColumnInfo[]) => {
|
|
425
425
|
const { stripe, rowKey, highlightHoverRow, rowClassName, rowStyle, editConfig, treeConfig } = tableProps
|
|
426
|
-
const { hasFixedColumn, treeExpandedMaps, scrollXLoad, scrollYLoad, isAllOverflow, rowExpandedMaps, expandColumn, selectRadioRow, pendingRowMaps, isDragColMove } = tableReactData
|
|
426
|
+
const { hasFixedColumn, treeExpandedMaps, isColLoading, scrollXLoad, scrollYLoad, isAllOverflow, rowExpandedMaps, expandColumn, selectRadioRow, pendingRowMaps, isDragColMove } = tableReactData
|
|
427
427
|
const { fullAllDataRowIdData } = tableInternalData
|
|
428
428
|
const checkboxOpts = computeCheckboxOpts.value
|
|
429
429
|
const radioOpts = computeRadioOpts.value
|
|
@@ -508,7 +508,7 @@ export default defineComponent({
|
|
|
508
508
|
return renderTdColumn(seq, rowid, fixedType, isOptimizeMode, rowLevel, row, rowIndex, $rowIndex, _rowIndex, column, $columnIndex, tableColumn, tableData)
|
|
509
509
|
})
|
|
510
510
|
rows.push(
|
|
511
|
-
columnOpts.drag && columnDragOpts.animation
|
|
511
|
+
!isColLoading && (columnOpts.drag && columnDragOpts.animation)
|
|
512
512
|
? h(TransitionGroup, {
|
|
513
513
|
name: `vxe-header--col-list${isDragColMove ? '' : '-disabled'}`,
|
|
514
514
|
tag: 'tr',
|
|
@@ -615,7 +615,7 @@ export default defineComponent({
|
|
|
615
615
|
|
|
616
616
|
const { fixedColumn, fixedType, tableColumn } = props
|
|
617
617
|
const { spanMethod, footerSpanMethod, mouseConfig } = tableProps
|
|
618
|
-
const { isGroup, tableData, scrollXLoad, scrollYLoad, isAllOverflow, isDragRowMove, expandColumn, dragRow, dragCol } = tableReactData
|
|
618
|
+
const { isGroup, tableData, isRowLoading, isColLoading, scrollXLoad, scrollYLoad, isAllOverflow, isDragRowMove, expandColumn, dragRow, dragCol } = tableReactData
|
|
619
619
|
const { visibleColumn, fullAllDataRowIdData, fullColumnIdData } = tableInternalData
|
|
620
620
|
const rowOpts = computeRowOpts.value
|
|
621
621
|
const emptyOpts = computeEmptyOpts.value
|
|
@@ -742,21 +742,21 @@ export default defineComponent({
|
|
|
742
742
|
cellpadding: 0,
|
|
743
743
|
border: 0
|
|
744
744
|
}, [
|
|
745
|
-
|
|
746
|
-
|
|
747
|
-
|
|
745
|
+
/**
|
|
746
|
+
* 列宽
|
|
747
|
+
*/
|
|
748
748
|
h('colgroup', {
|
|
749
749
|
ref: refBodyColgroup
|
|
750
|
-
},
|
|
750
|
+
}, renderColumnList.map((column, $columnIndex) => {
|
|
751
751
|
return h('col', {
|
|
752
752
|
name: column.id,
|
|
753
753
|
key: $columnIndex
|
|
754
754
|
})
|
|
755
755
|
})),
|
|
756
756
|
/**
|
|
757
|
-
|
|
758
|
-
|
|
759
|
-
rowOpts.drag && rowDragOpts.animation
|
|
757
|
+
* 内容
|
|
758
|
+
*/
|
|
759
|
+
!(isRowLoading || isColLoading) && (rowOpts.drag && rowDragOpts.animation)
|
|
760
760
|
? h(TransitionGroup, {
|
|
761
761
|
ref: refBodyTBody,
|
|
762
762
|
name: `vxe-body--row-list${isDragRowMove ? '' : '-disabled'}`,
|
|
@@ -885,7 +885,7 @@ export const Cell = {
|
|
|
885
885
|
const { $table, column } = params
|
|
886
886
|
const { computeSortOpts } = $table.getComputeMaps()
|
|
887
887
|
const sortOpts = computeSortOpts.value
|
|
888
|
-
const { showIcon, iconLayout, iconAsc, iconDesc, iconVisibleMethod } = sortOpts
|
|
888
|
+
const { showIcon, allowBtn, iconLayout, iconAsc, iconDesc, iconVisibleMethod } = sortOpts
|
|
889
889
|
const { order } = column
|
|
890
890
|
if (showIcon && (!iconVisibleMethod || iconVisibleMethod(params))) {
|
|
891
891
|
return [
|
|
@@ -897,20 +897,24 @@ export const Cell = {
|
|
|
897
897
|
'sort--active': order === 'asc'
|
|
898
898
|
}],
|
|
899
899
|
title: getI18n('vxe.table.sortAsc'),
|
|
900
|
-
onClick
|
|
901
|
-
evnt
|
|
902
|
-
|
|
903
|
-
|
|
900
|
+
onClick: allowBtn
|
|
901
|
+
? (evnt: Event) => {
|
|
902
|
+
evnt.stopPropagation()
|
|
903
|
+
$table.triggerSortEvent(evnt, column, 'asc')
|
|
904
|
+
}
|
|
905
|
+
: undefined
|
|
904
906
|
}),
|
|
905
907
|
h('i', {
|
|
906
908
|
class: ['vxe-sort--desc-btn', iconDesc || getIcon().TABLE_SORT_DESC, {
|
|
907
909
|
'sort--active': order === 'desc'
|
|
908
910
|
}],
|
|
909
911
|
title: getI18n('vxe.table.sortDesc'),
|
|
910
|
-
onClick
|
|
911
|
-
evnt
|
|
912
|
-
|
|
913
|
-
|
|
912
|
+
onClick: allowBtn
|
|
913
|
+
? (evnt: Event) => {
|
|
914
|
+
evnt.stopPropagation()
|
|
915
|
+
$table.triggerSortEvent(evnt, column, 'desc')
|
|
916
|
+
}
|
|
917
|
+
: undefined
|
|
914
918
|
})
|
|
915
919
|
])
|
|
916
920
|
]
|
|
@@ -213,7 +213,7 @@ export default defineComponent({
|
|
|
213
213
|
const renderHeads = (renderColumnList: VxeTableDefines.ColumnInfo[]) => {
|
|
214
214
|
const { fixedType, footerTableData } = props
|
|
215
215
|
const { footerRowClassName, footerRowStyle } = tableProps
|
|
216
|
-
const { isDragColMove } = tableReactData
|
|
216
|
+
const { isColLoading, isDragColMove } = tableReactData
|
|
217
217
|
const columnOpts = computeColumnOpts.value
|
|
218
218
|
const columnDragOpts = computeColumnDragOpts.value
|
|
219
219
|
|
|
@@ -221,7 +221,7 @@ export default defineComponent({
|
|
|
221
221
|
const _rowIndex = $rowIndex
|
|
222
222
|
const rowParams = { $table: $xeTable, row, _rowIndex, $rowIndex, fixed: fixedType, type: renderType }
|
|
223
223
|
|
|
224
|
-
if (columnOpts.drag && columnDragOpts.animation) {
|
|
224
|
+
if (!isColLoading && columnOpts.drag && columnDragOpts.animation) {
|
|
225
225
|
return h(TransitionGroup, {
|
|
226
226
|
key: $rowIndex,
|
|
227
227
|
name: `vxe-header--col-list${isDragColMove ? '' : '-disabled'}`,
|
|
@@ -186,14 +186,14 @@ export default defineComponent({
|
|
|
186
186
|
const renderHeads = (isGroup: boolean, isOptimizeMode: boolean, headerGroups: VxeTableDefines.ColumnInfo[][]) => {
|
|
187
187
|
const { fixedType } = props
|
|
188
188
|
const { headerRowClassName, headerRowStyle } = tableProps
|
|
189
|
-
const { isDragColMove } = tableReactData
|
|
189
|
+
const { isColLoading, isDragColMove } = tableReactData
|
|
190
190
|
const columnOpts = computeColumnOpts.value
|
|
191
191
|
const columnDragOpts = computeColumnDragOpts.value
|
|
192
192
|
|
|
193
193
|
return headerGroups.map((cols, $rowIndex) => {
|
|
194
194
|
const params = { $table: $xeTable, $rowIndex, fixed: fixedType, type: renderType }
|
|
195
195
|
|
|
196
|
-
if (columnOpts.drag && columnDragOpts.animation) {
|
|
196
|
+
if (!isColLoading && columnOpts.drag && columnDragOpts.animation) {
|
|
197
197
|
return h(TransitionGroup, {
|
|
198
198
|
key: $rowIndex,
|
|
199
199
|
name: `vxe-header--col-list${isDragColMove ? '' : '-disabled'}`,
|
|
@@ -86,13 +86,18 @@ export default {
|
|
|
86
86
|
type: Boolean as PropType<VxeTablePropTypes.HighlightHoverRow>,
|
|
87
87
|
default: () => getConfig().table.highlightHoverRow
|
|
88
88
|
},
|
|
89
|
-
|
|
90
|
-
|
|
89
|
+
/**
|
|
90
|
+
* （即将废弃）是否要高亮当前选中列
|
|
91
|
+
* @deprecated
|
|
92
|
+
*/
|
|
91
93
|
highlightCurrentColumn: {
|
|
92
94
|
type: Boolean as PropType<VxeTablePropTypes.HighlightCurrentColumn>,
|
|
93
95
|
default: () => getConfig().table.highlightCurrentColumn
|
|
94
96
|
},
|
|
95
|
-
|
|
97
|
+
/**
|
|
98
|
+
* （即将废弃）鼠标移到列是否要高亮显示
|
|
99
|
+
* @deprecated
|
|
100
|
+
*/
|
|
96
101
|
highlightHoverColumn: {
|
|
97
102
|
type: Boolean as PropType<VxeTablePropTypes.HighlightHoverColumn>,
|
|
98
103
|
default: () => getConfig().table.highlightHoverColumn
|
|
@@ -269,7 +269,8 @@ export default defineComponent({
|
|
|
269
269
|
dragTipText: '',
|
|
270
270
|
|
|
271
271
|
isDragResize: false,
|
|
272
|
-
|
|
272
|
+
isRowLoading: false,
|
|
273
|
+
isColLoading: false
|
|
273
274
|
})
|
|
274
275
|
|
|
275
276
|
const internalData: TableInternalData = {
|
|
@@ -2708,16 +2709,18 @@ export default defineComponent({
|
|
|
2708
2709
|
scrollYStore.endIndex = 1
|
|
2709
2710
|
scrollXStore.startIndex = 0
|
|
2710
2711
|
scrollXStore.endIndex = 1
|
|
2712
|
+
reactData.isRowLoading = true
|
|
2711
2713
|
reactData.scrollVMLoading = false
|
|
2712
2714
|
editStore.insertMaps = {}
|
|
2713
2715
|
editStore.removeMaps = {}
|
|
2714
2716
|
const sYLoad = updateScrollYStatus(fullData)
|
|
2717
|
+
reactData.isDragColMove = false
|
|
2715
2718
|
reactData.isDragRowMove = false
|
|
2716
2719
|
// 全量数据
|
|
2717
2720
|
internalData.tableFullData = fullData
|
|
2718
2721
|
internalData.tableFullTreeData = treeData
|
|
2719
2722
|
// 缓存数据
|
|
2720
|
-
|
|
2723
|
+
$xeTable.cacheRowMap(true, isReset)
|
|
2721
2724
|
// 原始数据
|
|
2722
2725
|
internalData.tableSynchData = datas
|
|
2723
2726
|
if (isReset) {
|
|
@@ -2729,7 +2732,7 @@ export default defineComponent({
|
|
|
2729
2732
|
}
|
|
2730
2733
|
// 克隆原数据，用于显示编辑状态，与编辑值做对比
|
|
2731
2734
|
if (keepSource) {
|
|
2732
|
-
|
|
2735
|
+
$xeTable.cacheSourceMap(fullData)
|
|
2733
2736
|
}
|
|
2734
2737
|
if ($xeTable.clearCellAreas && props.mouseConfig) {
|
|
2735
2738
|
$xeTable.clearCellAreas()
|
|
@@ -2790,6 +2793,7 @@ export default defineComponent({
|
|
|
2790
2793
|
if (sYOpts.scrollToTopOnChange) {
|
|
2791
2794
|
targetScrollTop = 0
|
|
2792
2795
|
}
|
|
2796
|
+
reactData.isRowLoading = false
|
|
2793
2797
|
calcCellHeight()
|
|
2794
2798
|
// 是否变更虚拟滚动
|
|
2795
2799
|
if (oldScrollYLoad === sYLoad) {
|
|
@@ -3024,13 +3028,12 @@ export default defineComponent({
|
|
|
3024
3028
|
internalData.collectColumn = collectColumn
|
|
3025
3029
|
const tableFullColumn = getColumnList(collectColumn)
|
|
3026
3030
|
internalData.tableFullColumn = tableFullColumn
|
|
3027
|
-
reactData.
|
|
3031
|
+
reactData.isColLoading = true
|
|
3028
3032
|
reactData.isDragColMove = false
|
|
3029
3033
|
initColumnSort()
|
|
3030
3034
|
return Promise.resolve(
|
|
3031
3035
|
restoreCustomStorage()
|
|
3032
3036
|
).then(() => {
|
|
3033
|
-
reactData.isLoading = false
|
|
3034
3037
|
cacheColumnMap()
|
|
3035
3038
|
parseColumns(true).then(() => {
|
|
3036
3039
|
if (reactData.scrollXLoad) {
|
|
@@ -3055,6 +3058,7 @@ export default defineComponent({
|
|
|
3055
3058
|
if ($xeTable.handleUpdateCustomColumn) {
|
|
3056
3059
|
$xeTable.handleUpdateCustomColumn()
|
|
3057
3060
|
}
|
|
3061
|
+
reactData.isColLoading = false
|
|
3058
3062
|
return $xeTable.recalculate()
|
|
3059
3063
|
})
|
|
3060
3064
|
})
|
|
@@ -7812,10 +7816,13 @@ export default defineComponent({
|
|
|
7812
7816
|
*/
|
|
7813
7817
|
triggerSortEvent (evnt, column, order) {
|
|
7814
7818
|
const sortOpts = computeSortOpts.value
|
|
7819
|
+
const { multiple, allowClear } = sortOpts
|
|
7815
7820
|
const { field, sortable } = column
|
|
7816
7821
|
if (sortable) {
|
|
7817
7822
|
if (!order || column.order === order) {
|
|
7818
|
-
|
|
7823
|
+
if (allowClear) {
|
|
7824
|
+
tableMethods.clearSort(multiple ? column : null)
|
|
7825
|
+
}
|
|
7819
7826
|
} else {
|
|
7820
7827
|
tableMethods.sort({ field, order })
|
|
7821
7828
|
}
|
|
@@ -9391,7 +9398,7 @@ export default defineComponent({
|
|
|
9391
9398
|
const areaOpts = computeAreaOpts.value
|
|
9392
9399
|
const loadingOpts = computeLoadingOpts.value
|
|
9393
9400
|
const isMenu = computeIsMenu.value
|
|
9394
|
-
const currLoading = reactData.
|
|
9401
|
+
const currLoading = reactData.isColLoading || reactData.isRowLoading || loading
|
|
9395
9402
|
const resizableOpts = computeResizableOpts.value
|
|
9396
9403
|
const isArea = mouseConfig && mouseOpts.area
|
|
9397
9404
|
const columnDragOpts = computeColumnDragOpts.value
|
package/packages/ui/index.ts
CHANGED
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|