vxe-table 3.16.4 → 3.17.0-beta.1

package/lib/index.umd.js

@@ -2002,7 +2002,7 @@ function getClass(property, params) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "3.16.4";
+const version = "3.17.0-beta.1";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -2667,7 +2667,7 @@ function isNodeElement(elem) {
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.16.4"}`;
+const log_version = `table v${"3.17.0-beta.1"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -2690,6 +2690,10 @@ class ColumnInfo {
   } = {}) {
     const tableProps = $xeTable;
     const $xeGrid = $xeTable.$xeGrid;
+    const {
+      field,
+      editRender
+    } = _vm;
     const proxyOpts = $xeGrid ? $xeGrid.computeProxyOpts : null;
     const formatter = _vm.formatter;
     const visible = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isBoolean(_vm.visible) ? _vm.visible : true;
@@ -2735,11 +2739,19 @@ 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,
@@ -2776,7 +2788,7 @@ 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,
@@ -18547,7 +18559,7 @@ function renderRows(h, _vm, fixedType, isOptimizeMode, tableData, tableColumn) {
         }
       }
     })] : null), h('span', {
-      class: 'vxe-table--cell-copy-area'
+      class: 'vxe-table--cell-clip-area'
     }), h('span', {
       class: 'vxe-table--cell-extend-area'
     }), h('span', {
@@ -18984,7 +18996,7 @@ function renderHeads(h, _vm, isGroup, isOptimizeMode, headerGroups) {
     }, [h('span', {
       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'
     }), h('span', {
@@ -28802,9 +28814,12 @@ function renderBody(h, $xeTable) {
       return Object.assign({}, table_getConfig().table.clipConfig, this.clipConfig);
     },
     fnrOpts() {
-      return this.computeFNROpts;
+      return this.computeFnrOpts;
     },
     computeFNROpts() {
+      return this.computeFnrOpts;
+    },
+    computeFnrOpts() {
       return Object.assign({}, table_getConfig().table.fnrConfig, this.fnrConfig);
     },
     headerCtxMenu() {
@@ -34132,6 +34147,7 @@ const Toolbar = VxeToolbar;
       groupTag: '分组列头应该使用 "{0}" 而不是 "{1}"，这可能会出现错误',
       scrollErrProp: '启用虚拟滚动后不支持该参数 "{0}"',
       errConflicts: '参数 "{0}" 与 "{1}" 有冲突',
+      modelConflicts: '绑定的字段值 "{0}" 与 "{1}" 存在冲突，将会出现错误',
       notSupportProp: '当启用参数 "{0}" 时不支持 "{1}"，应该为 "{2}"，否则将会出现错误',
       notConflictProp: '当使用 "{0}" 时，应该设置 "{1}"，否则可能会存在功能冲突',
       unableInsert: '无法插入到指定位置，请检查参数是否正确',