vxe-table 4.14.5 → 4.15.0-beta.1

package/lib/vxe-v-x-e-table/index.js

@@ -17,5 +17,6 @@ Object.keys(_vXETable).forEach(function (key) {
     }
   });
 });
-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); }
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
+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; }
 var _default = exports.default = _vXETable.default;

package/lib/vxe-v-x-e-table/index.min.js

@@ -1 +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;
+Object.defineProperty(exports,"__esModule",{value:!0});var _exportNames={},_vXETable=(exports.default=void 0,_interopRequireWildcard(require("../v-x-e-table")));function _getRequireWildcardCache(e){var t,r;return"function"!=typeof WeakMap?null:(t=new WeakMap,r=new WeakMap,(_getRequireWildcardCache=function(e){return e?r:t})(e))}function _interopRequireWildcard(e,t){if(!t&&e&&e.__esModule)return e;if(null===e||"object"!=typeof e&&"function"!=typeof e)return{default:e};t=_getRequireWildcardCache(t);if(t&&t.has(e))return t.get(e);var r,a,o={__proto__:null},n=Object.defineProperty&&Object.getOwnPropertyDescriptor;for(r in e)"default"!==r&&{}.hasOwnProperty.call(e,r)&&((a=n?Object.getOwnPropertyDescriptor(e,r):null)&&(a.get||a.set)?Object.defineProperty(o,r,a):o[r]=e[r]);return o.default=e,t&&t.set(e,o),o}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

@@ -1,6 +1,6 @@
 {
   "name": "vxe-table",
-  "version": "4.14.5",
+  "version": "4.15.0-beta.1",
   "description": "A PC-end table component based on Vxe UI, supporting copy-paste, data pivot table, and high-performance virtual list table solution.",
   "scripts": {
     "update": "npm install --legacy-peer-deps",

package/packages/table/src/body.ts

@@ -868,7 +868,7 @@ export default defineVxeComponent({
                   ]
                 : []),
               h('span', {
-                class: 'vxe-table--cell-copy-area'
+                class: 'vxe-table--cell-clip-area'
               }),
               h('span', {
                 class: 'vxe-table--cell-extend-area'

package/packages/table/src/header.ts

@@ -337,7 +337,7 @@ export default defineVxeComponent({
                 class: 'vxe-table--cell-main-area'
               }),
               h('span', {
-                class: 'vxe-table--cell-copy-area'
+                class: 'vxe-table--cell-clip-area'
               }),
               h('span', {
                 class: 'vxe-table--cell-extend-area'

package/packages/table/src/table.ts

@@ -672,6 +672,11 @@ export default defineVxeComponent({
     })
 
     const computeFNROpts = computed(() => {
+      const fnrOpts = computeFnrOpts.value
+      return fnrOpts
+    })
+
+    const computeFnrOpts = computed(() => {
       return Object.assign({}, getConfig().table.fnrConfig, props.fnrConfig) as VxeTablePropTypes.FNROpts
     })
 
@@ -944,7 +949,7 @@ export default defineVxeComponent({
       computeAreaOpts,
       computeKeyboardOpts,
       computeClipOpts,
-      computeFNROpts,
+      computeFnrOpts,
       computeHeaderMenu,
       computeBodyMenu,
       computeFooterMenu,
@@ -969,6 +974,7 @@ export default defineVxeComponent({
       computeRowGroupFields,
       computeRowGroupColumns,
 
+      computeFNROpts,
       computeSXOpts,
       computeSYOpts
     }
@@ -5927,7 +5933,8 @@ export default defineVxeComponent({
         return nextTick()
       },
       setSort (sortConfs, isUpdate) {
-        return handleSortEvent(null, sortConfs, isUpdate)
+        // 已废弃，即将去掉事件触发 new Event('click') -> null
+        return handleSortEvent(new Event('click'), sortConfs, isUpdate)
       },
       setSortByEvent (evnt, sortConfs, isUpdate) {
         return handleSortEvent(evnt, sortConfs, isUpdate)

package/styles/components/table.scss

@@ -307,6 +307,7 @@ $btnThemeList: (
 
 .vxe-table--checkbox-range,
 .vxe-table--cell-main-area,
+.vxe-table--cell-item-area,
 .vxe-table--cell-extend-area,
 .vxe-table--cell-active-area,
 .vxe-table--cell-copy-area,
@@ -329,6 +330,7 @@ $btnThemeList: (
 .vxe-table--fixed-right-wrapper {
   .vxe-table--checkbox-range,
   .vxe-table--cell-main-area,
+  .vxe-table--cell-item-area,
   .vxe-table--cell-extend-area,
   .vxe-table--cell-active-area,
   .vxe-table--cell-copy-area,
@@ -340,6 +342,7 @@ $btnThemeList: (
 
 .vxe-table--fixed-left-wrapper {
   .vxe-table--cell-main-area,
+  .vxe-table--cell-item-area,
   .vxe-table--cell-extend-area,
   .vxe-table--cell-active-area {
     &[half="1"] {
@@ -348,13 +351,14 @@ $btnThemeList: (
   }
   .vxe-table--cell-copy-area {
     &[half="1"] {
-      background-size: var(--vxe-ui-table-cell-copy-area-border-width) 12px, 0 12px, 12px var(--vxe-ui-table-cell-copy-area-border-width), 12px var(--vxe-ui-table-cell-copy-area-border-width);
+      background-size: var(--vxe-ui-table-cell-clip-area-border-width) 12px, 0 12px, 12px var(--vxe-ui-table-cell-clip-area-border-width), 12px var(--vxe-ui-table-cell-clip-area-border-width);
     }
   }
 }
 
 .vxe-table--fixed-right-wrapper {
   .vxe-table--cell-main-area,
+  .vxe-table--cell-item-area,
   .vxe-table--cell-extend-area,
   .vxe-table--cell-active-area {
     &[half="1"] {
@@ -363,7 +367,7 @@ $btnThemeList: (
   }
   .vxe-table--cell-copy-area {
     &[half="1"] {
-      background-size: 0 12px, var(--vxe-ui-table-cell-copy-area-border-width) 12px, 12px var(--vxe-ui-table-cell-copy-area-border-width), 12px var(--vxe-ui-table-cell-copy-area-border-width);
+      background-size: 0 12px, var(--vxe-ui-table-cell-clip-area-border-width) 12px, 12px var(--vxe-ui-table-cell-clip-area-border-width), 12px var(--vxe-ui-table-cell-clip-area-border-width);
     }
   }
 }
@@ -420,11 +424,11 @@ $btnThemeList: (
 }
 
 .vxe-table--cell-copy-area {
-  background: linear-gradient(0deg, transparent 6px, var(--vxe-ui-table-cell-copy-area-border-color) 6px) repeat-y,
-              linear-gradient(0deg, transparent 50%, var(--vxe-ui-table-cell-copy-area-border-color) 0) repeat-y,
-              linear-gradient(90deg, transparent 50%, var(--vxe-ui-table-cell-copy-area-border-color) 0) repeat-x,
-              linear-gradient(90deg, transparent 50%, var(--vxe-ui-table-cell-copy-area-border-color) 0) repeat-x;
-  background-size: var(--vxe-ui-table-cell-copy-area-border-width) 12px, var(--vxe-ui-table-cell-copy-area-border-width) 12px, 12px var(--vxe-ui-table-cell-copy-area-border-width), 12px var(--vxe-ui-table-cell-copy-area-border-width);
+  background: linear-gradient(0deg, transparent 6px, var(--vxe-ui-table-cell-clip-area-border-color) 6px) repeat-y,
+              linear-gradient(0deg, transparent 50%, var(--vxe-ui-table-cell-clip-area-border-color) 0) repeat-y,
+              linear-gradient(90deg, transparent 50%, var(--vxe-ui-table-cell-clip-area-border-color) 0) repeat-x,
+              linear-gradient(90deg, transparent 50%, var(--vxe-ui-table-cell-clip-area-border-color) 0) repeat-x;
+  background-size: var(--vxe-ui-table-cell-clip-area-border-width) 12px, var(--vxe-ui-table-cell-clip-area-border-width) 12px, 12px var(--vxe-ui-table-cell-clip-area-border-width), 12px var(--vxe-ui-table-cell-clip-area-border-width);
   background-position: 0 0, 100% 0, 0 0, 0 100%;
   animation: moveCopyCellBorder .5s infinite linear;
 }
@@ -437,7 +441,7 @@ $btnThemeList: (
 }
 
 .vxe-table--cell-multi-area {
-  & > .vxe-table--cell-main-area {
+  & > .vxe-table--cell-item-area {
     background-color: var(--vxe-ui-table-cell-area-background-color);
   }
 }

package/styles/theme/base.scss

@@ -58,10 +58,10 @@
   --vxe-ui-table-cell-main-area-extension-border-color: #fff;
   --vxe-ui-table-cell-main-area-extension-background-color: var(--vxe-ui-font-primary-color);
   --vxe-ui-table-cell-extend-area-border-width: 2px;
-  --vxe-ui-table-cell-copy-area-border-width: 3px;
+  --vxe-ui-table-cell-clip-area-border-width: 3px;
   --vxe-ui-table-cell-active-area-border-width: 2px;
   --vxe-ui-table-cell-active-area-background-color: transparent;
-  --vxe-ui-table-cell-copy-area-border-color: var(--vxe-ui-table-cell-area-border-color);
+  --vxe-ui-table-cell-clip-area-border-color: var(--vxe-ui-table-cell-area-border-color);
   --vxe-ui-table-cell-extend-area-border-color: var(--vxe-ui-table-cell-area-border-color);
   --vxe-ui-table-cell-active-area-border-color: var(--vxe-ui-table-cell-area-border-color);
   --vxe-ui-table-cell-area-background-color: rgba(64,158,255,0.2);