vxe-table 3.11.26 → 3.11.27-beta.0

package/lib/index.umd.js

@@ -2220,7 +2220,7 @@ function getClass(property, params) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "3.11.26";
+const version = "3.11.27-beta.0";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -2789,7 +2789,7 @@ function isNodeElement(elem) {
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.11.26"}`;
+const log_version = `table v${"3.11.27-beta.0"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -3097,7 +3097,6 @@ function assembleColumn(_vm) {
     columnConfig
   } = _vm;
   const groupConfig = $xecolumn ? $xecolumn.columnConfig : null;
-  columnConfig.slots = _vm.$scopedSlots;
   if (groupConfig) {
     if (true) {
       if ($xecolumn.$options._componentTag === 'vxe-table-column') {
@@ -3629,12 +3628,13 @@ function renderHeaderCellDragIcon(h, params) {
   const {
     showIcon,
     icon,
+    isCrossDrag,
     visibleMethod,
     disabledMethod
   } = columnDragOpts;
   const isDisabled = disabledMethod && disabledMethod(params);
   if (columnOpts.drag && showIcon && (!visibleMethod || visibleMethod(params))) {
-    if (!(column.fixed || column.parentId)) {
+    if (!column.fixed && (isCrossDrag || !column.parentId)) {
       return h('span', {
         key: 'dg',
         class: ['vxe-cell--drag-handle', {
@@ -4638,10 +4638,13 @@ const Cell = {
   }
 };
 /* harmony default export */ var cell = (Cell);
+;// CONCATENATED MODULE: ./packages/ui/src/comp.ts
+const defineVxeComponent = options => options;
 ;// CONCATENATED MODULE: ./packages/table/src/column.ts
 
 
-const props = {
+
+const columnProps = {
   // 列唯一主键
   colId: [String, Number],
   // 渲染类型 seq,radio,checkbox,expand,html
@@ -4757,9 +4760,9 @@ const props = {
   // 额外的参数
   params: Object
 };
-const watch = {};
-Object.keys(props).forEach(name => {
-  watch[name] = function (value) {
+const columnWatch = {};
+Object.keys(columnProps).forEach(name => {
+  columnWatch[name] = function (value) {
     this.columnConfig.update(name, value);
     if (this.$xetable) {
       if (name === 'filters') {
@@ -4771,9 +4774,9 @@ Object.keys(props).forEach(name => {
     }
   };
 });
-/* harmony default export */ var column = ({
+/* harmony default export */ var column = (defineVxeComponent({
   name: 'VxeColumn',
-  props,
+  props: columnProps,
   provide() {
     return {
       $xecolumn: this,
@@ -4788,11 +4791,12 @@ Object.keys(props).forEach(name => {
       default: null
     }
   },
-  watch,
+  watch: columnWatch,
   created() {
     this.columnConfig = this.createColumn(this.$xetable, this);
   },
   mounted() {
+    this.columnConfig.slots = this.$scopedSlots;
     assembleColumn(this);
   },
   destroyed() {
@@ -4802,7 +4806,7 @@ Object.keys(props).forEach(name => {
     return h('div', this.$slots.default);
   },
   methods: cell
-});
+}));
 ;// CONCATENATED MODULE: ./packages/column/index.ts
 
 
@@ -4823,16 +4827,49 @@ const Column = VxeColumn;
 /* harmony default export */ var packages_column = ((/* unused pure expression or super */ null && (VxeColumn)));
 ;// CONCATENATED MODULE: ./packages/table/src/group.ts
 
-/* harmony default export */ var group = ({
+
+
+
+/* harmony default export */ var group = (defineVxeComponent({
   name: 'VxeColgroup',
-  extends: column,
+  props: columnProps,
   provide() {
     return {
-      xecolgroup: this,
+      $xecolumn: this,
       $xegrid: null
     };
-  }
-});
+  },
+  inject: {
+    $xetable: {
+      default: null
+    },
+    $xecolumn: {
+      default: null
+    }
+  },
+  watch: columnWatch,
+  created() {
+    this.columnConfig = this.createColumn(this.$xetable, this);
+  },
+  mounted() {
+    const {
+      $scopedSlots
+    } = this;
+    const columnSlots = {};
+    if ($scopedSlots.header) {
+      columnSlots.header = $scopedSlots.header;
+    }
+    this.columnConfig.slots = columnSlots;
+    assembleColumn(this);
+  },
+  destroyed() {
+    destroyColumn(this);
+  },
+  render(h) {
+    return h('div', this.$slots.default);
+  },
+  methods: cell
+}));
 ;// CONCATENATED MODULE: ./packages/colgroup/index.ts
 
 
@@ -4872,6 +4909,7 @@ const {
 // const isWebkit = browse['-webkit'] && !browse.edge
 // const debounceScrollYDuration = browse.msie ? 80 : 20
 const customStorageKey = 'VXE_CUSTOM_STORE';
+const tpImg = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNkYAAAAAYAAjCB0C8AAAAASUVORK5CYII=';
 // 获取所有的列，排除分组
 const getColumnList = columns => {
   const result = [];
@@ -5384,11 +5422,18 @@ function showDropTip($xeTable, evnt, trEl, thEl, showLine, dragPos) {
     if (cdLineEl) {
       if (showLine) {
         const thRect = thEl.getBoundingClientRect();
+        const offsetTop = Math.max(0, thRect.y - wrapperRect.y);
         cdLineEl.style.display = 'block';
+        cdLineEl.style.top = `${offsetTop}px`;
         cdLineEl.style.left = `${Math.max(1, thRect.x - wrapperRect.x)}px`;
         cdLineEl.style.width = `${thRect.width}px`;
-        cdLineEl.style.height = `${wrapperRect.height - scrollbarHeight}px`;
+        if (prevDragToChild) {
+          cdLineEl.style.height = `${thRect.height}px`;
+        } else {
+          cdLineEl.style.height = `${wrapperRect.height - offsetTop - scrollbarHeight}px`;
+        }
         cdLineEl.setAttribute('drag-pos', dragPos);
+        cdLineEl.setAttribute('drag-to-child', prevDragToChild ? 'y' : 'n');
       } else {
         cdLineEl.style.display = '';
       }
@@ -5950,12 +5995,12 @@ const Methods = {
           height: 0
         };
       }
+      cacheItem.row = row;
+      cacheItem.items = items;
+      cacheItem.parent = parent;
+      cacheItem.level = level;
+      cacheItem.index = treeConfig && parent ? -1 : index;
       if (isSource) {
-        cacheItem.row = row;
-        cacheItem.items = items;
-        cacheItem.parent = parent;
-        cacheItem.level = level;
-        cacheItem.index = treeConfig && parent ? -1 : index;
         fullDataRowIdMaps[rowid] = cacheItem;
       }
       fullAllDataRowIdMaps[rowid] = cacheItem;
@@ -6070,18 +6115,26 @@ const Methods = {
    * 牺牲数据组装的耗时，用来换取使用过程中的流畅
    */
   cacheColumnMap() {
+    const $xeTable = this;
+    const props = $xeTable;
+    const reactData = $xeTable;
+    const internalData = $xeTable;
     const {
       tableFullColumn,
-      collectColumn,
-      fullColumnMap,
-      showOverflow,
-      columnOpts,
-      rowOpts
-    } = this;
-    const fullColumnIdData = this.fullColumnIdData = {};
-    const fullColumnFieldData = this.fullColumnFieldData = {};
+      collectColumn
+    } = internalData;
+    const fullColumnIdData = internalData.fullColumnIdData = {};
+    const fullColumnFieldData = internalData.fullColumnFieldData = {};
+    const mouseOpts = $xeTable.computeMouseOpts;
+    const columnOpts = $xeTable.computeColumnOpts;
+    const columnDragOpts = $xeTable.computeColumnDragOpts;
+    const {
+      isCrossDrag,
+      isSelfToChildDrag
+    } = columnDragOpts;
+    const rowOpts = $xeTable.computeRowOpts;
     const isGroup = collectColumn.some(hasChildrenList);
-    let isAllOverflow = !!showOverflow;
+    let isAllOverflow = !!props.showOverflow;
     let expandColumn;
     let treeNodeColumn;
     let checkboxColumn;
@@ -6097,6 +6150,8 @@ const Methods = {
         treeNode
       } = column;
       const rest = {
+        $index: -1,
+        _index: -1,
         column,
         colid,
         index,
@@ -6105,12 +6160,14 @@ const Methods = {
         width: 0
       };
       if (field) {
-        if (true) {
-          if (fullColumnFieldData[field]) {
-            warnLog('vxe.error.colRepet', ['field', field]);
-          }
+        if (fullColumnFieldData[field]) {
+          errLog('vxe.error.colRepet', ['field', field]);
         }
         fullColumnFieldData[field] = rest;
+      } else {
+        if (isCrossDrag || isSelfToChildDrag) {
+          errLog('vxe.error.emptyProp', ['column.field']);
+        }
       }
       if (!hasFixed && fixed) {
         hasFixed = fixed;
@@ -6154,27 +6211,6 @@ const Methods = {
           }
         }
       }
-      if (true) {
-        if (this.showOverflow && column.showOverflow === false) {
-          warnLog('vxe.error.errConflicts', [`table.show-overflow=${this.showOverflow}`, `column.show-overflow=${column.showOverflow}`]);
-        }
-        if (this.showHeaderOverflow && column.showHeaderOverflow === false) {
-          warnLog('vxe.error.errConflicts', [`table.show-header-overflow=${this.showHeaderOverflow}`, `column.show-header-overflow=${column.showHeaderOverflow}`]);
-        }
-        if (this.showFooterOverflow && column.showFooterOverflow === false) {
-          warnLog('vxe.error.errConflicts', [`table.show-footer-overflow=${this.showFooterOverflow}`, `column.show-footer-overflow=${column.showFooterOverflow}`]);
-        }
-      }
-      if (true) {
-        if (htmlColumn) {
-          if (!columnOpts.useKey) {
-            errLog('vxe.error.reqProp', ['column-config.useKey', 'column.type=html']);
-          }
-          if (!rowOpts.useKey) {
-            errLog('vxe.error.reqProp', ['row-config.useKey', 'column.type=html']);
-          }
-        }
-      }
       if (isAllOverflow && column.showOverflow === false) {
         isAllOverflow = false;
       }
@@ -6182,9 +6218,7 @@ const Methods = {
         errLog('vxe.error.colRepet', ['colId', colid]);
       }
       fullColumnIdData[colid] = rest;
-      fullColumnMap.set(column, rest);
     };
-    fullColumnMap.clear();
     if (isGroup) {
       external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(collectColumn, (column, index, items, path, parent, nodes) => {
         column.level = nodes.length;
@@ -6194,14 +6228,24 @@ const Methods = {
       tableFullColumn.forEach(handleFunc);
     }
     if (true) {
-      if (expandColumn && this.mouseOpts.area) {
+      if (expandColumn && mouseOpts.area) {
         errLog('vxe.error.errConflicts', ['mouse-config.area', 'column.type=expand']);
       }
     }
-    this.isGroup = isGroup;
-    this.treeNodeColumn = treeNodeColumn;
-    this.expandColumn = expandColumn;
-    this.isAllOverflow = isAllOverflow;
+    if (true) {
+      if (htmlColumn) {
+        if (!columnOpts.useKey) {
+          errLog('vxe.error.reqProp', ['column-config.useKey & column.type=html']);
+        }
+        if (!rowOpts.useKey) {
+          errLog('vxe.error.reqProp', ['row-config.useKey & column.type=html']);
+        }
+      }
+    }
+    reactData.isGroup = isGroup;
+    reactData.treeNodeColumn = treeNodeColumn;
+    reactData.expandColumn = expandColumn;
+    reactData.isAllOverflow = isAllOverflow;
   },
   /**
    * 根据 tr 元素获取对应的 row 信息
@@ -8010,6 +8054,10 @@ const Methods = {
       const {
         rceTimeout
       } = internalData;
+      const el = $xeTable.$refs.refElem;
+      if (!el || !el.clientWidth) {
+        $xeTable.autoCellWidth();
+      }
       if (rceTimeout) {
         clearTimeout(rceTimeout);
         $xeTable.$nextTick(() => {
@@ -10869,8 +10917,9 @@ const Methods = {
    * 行拖拽
    */
   handleRowDragDragstartEvent(evnt) {
-    const img = new Image();
     if (evnt.dataTransfer) {
+      const img = new Image();
+      img.src = tpImg;
       evnt.dataTransfer.setDragImage(img, 0, 0);
     }
   },
@@ -10954,8 +11003,8 @@ const Methods = {
                     return;
                   }
                   if (oldAllMaps[newRowid]) {
+                    isSelfToChildStatus = true;
                     if (!isSelfToChildDrag) {
-                      isSelfToChildStatus = true;
                       if (core_.VxeUI.modal) {
                         core_.VxeUI.modal.message({
                           status: 'error',
@@ -11031,7 +11080,7 @@ const Methods = {
           }
           reactData.isDragRowMove = true;
           $xeTable.handleTableData(treeConfig && transform);
-          $xeTable.cacheRowMap(true);
+          $xeTable.cacheRowMap();
           $xeTable.updateScrollYStatus();
           if (!(treeConfig && transform)) {
             $xeTable.updateAfterDataIndex();
@@ -11059,6 +11108,7 @@ const Methods = {
     }
     hideDropTip($xeTable);
     clearRowDropOrigin($xeTable);
+    internalData.prevDragToChild = false;
     reactData.dragRow = null;
     reactData.dragCol = null;
     setTimeout(() => {
@@ -11167,8 +11217,9 @@ const Methods = {
    * 列拖拽
    */
   handleHeaderCellDragDragstartEvent(evnt) {
-    const img = new Image();
     if (evnt.dataTransfer) {
+      const img = new Image();
+      img.src = tpImg;
       evnt.dataTransfer.setDragImage(img, 0, 0);
     }
   },
@@ -11182,6 +11233,9 @@ const Methods = {
     } = props;
     const columnDragOpts = $xeTable.computeColumnDragOpts;
     const {
+      isCrossDrag,
+      isSelfToChildDrag,
+      isToChildDrag,
       dragEndMethod
     } = columnDragOpts;
     const {
@@ -11190,38 +11244,126 @@ const Methods = {
     const {
       collectColumn,
       prevDragCol,
-      prevDragPos
+      prevDragPos,
+      prevDragToChild
     } = internalData;
     const dragOffsetIndex = prevDragPos === 'right' ? 1 : 0;
     if (prevDragCol && dragCol) {
       // 判断是否有拖动
       if (prevDragCol !== dragCol) {
+        const oldColumn = dragCol;
+        const newColumn = prevDragCol;
         Promise.resolve(dragEndMethod ? dragEndMethod({
-          oldColumn: dragCol,
-          newColumn: prevDragCol,
+          oldColumn,
+          newColumn,
           dragPos: prevDragPos,
           offsetIndex: dragOffsetIndex
         }) : true).then(status => {
           if (!status) {
             return;
           }
+          let oafIndex = -1;
+          let nafIndex = -1;
+          const oldAllMaps = {};
+          external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree([oldColumn], column => {
+            oldAllMaps[column.id] = column;
+          });
+          let isSelfToChildStatus = false;
+          if (oldColumn.parentId && newColumn.parentId) {
+            // 子到子
+            if (!isCrossDrag) {
+              return;
+            }
+            if (oldAllMaps[newColumn.id]) {
+              isSelfToChildStatus = true;
+              if (!isSelfToChildDrag) {
+                if (core_.VxeUI.modal) {
+                  core_.VxeUI.modal.message({
+                    status: 'error',
+                    content: methods_getI18n('vxe.error.treeDragChild')
+                  });
+                }
+                return;
+              }
+            }
+          } else if (oldColumn.parentId) {
+            // 子到根
+            if (!isCrossDrag) {
+              return;
+            }
+          } else if (newColumn.parentId) {
+            // 根到子
+            if (!isCrossDrag) {
+              return;
+            }
+            if (oldAllMaps[newColumn.id]) {
+              isSelfToChildStatus = true;
+              if (!isSelfToChildDrag) {
+                if (core_.VxeUI.modal) {
+                  core_.VxeUI.modal.message({
+                    status: 'error',
+                    content: methods_getI18n('vxe.error.treeDragChild')
+                  });
+                }
+                return;
+              }
+            }
+          } else {
+            // 根到根
+          }
+          const oldewMatchRest = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().findTree(collectColumn, item => item.id === oldColumn.id);
+          // 改变层级
+          if (isSelfToChildStatus && isSelfToChildDrag) {
+            if (oldewMatchRest) {
+              const {
+                items: oCols,
+                index: oIndex
+              } = oldewMatchRest;
+              const childList = oldColumn.children || [];
+              childList.forEach(column => {
+                column.parentId = oldColumn.parentId;
+              });
+              oCols.splice(oIndex, 1, ...childList);
+              oldColumn.children = [];
+            }
+          } else {
+            if (oldewMatchRest) {
+              const {
+                items: oCols,
+                index: oIndex,
+                parent: oParent
+              } = oldewMatchRest;
+              oCols.splice(oIndex, 1);
+              if (!oParent) {
+                oafIndex = oIndex;
+              }
+            }
+          }
+          const newMatchRest = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().findTree(collectColumn, item => item.id === newColumn.id);
+          if (newMatchRest) {
+            const {
+              items: nCols,
+              index: nIndex,
+              parent: nParent
+            } = newMatchRest;
+            // 转子级
+            if (isToChildDrag && prevDragToChild) {
+              oldColumn.parentId = newColumn.id;
+              newColumn.children = (newColumn.children || []).concat([oldColumn]);
+            } else {
+              oldColumn.parentId = newColumn.parentId;
+              nCols.splice(nIndex + dragOffsetIndex, 0, oldColumn);
+            }
+            if (!nParent) {
+              nafIndex = nIndex;
+            }
+          }
           external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(collectColumn, (column, index, items, path, parent) => {
             if (!parent) {
               const sortIndex = index + 1;
               column.renderSortNumber = sortIndex;
             }
           });
-          const oafIndex = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().findIndexOf(collectColumn, item => item.id === dragCol.id);
-          const nafIndex = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().findIndexOf(collectColumn, item => item.id === prevDragCol.id) + dragOffsetIndex;
-          const newTargetCol = collectColumn[nafIndex];
-          if (newTargetCol) {
-            // 插入最后位置
-            dragCol.renderSortNumber = newTargetCol.renderSortNumber;
-            newTargetCol.renderSortNumber = dragCol.renderSortNumber + 0.5;
-          } else {
-            // 插入新位置
-            dragCol.renderSortNumber = collectColumn.length + 1.5;
-          }
           reactData.isDragColMove = true;
           if (mouseConfig) {
             if ($xeTable.clearSelected) {
@@ -11232,14 +11374,12 @@ const Methods = {
               $xeTable.clearCopyCellArea();
             }
           }
-          $xeTable.analyColumnWidth();
-          $xeTable.$nextTick().then(() => {
+          $xeTable.refreshColumn(true).then(() => {
             $xeTable.updateCellAreas();
-            $xeTable.refreshColumn(true);
           });
           $xeTable.dispatchEvent('column-dragend', {
-            oldColumn: dragCol,
-            newColumn: prevDragCol,
+            oldColumn,
+            newColumn,
             dragPos: prevDragPos,
             offsetIndex: dragOffsetIndex,
             _index: {
@@ -11253,6 +11393,7 @@ const Methods = {
     }
     hideDropTip($xeTable);
     clearColDropOrigin($xeTable);
+    internalData.prevDragToChild = false;
     reactData.dragRow = null;
     reactData.dragCol = null;
     setTimeout(() => {
@@ -11266,10 +11407,16 @@ const Methods = {
     const {
       dragCol
     } = reactData;
+    const columnDragOpts = $xeTable.computeColumnDragOpts;
+    const {
+      isToChildDrag,
+      isCrossDrag
+    } = columnDragOpts;
     if (!dragCol) {
       evnt.preventDefault();
       return;
     }
+    const hasCtrlKey = evnt.ctrlKey;
     const thEl = evnt.currentTarget;
     const colid = thEl.getAttribute('colid');
     const column = $xeTable.getColumnById(colid);
@@ -11280,11 +11427,11 @@ const Methods = {
       } = reactData;
       const offsetX = evnt.clientX - thEl.getBoundingClientRect().x;
       const dragPos = offsetX < thEl.clientWidth / 2 ? 'left' : 'right';
-      if (dragCol.id === column.id || column.parentId) {
+      if (dragCol && dragCol.id === column.id || !isCrossDrag && column.parentId) {
         showDropTip($xeTable, evnt, null, thEl, false, dragPos);
         return;
       }
-      internalData.prevDragToChild = false;
+      internalData.prevDragToChild = !!(isToChildDrag && hasCtrlKey);
       internalData.prevDragCol = column;
       internalData.prevDragPos = dragPos;
       showDropTip($xeTable, evnt, null, thEl, true, dragPos);
@@ -13748,7 +13895,7 @@ function renderColumn(h, _vm, $xetable, seq, rowid, fixedType, rowLevel, row, ro
       'col--valid-error': !!errorValidItem,
       'col--current': currentColumn === column
     }, getClass(compCellClassName, params), getClass(className, params), getClass(allCellClassName, params)],
-    key: columnKey || columnOpts.useKey || rowOpts.useKey ? column.id : $columnIndex,
+    key: columnKey || columnOpts.useKey || rowOpts.useKey || columnOpts.drag ? column.id : $columnIndex,
     attrs,
     style: Object.assign({
       height: cellHeight
@@ -13886,7 +14033,7 @@ function renderRows(h, _vm, $xeTable, fixedType, tableData, tableColumn) {
         rowid
       },
       style: rowStyle ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(rowStyle) ? rowStyle(params) : rowStyle : null,
-      key: rowKey || rowOpts.useKey || rowOpts.drag || treeConfig ? rowid : $rowIndex,
+      key: rowKey || rowOpts.useKey || rowOpts.drag || columnOpts.drag || treeConfig ? rowid : $rowIndex,
       nativeOn: trOn
     }, tdVNs) : h('tr', {
       class: trClass,
@@ -15233,7 +15380,7 @@ function footer_renderHeads(h, _vm, footerTableData) {
 const {
   getConfig: props_getConfig
 } = core_.VxeUI;
-/* harmony default export */ var src_props = ({
+/* harmony default export */ var props = ({
   /** 基本属性 */
   id: [String, Function],
   // 数据
@@ -22686,7 +22833,7 @@ function handleUupdateResize(_vm) {
 /* harmony default export */ var table = ({
   name: 'VxeTable',
   mixins: [table_globalMixins.sizeMixin, mixin, menu_mixin, edit_mixin, export_mixin, keyboard_mixin, validator_mixin, custom_mixin],
-  props: src_props,
+  props: props,
   provide() {
     return {
       $xetable: this,
@@ -24011,8 +24158,6 @@ function handleUupdateResize(_vm) {
   },
   methods: methods
 });
-;// CONCATENATED MODULE: ./packages/ui/src/comp.ts
-const defineVxeComponent = options => options;
 ;// CONCATENATED MODULE: ./packages/toolbar/src/toolbar.ts
 
 
@@ -24800,7 +24945,7 @@ const {
   renderEmptyElement: grid_renderEmptyElement
 } = core_.VxeUI;
 const grid_methods = {};
-const propKeys = Object.keys(src_props);
+const propKeys = Object.keys(props);
 function renderDefaultForm(h, $xeGrid) {
   const VxeUIFormComponent = core_.VxeUI.getComponent('VxeForm');
   const props = $xeGrid;
@@ -25157,7 +25302,7 @@ Object.keys(table.methods).forEach(name => {
   name: 'VxeGrid',
   mixins: [grid_globalMixins.sizeMixin],
   props: {
-    ...src_props,
+    ...props,
     layouts: Array,
     columns: Array,
     pagerConfig: [Boolean, Object],
@@ -27422,8 +27567,8 @@ const Toolbar = VxeToolbar;
       notExp: '该浏览器不支持导入/导出功能',
       impFields: '导入失败，请检查字段名和数据格式是否正确',
       treeNotImp: '树表格不支持导入',
-      treeCrossDrag: '只能拖拽第一层级的数据',
-      treeDragChild: '父级数据不能拖拽到自己的子级中',
+      treeCrossDrag: '只能拖拽第一层级',
+      treeDragChild: '父级不能拖拽到自己的子级中',
       reqPlugin: '可选扩展插件 "{1}" https://vxeui.com/other{0}/#/{1}/install'
     },
     table: {