vxe-table 4.15.0-beta.0 → 4.15.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.props;
         const $xeGrid = $xeTable.xeGrid;
+        const { field, editRender } = _vm;
         const formatter = _vm.formatter;
         const visible = XEUtils.isBoolean(_vm.visible) ? _vm.visible : true;
         const types = ['seq', 'checkbox', 'radio', 'expand', 'html'];
@@ -48,11 +49,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,
@@ -87,7 +96,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/ui/index.js

@@ -1,6 +1,6 @@
 import { VxeUI } from '@vxe-ui/core';
 import { getFuncText } from './src/utils';
-export const version = "4.15.0-beta.0";
+export const version = "4.15.0-beta.1";
 VxeUI.version = version;
 VxeUI.tableVersion = version;
 VxeUI.setConfig({

package/es/ui/src/log.js

@@ -1,5 +1,5 @@
 import { VxeUI } from '@vxe-ui/core';
 const { log } = VxeUI;
-const version = `table v${"4.15.0-beta.0"}`;
+const version = `table v${"4.15.0-beta.1"}`;
 export const warnLog = log.create('warn', version);
 export const errLog = log.create('error', version);

package/lib/index.umd.js

@@ -3138,7 +3138,7 @@ function eqEmptyValue(cellValue) {
 ;// ./packages/ui/index.ts
 
 
-const version = "4.15.0-beta.0";
+const version = "4.15.0-beta.1";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -3628,7 +3628,7 @@ var esnext_iterator_some = __webpack_require__(7550);
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"4.15.0-beta.0"}`;
+const log_version = `table v${"4.15.0-beta.1"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// ./packages/table/src/columnInfo.ts
@@ -3651,6 +3651,10 @@ class ColumnInfo {
   } = {}) {
     const tableProps = $xeTable.props;
     const $xeGrid = $xeTable.xeGrid;
+    const {
+      field,
+      editRender
+    } = _vm;
     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;
     const types = ['seq', 'checkbox', 'radio', 'expand', 'html'];
@@ -3693,11 +3697,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,
@@ -3732,7 +3744,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,
@@ -21360,6 +21372,7 @@ const Toolbar = VxeToolbar;
       groupTag: '分组列头应该使用 "{0}" 而不是 "{1}"，这可能会出现错误',
       scrollErrProp: '启用虚拟滚动后不支持该参数 "{0}"',
       errConflicts: '参数 "{0}" 与 "{1}" 有冲突',
+      modelConflicts: '绑定的字段值 "{0}" 与 "{1}" 存在冲突，将会出现错误',
       notSupportProp: '当启用参数 "{0}" 时不支持 "{1}"，应该为 "{2}"，否则将会出现错误',
       notConflictProp: '当使用 "{0}" 时，应该设置 "{1}"，否则可能会存在功能冲突',
       unableInsert: '无法插入到指定位置，请检查参数是否正确',