vxe-table 3.16.4 → 3.17.0-beta.1

package/es/table/src/columnInfo.js

@@ -9,6 +9,7 @@ export class ColumnInfo {
     constructor($xeTable, _vm, { renderHeader, renderCell, renderFooter, renderData } = {}) {
         const tableProps = $xeTable;
         const $xeGrid = $xeTable.$xeGrid;
+        const { field, editRender } = _vm;
         const proxyOpts = $xeGrid ? $xeGrid.computeProxyOpts : null;
         const formatter = _vm.formatter;
         const visible = XEUtils.isBoolean(_vm.visible) ? _vm.visible : true;
@@ -53,11 +54,19 @@ export class ColumnInfo {
                 errLog('vxe.error.errProp', [`column.agg-func=${_vm.aggFunc}`, 'column.agg-func=true']);
             }
         }
+        if (field && editRender) {
+            if (editRender.startField && `${editRender.startField}`.indexOf(field) >= 0) {
+                errLog('vxe.error.modelConflicts', [`field=${field}`, `edit-render.startField=${editRender.startField}`]);
+            }
+            if (editRender.endField && `${editRender.endField}`.indexOf(field) >= 0) {
+                errLog('vxe.error.modelConflicts', [`field=${field}`, `edit-render.endField=${editRender.endField}`]);
+            }
+        }
         Object.assign(this, {
             // 基本属性
             type: _vm.type,
             property: _vm.field,
-            field: _vm.field,
+            field: field,
             title: _vm.title,
             width: _vm.width,
             minWidth: _vm.minWidth,
@@ -94,7 +103,7 @@ export class ColumnInfo {
             rowResize: _vm.rowResize,
             cellType: _vm.cellType,
             cellRender: _vm.cellRender,
-            editRender: _vm.editRender,
+            editRender: editRender,
             contentRender: _vm.contentRender,
             headerExportMethod: _vm.headerExportMethod,
             exportMethod: _vm.exportMethod,

package/es/table/src/header.js

@@ -365,7 +365,7 @@ export default {
                                 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/es/table/src/table.js

@@ -981,9 +981,12 @@ export default {
             return Object.assign({}, getConfig().table.clipConfig, this.clipConfig);
         },
         fnrOpts() {
-            return this.computeFNROpts;
+            return this.computeFnrOpts;
         },
         computeFNROpts() {
+            return this.computeFnrOpts;
+        },
+        computeFnrOpts() {
             return Object.assign({}, getConfig().table.fnrConfig, this.fnrConfig);
         },
         headerCtxMenu() {

package/es/table/style.css

@@ -2020,6 +2020,7 @@
 
 .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,
@@ -2038,6 +2039,7 @@
 
 .vxe-table--fixed-left-wrapper .vxe-table--checkbox-range,
 .vxe-table--fixed-left-wrapper .vxe-table--cell-main-area,
+.vxe-table--fixed-left-wrapper .vxe-table--cell-item-area,
 .vxe-table--fixed-left-wrapper .vxe-table--cell-extend-area,
 .vxe-table--fixed-left-wrapper .vxe-table--cell-active-area,
 .vxe-table--fixed-left-wrapper .vxe-table--cell-copy-area,
@@ -2045,6 +2047,7 @@
 .vxe-table--fixed-left-wrapper .vxe-table--cell-row-status-area,
 .vxe-table--fixed-right-wrapper .vxe-table--checkbox-range,
 .vxe-table--fixed-right-wrapper .vxe-table--cell-main-area,
+.vxe-table--fixed-right-wrapper .vxe-table--cell-item-area,
 .vxe-table--fixed-right-wrapper .vxe-table--cell-extend-area,
 .vxe-table--fixed-right-wrapper .vxe-table--cell-active-area,
 .vxe-table--fixed-right-wrapper .vxe-table--cell-copy-area,
@@ -2054,21 +2057,23 @@
 }
 
 .vxe-table--fixed-left-wrapper .vxe-table--cell-main-area[half="1"],
+.vxe-table--fixed-left-wrapper .vxe-table--cell-item-area[half="1"],
 .vxe-table--fixed-left-wrapper .vxe-table--cell-extend-area[half="1"],
 .vxe-table--fixed-left-wrapper .vxe-table--cell-active-area[half="1"] {
   border-right: 0;
 }
 .vxe-table--fixed-left-wrapper .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[half="1"],
+.vxe-table--fixed-right-wrapper .vxe-table--cell-item-area[half="1"],
 .vxe-table--fixed-right-wrapper .vxe-table--cell-extend-area[half="1"],
 .vxe-table--fixed-right-wrapper .vxe-table--cell-active-area[half="1"] {
   border-left: 0;
 }
 .vxe-table--fixed-right-wrapper .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);
 }
 
 /*复选框-范围选择*/
@@ -2120,8 +2125,8 @@
   }
 }
 .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 0.5s infinite linear;
 }
@@ -2133,7 +2138,7 @@
   background-color: var(--vxe-ui-table-cell-active-area-background-color);
 }
 
-.vxe-table--cell-multi-area > .vxe-table--cell-main-area {
+.vxe-table--cell-multi-area > .vxe-table--cell-item-area {
   background-color: var(--vxe-ui-table-cell-area-background-color);
 }