vxe-table 4.13.48 → 4.13.50
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/module/edit/hook.js +27 -1
- package/es/table/src/columnInfo.js +5 -0
- package/es/table/src/table.js +47 -12
- package/es/ui/index.js +1 -1
- package/es/ui/src/log.js +1 -1
- package/lib/index.common.js +1 -2
- package/lib/index.umd.js +1938 -1805
- package/lib/index.umd.min.js +1 -1
- package/lib/style.css +1 -1
- package/lib/table/module/edit/hook.js +26 -1
- package/lib/table/module/edit/hook.min.js +1 -1
- package/lib/table/src/columnInfo.js +5 -0
- package/lib/table/src/columnInfo.min.js +1 -1
- package/lib/table/src/table.js +10 -5
- 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/v-x-e-table/index.js +1 -2
- package/lib/v-x-e-table/index.min.js +1 -1
- package/lib/vxe-colgroup/index.js +1 -2
- package/lib/vxe-colgroup/index.min.js +1 -1
- package/lib/vxe-column/index.js +1 -2
- package/lib/vxe-column/index.min.js +1 -1
- package/lib/vxe-grid/index.js +1 -2
- package/lib/vxe-grid/index.min.js +1 -1
- package/lib/vxe-table/index.js +1 -2
- package/lib/vxe-table/index.min.js +1 -1
- package/lib/vxe-toolbar/index.js +1 -2
- package/lib/vxe-toolbar/index.min.js +1 -1
- package/lib/vxe-ui/index.js +1 -2
- package/lib/vxe-ui/index.min.js +1 -1
- package/lib/vxe-v-x-e-table/index.js +1 -2
- package/lib/vxe-v-x-e-table/index.min.js +1 -1
- package/package.json +1 -1
- package/packages/table/module/edit/hook.ts +25 -1
- package/packages/table/src/columnInfo.ts +5 -0
- package/packages/table/src/table.ts +44 -12
- /package/es/{iconfont.1750813693750.ttf → iconfont.1751253216739.ttf} +0 -0
- /package/es/{iconfont.1750813693750.woff → iconfont.1751253216739.woff} +0 -0
- /package/es/{iconfont.1750813693750.woff2 → iconfont.1751253216739.woff2} +0 -0
- /package/lib/{iconfont.1750813693750.ttf → iconfont.1751253216739.ttf} +0 -0
- /package/lib/{iconfont.1750813693750.woff → iconfont.1751253216739.woff} +0 -0
- /package/lib/{iconfont.1750813693750.woff2 → iconfont.1751253216739.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.13.
|
|
16
|
+
const version = exports.version = "4.13.50";
|
|
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.13.
|
|
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.13.50",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",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:{showIcon:!0},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},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:{}},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_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_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.13.
|
|
11
|
+
const version = `table v${"4.13.50"}`;
|
|
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.13.
|
|
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.13.50",warnLog=exports.warnLog=log.create("warn",version),errLog=exports.errLog=log.create("error",version);
|
package/lib/v-x-e-table/index.js
CHANGED
|
@@ -17,6 +17,5 @@ Object.keys(_ui).forEach(function (key) {
|
|
|
17
17
|
}
|
|
18
18
|
});
|
|
19
19
|
});
|
|
20
|
-
function
|
|
21
|
-
function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
|
|
20
|
+
function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
|
|
22
21
|
var _default = exports.default = _ui.default;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
Object.defineProperty(exports,"__esModule",{value:!0});var _exportNames={},_ui=(exports.default=void 0,_interopRequireWildcard(require("../ui")));function
|
|
1
|
+
Object.defineProperty(exports,"__esModule",{value:!0});var _exportNames={},_ui=(exports.default=void 0,_interopRequireWildcard(require("../ui")));function _interopRequireWildcard(e,t){var i,n;return"function"==typeof WeakMap&&(i=new WeakMap,n=new WeakMap),(_interopRequireWildcard=function(t,e){if(!e&&t&&t.__esModule)return t;var r,o,u={__proto__:null,default:t};if(null!==t&&("object"==typeof t||"function"==typeof t)){if(r=e?n:i){if(r.has(t))return r.get(t);r.set(t,u)}for(let e in t)"default"!==e&&{}.hasOwnProperty.call(t,e)&&((o=(r=Object.defineProperty)&&Object.getOwnPropertyDescriptor(t,e))&&(o.get||o.set)?r(u,e,o):u[e]=t[e])}return u})(e,t)}Object.keys(_ui).forEach(function(e){"default"===e||"__esModule"===e||Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_ui[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _ui[e]}})});var _default=exports.default=_ui.default;
|
|
@@ -17,6 +17,5 @@ Object.keys(_colgroup).forEach(function (key) {
|
|
|
17
17
|
}
|
|
18
18
|
});
|
|
19
19
|
});
|
|
20
|
-
function
|
|
21
|
-
function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
|
|
20
|
+
function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
|
|
22
21
|
var _default = exports.default = _colgroup.default;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
Object.defineProperty(exports,"__esModule",{value:!0});var _exportNames={},_colgroup=(exports.default=void 0,_interopRequireWildcard(require("../colgroup")));function
|
|
1
|
+
Object.defineProperty(exports,"__esModule",{value:!0});var _exportNames={},_colgroup=(exports.default=void 0,_interopRequireWildcard(require("../colgroup")));function _interopRequireWildcard(e,r){var n,p;return"function"==typeof WeakMap&&(n=new WeakMap,p=new WeakMap),(_interopRequireWildcard=function(r,e){if(!e&&r&&r.__esModule)return r;var t,o,u={__proto__:null,default:r};if(null!==r&&("object"==typeof r||"function"==typeof r)){if(t=e?p:n){if(t.has(r))return t.get(r);t.set(r,u)}for(let e in r)"default"!==e&&{}.hasOwnProperty.call(r,e)&&((o=(t=Object.defineProperty)&&Object.getOwnPropertyDescriptor(r,e))&&(o.get||o.set)?t(u,e,o):u[e]=r[e])}return u})(e,r)}Object.keys(_colgroup).forEach(function(e){"default"===e||"__esModule"===e||Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_colgroup[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _colgroup[e]}})});var _default=exports.default=_colgroup.default;
|
package/lib/vxe-column/index.js
CHANGED
|
@@ -17,6 +17,5 @@ Object.keys(_column).forEach(function (key) {
|
|
|
17
17
|
}
|
|
18
18
|
});
|
|
19
19
|
});
|
|
20
|
-
function
|
|
21
|
-
function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
|
|
20
|
+
function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
|
|
22
21
|
var _default = exports.default = _column.default;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
Object.defineProperty(exports,"__esModule",{value:!0});var _exportNames={},_column=(exports.default=void 0,_interopRequireWildcard(require("../column")));function
|
|
1
|
+
Object.defineProperty(exports,"__esModule",{value:!0});var _exportNames={},_column=(exports.default=void 0,_interopRequireWildcard(require("../column")));function _interopRequireWildcard(e,t){var u,a;return"function"==typeof WeakMap&&(u=new WeakMap,a=new WeakMap),(_interopRequireWildcard=function(t,e){if(!e&&t&&t.__esModule)return t;var r,o,n={__proto__:null,default:t};if(null!==t&&("object"==typeof t||"function"==typeof t)){if(r=e?a:u){if(r.has(t))return r.get(t);r.set(t,n)}for(let e in t)"default"!==e&&{}.hasOwnProperty.call(t,e)&&((o=(r=Object.defineProperty)&&Object.getOwnPropertyDescriptor(t,e))&&(o.get||o.set)?r(n,e,o):n[e]=t[e])}return n})(e,t)}Object.keys(_column).forEach(function(e){"default"===e||"__esModule"===e||Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_column[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _column[e]}})});var _default=exports.default=_column.default;
|
package/lib/vxe-grid/index.js
CHANGED
|
@@ -17,6 +17,5 @@ Object.keys(_grid).forEach(function (key) {
|
|
|
17
17
|
}
|
|
18
18
|
});
|
|
19
19
|
});
|
|
20
|
-
function
|
|
21
|
-
function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
|
|
20
|
+
function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
|
|
22
21
|
var _default = exports.default = _grid.default;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
Object.defineProperty(exports,"__esModule",{value:!0});var _exportNames={},_grid=(exports.default=void 0,_interopRequireWildcard(require("../grid")));function
|
|
1
|
+
Object.defineProperty(exports,"__esModule",{value:!0});var _exportNames={},_grid=(exports.default=void 0,_interopRequireWildcard(require("../grid")));function _interopRequireWildcard(e,r){var n,a;return"function"==typeof WeakMap&&(n=new WeakMap,a=new WeakMap),(_interopRequireWildcard=function(r,e){if(!e&&r&&r.__esModule)return r;var t,o,i={__proto__:null,default:r};if(null!==r&&("object"==typeof r||"function"==typeof r)){if(t=e?a:n){if(t.has(r))return t.get(r);t.set(r,i)}for(let e in r)"default"!==e&&{}.hasOwnProperty.call(r,e)&&((o=(t=Object.defineProperty)&&Object.getOwnPropertyDescriptor(r,e))&&(o.get||o.set)?t(i,e,o):i[e]=r[e])}return i})(e,r)}Object.keys(_grid).forEach(function(e){"default"===e||"__esModule"===e||Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_grid[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _grid[e]}})});var _default=exports.default=_grid.default;
|
package/lib/vxe-table/index.js
CHANGED
|
@@ -17,6 +17,5 @@ Object.keys(_table).forEach(function (key) {
|
|
|
17
17
|
}
|
|
18
18
|
});
|
|
19
19
|
});
|
|
20
|
-
function
|
|
21
|
-
function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
|
|
20
|
+
function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
|
|
22
21
|
var _default = exports.default = _table.default;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
Object.defineProperty(exports,"__esModule",{value:!0});var _exportNames={},_table=(exports.default=void 0,_interopRequireWildcard(require("../table")));function
|
|
1
|
+
Object.defineProperty(exports,"__esModule",{value:!0});var _exportNames={},_table=(exports.default=void 0,_interopRequireWildcard(require("../table")));function _interopRequireWildcard(e,t){var n,l;return"function"==typeof WeakMap&&(n=new WeakMap,l=new WeakMap),(_interopRequireWildcard=function(t,e){if(!e&&t&&t.__esModule)return t;var r,o,a={__proto__:null,default:t};if(null!==t&&("object"==typeof t||"function"==typeof t)){if(r=e?l:n){if(r.has(t))return r.get(t);r.set(t,a)}for(let e in t)"default"!==e&&{}.hasOwnProperty.call(t,e)&&((o=(r=Object.defineProperty)&&Object.getOwnPropertyDescriptor(t,e))&&(o.get||o.set)?r(a,e,o):a[e]=t[e])}return a})(e,t)}Object.keys(_table).forEach(function(e){"default"===e||"__esModule"===e||Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_table[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _table[e]}})});var _default=exports.default=_table.default;
|
package/lib/vxe-toolbar/index.js
CHANGED
|
@@ -17,6 +17,5 @@ Object.keys(_toolbar).forEach(function (key) {
|
|
|
17
17
|
}
|
|
18
18
|
});
|
|
19
19
|
});
|
|
20
|
-
function
|
|
21
|
-
function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
|
|
20
|
+
function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
|
|
22
21
|
var _default = exports.default = _toolbar.default;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
Object.defineProperty(exports,"__esModule",{value:!0});var _exportNames={},_toolbar=(exports.default=void 0,_interopRequireWildcard(require("../toolbar")));function
|
|
1
|
+
Object.defineProperty(exports,"__esModule",{value:!0});var _exportNames={},_toolbar=(exports.default=void 0,_interopRequireWildcard(require("../toolbar")));function _interopRequireWildcard(e,t){var n,l;return"function"==typeof WeakMap&&(n=new WeakMap,l=new WeakMap),(_interopRequireWildcard=function(t,e){if(!e&&t&&t.__esModule)return t;var r,o,a={__proto__:null,default:t};if(null!==t&&("object"==typeof t||"function"==typeof t)){if(r=e?l:n){if(r.has(t))return r.get(t);r.set(t,a)}for(let e in t)"default"!==e&&{}.hasOwnProperty.call(t,e)&&((o=(r=Object.defineProperty)&&Object.getOwnPropertyDescriptor(t,e))&&(o.get||o.set)?r(a,e,o):a[e]=t[e])}return a})(e,t)}Object.keys(_toolbar).forEach(function(e){"default"===e||"__esModule"===e||Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_toolbar[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _toolbar[e]}})});var _default=exports.default=_toolbar.default;
|
package/lib/vxe-ui/index.js
CHANGED
|
@@ -17,6 +17,5 @@ Object.keys(_ui).forEach(function (key) {
|
|
|
17
17
|
}
|
|
18
18
|
});
|
|
19
19
|
});
|
|
20
|
-
function
|
|
21
|
-
function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
|
|
20
|
+
function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
|
|
22
21
|
var _default = exports.default = _ui.default;
|
package/lib/vxe-ui/index.min.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
Object.defineProperty(exports,"__esModule",{value:!0});var _exportNames={},_ui=(exports.default=void 0,_interopRequireWildcard(require("../ui")));function
|
|
1
|
+
Object.defineProperty(exports,"__esModule",{value:!0});var _exportNames={},_ui=(exports.default=void 0,_interopRequireWildcard(require("../ui")));function _interopRequireWildcard(e,t){var i,n;return"function"==typeof WeakMap&&(i=new WeakMap,n=new WeakMap),(_interopRequireWildcard=function(t,e){if(!e&&t&&t.__esModule)return t;var r,o,u={__proto__:null,default:t};if(null!==t&&("object"==typeof t||"function"==typeof t)){if(r=e?n:i){if(r.has(t))return r.get(t);r.set(t,u)}for(let e in t)"default"!==e&&{}.hasOwnProperty.call(t,e)&&((o=(r=Object.defineProperty)&&Object.getOwnPropertyDescriptor(t,e))&&(o.get||o.set)?r(u,e,o):u[e]=t[e])}return u})(e,t)}Object.keys(_ui).forEach(function(e){"default"===e||"__esModule"===e||Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_ui[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _ui[e]}})});var _default=exports.default=_ui.default;
|
|
@@ -17,6 +17,5 @@ Object.keys(_vXETable).forEach(function (key) {
|
|
|
17
17
|
}
|
|
18
18
|
});
|
|
19
19
|
});
|
|
20
|
-
function
|
|
21
|
-
function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
|
|
20
|
+
function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
|
|
22
21
|
var _default = exports.default = _vXETable.default;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
Object.defineProperty(exports,"__esModule",{value:!0});var _exportNames={},_vXETable=(exports.default=void 0,_interopRequireWildcard(require("../v-x-e-table")));function
|
|
1
|
+
Object.defineProperty(exports,"__esModule",{value:!0});var _exportNames={},_vXETable=(exports.default=void 0,_interopRequireWildcard(require("../v-x-e-table")));function _interopRequireWildcard(e,t){var n,l;return"function"==typeof WeakMap&&(n=new WeakMap,l=new WeakMap),(_interopRequireWildcard=function(t,e){if(!e&&t&&t.__esModule)return t;var r,o,a={__proto__:null,default:t};if(null!==t&&("object"==typeof t||"function"==typeof t)){if(r=e?l:n){if(r.has(t))return r.get(t);r.set(t,a)}for(let e in t)"default"!==e&&{}.hasOwnProperty.call(t,e)&&((o=(r=Object.defineProperty)&&Object.getOwnPropertyDescriptor(t,e))&&(o.get||o.set)?r(a,e,o):a[e]=t[e])}return a})(e,t)}Object.keys(_vXETable).forEach(function(e){"default"===e||"__esModule"===e||Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_vXETable[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _vXETable[e]}})});var _default=exports.default=_vXETable.default;
|
package/package.json
CHANGED
|
@@ -104,8 +104,13 @@ hooks.add('tableEditModule', {
|
|
|
104
104
|
})
|
|
105
105
|
}
|
|
106
106
|
|
|
107
|
+
// const insertGroupRow = (newRecords: any[], isAppend: boolean) => {
|
|
108
|
+
|
|
109
|
+
// }
|
|
110
|
+
|
|
107
111
|
const handleInsertRowAt = (records: any, targetRow: any, isInsertNextRow?: boolean) => {
|
|
108
112
|
const { treeConfig } = props
|
|
113
|
+
const { isRowGroupStatus } = reactData
|
|
109
114
|
const { tableFullTreeData, afterFullData, mergeBodyList, tableFullData, fullDataRowIdData, fullAllDataRowIdData, insertRowMaps } = internalData
|
|
110
115
|
const treeOpts = computeTreeOpts.value
|
|
111
116
|
const { transform, rowField, mapChildrenField } = treeOpts
|
|
@@ -118,6 +123,12 @@ hooks.add('tableEditModule', {
|
|
|
118
123
|
// 如果为虚拟树
|
|
119
124
|
if (treeConfig && transform) {
|
|
120
125
|
insertTreeRow(newRecords, false)
|
|
126
|
+
} else if (isRowGroupStatus) {
|
|
127
|
+
// 如果分组
|
|
128
|
+
if (treeConfig) {
|
|
129
|
+
throw new Error(getI18n('vxe.error.noTree', ['insert']))
|
|
130
|
+
}
|
|
131
|
+
// insertGroupRow(newRecords, false)
|
|
121
132
|
} else {
|
|
122
133
|
newRecords.forEach(item => {
|
|
123
134
|
const rowid = getRowid($xeTable, item)
|
|
@@ -140,6 +151,12 @@ hooks.add('tableEditModule', {
|
|
|
140
151
|
// 如果为虚拟树
|
|
141
152
|
if (treeConfig && transform) {
|
|
142
153
|
insertTreeRow(newRecords, true)
|
|
154
|
+
} else if (isRowGroupStatus) {
|
|
155
|
+
// 如果分组
|
|
156
|
+
if (treeConfig) {
|
|
157
|
+
throw new Error(getI18n('vxe.error.noTree', ['insert']))
|
|
158
|
+
}
|
|
159
|
+
// insertGroupRow(newRecords, true)
|
|
143
160
|
} else {
|
|
144
161
|
newRecords.forEach(item => {
|
|
145
162
|
const rowid = getRowid($xeTable, item)
|
|
@@ -202,6 +219,11 @@ hooks.add('tableEditModule', {
|
|
|
202
219
|
warnLog('vxe.error.unableInsert')
|
|
203
220
|
insertTreeRow(newRecords, true)
|
|
204
221
|
}
|
|
222
|
+
} else if (isRowGroupStatus) {
|
|
223
|
+
// 如果分组
|
|
224
|
+
if (treeConfig) {
|
|
225
|
+
throw new Error(getI18n('vxe.error.noTree', ['insert']))
|
|
226
|
+
}
|
|
205
227
|
} else {
|
|
206
228
|
if (treeConfig) {
|
|
207
229
|
throw new Error(getI18n('vxe.error.noTree', ['insert']))
|
|
@@ -488,7 +510,7 @@ hooks.add('tableEditModule', {
|
|
|
488
510
|
*/
|
|
489
511
|
remove (rows: any) {
|
|
490
512
|
const { treeConfig } = props
|
|
491
|
-
const { editStore } = reactData
|
|
513
|
+
const { editStore, isRowGroupStatus } = reactData
|
|
492
514
|
const { tableFullTreeData, selectCheckboxMaps, afterFullData, mergeBodyList, tableFullData, pendingRowMaps, insertRowMaps, removeRowMaps } = internalData
|
|
493
515
|
const checkboxOpts = computeCheckboxOpts.value
|
|
494
516
|
const treeOpts = computeTreeOpts.value
|
|
@@ -544,6 +566,8 @@ hooks.add('tableEditModule', {
|
|
|
544
566
|
afterFullData.splice(afIndex, 1)
|
|
545
567
|
}
|
|
546
568
|
})
|
|
569
|
+
} else if (isRowGroupStatus) {
|
|
570
|
+
// 如果分组
|
|
547
571
|
} else {
|
|
548
572
|
rows.forEach((row: any) => {
|
|
549
573
|
const tfIndex = $xeTable.findRowIndexOf(tableFullData, row)
|
|
@@ -47,6 +47,11 @@ export class ColumnInfo {
|
|
|
47
47
|
}
|
|
48
48
|
}
|
|
49
49
|
}
|
|
50
|
+
if (_vm.aggFunc) {
|
|
51
|
+
if (!$xeTable.handlePivotTableAggregateData && _vm.aggFunc !== true) {
|
|
52
|
+
errLog('vxe.error.errProp', [`column.agg-func=${_vm.aggFunc}`, 'column.agg-func=true'])
|
|
53
|
+
}
|
|
54
|
+
}
|
|
50
55
|
|
|
51
56
|
Object.assign(this, {
|
|
52
57
|
// 基本属性
|
|
@@ -772,10 +772,10 @@ export default defineVxeComponent({
|
|
|
772
772
|
})
|
|
773
773
|
|
|
774
774
|
const computeTableRowExpandedList = computed(() => {
|
|
775
|
-
const { rowExpandedFlag, expandColumn, rowGroupExpandedFlag, treeExpandedFlag } = reactData
|
|
775
|
+
const { tableData, rowExpandedFlag, expandColumn, rowGroupExpandedFlag, treeExpandedFlag } = reactData
|
|
776
776
|
const { visibleDataRowIdData, rowExpandedMaps } = internalData
|
|
777
777
|
const expandList: any[] = []
|
|
778
|
-
if (expandColumn && rowExpandedFlag && rowGroupExpandedFlag && treeExpandedFlag) {
|
|
778
|
+
if (tableData.length && expandColumn && rowExpandedFlag && rowGroupExpandedFlag && treeExpandedFlag) {
|
|
779
779
|
XEUtils.each(rowExpandedMaps, (row, rowid) => {
|
|
780
780
|
if (visibleDataRowIdData[rowid]) {
|
|
781
781
|
expandList.push(row)
|
|
@@ -8421,7 +8421,8 @@ export default defineVxeComponent({
|
|
|
8421
8421
|
const childList: any[] = vals[2]
|
|
8422
8422
|
let sLen = 0 // 已选
|
|
8423
8423
|
let hLen = 0 // 半选
|
|
8424
|
-
let vLen = 0 //
|
|
8424
|
+
let vLen = 0 // 有效子行
|
|
8425
|
+
const cLen = childList.length // 有效子行
|
|
8425
8426
|
childList.forEach(
|
|
8426
8427
|
checkMethod
|
|
8427
8428
|
? (item) => {
|
|
@@ -8454,15 +8455,25 @@ export default defineVxeComponent({
|
|
|
8454
8455
|
}
|
|
8455
8456
|
)
|
|
8456
8457
|
|
|
8457
|
-
let isSelected =
|
|
8458
|
-
if (
|
|
8459
|
-
if (
|
|
8460
|
-
isSelected = sLen >= vLen
|
|
8458
|
+
let isSelected = false
|
|
8459
|
+
if (cLen > 0) {
|
|
8460
|
+
if (vLen > 0) {
|
|
8461
|
+
isSelected = (sLen > 0 || hLen > 0) && sLen >= vLen
|
|
8461
8462
|
} else {
|
|
8462
|
-
|
|
8463
|
+
// 如果存在子项禁用
|
|
8464
|
+
if ((sLen > 0 && sLen >= vLen)) {
|
|
8465
|
+
isSelected = true
|
|
8466
|
+
} else if (selectCheckboxMaps[rowid]) {
|
|
8467
|
+
isSelected = true
|
|
8468
|
+
} else {
|
|
8469
|
+
isSelected = false
|
|
8470
|
+
}
|
|
8463
8471
|
}
|
|
8472
|
+
} else {
|
|
8473
|
+
// 如果无子项
|
|
8474
|
+
isSelected = selectCheckboxMaps[rowid]
|
|
8464
8475
|
}
|
|
8465
|
-
const halfSelect = !isSelected && (sLen
|
|
8476
|
+
const halfSelect = !isSelected && (sLen > 0 || hLen > 0)
|
|
8466
8477
|
|
|
8467
8478
|
if (checkField) {
|
|
8468
8479
|
XEUtils.set(row, checkField, isSelected)
|
|
@@ -8501,7 +8512,9 @@ export default defineVxeComponent({
|
|
|
8501
8512
|
const { handleGetRowId } = createHandleGetRowId($xeTable)
|
|
8502
8513
|
|
|
8503
8514
|
let sLen = 0 // 已选
|
|
8515
|
+
let dsLen = 0 // 禁用的已选
|
|
8504
8516
|
let hLen = 0 // 半选
|
|
8517
|
+
let dhLen = 0 // 禁用的半选
|
|
8505
8518
|
let vLen = 0 // 有效行
|
|
8506
8519
|
|
|
8507
8520
|
const rootList = (treeConfig ? afterTreeFullData : (isRowGroupStatus ? afterGroupFullData : afterFullData))
|
|
@@ -8518,9 +8531,9 @@ export default defineVxeComponent({
|
|
|
8518
8531
|
vLen++
|
|
8519
8532
|
} else {
|
|
8520
8533
|
if (selected) {
|
|
8521
|
-
|
|
8534
|
+
dsLen++
|
|
8522
8535
|
} else if (treeIndeterminateRowMaps[childRowid]) {
|
|
8523
|
-
|
|
8536
|
+
dhLen++
|
|
8524
8537
|
}
|
|
8525
8538
|
}
|
|
8526
8539
|
}
|
|
@@ -8536,7 +8549,7 @@ export default defineVxeComponent({
|
|
|
8536
8549
|
})
|
|
8537
8550
|
|
|
8538
8551
|
const isSelected = rootList.length > 0 ? (vLen > 0 ? (sLen >= vLen) : (sLen >= rootList.length)) : false
|
|
8539
|
-
let halfSelect = !isSelected && (sLen
|
|
8552
|
+
let halfSelect = !isSelected && (sLen > 0 || hLen > 0 || dsLen > 0 || dhLen > 0)
|
|
8540
8553
|
|
|
8541
8554
|
// 如果复选框启用保留记录,当保留数据存在时显示半选
|
|
8542
8555
|
if (!isSelected && !halfSelect && showReserveStatus) {
|
|
@@ -11860,6 +11873,7 @@ export default defineVxeComponent({
|
|
|
11860
11873
|
nextTick(() => {
|
|
11861
11874
|
if (props.loading) {
|
|
11862
11875
|
if (!VxeUILoadingComponent && !slots.loading) {
|
|
11876
|
+
errLog('vxe.error.errProp', ['loading=true', 'loading=false | <template #loading>...</template>'])
|
|
11863
11877
|
errLog('vxe.error.reqComp', ['vxe-loading'])
|
|
11864
11878
|
}
|
|
11865
11879
|
}
|
|
@@ -11868,6 +11882,24 @@ export default defineVxeComponent({
|
|
|
11868
11882
|
(props.showFooterOverflow === true || props.showFooterOverflow === 'tooltip') ||
|
|
11869
11883
|
props.tooltipConfig || props.editRules) {
|
|
11870
11884
|
if (!VxeUITooltipComponent) {
|
|
11885
|
+
if (props.showOverflow === true) {
|
|
11886
|
+
errLog('vxe.error.errProp', ['show-overflow=true', 'show-overflow=title'])
|
|
11887
|
+
}
|
|
11888
|
+
if (props.showOverflow === 'tooltip') {
|
|
11889
|
+
errLog('vxe.error.errProp', ['show-overflow=tooltip', 'show-overflow=title'])
|
|
11890
|
+
}
|
|
11891
|
+
if (props.showHeaderOverflow === true) {
|
|
11892
|
+
errLog('vxe.error.errProp', ['show-header-overflow=true', 'show-header-overflow=title'])
|
|
11893
|
+
}
|
|
11894
|
+
if (props.showHeaderOverflow === 'tooltip') {
|
|
11895
|
+
errLog('vxe.error.errProp', ['show-header-overflow=tooltip', 'show-header-overflow=title'])
|
|
11896
|
+
}
|
|
11897
|
+
if (props.showFooterOverflow === true) {
|
|
11898
|
+
errLog('vxe.error.errProp', ['show-footer-overflow=true', 'show-footer-overflow=title'])
|
|
11899
|
+
}
|
|
11900
|
+
if (props.showFooterOverflow === 'tooltip') {
|
|
11901
|
+
errLog('vxe.error.errProp', ['show-footer-overflow=tooltip', 'show-footer-overflow=title'])
|
|
11902
|
+
}
|
|
11871
11903
|
errLog('vxe.error.reqComp', ['vxe-tooltip'])
|
|
11872
11904
|
}
|
|
11873
11905
|
}
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|