vxe-table 4.11.21 → 4.11.23
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/cell.js +10 -9
- package/es/table/src/table.js +28 -32
- package/es/ui/index.js +1 -1
- package/es/ui/src/log.js +1 -1
- package/lib/index.umd.js +46 -42
- package/lib/index.umd.min.js +1 -1
- package/lib/style.css +1 -1
- package/lib/table/src/cell.js +15 -8
- package/lib/table/src/cell.min.js +1 -1
- package/lib/table/src/table.js +29 -32
- 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/src/cell.ts +10 -9
- package/packages/table/src/table.ts +28 -32
- /package/es/{iconfont.1741744105265.ttf → iconfont.1741921400827.ttf} +0 -0
- /package/es/{iconfont.1741744105265.woff → iconfont.1741921400827.woff} +0 -0
- /package/es/{iconfont.1741744105265.woff2 → iconfont.1741921400827.woff2} +0 -0
- /package/lib/{iconfont.1741744105265.ttf → iconfont.1741921400827.ttf} +0 -0
- /package/lib/{iconfont.1741744105265.woff → iconfont.1741921400827.woff} +0 -0
- /package/lib/{iconfont.1741744105265.woff2 → iconfont.1741921400827.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.11.
|
|
16
|
+
const version = exports.version = "4.11.23";
|
|
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.11.
|
|
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.11.23",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:0,oSize:1},virtualYConfig:{enabled:!0,gt:100,preSize:0,oSize:1},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.11.
|
|
11
|
+
const version = `table v${"4.11.23"}`;
|
|
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.11.
|
|
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.11.23",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.11.
|
|
3
|
+
"version": "4.11.23",
|
|
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.4.
|
|
31
|
+
"vxe-pc-ui": "^4.4.14"
|
|
32
32
|
},
|
|
33
33
|
"devDependencies": {
|
|
34
34
|
"@types/resize-observer-browser": "^0.1.11",
|
|
@@ -598,7 +598,8 @@ export const Cell = {
|
|
|
598
598
|
const headerSlot = slots ? slots.header : null
|
|
599
599
|
const titleSlot = slots ? slots.title : null
|
|
600
600
|
const checkboxOpts = computeCheckboxOpts.value
|
|
601
|
-
const headerTitle =
|
|
601
|
+
const { checkStrictly, showHeader, headerTitle } = checkboxOpts
|
|
602
|
+
const colTitle = column.getTitle()
|
|
602
603
|
const ons: Record<string, any> = {}
|
|
603
604
|
if (!isHidden) {
|
|
604
605
|
ons.onClick = (evnt: MouseEvent) => {
|
|
@@ -611,11 +612,11 @@ export const Cell = {
|
|
|
611
612
|
if (headerSlot) {
|
|
612
613
|
return renderHeaderCellBaseVNs(params, renderTitleContent(checkboxParams, $table.callSlot(headerSlot, checkboxParams)))
|
|
613
614
|
}
|
|
614
|
-
if (
|
|
615
|
+
if (checkStrictly ? !showHeader : showHeader === false) {
|
|
615
616
|
return renderHeaderCellBaseVNs(params, renderTitleContent(checkboxParams, [
|
|
616
617
|
h('span', {
|
|
617
618
|
class: 'vxe-checkbox--label'
|
|
618
|
-
}, titleSlot ? $table.callSlot(titleSlot, checkboxParams) :
|
|
619
|
+
}, titleSlot ? $table.callSlot(titleSlot, checkboxParams) : colTitle)
|
|
619
620
|
]))
|
|
620
621
|
}
|
|
621
622
|
return renderHeaderCellBaseVNs(params,
|
|
@@ -626,17 +627,17 @@ export const Cell = {
|
|
|
626
627
|
'is--disabled': isAllCheckboxDisabled,
|
|
627
628
|
'is--indeterminate': isAllCheckboxIndeterminate
|
|
628
629
|
}],
|
|
629
|
-
title: getI18n('vxe.table.allTitle')
|
|
630
|
+
title: XEUtils.eqNull(headerTitle) ? getI18n('vxe.table.allTitle') : `${headerTitle || ''}`,
|
|
630
631
|
...ons
|
|
631
632
|
}, [
|
|
632
633
|
h('span', {
|
|
633
634
|
class: ['vxe-checkbox--icon', isAllCheckboxIndeterminate ? getIcon().TABLE_CHECKBOX_INDETERMINATE : (isAllCheckboxSelected ? getIcon().TABLE_CHECKBOX_CHECKED : getIcon().TABLE_CHECKBOX_UNCHECKED)]
|
|
634
635
|
})
|
|
635
|
-
].concat(titleSlot ||
|
|
636
|
+
].concat(titleSlot || colTitle
|
|
636
637
|
? [
|
|
637
638
|
h('span', {
|
|
638
639
|
class: 'vxe-checkbox--label'
|
|
639
|
-
}, titleSlot ? $table.callSlot(titleSlot, checkboxParams) :
|
|
640
|
+
}, titleSlot ? $table.callSlot(titleSlot, checkboxParams) : colTitle)
|
|
640
641
|
]
|
|
641
642
|
: []))
|
|
642
643
|
])
|
|
@@ -889,7 +890,7 @@ export const Cell = {
|
|
|
889
890
|
const { $table, column } = params
|
|
890
891
|
const { computeSortOpts } = $table.getComputeMaps()
|
|
891
892
|
const sortOpts = computeSortOpts.value
|
|
892
|
-
const { showIcon, allowBtn, iconLayout, iconAsc, iconDesc, iconVisibleMethod } = sortOpts
|
|
893
|
+
const { showIcon, allowBtn, ascTitle, descTitle, iconLayout, iconAsc, iconDesc, iconVisibleMethod } = sortOpts
|
|
893
894
|
const { order } = column
|
|
894
895
|
if (showIcon && (!iconVisibleMethod || iconVisibleMethod(params))) {
|
|
895
896
|
return [
|
|
@@ -900,7 +901,7 @@ export const Cell = {
|
|
|
900
901
|
class: ['vxe-sort--asc-btn', iconAsc || getIcon().TABLE_SORT_ASC, {
|
|
901
902
|
'sort--active': order === 'asc'
|
|
902
903
|
}],
|
|
903
|
-
title: getI18n('vxe.table.sortAsc')
|
|
904
|
+
title: XEUtils.eqNull(ascTitle) ? getI18n('vxe.table.sortAsc') : `${ascTitle || ''}`,
|
|
904
905
|
onClick: allowBtn
|
|
905
906
|
? (evnt: Event) => {
|
|
906
907
|
evnt.stopPropagation()
|
|
@@ -912,7 +913,7 @@ export const Cell = {
|
|
|
912
913
|
class: ['vxe-sort--desc-btn', iconDesc || getIcon().TABLE_SORT_DESC, {
|
|
913
914
|
'sort--active': order === 'desc'
|
|
914
915
|
}],
|
|
915
|
-
title: getI18n('vxe.table.sortDesc')
|
|
916
|
+
title: XEUtils.eqNull(descTitle) ? getI18n('vxe.table.sortDesc') : `${descTitle || ''}`,
|
|
916
917
|
onClick: allowBtn
|
|
917
918
|
? (evnt: Event) => {
|
|
918
919
|
evnt.stopPropagation()
|
|
@@ -1278,7 +1278,7 @@ export default defineComponent({
|
|
|
1278
1278
|
fullColumnFieldData[field] = rest
|
|
1279
1279
|
} else {
|
|
1280
1280
|
if ((storage && !type) || (columnOpts.drag && (isCrossDrag || isSelfToChildDrag))) {
|
|
1281
|
-
errLog('vxe.error.reqProp', [`${column.getTitle() || type || ''} -> column.field
|
|
1281
|
+
errLog('vxe.error.reqProp', [`${column.getTitle() || type || ''} -> column.field=?`])
|
|
1282
1282
|
}
|
|
1283
1283
|
}
|
|
1284
1284
|
if (!hasFixed && fixed) {
|
|
@@ -5888,7 +5888,13 @@ export default defineComponent({
|
|
|
5888
5888
|
const { id } = props
|
|
5889
5889
|
const customOpts = computeCustomOpts.value
|
|
5890
5890
|
const { collectColumn } = internalData
|
|
5891
|
-
const { checkMethod } = customOpts
|
|
5891
|
+
const { storage, checkMethod } = customOpts
|
|
5892
|
+
const isAllCustom = storage === true
|
|
5893
|
+
const storageOpts: VxeTableDefines.VxeTableCustomStorageObj = isAllCustom ? {} : Object.assign({}, storage || {})
|
|
5894
|
+
const isCustomResizable = isAllCustom || storageOpts.resizable
|
|
5895
|
+
const isCustomVisible = isAllCustom || storageOpts.visible
|
|
5896
|
+
const isCustomFixed = isAllCustom || storageOpts.fixed
|
|
5897
|
+
const isCustomSort = isAllCustom || storageOpts.sort
|
|
5892
5898
|
const resizableData: Record<string, number> = {}
|
|
5893
5899
|
const sortData: Record<string, number> = {}
|
|
5894
5900
|
const visibleData: Record<string, boolean> = {}
|
|
@@ -5908,43 +5914,33 @@ export default defineComponent({
|
|
|
5908
5914
|
let hasFixed = 0
|
|
5909
5915
|
let hasVisible = 0
|
|
5910
5916
|
XEUtils.eachTree(collectColumn, (column, index, items, path, parentColumn) => {
|
|
5917
|
+
const colKey = column.getKey()
|
|
5918
|
+
if (!colKey) {
|
|
5919
|
+
errLog('vxe.error.reqProp', [`${column.getTitle() || column.type || ''} -> column.field=?`])
|
|
5920
|
+
return
|
|
5921
|
+
}
|
|
5911
5922
|
// 只支持一级
|
|
5912
5923
|
if (!parentColumn) {
|
|
5913
|
-
|
|
5914
|
-
|
|
5915
|
-
|
|
5916
|
-
hasSort = 1
|
|
5917
|
-
sortData[colKey] = column.renderSortNumber
|
|
5918
|
-
}
|
|
5919
|
-
})
|
|
5920
|
-
if (column.fixed !== column.defaultFixed) {
|
|
5921
|
-
const colKey = column.getKey()
|
|
5922
|
-
if (colKey) {
|
|
5923
|
-
hasFixed = 1
|
|
5924
|
-
fixedData[colKey] = column.fixed
|
|
5925
|
-
}
|
|
5924
|
+
if (isCustomSort) {
|
|
5925
|
+
hasSort = 1
|
|
5926
|
+
sortData[colKey] = column.renderSortNumber
|
|
5926
5927
|
}
|
|
5927
|
-
|
|
5928
|
-
|
|
5929
|
-
|
|
5930
|
-
if (colKey) {
|
|
5931
|
-
hasResizable = 1
|
|
5932
|
-
resizableData[colKey] = column.renderWidth
|
|
5928
|
+
if (isCustomFixed && column.fixed !== column.defaultFixed) {
|
|
5929
|
+
hasFixed = 1
|
|
5930
|
+
fixedData[colKey] = column.fixed
|
|
5933
5931
|
}
|
|
5934
5932
|
}
|
|
5935
|
-
if (
|
|
5933
|
+
if (isCustomResizable && column.resizeWidth) {
|
|
5934
|
+
hasResizable = 1
|
|
5935
|
+
resizableData[colKey] = column.renderWidth
|
|
5936
|
+
}
|
|
5937
|
+
if (isCustomVisible && (!checkMethod || checkMethod({ column }))) {
|
|
5936
5938
|
if (!column.visible && column.defaultVisible) {
|
|
5937
|
-
|
|
5938
|
-
|
|
5939
|
-
hasVisible = 1
|
|
5940
|
-
visibleData[colKey] = false
|
|
5941
|
-
}
|
|
5939
|
+
hasVisible = 1
|
|
5940
|
+
visibleData[colKey] = false
|
|
5942
5941
|
} else if (column.visible && !column.defaultVisible) {
|
|
5943
|
-
|
|
5944
|
-
|
|
5945
|
-
hasVisible = 1
|
|
5946
|
-
visibleData[colKey] = true
|
|
5947
|
-
}
|
|
5942
|
+
hasVisible = 1
|
|
5943
|
+
visibleData[colKey] = true
|
|
5948
5944
|
}
|
|
5949
5945
|
}
|
|
5950
5946
|
})
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|