vxe-table 4.18.3 → 4.18.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.
- package/es/grid/style.css +4 -0
- package/es/grid/style.min.css +1 -1
- package/es/index.css +1 -1
- package/es/index.min.css +1 -1
- package/es/style.css +1 -1
- package/es/style.min.css +1 -1
- package/es/table/module/custom/hook.js +3 -1
- package/es/table/module/custom/panel.js +3 -1
- package/es/table/src/table.js +31 -22
- package/es/ui/index.js +1 -1
- package/es/ui/src/log.js +1 -1
- package/es/vxe-grid/style.css +4 -0
- package/es/vxe-grid/style.min.css +1 -1
- package/lib/grid/style/style.css +4 -0
- package/lib/grid/style/style.min.css +1 -1
- package/lib/index.css +1 -1
- package/lib/index.min.css +1 -1
- package/lib/index.umd.js +10 -6
- package/lib/index.umd.min.js +1 -1
- package/lib/style.css +1 -1
- package/lib/style.min.css +1 -1
- package/lib/table/module/custom/hook.js +3 -1
- package/lib/table/module/custom/hook.min.js +1 -1
- package/lib/table/module/custom/panel.js +3 -1
- package/lib/table/module/custom/panel.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/lib/vxe-grid/style/style.css +4 -0
- package/lib/vxe-grid/style/style.min.css +1 -1
- package/package.json +1 -1
- package/packages/table/module/custom/hook.ts +3 -1
- package/packages/table/module/custom/panel.ts +3 -1
- package/packages/table/src/table.ts +31 -23
- package/styles/components/grid.scss +4 -0
- /package/es/{iconfont.1773640299992.ttf → iconfont.1773710736571.ttf} +0 -0
- /package/es/{iconfont.1773640299992.woff → iconfont.1773710736571.woff} +0 -0
- /package/es/{iconfont.1773640299992.woff2 → iconfont.1773710736571.woff2} +0 -0
- /package/lib/{iconfont.1773640299992.ttf → iconfont.1773710736571.ttf} +0 -0
- /package/lib/{iconfont.1773640299992.woff → iconfont.1773710736571.woff} +0 -0
- /package/lib/{iconfont.1773640299992.woff2 → iconfont.1773710736571.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.18.
|
|
16
|
+
const version = exports.version = "4.18.5";
|
|
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.18.
|
|
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.18.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,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:{enterable:!0},headerTooltipConfig:{enterable:!0},footerTooltipConfig:{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,showFooter:!0,placement:"top-right",storeOptions:{visible:!0,resizable:!0,sort:!0,fixed:!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:280},floatingFilterConfig:{},aggregateConfig:{padding:!0,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},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:{x:{visible:!0},y:{visible:!0}},undoHistoryConfig:{isEditRow:!0}},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_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+"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.18.
|
|
11
|
+
const version = `table v${"4.18.5"}`;
|
|
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.18.
|
|
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.18.5",warnLog=exports.warnLog=log.create("warn",version),errLog=exports.errLog=log.create("error",version);
|
|
@@ -36,6 +36,8 @@
|
|
|
36
36
|
.vxe-grid .vxe-grid--table-container {
|
|
37
37
|
display: flex;
|
|
38
38
|
flex-direction: row;
|
|
39
|
+
flex-grow: 1;
|
|
40
|
+
overflow: hidden;
|
|
39
41
|
}
|
|
40
42
|
.vxe-grid .vxe-grid--left-wrapper,
|
|
41
43
|
.vxe-grid .vxe-grid--right-wrapper {
|
|
@@ -56,6 +58,8 @@
|
|
|
56
58
|
}
|
|
57
59
|
|
|
58
60
|
.vxe-grid--layout-body-content-wrapper {
|
|
61
|
+
display: flex;
|
|
62
|
+
flex-direction: column;
|
|
59
63
|
flex-grow: 1;
|
|
60
64
|
overflow: auto;
|
|
61
65
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
.vxe-grid{position:relative;display:flex;flex-direction:column}.vxe-grid.is--loading:before{content:"";position:absolute;top:0;left:0;width:100%;height:100%;z-index:99;-webkit-user-select:none;-moz-user-select:none;user-select:none;background-color:var(--vxe-ui-loading-background-color)}.vxe-grid.is--loading>.vxe-table .vxe-loading{background-color:transparent}.vxe-grid.is--maximize{position:fixed;top:0;left:0;width:100%;height:100%;padding:.5em 1em;background-color:var(--vxe-ui-layout-background-color)}.vxe-grid .vxe-grid--bottom-wrapper,.vxe-grid .vxe-grid--form-wrapper,.vxe-grid .vxe-grid--top-wrapper{position:relative}.vxe-grid .vxe-grid--table-container{display:flex;flex-direction:row}.vxe-grid .vxe-grid--left-wrapper,.vxe-grid .vxe-grid--right-wrapper{flex-shrink:0;overflow:auto;outline:0}.vxe-grid .vxe-grid--table-wrapper{flex-grow:1;overflow:hidden}.vxe-grid--layout-body-wrapper{display:flex;flex-direction:row;overflow:auto;flex-grow:1}.vxe-grid--layout-body-content-wrapper{flex-grow:1;overflow:auto}.vxe-grid--layout-aside-left-wrapper,.vxe-grid--layout-footer-wrapper,.vxe-grid--layout-header-wrapper{flex-shrink:0}.vxe-grid--layout-aside-left-wrapper{overflow:auto}.vxe-grid{font-size:var(--vxe-ui-font-size-default)}.vxe-grid.size--medium{font-size:var(--vxe-ui-font-size-medium)}.vxe-grid.size--small{font-size:var(--vxe-ui-font-size-small)}.vxe-grid.size--mini{font-size:var(--vxe-ui-font-size-mini)}
|
|
1
|
+
.vxe-grid{position:relative;display:flex;flex-direction:column}.vxe-grid.is--loading:before{content:"";position:absolute;top:0;left:0;width:100%;height:100%;z-index:99;-webkit-user-select:none;-moz-user-select:none;user-select:none;background-color:var(--vxe-ui-loading-background-color)}.vxe-grid.is--loading>.vxe-table .vxe-loading{background-color:transparent}.vxe-grid.is--maximize{position:fixed;top:0;left:0;width:100%;height:100%;padding:.5em 1em;background-color:var(--vxe-ui-layout-background-color)}.vxe-grid .vxe-grid--bottom-wrapper,.vxe-grid .vxe-grid--form-wrapper,.vxe-grid .vxe-grid--top-wrapper{position:relative}.vxe-grid .vxe-grid--table-container{display:flex;flex-direction:row;flex-grow:1;overflow:hidden}.vxe-grid .vxe-grid--left-wrapper,.vxe-grid .vxe-grid--right-wrapper{flex-shrink:0;overflow:auto;outline:0}.vxe-grid .vxe-grid--table-wrapper{flex-grow:1;overflow:hidden}.vxe-grid--layout-body-wrapper{display:flex;flex-direction:row;overflow:auto;flex-grow:1}.vxe-grid--layout-body-content-wrapper{display:flex;flex-direction:column;flex-grow:1;overflow:auto}.vxe-grid--layout-aside-left-wrapper,.vxe-grid--layout-footer-wrapper,.vxe-grid--layout-header-wrapper{flex-shrink:0}.vxe-grid--layout-aside-left-wrapper{overflow:auto}.vxe-grid{font-size:var(--vxe-ui-font-size-default)}.vxe-grid.size--medium{font-size:var(--vxe-ui-font-size-medium)}.vxe-grid.size--small{font-size:var(--vxe-ui-font-size-small)}.vxe-grid.size--mini{font-size:var(--vxe-ui-font-size-mini)}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "vxe-table",
|
|
3
|
-
"version": "4.18.
|
|
3
|
+
"version": "4.18.5",
|
|
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",
|
|
@@ -13,7 +13,9 @@ VxeUI.hooks.add('tableCustomModule', {
|
|
|
13
13
|
const { computeCustomOpts, computeRowGroupFields, computeCustomSimpleMode } = $xeTable.getComputeMaps()
|
|
14
14
|
const { refElem } = $xeTable.getRefMaps()
|
|
15
15
|
|
|
16
|
+
const $xeGrid = $xeTable.xeGrid
|
|
16
17
|
const $xeGantt = $xeTable.xeGantt
|
|
18
|
+
const $xeGGWrapper = $xeGrid || $xeGantt
|
|
17
19
|
|
|
18
20
|
const updatePopupStyle = () => {
|
|
19
21
|
const { customStore } = reactData
|
|
@@ -33,7 +35,7 @@ VxeUI.hooks.add('tableCustomModule', {
|
|
|
33
35
|
}
|
|
34
36
|
}
|
|
35
37
|
if (showCustomSimpleOutside) {
|
|
36
|
-
if (wrapperEl) {
|
|
38
|
+
if ($xeGGWrapper && wrapperEl) {
|
|
37
39
|
popupTop = wrapperEl.offsetTop
|
|
38
40
|
}
|
|
39
41
|
popupMaxHeight = XEUtils.eqNull(maxHeight) ? 360 : maxHeight
|
|
@@ -756,7 +756,9 @@ export default defineVxeComponent({
|
|
|
756
756
|
})
|
|
757
757
|
const popupStys: VxeComponentStyleType = {}
|
|
758
758
|
if (maxHeight && !['left', 'right'].includes(placement || '')) {
|
|
759
|
-
|
|
759
|
+
if (popupTop) {
|
|
760
|
+
popupStys.top = toCssUnit(popupTop)
|
|
761
|
+
}
|
|
760
762
|
popupStys.maxHeight = toCssUnit(maxHeight)
|
|
761
763
|
}
|
|
762
764
|
return h('div', {
|
|
@@ -10273,18 +10273,22 @@ export default defineVxeComponent({
|
|
|
10273
10273
|
if (!checkMethod || checkMethod({ $table: $xeTable, row })) {
|
|
10274
10274
|
let newValue = row
|
|
10275
10275
|
let isChange = oldValue !== newValue
|
|
10276
|
-
|
|
10277
|
-
if (isChange) {
|
|
10276
|
+
if (strict) {
|
|
10278
10277
|
handleCheckedRadioRow(newValue)
|
|
10279
|
-
} else
|
|
10280
|
-
|
|
10281
|
-
|
|
10278
|
+
} else {
|
|
10279
|
+
if (oldValue === newValue) {
|
|
10280
|
+
newValue = null
|
|
10281
|
+
}
|
|
10282
|
+
isChange = oldValue !== newValue
|
|
10283
|
+
if (isChange && newValue) {
|
|
10284
|
+
handleCheckedRadioRow(newValue)
|
|
10285
|
+
} else {
|
|
10282
10286
|
newValue = null
|
|
10283
10287
|
$xeTable.clearRadioRow()
|
|
10284
10288
|
}
|
|
10285
10289
|
}
|
|
10286
10290
|
if (isChange) {
|
|
10287
|
-
dispatchEvent('radio-change', { oldValue, newValue, selected, ...params }, evnt)
|
|
10291
|
+
dispatchEvent('radio-change', { oldValue, newValue, selected: !!newValue, ...params }, evnt)
|
|
10288
10292
|
}
|
|
10289
10293
|
}
|
|
10290
10294
|
},
|
|
@@ -10293,27 +10297,29 @@ export default defineVxeComponent({
|
|
|
10293
10297
|
const columnOpts = computeColumnOpts.value
|
|
10294
10298
|
const currentColumnOpts = computeCurrentColumnOpts.value
|
|
10295
10299
|
const beforeRowMethod = currentColumnOpts.beforeSelectMethod || columnOpts.currentMethod as any
|
|
10296
|
-
let
|
|
10300
|
+
let newValue: VxeTableDefines.ColumnInfo | null = params.column
|
|
10297
10301
|
const { trigger, strict } = currentColumnOpts
|
|
10298
10302
|
if (trigger === 'manual') {
|
|
10299
10303
|
return
|
|
10300
10304
|
}
|
|
10301
10305
|
let isChange = oldValue !== newValue
|
|
10302
|
-
|
|
10303
|
-
if (!beforeRowMethod || beforeRowMethod({ column: newValue, selected, $table: $xeTable })) {
|
|
10306
|
+
if (!beforeRowMethod || beforeRowMethod({ column: newValue, $table: $xeTable })) {
|
|
10304
10307
|
if (strict) {
|
|
10305
10308
|
$xeTable.setCurrentColumn(newValue)
|
|
10306
10309
|
} else {
|
|
10307
|
-
|
|
10308
|
-
|
|
10309
|
-
|
|
10310
|
-
|
|
10311
|
-
|
|
10310
|
+
if (oldValue === newValue) {
|
|
10311
|
+
newValue = null
|
|
10312
|
+
}
|
|
10313
|
+
isChange = oldValue !== newValue
|
|
10314
|
+
if (isChange && newValue) {
|
|
10312
10315
|
$xeTable.setCurrentColumn(newValue)
|
|
10316
|
+
} else {
|
|
10317
|
+
newValue = null
|
|
10318
|
+
$xeTable.clearCurrentColumn()
|
|
10313
10319
|
}
|
|
10314
10320
|
}
|
|
10315
10321
|
if (isChange) {
|
|
10316
|
-
dispatchEvent('current-column-change', { oldValue, newValue, selected, ...params }, evnt)
|
|
10322
|
+
dispatchEvent('current-column-change', { oldValue, newValue, selected: !!newValue, ...params }, evnt)
|
|
10317
10323
|
}
|
|
10318
10324
|
} else {
|
|
10319
10325
|
dispatchEvent('current-column-disabled', params, evnt)
|
|
@@ -10330,23 +10336,25 @@ export default defineVxeComponent({
|
|
|
10330
10336
|
return
|
|
10331
10337
|
}
|
|
10332
10338
|
let isChange = oldValue !== newValue
|
|
10333
|
-
|
|
10334
|
-
if (!beforeRowMethod || beforeRowMethod({ row: newValue, selected, $table: $xeTable })) {
|
|
10339
|
+
if (!beforeRowMethod || beforeRowMethod({ row: newValue, $table: $xeTable })) {
|
|
10335
10340
|
if (strict) {
|
|
10336
10341
|
$xeTable.setCurrentRow(newValue)
|
|
10337
10342
|
} else {
|
|
10338
|
-
|
|
10339
|
-
if (isChange) {
|
|
10343
|
+
if (oldValue === newValue) {
|
|
10340
10344
|
newValue = null
|
|
10341
|
-
|
|
10342
|
-
|
|
10345
|
+
}
|
|
10346
|
+
isChange = oldValue !== newValue
|
|
10347
|
+
if (isChange && newValue) {
|
|
10343
10348
|
$xeTable.setCurrentRow(newValue)
|
|
10349
|
+
} else {
|
|
10350
|
+
newValue = null
|
|
10351
|
+
$xeTable.clearCurrentRow()
|
|
10344
10352
|
}
|
|
10345
10353
|
}
|
|
10346
10354
|
if (isChange) {
|
|
10347
|
-
dispatchEvent('current-row-change', { oldValue, newValue, selected, ...params }, evnt)
|
|
10355
|
+
dispatchEvent('current-row-change', { oldValue, newValue, selected: !!newValue, ...params }, evnt)
|
|
10348
10356
|
// 已废弃
|
|
10349
|
-
dispatchEvent('current-change', { oldValue, newValue,
|
|
10357
|
+
dispatchEvent('current-change', { oldValue, newValue, ...params }, evnt)
|
|
10350
10358
|
}
|
|
10351
10359
|
} else {
|
|
10352
10360
|
dispatchEvent('current-row-disabled', params, evnt)
|
|
@@ -37,6 +37,8 @@
|
|
|
37
37
|
.vxe-grid--table-container {
|
|
38
38
|
display: flex;
|
|
39
39
|
flex-direction: row;
|
|
40
|
+
flex-grow: 1;
|
|
41
|
+
overflow: hidden;
|
|
40
42
|
}
|
|
41
43
|
.vxe-grid--left-wrapper,
|
|
42
44
|
.vxe-grid--right-wrapper {
|
|
@@ -57,6 +59,8 @@
|
|
|
57
59
|
flex-grow: 1;
|
|
58
60
|
}
|
|
59
61
|
.vxe-grid--layout-body-content-wrapper {
|
|
62
|
+
display: flex;
|
|
63
|
+
flex-direction: column;
|
|
60
64
|
flex-grow: 1;
|
|
61
65
|
overflow: auto;
|
|
62
66
|
}
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|