vxe-table 4.23.0 → 4.23.2
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/dist/all.esm.js +52 -41
- package/dist/style.css +1 -1
- package/es/style.css +1 -1
- package/es/table/module/validator/hook.js +40 -39
- package/es/table/src/table.js +10 -0
- package/es/ui/index.js +1 -1
- package/es/ui/src/log.js +1 -1
- package/lib/index.umd.js +44 -43
- package/lib/index.umd.min.js +1 -1
- package/lib/style.css +1 -1
- package/lib/table/module/validator/hook.js +40 -39
- package/lib/table/module/validator/hook.min.js +1 -1
- package/lib/table/src/table.js +2 -2
- 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/validator/hook.ts +44 -42
- package/packages/table/src/table.ts +10 -0
- /package/es/{iconfont.1792337313144.ttf → iconfont.1792647501835.ttf} +0 -0
- /package/es/{iconfont.1792337313144.woff → iconfont.1792647501835.woff} +0 -0
- /package/es/{iconfont.1792337313144.woff2 → iconfont.1792647501835.woff2} +0 -0
- /package/lib/{iconfont.1792337313144.ttf → iconfont.1792647501835.ttf} +0 -0
- /package/lib/{iconfont.1792337313144.woff → iconfont.1792647501835.woff} +0 -0
- /package/lib/{iconfont.1792337313144.woff2 → iconfont.1792647501835.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.23.
|
|
16
|
+
const version = exports.version = "4.23.2";
|
|
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.23.
|
|
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.23.2",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},currentRowConfig:{strict:!0},currentColumnConfig:{strict:!0},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:{mode:"tooltip",enterable:!0,defaultPlacement:"top"},headerTooltipConfig:{mode:"tooltip",enterable:!0},footerTooltipConfig:{mode:"tooltip",enterable:!0},validConfig:{showErrorMessage:!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,allowAlign:!0,showSortDragButton:!0,showFooter:!0,placement:"top-right",storeOptions:{visible:!0,resizable:!0,sort:!0,fixed:!0,align:!0,headerAlign:!0,footerAlign:!0,aggFunc:!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,maxHeight:320},floatingFilterConfig:{},aggregateConfig:{padding:!0,placement:"left",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,isReuseKeep:!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:{},undoRedoHistoryConfig:{stackSize:50}},grid:{formConfig:{enabled:!0},pagerConfig:{enabled:!0},toolbarConfig:{enabled:!0},proxyConfig:{enabled:!0,autoLoad:!0,showLoading:!0,showResponseMsg:!0,showActionMsg:!0,response:{list:"list",result:"result",total:"page.total",footerData:"footerData",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_CUSTOM_FIXED_LEFT:iconPrefix+"fixed-left",TABLE_CUSTOM_FIXED_RIGHT:iconPrefix+"fixed-right",TABLE_CUSTOM_ALIGN_LEFT:iconPrefix+"align-left",TABLE_CUSTOM_ALIGN_CENTER:iconPrefix+"align-center",TABLE_CUSTOM_ALIGN_RIGHT:iconPrefix+"align-right",TABLE_CUSTOM_MOVE_UP:iconPrefix+"arrows-up",TABLE_CUSTOM_MOVE_DN:iconPrefix+"arrows-down",TABLE_CUSTOM_PUT_TOP:iconPrefix+"top",TABLE_CUSTOM_PUT_BOTTOM:iconPrefix+"bottom",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+"setting",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,i){return _core.VxeUI.modal.alert(e,o,i)},confirm(e,o,i){return _core.VxeUI.modal.confirm(e,o,i)},message(e,o){return _core.VxeUI.modal.message(e,o)},notification(e,o,i){return _core.VxeUI.modal.notification(e,o,i)}});var _default=exports.default=_core.VxeUI;
|
package/lib/ui/src/log.js
CHANGED
|
@@ -9,7 +9,7 @@ var _core = require("@vxe-ui/core");
|
|
|
9
9
|
const {
|
|
10
10
|
log
|
|
11
11
|
} = _core.VxeUI;
|
|
12
|
-
const tableVersion = `table v${"4.23.
|
|
12
|
+
const tableVersion = `table v${"4.23.2"}`;
|
|
13
13
|
function createComponentLog(name) {
|
|
14
14
|
const uiVersion = _core.VxeUI.uiVersion ? `ui v${_core.VxeUI.uiVersion}` : '';
|
|
15
15
|
const ganttVersion = _core.VxeUI.ganttVersion ? `gantt v${_core.VxeUI.ganttVersion}` : '';
|
package/lib/ui/src/log.min.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
Object.defineProperty(exports,"__esModule",{value:!0}),exports.createComponentLog=createComponentLog,exports.warnLog=exports.errLog=void 0;var _core=require("@vxe-ui/core");let log=_core.VxeUI.log,tableVersion="table v4.23.
|
|
1
|
+
Object.defineProperty(exports,"__esModule",{value:!0}),exports.createComponentLog=createComponentLog,exports.warnLog=exports.errLog=void 0;var _core=require("@vxe-ui/core");let log=_core.VxeUI.log,tableVersion="table v4.23.2";function createComponentLog(e){var r=_core.VxeUI.uiVersion?"ui v"+_core.VxeUI.uiVersion:"",o=_core.VxeUI.ganttVersion?"gantt v"+_core.VxeUI.ganttVersion:"",t=_core.VxeUI.designVersion?"design v"+_core.VxeUI.designVersion:"",r=[r,tableVersion,o,t].filter(e=>e).join(" ");return{warnLog:log.create("warn",r+"] ["+e),errLog:log.create("error",r+"] ["+e)}}let warnLog=exports.warnLog=log.create("warn",tableVersion),errLog=exports.errLog=log.create("error",tableVersion);
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "vxe-table",
|
|
3
|
-
"version": "4.23.
|
|
3
|
+
"version": "4.23.2",
|
|
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",
|
|
@@ -66,7 +66,7 @@
|
|
|
66
66
|
"typescript": "~5.9.3",
|
|
67
67
|
"vue": "3.4.27",
|
|
68
68
|
"vue-router": "~4.5.1",
|
|
69
|
-
"vxe-pc-ui": "4.20.
|
|
69
|
+
"vxe-pc-ui": "4.20.12"
|
|
70
70
|
},
|
|
71
71
|
"vetur": {
|
|
72
72
|
"tags": "helper/vetur/tags.json",
|
|
@@ -157,6 +157,48 @@ hooks.add('tableValidatorModule', {
|
|
|
157
157
|
let validatorMethods = {} as TableValidatorMethods
|
|
158
158
|
let validatorPrivateMethods = {} as TableValidatorPrivateMethods
|
|
159
159
|
|
|
160
|
+
const handleClearValid = (rows: any, fieldOrColumn: string | string[] | VxeTableDefines.ColumnInfo | VxeTableDefines.ColumnInfo[] | undefined) => {
|
|
161
|
+
const { validErrorMaps } = reactData
|
|
162
|
+
const validOpts = computeValidOpts.value
|
|
163
|
+
const rowList = XEUtils.isArray(rows) ? rows : (rows ? [rows] : [])
|
|
164
|
+
const colList = (XEUtils.isArray(fieldOrColumn) ? fieldOrColumn : (fieldOrColumn ? [fieldOrColumn] : [])).map(column => handleFieldOrColumn($xeTable, column)) as VxeTableDefines.ColumnInfo<any>[]
|
|
165
|
+
let validErrMaps: Record<string, {
|
|
166
|
+
row: any;
|
|
167
|
+
column: any;
|
|
168
|
+
rule: any;
|
|
169
|
+
content: any;
|
|
170
|
+
}> = {}
|
|
171
|
+
// 如果是多个提示模式
|
|
172
|
+
if (validOpts.msgMode === 'full') {
|
|
173
|
+
validErrMaps = Object.assign({}, validErrorMaps)
|
|
174
|
+
if (rowList.length && colList.length) {
|
|
175
|
+
rowList.forEach(row => {
|
|
176
|
+
colList.forEach((column) => {
|
|
177
|
+
const validKey = `${getRowid($xeTable, row)}:${column.id}`
|
|
178
|
+
if (validErrMaps[validKey]) {
|
|
179
|
+
delete validErrMaps[validKey]
|
|
180
|
+
}
|
|
181
|
+
})
|
|
182
|
+
})
|
|
183
|
+
} else if (rowList.length) {
|
|
184
|
+
const rowIdList = rowList.map(row => `${getRowid($xeTable, row)}`)
|
|
185
|
+
XEUtils.each(validErrorMaps, (item, key) => {
|
|
186
|
+
if (rowIdList.indexOf(key.split(':')[0]) > -1) {
|
|
187
|
+
delete validErrMaps[key]
|
|
188
|
+
}
|
|
189
|
+
})
|
|
190
|
+
} else if (colList.length) {
|
|
191
|
+
const colidList = colList.map(column => `${column.id}`)
|
|
192
|
+
XEUtils.each(validErrorMaps, (item, key) => {
|
|
193
|
+
if (colidList.indexOf(key.split(':')[1]) > -1) {
|
|
194
|
+
delete validErrMaps[key]
|
|
195
|
+
}
|
|
196
|
+
})
|
|
197
|
+
}
|
|
198
|
+
}
|
|
199
|
+
return validErrMaps
|
|
200
|
+
}
|
|
201
|
+
|
|
160
202
|
/**
|
|
161
203
|
* 聚焦到校验通过的单元格并弹出校验错误提示
|
|
162
204
|
*/
|
|
@@ -306,7 +348,7 @@ hooks.add('tableValidatorModule', {
|
|
|
306
348
|
}
|
|
307
349
|
return Promise.all(rowValidErrs).then(() => {
|
|
308
350
|
const ruleProps = Object.keys(validRest)
|
|
309
|
-
reactData.validErrorMaps = handleErrMsgMode(validErrMaps)
|
|
351
|
+
reactData.validErrorMaps = Object.assign(handleClearValid(rows, columns), handleErrMsgMode(validErrMaps))
|
|
310
352
|
return nextTick().then(() => {
|
|
311
353
|
if (ruleProps.length) {
|
|
312
354
|
return Promise.reject(validRest[ruleProps[0]][0])
|
|
@@ -398,51 +440,11 @@ hooks.add('tableValidatorModule', {
|
|
|
398
440
|
return nextTick()
|
|
399
441
|
},
|
|
400
442
|
clearValidate (rows, fieldOrColumn) {
|
|
401
|
-
const { validErrorMaps } = reactData
|
|
402
443
|
const validTip = refValidTooltip.value
|
|
403
|
-
const validOpts = computeValidOpts.value
|
|
404
|
-
const rowList = XEUtils.isArray(rows) ? rows : (rows ? [rows] : [])
|
|
405
|
-
const colList = (XEUtils.isArray(fieldOrColumn) ? fieldOrColumn : (fieldOrColumn ? [fieldOrColumn] : [])).map(column => handleFieldOrColumn($xeTable, column)) as VxeTableDefines.ColumnInfo<any>[]
|
|
406
|
-
let validErrMaps: Record<string, {
|
|
407
|
-
row: any;
|
|
408
|
-
column: any;
|
|
409
|
-
rule: any;
|
|
410
|
-
content: any;
|
|
411
|
-
}> = {}
|
|
412
444
|
if (validTip && validTip.reactData.visible) {
|
|
413
445
|
validTip.close()
|
|
414
446
|
}
|
|
415
|
-
|
|
416
|
-
if (validOpts.msgMode === 'single') {
|
|
417
|
-
reactData.validErrorMaps = {}
|
|
418
|
-
return nextTick()
|
|
419
|
-
}
|
|
420
|
-
if (rowList.length && colList.length) {
|
|
421
|
-
validErrMaps = Object.assign({}, validErrorMaps)
|
|
422
|
-
rowList.forEach(row => {
|
|
423
|
-
colList.forEach((column) => {
|
|
424
|
-
const validKey = `${getRowid($xeTable, row)}:${column.id}`
|
|
425
|
-
if (validErrMaps[validKey]) {
|
|
426
|
-
delete validErrMaps[validKey]
|
|
427
|
-
}
|
|
428
|
-
})
|
|
429
|
-
})
|
|
430
|
-
} else if (rowList.length) {
|
|
431
|
-
const rowIdList = rowList.map(row => `${getRowid($xeTable, row)}`)
|
|
432
|
-
XEUtils.each(validErrorMaps, (item, key) => {
|
|
433
|
-
if (rowIdList.indexOf(key.split(':')[0]) > -1) {
|
|
434
|
-
validErrMaps[key] = item
|
|
435
|
-
}
|
|
436
|
-
})
|
|
437
|
-
} else if (colList.length) {
|
|
438
|
-
const colidList = colList.map(column => `${column.id}`)
|
|
439
|
-
XEUtils.each(validErrorMaps, (item, key) => {
|
|
440
|
-
if (colidList.indexOf(key.split(':')[1]) > -1) {
|
|
441
|
-
validErrMaps[key] = item
|
|
442
|
-
}
|
|
443
|
-
})
|
|
444
|
-
}
|
|
445
|
-
reactData.validErrorMaps = validErrMaps
|
|
447
|
+
reactData.validErrorMaps = handleClearValid(rows, fieldOrColumn)
|
|
446
448
|
return nextTick()
|
|
447
449
|
}
|
|
448
450
|
}
|
|
@@ -283,12 +283,14 @@ export default defineVxeComponent({
|
|
|
283
283
|
|
|
284
284
|
const computeScrollbarWrapperClss = computed(() => {
|
|
285
285
|
const { yThumbHeight, xThumbWidth } = reactData
|
|
286
|
+
const scrollbarOpts = computeScrollbarOpts.value
|
|
286
287
|
const scrollbarXToTop = computeScrollbarXToTop.value
|
|
287
288
|
const scrollbarYToLeft = computeScrollbarYToLeft.value
|
|
288
289
|
const scrollXVisible = computeScrollXVisible.value
|
|
289
290
|
const scrollYVisible = computeScrollYVisible.value
|
|
290
291
|
return domUtils.buildClass([
|
|
291
292
|
'vxe-scrollbar is--virtual',
|
|
293
|
+
scrollbarOpts.fluentOverlay ? 'is--fluent-overlay' : 'is--default-mode',
|
|
292
294
|
`ov-x--${scrollXVisible === false ? 'hidden' : 'visible'}`,
|
|
293
295
|
`ov-y--${scrollYVisible === false ? 'hidden' : 'visible'}`,
|
|
294
296
|
`sx-pos--${scrollbarXToTop ? 'top' : 'bottom'}`,
|
|
@@ -13791,6 +13793,8 @@ export default defineVxeComponent({
|
|
|
13791
13793
|
if (isVScrollbar) {
|
|
13792
13794
|
const el = refElem.value
|
|
13793
13795
|
const viewInnerEl = getRefElem(elemStore['main-body-table'])
|
|
13796
|
+
const viewXSpaceEl = getRefElem(elemStore['main-body-xSpace'])
|
|
13797
|
+
const viewYSpaceEl = getRefElem(elemStore['main-body-ySpace'])
|
|
13794
13798
|
const scrollObserver = globalResize.create(() => {
|
|
13795
13799
|
reScrollFlag.value++
|
|
13796
13800
|
})
|
|
@@ -13800,6 +13804,12 @@ export default defineVxeComponent({
|
|
|
13800
13804
|
if (viewInnerEl) {
|
|
13801
13805
|
scrollObserver.observe(viewInnerEl)
|
|
13802
13806
|
}
|
|
13807
|
+
if (viewXSpaceEl) {
|
|
13808
|
+
scrollObserver.observe(viewXSpaceEl)
|
|
13809
|
+
}
|
|
13810
|
+
if (viewYSpaceEl) {
|
|
13811
|
+
scrollObserver.observe(viewYSpaceEl)
|
|
13812
|
+
}
|
|
13803
13813
|
internalData.scrollObserver = scrollObserver
|
|
13804
13814
|
}
|
|
13805
13815
|
}
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|