vxe-table 4.1.0-beta.0 → 4.1.2

package/helper/vetur/attributes.json

@@ -181,7 +181,11 @@
   },
   "vxe-table/column-config": {
     "type": "any",
-    "description": "列的默认参数"
+    "description": "列配置信息"
+  },
+  "vxe-table/row-config": {
+    "type": "any",
+    "description": "行配置信息"
   },
   "vxe-table/resizable-config": {
     "type": "object",
@@ -229,7 +233,7 @@
   },
   "vxe-table/tree-config": {
     "type": "any",
-    "description": "树形结构配置项（不支持虚拟滚动）"
+    "description": "树形结构配置项"
   },
   "vxe-table/menu-config": {
     "type": "any",
@@ -281,11 +285,11 @@
   },
   "vxe-table/scroll-x": {
     "type": "any",
-    "description": "横向虚拟滚动配置（不支持深层结构和展开行）"
+    "description": "横向虚拟滚动配置（不支持展开行）"
   },
   "vxe-table/scroll-y": {
     "type": "any",
-    "description": "纵向虚拟滚动配置（不支持深层结构和展开行）"
+    "description": "纵向虚拟滚动配置（不支持展开行）"
   },
   "vxe-table/params": {
     "type": "any",
@@ -339,54 +343,6 @@
     "type": "string | (({ $rowindex, column, columnindex, $columnindex }) => any)",
     "description": "给表头的单元格附加 className"
   },
-  "vxe-table-colgroup/field": {
-    "type": "string",
-    "description": "列字段名（注：属性层级越深，渲染性能就越差，例如：aa.bb.cc.dd.ee）"
-  },
-  "vxe-table-colgroup/title": {
-    "type": "string",
-    "description": "列标题（支持开启国际化）"
-  },
-  "vxe-table-colgroup/width": {
-    "type": "number | string",
-    "description": "列宽度（如果为空则均匀分配剩余宽度，如果全部列固定了，可能会存在宽屏下不会铺满，可以配合 \"%\" 或者 \"min-width\" 布局）"
-  },
-  "vxe-table-colgroup/min-width": {
-    "type": "number | string",
-    "description": "最小列宽度；会自动将剩余空间按比例分配"
-  },
-  "vxe-table-colgroup/resizable": {
-    "type": "boolean",
-    "description": "列是否允许拖动列宽调整大小"
-  },
-  "vxe-table-colgroup/visible": {
-    "type": "boolean",
-    "description": "默认是否显示"
-  },
-  "vxe-table-colgroup/fixed": {
-    "type": "string",
-    "description": "将列固定在左侧或者右侧（注意：固定列应该放在左右两侧的位置）"
-  },
-  "vxe-table-colgroup/align": {
-    "type": "string",
-    "description": "列对齐方式"
-  },
-  "vxe-table-colgroup/header-align": {
-    "type": "string",
-    "description": "表头列的对齐方式"
-  },
-  "vxe-table-colgroup/show-overflow": {
-    "type": "string | boolean",
-    "description": "当内容过长时显示为省略号"
-  },
-  "vxe-table-colgroup/show-header-overflow": {
-    "type": "string | boolean",
-    "description": "当表头内容过长时显示为省略号"
-  },
-  "vxe-table-colgroup/header-class-name": {
-    "type": "string | (({ $rowindex, column, columnindex, $columnindex }) => any)",
-    "description": "给表头的单元格附加 className"
-  },
   "vxe-column/type": {
     "type": "string",
     "description": "列的类型"
@@ -535,154 +491,6 @@
     "type": "string | number",
     "description": "自定义列的唯一主键（注：99%的场景不应该设置，操作不正确将导致出现问题）"
   },
-  "vxe-table-column/type": {
-    "type": "string",
-    "description": "列的类型"
-  },
-  "vxe-table-column/field": {
-    "type": "string",
-    "description": "列字段名（注：属性层级越深，渲染性能就越差，例如：aa.bb.cc.dd.ee）"
-  },
-  "vxe-table-column/title": {
-    "type": "string",
-    "description": "列标题（支持开启国际化）"
-  },
-  "vxe-table-column/width": {
-    "type": "number | string",
-    "description": "列宽度（如果为空则均匀分配剩余宽度，如果全部列固定了，可能会存在宽屏下不会铺满，可以配合 \"%\" 或者 \"min-width\" 布局）"
-  },
-  "vxe-table-column/min-width": {
-    "type": "number | string",
-    "description": "最小列宽度；会自动将剩余空间按比例分配"
-  },
-  "vxe-table-column/resizable": {
-    "type": "boolean",
-    "description": "列是否允许拖动列宽调整大小"
-  },
-  "vxe-table-column/visible": {
-    "type": "boolean",
-    "description": "默认是否显示"
-  },
-  "vxe-table-column/fixed": {
-    "type": "string",
-    "description": "将列固定在左侧或者右侧（注意：固定列应该放在左右两侧的位置）"
-  },
-  "vxe-table-column/align": {
-    "type": "string",
-    "description": "列对齐方式"
-  },
-  "vxe-table-column/header-align": {
-    "type": "string",
-    "description": "表头列的对齐方式"
-  },
-  "vxe-table-column/footer-align": {
-    "type": "string",
-    "description": "表尾列的对齐方式"
-  },
-  "vxe-table-column/show-overflow": {
-    "type": "string | boolean",
-    "description": "当内容过长时显示为省略号"
-  },
-  "vxe-table-column/show-header-overflow": {
-    "type": "string | boolean",
-    "description": "当表头内容过长时显示为省略号"
-  },
-  "vxe-table-column/show-footer-overflow": {
-    "type": "boolean | string",
-    "description": "当表尾内容过长时显示为省略号"
-  },
-  "vxe-table-column/class-name": {
-    "type": "string | (({row, rowindex, $rowindex, column, columnindex, $columnindex}) => any)",
-    "description": "给单元格附加 className"
-  },
-  "vxe-table-column/header-class-name": {
-    "type": "string | (({ $rowindex, column, columnindex, $columnindex }) => any)",
-    "description": "给表头的单元格附加 className"
-  },
-  "vxe-table-column/footer-class-name": {
-    "type": "string | (({ $rowindex, column, columnindex, $columnindex }) => any)",
-    "description": "给表尾的单元格附加 className"
-  },
-  "vxe-table-column/formatter": {
-    "type": "(({ cellvalue, row, column }) => string) | any[] | string",
-    "description": "格式化显示内容"
-  },
-  "vxe-table-column/sortable": {
-    "type": "boolean",
-    "description": "是否允许列排序"
-  },
-  "vxe-table-column/sort-by": {
-    "type": "string | (({ row, column }) => string | number)",
-    "description": "只对 sortable 有效，指定排序的字段（当值 formatter 格式化后，可以设置该字段，使用值进行排序）"
-  },
-  "vxe-table-column/sort-type": {
-    "type": "string",
-    "description": "排序的字段类型，比如字符串转数值等"
-  },
-  "vxe-table-column/filters": {
-    "type": "any[]",
-    "description": "配置筛选条件（注：筛选只能用于列表，如果是树结构则过滤根节点）"
-  },
-  "vxe-table-column/filter-multiple": {
-    "type": "boolean",
-    "description": "只对 filters 有效，筛选是否允许多选"
-  },
-  "vxe-table-column/filter-method": {
-    "type": "({ value, option, cellvalue, row, column }) => boolean",
-    "description": "只对 filters 有效，列的筛选方法，该方法的返回值用来决定该行是否显示"
-  },
-  "vxe-table-column/filter-reset-method": {
-    "type": "({ options, column }) => void",
-    "description": "只对 filters 有效，自定义筛选重置方法"
-  },
-  "vxe-table-column/filter-recover-method": {
-    "type": "({ option, column }) => void",
-    "description": "只对 filters 有效，自定义筛选复原方法（使用自定义筛选时可能会用到）"
-  },
-  "vxe-table-column/filter-render": {
-    "type": "any",
-    "description": "筛选渲染器配置项"
-  },
-  "vxe-table-column/export-method": {
-    "type": "({ row, column }) => string",
-    "description": "自定义单元格数据导出方法，返回自定义的值"
-  },
-  "vxe-table-column/footer-export-method": {
-    "type": "({ items, _columnindex }) => string",
-    "description": "自定义表尾单元格数据导出方法，返回自定义的值"
-  },
-  "vxe-table-column/title-help": {
-    "type": "any",
-    "description": "标题帮助图标配置项"
-  },
-  "vxe-table-column/cell-type": {
-    "type": "string",
-    "description": "只对特定功能有效，单元格值类型（例如：导出数据类型设置）"
-  },
-  "vxe-table-column/cell-render": {
-    "type": "any",
-    "description": "默认的渲染器配置项"
-  },
-  "vxe-table-column/edit-render": {
-    "type": "any",
-    "description": "可编辑渲染器配置项"
-  },
-  "vxe-table-column/content-render": {
-    "type": "any",
-    "description": "内容渲染配置项"
-  },
-  "vxe-table-column/tree-node": {
-    "type": "boolean",
-    "description": "只对 tree-config 配置时有效，指定为树节点"
-  },
-  "vxe-table-column/params": {
-    "type": "any",
-    "description": "额外的参数（可以用来存放一些私有参数）"
-  },
-  "vxe-table-column/col-id": {
-    "type": "string | number",
-    "description": "自定义列的唯一主键（注：99%的场景不应该设置，操作不正确将导致出现问题）"
-  },
   "vxe-grid/id": {
     "type": "string",
     "description": "唯一标识（被某些特定的功能所依赖）"
@@ -869,7 +677,11 @@
   },
   "vxe-grid/column-config": {
     "type": "any",
-    "description": "列的默认参数"
+    "description": "列配置信息"
+  },
+  "vxe-grid/row-config": {
+    "type": "any",
+    "description": "行配置信息"
   },
   "vxe-grid/resizable-config": {
     "type": "object",
@@ -917,7 +729,7 @@
   },
   "vxe-grid/tree-config": {
     "type": "any",
-    "description": "树形结构配置项（不支持虚拟滚动）"
+    "description": "树形结构配置项"
   },
   "vxe-grid/menu-config": {
     "type": "any",
@@ -969,11 +781,11 @@
   },
   "vxe-grid/scroll-x": {
     "type": "any",
-    "description": "横向虚拟滚动配置（不支持深层结构和展开行）"
+    "description": "横向虚拟滚动配置（不支持展开行）"
   },
   "vxe-grid/scroll-y": {
     "type": "any",
-    "description": "纵向虚拟滚动配置（不支持深层结构和展开行）"
+    "description": "纵向虚拟滚动配置（不支持展开行）"
   },
   "vxe-grid/params": {
     "type": "any",

package/helper/vetur/tags.json

@@ -47,6 +47,7 @@
       "row-id",
       "keep-source",
       "column-config",
+      "row-config",
       "resizable-config",
       "seq-config",
       "sort-config",
@@ -77,9 +78,7 @@
     ],
     "subtags": [
       "vxe-colgroup",
-      "vxe-table-colgroup",
-      "vxe-column",
-      "vxe-table-column"
+      "vxe-column"
     ],
     "description": "基础表格"
   },
@@ -103,26 +102,6 @@
     ],
     "description": "基础表格 - 分组列"
   },
-  "vxe-table-colgroup": {
-    "attributes": [
-      "field",
-      "title",
-      "width",
-      "min-width",
-      "resizable",
-      "visible",
-      "fixed",
-      "align",
-      "header-align",
-      "show-overflow",
-      "show-header-overflow",
-      "header-class-name"
-    ],
-    "subtags": [
-      "vxe-table-column"
-    ],
-    "description": "基础表格 - 分组列"
-  },
   "vxe-column": {
     "attributes": [
       "type",
@@ -165,48 +144,6 @@
     ],
     "description": "基础表格 - 列"
   },
-  "vxe-table-column": {
-    "attributes": [
-      "type",
-      "field",
-      "title",
-      "width",
-      "min-width",
-      "resizable",
-      "visible",
-      "fixed",
-      "align",
-      "header-align",
-      "footer-align",
-      "show-overflow",
-      "show-header-overflow",
-      "show-footer-overflow",
-      "class-name",
-      "header-class-name",
-      "footer-class-name",
-      "formatter",
-      "sortable",
-      "sort-by",
-      "sort-type",
-      "filters",
-      "filter-multiple",
-      "filter-method",
-      "filter-reset-method",
-      "filter-recover-method",
-      "filter-render",
-      "export-method",
-      "footer-export-method",
-      "title-help",
-      "cell-type",
-      "cell-render",
-      "edit-render",
-      "content-render",
-      "tree-node",
-      "params",
-      "col-id"
-    ],
-    "description": "基础表格 - 列"
-  },
   "vxe-grid": {
     "attributes": [
       "id",
@@ -256,6 +193,7 @@
       "row-id",
       "keep-source",
       "column-config",
+      "row-config",
       "resizable-config",
       "seq-config",
       "sort-config",

package/lib/edit/src/hook.js

@@ -205,7 +205,7 @@ var editHook = {
 
         reactData.scrollYLoad = !treeConfig && sYOpts.gt > -1 && sYOpts.gt < tableFullData.length;
         $xetable.updateFooter();
-        $xetable.updateCache();
+        $xetable.cacheRowMap();
         $xetable.handleTableData();
         $xetable.updateAfterDataIndex();
         $xetable.checkSelectionStatus();
@@ -319,7 +319,7 @@ var editHook = {
         });
         reactData.scrollYLoad = !treeConfig && sYOpts.gt > -1 && sYOpts.gt < tableFullData.length;
         $xetable.updateFooter();
-        $xetable.updateCache();
+        $xetable.cacheRowMap();
         $xetable.handleTableData();
         $xetable.updateAfterDataIndex();
         $xetable.checkSelectionStatus();

package/lib/edit/src/hook.min.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _vue=require("vue"),_xeUtils=_interopRequireDefault(require("xe-utils")),_vXETable=require("../../v-x-e-table"),_utils=require("../../tools/utils"),_util=require("../../table/src/util"),_dom=require("../../tools/dom");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}var __assign=function(){return(__assign=Object.assign||function(e){for(var t,r=1,l=arguments.length;r<l;r++)for(var n in t=arguments[r])Object.prototype.hasOwnProperty.call(t,n)&&(e[n]=t[n]);return e}).apply(this,arguments)},__spreadArray=function(e,t){for(var r=0,l=t.length,n=e.length;r<l;r++,n++)e[n]=t[r];return e},tableEditMethodKeys=["insert","insertAt","remove","removeCheckboxRow","removeRadioRow","removeCurrentRow","getRecordset","getInsertRecords","getRemoveRecords","getUpdateRecords","getActiveRecord","getSelectedCell","clearActived","clearSelected","isActiveByRow","setActiveRow","setActiveCell","setSelectCell"],editHook={setupTable:function(g){function v(e,t){var r=t.model;t.editRender&&(r.value=(0,_util.getCellValue)(e,t),r.update=!1)}function n(e,t){var r=t.model;t.editRender&&r.update&&((0,_util.setCellValue)(e,t,r.value),r.update=!1,r.value=null)}function r(){var e=o.value;!e||(e=e.querySelector(".col--selected"))&&(0,_dom.removeClass)(e,"col--selected")}var p=g.props,w=g.reactData,m=g.internalData,o=g.getRefMaps().refElem,e=g.getComputeMaps(),s=e.computeMouseOpts,h=e.computeEditOpts,C=e.computeCheckboxOpts,R=e.computeSYOpts,a=e.computeTreeOpts,x={},_={};function u(){var e=w.editStore,t=w.tableColumn,r=h.value,e=e.actived,l=e.row,e=e.column;(l||e)&&("row"===r.mode?t.forEach(function(e){return n(l,e)}):n(l,e))}return x={insert:function(e){return x.insertAt(e,null)},insertAt:function(e,t){var r=p.treeConfig,l=w.mergeList,n=w.editStore,o=w.scrollYLoad,a=m.afterFullData,u=m.tableFullData,c=R.value,i=(e=!_xeUtils.default.isArray(e)?[e]:e).map(function(e){return g.defineField(Object.assign({},e))});if(t)if(-1===t)a.push.apply(a,i),u.push.apply(u,i),l.forEach(function(e){var t=e.row,r=e.rowspan;t+r>a.length&&(e.rowspan=r+i.length)});else{if(r)throw new Error((0,_utils.getLog)("vxe.error.noTree",["insert"]));var d=g.findRowIndexOf(a,t);if(-1===d)throw new Error((0,_utils.errLog)("vxe.error.unableInsert"));a.splice.apply(a,__spreadArray([d,0],i)),u.splice.apply(u,__spreadArray([g.findRowIndexOf(u,t),0],i)),l.forEach(function(e){var t=e.row,r=e.rowspan;d<t?e.row=t+i.length:d<t+r&&(e.rowspan=r+i.length)})}else a.unshift.apply(a,i),u.unshift.apply(u,i),l.forEach(function(e){var t=e.row;0<t&&(e.row=t+i.length)});return(n=n.insertList).unshift.apply(n,i),w.scrollYLoad=!r&&-1<c.gt&&c.gt<u.length,g.updateFooter(),g.updateCache(),g.handleTableData(),g.updateAfterDataIndex(),g.checkSelectionStatus(),o&&g.updateScrollYSpace(),(0,_vue.nextTick)().then(function(){return g.updateCellAreas(),g.recalculate()}).then(function(){return{row:i.length?i[i.length-1]:null,rows:i}})},remove:function(e){var t=p.treeConfig,r=w.mergeList,l=w.editStore,n=w.selection,o=w.scrollYLoad,a=m.afterFullData,u=m.tableFullData,c=C.value,i=R.value,d=l.actived,s=l.removeList,f=l.insertList,c=c.checkField,v=[];return e?_xeUtils.default.isArray(e)||(e=[e]):e=u,e.forEach(function(e){g.isInsertByRow(e)||s.push(e)}),c||e.forEach(function(e){e=g.findRowIndexOf(n,e);-1<e&&n.splice(e,1)}),u===e?(e=v=u.slice(0),m.tableFullData=[],m.afterFullData=[],g.clearMergeCells()):e.forEach(function(e){var t=g.findRowIndexOf(u,e);-1<t&&(t=u.splice(t,1),v.push(t[0]));var l=g.findRowIndexOf(a,e);-1<l&&(r.forEach(function(e){var t=e.row,r=e.rowspan;l<t?e.row=t-1:l<t+r&&(e.rowspan=r-1)}),a.splice(l,1))}),d.row&&-1<g.findRowIndexOf(e,d.row)&&x.clearActived(),e.forEach(function(e){e=g.findRowIndexOf(f,e);-1<e&&f.splice(e,1)}),w.scrollYLoad=!t&&-1<i.gt&&i.gt<u.length,g.updateFooter(),g.updateCache(),g.handleTableData(),g.updateAfterDataIndex(),g.checkSelectionStatus(),o&&g.updateScrollYSpace(),(0,_vue.nextTick)().then(function(){return g.updateCellAreas(),g.recalculate()}).then(function(){return{row:v.length?v[v.length-1]:null,rows:v}})},removeCheckboxRow:function(){return x.remove(g.getCheckboxRecords()).then(function(e){return g.clearCheckboxRow(),e})},removeRadioRow:function(){var e=g.getRadioRecord();return x.remove(e||[]).then(function(e){return g.clearRadioRow(),e})},removeCurrentRow:function(){var e=g.getCurrentRecord();return x.remove(e||[]).then(function(e){return g.clearCurrentRow(),e})},getRecordset:function(){return{insertRecords:x.getInsertRecords(),removeRecords:x.getRemoveRecords(),updateRecords:x.getUpdateRecords()}},getInsertRecords:function(){var e=w.editStore,t=m.tableFullData,r=e.insertList,l=[];return r.length&&t.forEach(function(e){-1<g.findRowIndexOf(r,e)&&l.push(e)}),l},getRemoveRecords:function(){return w.editStore.removeList},getUpdateRecords:function(){var e=p.keepSource,t=p.treeConfig,r=m.tableFullData,l=a.value;return e?(u(),t?_xeUtils.default.filterTree(r,function(e){return g.isUpdateByRow(e)},l):r.filter(function(e){return g.isUpdateByRow(e)})):[]},getActiveRecord:function(){var e=w.editStore,t=m.afterFullData,r=o.value,l=e.actived,e=l.args,l=l.row;return e&&-1<g.findRowIndexOf(t,l)&&r.querySelectorAll(".vxe-body--column.col--actived").length?Object.assign({},e):null},getSelectedCell:function(){var e=w.editStore.selected,t=e.args,e=e.column;return t&&e?Object.assign({},t):null},clearActived:function(e){var t=w.editStore.actived,r=t.row,l=t.column;return(r||l)&&(u(),t.args=null,t.row=null,t.column=null,g.updateFooter(),g.dispatchEvent("edit-closed",{row:r,rowIndex:g.getRowIndex(r),$rowIndex:g.getVMRowIndex(r),column:l,columnIndex:g.getColumnIndex(l),$columnIndex:g.getVMColumnIndex(l)},e||null)),(g.clearValidate?g.clearValidate():(0,_vue.nextTick)()).then(function(){return g.recalculate()})},clearSelected:function(){var e=w.editStore.selected;return e.row=null,e.column=null,r(),(0,_vue.nextTick)()},isActiveByRow:function(e){return w.editStore.actived.row===e},setActiveRow:function(e){var t=m.visibleColumn;return g.setActiveCell(e,_xeUtils.default.find(t,function(e){return(0,_utils.isEnableConf)(e.editRender)}))},setActiveCell:function(t,e){var r=p.editConfig,l=_xeUtils.default.isString(e)?g.getColumnByField(e):e;return t&&l&&(0,_utils.isEnableConf)(r)&&(0,_utils.isEnableConf)(l.editRender)?g.scrollToRow(t,l).then(function(){var e=g.getCell(t,l);return e&&(_.handleActived({row:t,rowIndex:g.getRowIndex(t),column:l,columnIndex:g.getColumnIndex(l),cell:e,$table:g}),m._lastCallTime=Date.now()),(0,_vue.nextTick)()}):(0,_vue.nextTick)()},setSelectCell:function(e,t){var r=w.tableData,l=m.visibleColumn,n=h.value,t=_xeUtils.default.isString(t)?g.getColumnByField(t):t;return e&&t&&"manual"!==n.trigger&&(-1<(n=g.findRowIndexOf(r,e))&&t&&(r=g.getCell(e,t),r={row:e,rowIndex:n,column:t,columnIndex:l.indexOf(t),cell:r},g.handleSelected(r,{}))),(0,_vue.nextTick)()}},_={handleActived:function(e,t){var r,l=p.editConfig,n=p.mouseConfig,o=w.editStore,a=w.tableColumn,u=h.value,c=u.mode,i=u.activeMethod,d=o.actived,s=e.row,f=e.column,u=f.editRender,o=e.cell=e.cell||g.getCell(s,f);return(0,_utils.isEnableConf)(l)&&(0,_utils.isEnableConf)(u)&&o&&(d.row!==s||"cell"===c&&d.column!==f?(r="edit-disabled",i&&!i(e)||(n&&(x.clearSelected(),g.clearCellAreas&&(g.clearCellAreas(),g.clearCopyCellArea())),g.closeTooltip(),x.clearActived(t),r="edit-actived",f.renderHeight=o.offsetHeight,d.args=e,d.row=s,d.column=f,"row"===c?a.forEach(function(e){return v(s,e)}):v(s,f),(0,_vue.nextTick)(function(){_.handleFocus(e,t)})),g.dispatchEvent(r,{row:s,rowIndex:g.getRowIndex(s),$rowIndex:g.getVMRowIndex(s),column:f,columnIndex:g.getColumnIndex(f),$columnIndex:g.getVMColumnIndex(f)},t)):(r=d.column,n&&(x.clearSelected(),g.clearCellAreas&&(g.clearCellAreas(),g.clearCopyCellArea())),r!==f&&((n=r.model).update&&(0,_util.setCellValue)(s,r,n.value),g.clearValidate&&g.clearValidate()),f.renderHeight=o.offsetHeight,d.args=e,d.column=f,setTimeout(function(){_.handleFocus(e,t)})),g.focus()),(0,_vue.nextTick)()},handleFocus:function(e){var t,r,l=e.row,n=e.column,o=e.cell,a=n.editRender;(0,_utils.isEnableConf)(a)&&(t=_vXETable.renderer.get(a.name),r=a.autofocus,e=a.autoselect,a=void 0,(a=!(a=r?o.querySelector(r):a)&&t&&t.autofocus?o.querySelector(t.autofocus):a)?(a.focus(),e?a.select():_dom.browse.msie&&((a=a.createTextRange()).collapse(!1),a.select())):g.scrollToRow(l,n))},handleSelected:function(e,t){var r=p.mouseConfig,l=w.editStore,n=s.value,o=h.value,a=l.actived,u=l.selected,c=e.row,i=e.column,d=r&&n.selected;return!d||u.row===c&&u.column===i||(a.row!==c||"cell"===o.mode&&a.column!==i)&&(x.clearActived(t),x.clearSelected(),g.clearCellAreas&&(g.clearCellAreas(),g.clearCopyCellArea()),u.args=e,u.row=c,u.column=i,d&&_.addCellSelectedClass(),g.focus()),(0,_vue.nextTick)()},addCellSelectedClass:function(){var e=w.editStore.selected,t=e.row,e=e.column;r(),t&&e&&((e=g.getCell(t,e))&&(0,_dom.addClass)(e,"col--selected"))}},__assign(__assign({},x),_)},setupGrid:function(e){return e.extendTableMethods(tableEditMethodKeys)}},_default=editHook;exports.default=_default;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _vue=require("vue"),_xeUtils=_interopRequireDefault(require("xe-utils")),_vXETable=require("../../v-x-e-table"),_utils=require("../../tools/utils"),_util=require("../../table/src/util"),_dom=require("../../tools/dom");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}var __assign=function(){return(__assign=Object.assign||function(e){for(var t,r=1,l=arguments.length;r<l;r++)for(var n in t=arguments[r])Object.prototype.hasOwnProperty.call(t,n)&&(e[n]=t[n]);return e}).apply(this,arguments)},__spreadArray=function(e,t){for(var r=0,l=t.length,n=e.length;r<l;r++,n++)e[n]=t[r];return e},tableEditMethodKeys=["insert","insertAt","remove","removeCheckboxRow","removeRadioRow","removeCurrentRow","getRecordset","getInsertRecords","getRemoveRecords","getUpdateRecords","getActiveRecord","getSelectedCell","clearActived","clearSelected","isActiveByRow","setActiveRow","setActiveCell","setSelectCell"],editHook={setupTable:function(g){function v(e,t){var r=t.model;t.editRender&&(r.value=(0,_util.getCellValue)(e,t),r.update=!1)}function n(e,t){var r=t.model;t.editRender&&r.update&&((0,_util.setCellValue)(e,t,r.value),r.update=!1,r.value=null)}function r(){var e=o.value;!e||(e=e.querySelector(".col--selected"))&&(0,_dom.removeClass)(e,"col--selected")}var p=g.props,w=g.reactData,m=g.internalData,o=g.getRefMaps().refElem,e=g.getComputeMaps(),s=e.computeMouseOpts,h=e.computeEditOpts,R=e.computeCheckboxOpts,C=e.computeSYOpts,a=e.computeTreeOpts,x={},_={};function u(){var e=w.editStore,t=w.tableColumn,r=h.value,e=e.actived,l=e.row,e=e.column;(l||e)&&("row"===r.mode?t.forEach(function(e){return n(l,e)}):n(l,e))}return x={insert:function(e){return x.insertAt(e,null)},insertAt:function(e,t){var r=p.treeConfig,l=w.mergeList,n=w.editStore,o=w.scrollYLoad,a=m.afterFullData,u=m.tableFullData,c=C.value,i=(e=!_xeUtils.default.isArray(e)?[e]:e).map(function(e){return g.defineField(Object.assign({},e))});if(t)if(-1===t)a.push.apply(a,i),u.push.apply(u,i),l.forEach(function(e){var t=e.row,r=e.rowspan;t+r>a.length&&(e.rowspan=r+i.length)});else{if(r)throw new Error((0,_utils.getLog)("vxe.error.noTree",["insert"]));var d=g.findRowIndexOf(a,t);if(-1===d)throw new Error((0,_utils.errLog)("vxe.error.unableInsert"));a.splice.apply(a,__spreadArray([d,0],i)),u.splice.apply(u,__spreadArray([g.findRowIndexOf(u,t),0],i)),l.forEach(function(e){var t=e.row,r=e.rowspan;d<t?e.row=t+i.length:d<t+r&&(e.rowspan=r+i.length)})}else a.unshift.apply(a,i),u.unshift.apply(u,i),l.forEach(function(e){var t=e.row;0<t&&(e.row=t+i.length)});return(n=n.insertList).unshift.apply(n,i),w.scrollYLoad=!r&&-1<c.gt&&c.gt<u.length,g.updateFooter(),g.cacheRowMap(),g.handleTableData(),g.updateAfterDataIndex(),g.checkSelectionStatus(),o&&g.updateScrollYSpace(),(0,_vue.nextTick)().then(function(){return g.updateCellAreas(),g.recalculate()}).then(function(){return{row:i.length?i[i.length-1]:null,rows:i}})},remove:function(e){var t=p.treeConfig,r=w.mergeList,l=w.editStore,n=w.selection,o=w.scrollYLoad,a=m.afterFullData,u=m.tableFullData,c=R.value,i=C.value,d=l.actived,s=l.removeList,f=l.insertList,c=c.checkField,v=[];return e?_xeUtils.default.isArray(e)||(e=[e]):e=u,e.forEach(function(e){g.isInsertByRow(e)||s.push(e)}),c||e.forEach(function(e){e=g.findRowIndexOf(n,e);-1<e&&n.splice(e,1)}),u===e?(e=v=u.slice(0),m.tableFullData=[],m.afterFullData=[],g.clearMergeCells()):e.forEach(function(e){var t=g.findRowIndexOf(u,e);-1<t&&(t=u.splice(t,1),v.push(t[0]));var l=g.findRowIndexOf(a,e);-1<l&&(r.forEach(function(e){var t=e.row,r=e.rowspan;l<t?e.row=t-1:l<t+r&&(e.rowspan=r-1)}),a.splice(l,1))}),d.row&&-1<g.findRowIndexOf(e,d.row)&&x.clearActived(),e.forEach(function(e){e=g.findRowIndexOf(f,e);-1<e&&f.splice(e,1)}),w.scrollYLoad=!t&&-1<i.gt&&i.gt<u.length,g.updateFooter(),g.cacheRowMap(),g.handleTableData(),g.updateAfterDataIndex(),g.checkSelectionStatus(),o&&g.updateScrollYSpace(),(0,_vue.nextTick)().then(function(){return g.updateCellAreas(),g.recalculate()}).then(function(){return{row:v.length?v[v.length-1]:null,rows:v}})},removeCheckboxRow:function(){return x.remove(g.getCheckboxRecords()).then(function(e){return g.clearCheckboxRow(),e})},removeRadioRow:function(){var e=g.getRadioRecord();return x.remove(e||[]).then(function(e){return g.clearRadioRow(),e})},removeCurrentRow:function(){var e=g.getCurrentRecord();return x.remove(e||[]).then(function(e){return g.clearCurrentRow(),e})},getRecordset:function(){return{insertRecords:x.getInsertRecords(),removeRecords:x.getRemoveRecords(),updateRecords:x.getUpdateRecords()}},getInsertRecords:function(){var e=w.editStore,t=m.tableFullData,r=e.insertList,l=[];return r.length&&t.forEach(function(e){-1<g.findRowIndexOf(r,e)&&l.push(e)}),l},getRemoveRecords:function(){return w.editStore.removeList},getUpdateRecords:function(){var e=p.keepSource,t=p.treeConfig,r=m.tableFullData,l=a.value;return e?(u(),t?_xeUtils.default.filterTree(r,function(e){return g.isUpdateByRow(e)},l):r.filter(function(e){return g.isUpdateByRow(e)})):[]},getActiveRecord:function(){var e=w.editStore,t=m.afterFullData,r=o.value,l=e.actived,e=l.args,l=l.row;return e&&-1<g.findRowIndexOf(t,l)&&r.querySelectorAll(".vxe-body--column.col--actived").length?Object.assign({},e):null},getSelectedCell:function(){var e=w.editStore.selected,t=e.args,e=e.column;return t&&e?Object.assign({},t):null},clearActived:function(e){var t=w.editStore.actived,r=t.row,l=t.column;return(r||l)&&(u(),t.args=null,t.row=null,t.column=null,g.updateFooter(),g.dispatchEvent("edit-closed",{row:r,rowIndex:g.getRowIndex(r),$rowIndex:g.getVMRowIndex(r),column:l,columnIndex:g.getColumnIndex(l),$columnIndex:g.getVMColumnIndex(l)},e||null)),(g.clearValidate?g.clearValidate():(0,_vue.nextTick)()).then(function(){return g.recalculate()})},clearSelected:function(){var e=w.editStore.selected;return e.row=null,e.column=null,r(),(0,_vue.nextTick)()},isActiveByRow:function(e){return w.editStore.actived.row===e},setActiveRow:function(e){var t=m.visibleColumn;return g.setActiveCell(e,_xeUtils.default.find(t,function(e){return(0,_utils.isEnableConf)(e.editRender)}))},setActiveCell:function(t,e){var r=p.editConfig,l=_xeUtils.default.isString(e)?g.getColumnByField(e):e;return t&&l&&(0,_utils.isEnableConf)(r)&&(0,_utils.isEnableConf)(l.editRender)?g.scrollToRow(t,l).then(function(){var e=g.getCell(t,l);return e&&(_.handleActived({row:t,rowIndex:g.getRowIndex(t),column:l,columnIndex:g.getColumnIndex(l),cell:e,$table:g}),m._lastCallTime=Date.now()),(0,_vue.nextTick)()}):(0,_vue.nextTick)()},setSelectCell:function(e,t){var r=w.tableData,l=m.visibleColumn,n=h.value,t=_xeUtils.default.isString(t)?g.getColumnByField(t):t;return e&&t&&"manual"!==n.trigger&&(-1<(n=g.findRowIndexOf(r,e))&&t&&(r=g.getCell(e,t),r={row:e,rowIndex:n,column:t,columnIndex:l.indexOf(t),cell:r},g.handleSelected(r,{}))),(0,_vue.nextTick)()}},_={handleActived:function(e,t){var r,l=p.editConfig,n=p.mouseConfig,o=w.editStore,a=w.tableColumn,u=h.value,c=u.mode,i=u.activeMethod,d=o.actived,s=e.row,f=e.column,u=f.editRender,o=e.cell=e.cell||g.getCell(s,f);return(0,_utils.isEnableConf)(l)&&(0,_utils.isEnableConf)(u)&&o&&(d.row!==s||"cell"===c&&d.column!==f?(r="edit-disabled",i&&!i(e)||(n&&(x.clearSelected(),g.clearCellAreas&&(g.clearCellAreas(),g.clearCopyCellArea())),g.closeTooltip(),x.clearActived(t),r="edit-actived",f.renderHeight=o.offsetHeight,d.args=e,d.row=s,d.column=f,"row"===c?a.forEach(function(e){return v(s,e)}):v(s,f),(0,_vue.nextTick)(function(){_.handleFocus(e,t)})),g.dispatchEvent(r,{row:s,rowIndex:g.getRowIndex(s),$rowIndex:g.getVMRowIndex(s),column:f,columnIndex:g.getColumnIndex(f),$columnIndex:g.getVMColumnIndex(f)},t)):(r=d.column,n&&(x.clearSelected(),g.clearCellAreas&&(g.clearCellAreas(),g.clearCopyCellArea())),r!==f&&((n=r.model).update&&(0,_util.setCellValue)(s,r,n.value),g.clearValidate&&g.clearValidate()),f.renderHeight=o.offsetHeight,d.args=e,d.column=f,setTimeout(function(){_.handleFocus(e,t)})),g.focus()),(0,_vue.nextTick)()},handleFocus:function(e){var t,r,l=e.row,n=e.column,o=e.cell,a=n.editRender;(0,_utils.isEnableConf)(a)&&(t=_vXETable.renderer.get(a.name),r=a.autofocus,e=a.autoselect,a=void 0,(a=!(a=r?o.querySelector(r):a)&&t&&t.autofocus?o.querySelector(t.autofocus):a)?(a.focus(),e?a.select():_dom.browse.msie&&((a=a.createTextRange()).collapse(!1),a.select())):g.scrollToRow(l,n))},handleSelected:function(e,t){var r=p.mouseConfig,l=w.editStore,n=s.value,o=h.value,a=l.actived,u=l.selected,c=e.row,i=e.column,d=r&&n.selected;return!d||u.row===c&&u.column===i||(a.row!==c||"cell"===o.mode&&a.column!==i)&&(x.clearActived(t),x.clearSelected(),g.clearCellAreas&&(g.clearCellAreas(),g.clearCopyCellArea()),u.args=e,u.row=c,u.column=i,d&&_.addCellSelectedClass(),g.focus()),(0,_vue.nextTick)()},addCellSelectedClass:function(){var e=w.editStore.selected,t=e.row,e=e.column;r(),t&&e&&((e=g.getCell(t,e))&&(0,_dom.addClass)(e,"col--selected"))}},__assign(__assign({},x),_)},setupGrid:function(e){return e.extendTableMethods(tableEditMethodKeys)}},_default=editHook;exports.default=_default;

package/lib/export/src/hook.js

@@ -947,6 +947,13 @@ var tableExportHook = {
         content: content
       }).then(function () {
         if (opts.message !== false) {
+          // 检测弹窗模块
+          if (process.env.NODE_ENV === 'development') {
+            if (!_vXETable.VXETable.modal) {
+              (0, _utils.errLog)('vxe.error.reqModule', ['Modal']);
+            }
+          }
+
           _vXETable.VXETable.modal.message({
             content: _conf.default.i18n('vxe.table.expSuccess'),
             status: 'success'
@@ -1060,6 +1067,13 @@ var tableExportHook = {
           }
 
           if (opts.message !== false) {
+            // 检测弹窗模块
+            if (process.env.NODE_ENV === 'development') {
+              if (!_vXETable.VXETable.modal) {
+                (0, _utils.errLog)('vxe.error.reqModule', ['Modal']);
+              }
+            }
+
             _vXETable.VXETable.modal.message({
               content: _conf.default.i18n('vxe.table.impSuccess', [rows.length]),
               status: 'success'
@@ -1075,6 +1089,13 @@ var tableExportHook = {
           });
         });
       } else if (opts.message !== false) {
+        // 检测弹窗模块
+        if (process.env.NODE_ENV === 'development') {
+          if (!_vXETable.VXETable.modal) {
+            (0, _utils.errLog)('vxe.error.reqModule', ['Modal']);
+          }
+        }
+
         _vXETable.VXETable.modal.message({
           content: _conf.default.i18n('vxe.error.impFields'),
           status: 'error'
@@ -1099,6 +1120,13 @@ var tableExportHook = {
 
       if (!importMethod && !_xeUtils.default.includes(_vXETable.VXETable.config.importTypes, type)) {
         if (opts.message !== false) {
+          // 检测弹窗模块
+          if (process.env.NODE_ENV === 'development') {
+            if (!_vXETable.VXETable.modal) {
+              (0, _utils.errLog)('vxe.error.reqModule', ['Modal']);
+            }
+          }
+
           _vXETable.VXETable.modal.message({
             content: _conf.default.i18n('vxe.error.notType', [type]),
             status: 'error'