vxe-table 3.5.0-beta.0 → 3.5.0-beta.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (61) hide show
  1. package/helper/vetur/attributes.json +30 -10
  2. package/helper/vetur/tags.json +7 -2
  3. package/lib/form/src/form-item.js +2 -2
  4. package/lib/form/src/form-item.min.js +1 -1
  5. package/lib/form/src/form.js +32 -53
  6. package/lib/form/src/form.min.js +1 -1
  7. package/lib/form/src/render.js +14 -11
  8. package/lib/form/src/render.min.js +1 -1
  9. package/lib/index.css +1 -1
  10. package/lib/index.umd.js +410 -441
  11. package/lib/index.umd.min.js +1 -1
  12. package/lib/select/src/select.js +16 -5
  13. package/lib/select/src/select.min.js +1 -1
  14. package/lib/select/style/style.css +1 -1
  15. package/lib/select/style/style.min.css +1 -1
  16. package/lib/style.css +1 -1
  17. package/lib/style.min.css +1 -1
  18. package/lib/table/src/body.js +2 -5
  19. package/lib/table/src/body.min.js +1 -1
  20. package/lib/table/src/cell.js +3 -3
  21. package/lib/table/src/cell.min.js +1 -1
  22. package/lib/table/src/column.js +3 -1
  23. package/lib/table/src/column.min.js +1 -1
  24. package/lib/table/src/columnInfo.js +1 -0
  25. package/lib/table/src/columnInfo.min.js +1 -1
  26. package/lib/table/src/methods.js +184 -188
  27. package/lib/table/src/methods.min.js +1 -1
  28. package/lib/table/src/table.js +42 -73
  29. package/lib/table/src/table.min.js +1 -1
  30. package/lib/table/src/util.js +14 -0
  31. package/lib/table/src/util.min.js +1 -1
  32. package/lib/tools/log.js +1 -1
  33. package/lib/tools/log.min.js +1 -1
  34. package/lib/tools/utils.js +0 -13
  35. package/lib/tools/utils.min.js +1 -1
  36. package/lib/tooltip/src/tooltip.js +51 -28
  37. package/lib/tooltip/src/tooltip.min.js +1 -1
  38. package/lib/tooltip/style/style.css +1 -1
  39. package/lib/tooltip/style/style.min.css +1 -1
  40. package/lib/v-x-e-table/index.js +1 -1
  41. package/lib/v-x-e-table/index.min.js +1 -1
  42. package/lib/v-x-e-table/src/conf.js +13 -8
  43. package/lib/v-x-e-table/src/conf.min.js +1 -1
  44. package/package.json +1 -1
  45. package/packages/form/src/form-item.js +2 -2
  46. package/packages/form/src/form.js +12 -25
  47. package/packages/form/src/render.js +7 -7
  48. package/packages/select/src/select.js +14 -5
  49. package/packages/table/src/body.js +3 -3
  50. package/packages/table/src/cell.js +3 -3
  51. package/packages/table/src/column.js +3 -1
  52. package/packages/table/src/columnInfo.js +1 -0
  53. package/packages/table/src/methods.js +34 -50
  54. package/packages/table/src/table.js +34 -67
  55. package/packages/table/src/util.js +11 -0
  56. package/packages/tools/utils.js +0 -11
  57. package/packages/tooltip/src/tooltip.js +44 -25
  58. package/packages/v-x-e-table/src/conf.js +13 -8
  59. package/styles/select.scss +1 -1
  60. package/styles/tooltip.scss +1 -1
  61. package/types/table.d.ts +6 -6
@@ -27,6 +27,12 @@ var _log = require("../../tools/log");
27
27
 
28
28
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
29
29
 
30
+ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
31
+
32
+ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
33
+
34
+ function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
35
+
30
36
  /**
31
37
  * 渲染浮固定列
32
38
  * 分别渲染左边固定列和右边固定列
@@ -124,7 +130,7 @@ var _default2 = {
124
130
  height: [Number, String],
125
131
  // 表格的最大高度
126
132
  maxHeight: [Number, String],
127
- // (即将废弃)所有列是否允许拖动列宽调整大小
133
+ // 已废弃,被 column-config.resizable 替换
128
134
  resizable: {
129
135
  type: Boolean,
130
136
  default: function _default() {
@@ -196,35 +202,35 @@ var _default2 = {
196
202
  return _conf.default.table.showHeader;
197
203
  }
198
204
  },
199
- // (即将废弃)是否要高亮当前选中行
205
+ // 已废弃,被 row-config.isCurrent 替换
200
206
  highlightCurrentRow: {
201
207
  type: Boolean,
202
208
  default: function _default() {
203
209
  return _conf.default.table.highlightCurrentRow;
204
210
  }
205
211
  },
206
- // (即将废弃)鼠标移到行是否要高亮显示
212
+ // 已废弃,被 row-config.isHover 替换
207
213
  highlightHoverRow: {
208
214
  type: Boolean,
209
215
  default: function _default() {
210
216
  return _conf.default.table.highlightHoverRow;
211
217
  }
212
218
  },
213
- // (即将废弃)是否要高亮当前选中列
219
+ // 已废弃,被 column-config.isCurrent 替换
214
220
  highlightCurrentColumn: {
215
221
  type: Boolean,
216
222
  default: function _default() {
217
223
  return _conf.default.table.highlightCurrentColumn;
218
224
  }
219
225
  },
220
- // (即将废弃)鼠标移到列是否要高亮显示
226
+ // 已废弃,被 column-config.isHover 替换
221
227
  highlightHoverColumn: {
222
228
  type: Boolean,
223
229
  default: function _default() {
224
230
  return _conf.default.table.highlightHoverColumn;
225
231
  }
226
232
  },
227
- // (即将废弃)激活单元格编辑时是否高亮显示
233
+ // 已废弃,直接删除
228
234
  highlightCell: Boolean,
229
235
  // 是否显示表尾合计
230
236
  showFooter: Boolean,
@@ -533,6 +539,13 @@ var _default2 = {
533
539
  insertList: [],
534
540
  removeList: []
535
541
  },
542
+ // 存放 tooltip 相关信息
543
+ tooltipStore: {
544
+ row: null,
545
+ column: null,
546
+ visible: false,
547
+ currOpts: null
548
+ },
536
549
  // 存放数据校验相关信息
537
550
  validStore: {
538
551
  visible: false,
@@ -628,15 +641,10 @@ var _default2 = {
628
641
  return Object.assign({}, _conf.default.table.checkboxConfig, this.checkboxConfig);
629
642
  },
630
643
  tooltipOpts: function tooltipOpts() {
631
- var opts = Object.assign({
632
- leaveDelay: 300
633
- }, _conf.default.table.tooltipConfig, this.tooltipConfig);
634
-
635
- if (opts.enterable) {
636
- opts.leaveMethod = this.handleTooltipLeaveMethod;
637
- }
638
-
639
- return opts;
644
+ return Object.assign({}, _conf.default.tooltip, _conf.default.table.tooltipConfig, this.tooltipConfig);
645
+ },
646
+ tipConfig: function tipConfig() {
647
+ return _objectSpread(_objectSpread({}, this.tooltipOpts), this.tooltipStore.currOpts);
640
648
  },
641
649
  validTipOpts: function validTipOpts() {
642
650
  return Object.assign({
@@ -769,55 +777,7 @@ var _default2 = {
769
777
  }
770
778
 
771
779
  return false;
772
- } // isMergeLeftFixedExceeded () {
773
- // const { mergeList, columnStore, visibleColumn } = this
774
- // const { leftList } = columnStore
775
- // const lastFCIndex = visibleColumn.indexOf(leftList[leftList.length - 1])
776
- // for (let i = 0, len = mergeList.length; i < len; i++) {
777
- // const item = mergeList[i]
778
- // if (item.col <= lastFCIndex && item.col + item.colspan > lastFCIndex) {
779
- // return true
780
- // }
781
- // }
782
- // return false
783
- // },
784
- // isMergeRightFixedExceeded () {
785
- // const { mergeList, columnStore, visibleColumn } = this
786
- // const { rightList } = columnStore
787
- // const firstFCIndex = visibleColumn.indexOf(rightList[0])
788
- // for (let i = 0, len = mergeList.length; i < len; i++) {
789
- // const item = mergeList[i]
790
- // if (item.col < firstFCIndex && item.col + item.colspan >= firstFCIndex) {
791
- // return true
792
- // }
793
- // }
794
- // return false
795
- // },
796
- // isMergeFooterLeftFixedExceeded () {
797
- // const { mergeFooterList, columnStore, visibleColumn } = this
798
- // const { leftList } = columnStore
799
- // const lastFCIndex = visibleColumn.indexOf(leftList[leftList.length - 1])
800
- // for (let i = 0, len = mergeFooterList.length; i < len; i++) {
801
- // const item = mergeFooterList[i]
802
- // if (item.col <= lastFCIndex && item.col + item.colspan > lastFCIndex) {
803
- // return true
804
- // }
805
- // }
806
- // return false
807
- // },
808
- // isMergeFooterRightFixedExceeded () {
809
- // const { mergeFooterList, columnStore, visibleColumn } = this
810
- // const { rightList } = columnStore
811
- // const firstFCIndex = visibleColumn.indexOf(rightList[0])
812
- // for (let i = 0, len = mergeFooterList.length; i < len; i++) {
813
- // const item = mergeFooterList[i]
814
- // if (item.col < firstFCIndex && item.col + item.colspan >= firstFCIndex) {
815
- // return true
816
- // }
817
- // }
818
- // return false
819
- // }
820
-
780
+ }
821
781
  },
822
782
  watch: {
823
783
  data: function data(value) {
@@ -922,8 +882,6 @@ var _default2 = {
922
882
  scrollXStore: {},
923
883
  // 存放纵向 Y 虚拟滚动相关信息
924
884
  scrollYStore: {},
925
- // 存放 tooltip 相关信息
926
- tooltipStore: {},
927
885
  // 表格宽度
928
886
  tableWidth: 0,
929
887
  // 表格高度
@@ -975,13 +933,13 @@ var _default2 = {
975
933
 
976
934
  if (process.env.NODE_ENV === 'development') {
977
935
  // if (this.rowId) {
978
- // warnLog('vxe.error.delProp', ['rowId', 'row-config.keyField'])
936
+ // warnLog('vxe.error.delProp', ['row-id', 'row-config.keyField'])
979
937
  // }
980
938
  // if (this.rowKey) {
981
- // warnLog('vxe.error.delProp', ['rowId', 'row-config.useKey'])
939
+ // warnLog('vxe.error.delProp', ['row-id', 'row-config.useKey'])
982
940
  // }
983
941
  // if (this.columnKey) {
984
- // warnLog('vxe.error.delProp', ['rowId', 'column-config.useKey'])
942
+ // warnLog('vxe.error.delProp', ['row-id', 'column-config.useKey'])
985
943
  // }
986
944
  if (!(this.rowId || rowOpts.keyField) && (this.checkboxOpts.reserve || this.checkboxOpts.checkRowKeys || this.radioOpts.reserve || this.radioOpts.checkRowKey || this.expandOpts.expandRowKeys || this.treeOpts.expandRowKeys)) {
987
945
  (0, _log.warnLog)('vxe.error.reqProp', ['row-config.keyField']);
@@ -991,7 +949,7 @@ var _default2 = {
991
949
  (0, _log.warnLog)('vxe.error.reqProp', ['keep-source']);
992
950
  }
993
951
 
994
- if (treeConfig && treeOpts.line && (!this.rowKey || !rowOpts.useKey || !showOverflow)) {
952
+ if (treeConfig && treeOpts.line && (!(this.rowKey || rowOpts.useKey) || !showOverflow)) {
995
953
  (0, _log.warnLog)('vxe.error.reqProp', ['row-config.useKey | show-overflow']);
996
954
  }
997
955
 
@@ -1005,7 +963,19 @@ var _default2 = {
1005
963
 
1006
964
  if (this.tooltipOpts.enabled) {
1007
965
  (0, _log.warnLog)('vxe.error.delProp', ['tooltip-config.enabled', 'tooltip-config.showAll']);
1008
- } // 检查导入导出类型,如果自定义导入导出方法,则不校验类型
966
+ } // if (this.highlightCurrentRow) {
967
+ // warnLog('vxe.error.delProp', ['highlight-current-row', 'row-config.isCurrent'])
968
+ // }
969
+ // if (this.highlightHoverRow) {
970
+ // warnLog('vxe.error.delProp', ['highlight-hover-row', 'row-config.isHover'])
971
+ // }
972
+ // if (this.highlightCurrentColumn) {
973
+ // warnLog('vxe.error.delProp', ['highlight-current-column', 'column-config.isCurrent'])
974
+ // }
975
+ // if (this.highlightHoverColumn) {
976
+ // warnLog('vxe.error.delProp', ['highlight-hover-column', 'column-config.isHover'])
977
+ // }
978
+ // 检查导入导出类型,如果自定义导入导出方法,则不校验类型
1009
979
 
1010
980
 
1011
981
  var exportConfig = this.exportConfig,
@@ -1272,7 +1242,6 @@ var _default2 = {
1272
1242
  highlightHoverColumn = this.highlightHoverColumn,
1273
1243
  editConfig = this.editConfig,
1274
1244
  validTipOpts = this.validTipOpts,
1275
- tooltipOpts = this.tooltipOpts,
1276
1245
  initStore = this.initStore,
1277
1246
  columnStore = this.columnStore,
1278
1247
  filterStore = this.filterStore,
@@ -1454,7 +1423,7 @@ var _default2 = {
1454
1423
  */
1455
1424
  hasTip ? h('vxe-tooltip', {
1456
1425
  ref: 'tooltip',
1457
- props: tooltipOpts
1426
+ props: this.tipConfig
1458
1427
  }) : _e(),
1459
1428
  /**
1460
1429
  * 校验提示
@@ -1 +1 @@
1
- "use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils")),_conf=_interopRequireDefault(require("../../v-x-e-table/src/conf")),_vXETable=_interopRequireDefault(require("../../v-x-e-table")),_body=_interopRequireDefault(require("./body")),_size=_interopRequireDefault(require("../../mixins/size")),_utils=require("../../tools/utils"),_resize=require("../../tools/resize"),_event=require("../../tools/event"),_methods=_interopRequireDefault(require("./methods")),_log=require("../../tools/log");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function renderFixed(e,t,o){var n=t._e,i=t.tableData,r=t.tableColumn,l=t.tableGroupColumn,s=t.vSize,a=t.showHeader,u=t.showFooter,c=t.columnStore,t=t.footerTableData,c=c["".concat(o,"List")];return e("div",{class:"vxe-table--fixed-".concat(o,"-wrapper"),ref:"".concat(o,"Container")},[a?e("vxe-table-header",{props:{fixedType:o,tableData:i,tableColumn:r,tableGroupColumn:l,size:s,fixedColumn:c},ref:"".concat(o,"Header")}):n(),e("vxe-table-body",{props:{fixedType:o,tableData:i,tableColumn:r,fixedColumn:c,size:s},ref:"".concat(o,"Body")}),u?e("vxe-table-footer",{props:{footerTableData:t,tableColumn:r,fixedColumn:c,fixedType:o,size:s},ref:"".concat(o,"Footer")}):n()])}function renderEmptyContenet(e,t){var o=t.$scopedSlots,n=t.emptyOpts,i={$table:t};return o.empty?o.empty.call(t,i,e):(o=(o=n.name?_vXETable.default.renderer.get(n.name):null)?o.renderEmpty:null)?o.call(t,e,n,i):(0,_utils.getFuncText)(t.emptyText)||_conf.default.i18n("vxe.table.emptyText")}function handleUupdateResize(e){var t=e.$el;t&&t.clientWidth&&t.clientHeight&&e.recalculate()}var _default2={name:"VxeTable",mixins:[_size.default],props:{id:String,data:Array,height:[Number,String],maxHeight:[Number,String],resizable:{type:Boolean,default:function(){return _conf.default.table.resizable}},stripe:{type:Boolean,default:function(){return _conf.default.table.stripe}},border:{type:[Boolean,String],default:function(){return _conf.default.table.border}},round:{type:Boolean,default:function(){return _conf.default.table.round}},size:{type:String,default:function(){return _conf.default.table.size||_conf.default.size}},fit:{type:Boolean,default:function(){return _conf.default.table.fit}},loading:Boolean,align:{type:String,default:function(){return _conf.default.table.align}},headerAlign:{type:String,default:function(){return _conf.default.table.headerAlign}},footerAlign:{type:String,default:function(){return _conf.default.table.footerAlign}},showHeader:{type:Boolean,default:function(){return _conf.default.table.showHeader}},highlightCurrentRow:{type:Boolean,default:function(){return _conf.default.table.highlightCurrentRow}},highlightHoverRow:{type:Boolean,default:function(){return _conf.default.table.highlightHoverRow}},highlightCurrentColumn:{type:Boolean,default:function(){return _conf.default.table.highlightCurrentColumn}},highlightHoverColumn:{type:Boolean,default:function(){return _conf.default.table.highlightHoverColumn}},highlightCell:Boolean,showFooter:Boolean,footerMethod:Function,rowClassName:[String,Function],cellClassName:[String,Function],headerRowClassName:[String,Function],headerCellClassName:[String,Function],footerRowClassName:[String,Function],footerCellClassName:[String,Function],cellStyle:[Object,Function],headerCellStyle:[Object,Function],footerCellStyle:[Object,Function],rowStyle:[Object,Function],headerRowStyle:[Object,Function],footerRowStyle:[Object,Function],mergeCells:Array,mergeFooterItems:Array,spanMethod:Function,footerSpanMethod:Function,showOverflow:{type:[Boolean,String],default:function(){return _conf.default.table.showOverflow}},showHeaderOverflow:{type:[Boolean,String],default:function(){return _conf.default.table.showHeaderOverflow}},showFooterOverflow:{type:[Boolean,String],default:function(){return _conf.default.table.showFooterOverflow}},columnKey:Boolean,rowKey:Boolean,rowId:{type:String,default:function(){return _conf.default.table.rowId}},zIndex:Number,emptyText:{type:String,default:function(){return _conf.default.table.emptyText}},keepSource:{type:Boolean,default:function(){return _conf.default.table.keepSource}},autoResize:{type:Boolean,default:function(){return _conf.default.table.autoResize}},syncResize:[Boolean,String,Number],columnConfig:Object,rowConfig:Object,resizableConfig:Object,seqConfig:Object,sortConfig:Object,filterConfig:Object,radioConfig:Object,checkboxConfig:Object,tooltipConfig:Object,exportConfig:[Boolean,Object],importConfig:[Boolean,Object],printConfig:Object,expandConfig:Object,treeConfig:[Boolean,Object],menuConfig:[Boolean,Object],contextMenu:[Boolean,Object],mouseConfig:Object,areaConfig:Object,keyboardConfig:Object,clipConfig:Object,fnrConfig:Object,editConfig:[Boolean,Object],validConfig:Object,editRules:Object,emptyRender:[Boolean,Object],customConfig:[Boolean,Object],scrollX:Object,scrollY:Object,animat:{type:Boolean,default:function(){return _conf.default.table.animat}},delayHover:{type:Number,default:function(){return _conf.default.table.delayHover}},params:Object},components:{VxeTableBody:_body.default},provide:function(){return{$xetable:this,xecolgroup:null}},inject:{$xegrid:{default:null}},data:function(){return{tId:"".concat(_xeUtils.default.uniqueId()),staticColumns:[],tableGroupColumn:[],tableColumn:[],tableData:[],scrollXLoad:!1,scrollYLoad:!1,overflowY:!0,overflowX:!1,scrollbarWidth:0,scrollbarHeight:0,rowHeight:0,parentHeight:0,isGroup:!1,isAllOverflow:!1,isAllSelected:!1,isIndeterminate:!1,selection:[],currentRow:null,currentColumn:null,selectRow:null,footerTableData:[],expandColumn:null,hasFixedColumn:!1,treeNodeColumn:null,rowExpandeds:[],expandLazyLoadeds:[],treeExpandeds:[],treeLazyLoadeds:[],treeIndeterminates:[],mergeList:[],mergeFooterList:[],initStore:{filter:!1,import:!1,export:!1},filterStore:{isAllSelected:!1,isIndeterminate:!1,style:null,options:[],column:null,multiple:!1,visible:!1,maxHeight:null},columnStore:{leftList:[],centerList:[],rightList:[],resizeList:[],pxList:[],pxMinList:[],scaleList:[],scaleMinList:[],autoList:[]},ctxMenuStore:{selected:null,visible:!1,showChild:!1,selectChild:null,list:[],style:null},editStore:{indexs:{columns:[]},titles:{columns:[]},selected:{row:null,column:null},copyed:{cut:!1,rows:[],columns:[]},actived:{row:null,column:null},insertList:[],removeList:[]},validStore:{visible:!1,row:null,column:null,content:"",rule:null,isArrow:!1},importStore:{inited:!1,file:null,type:"",modeList:[],typeList:[],filename:"",visible:!1},importParams:{mode:"",types:null,message:!0},exportStore:{inited:!1,name:"",modeList:[],typeList:[],columns:[],isPrint:!1,hasFooter:!1,hasTree:!1,hasMerge:!1,hasColgroup:!1,visible:!1},exportParams:{filename:"",sheetName:"",mode:"",type:"",isColgroup:!1,isMerge:!1,isAllExpand:!1,useStyle:!1,original:!1,message:!0,isHeader:!1,isFooter:!1}}},computed:{validOpts:function(){return Object.assign({message:"default"},_conf.default.table.validConfig,this.validConfig)},sXOpts:function(){return Object.assign({},_conf.default.table.scrollX,this.scrollX)},sYOpts:function(){return Object.assign({},_conf.default.table.scrollY,this.scrollY)},rowHeightMaps:function(){return{default:48,medium:44,small:40,mini:36}},columnOpts:function(){return Object.assign({},_conf.default.table.columnConfig,this.columnConfig)},rowOpts:function(){return Object.assign({},_conf.default.table.rowConfig,this.rowConfig)},resizableOpts:function(){return Object.assign({},_conf.default.table.resizableConfig,this.resizableConfig)},seqOpts:function(){return Object.assign({startIndex:0},_conf.default.table.seqConfig,this.seqConfig)},radioOpts:function(){return Object.assign({},_conf.default.table.radioConfig,this.radioConfig)},checkboxOpts:function(){return Object.assign({},_conf.default.table.checkboxConfig,this.checkboxConfig)},tooltipOpts:function(){var e=Object.assign({leaveDelay:300},_conf.default.table.tooltipConfig,this.tooltipConfig);return e.enterable&&(e.leaveMethod=this.handleTooltipLeaveMethod),e},validTipOpts:function(){return Object.assign({isArrow:!1},this.tooltipOpts)},editOpts:function(){return Object.assign({},_conf.default.table.editConfig,this.editConfig)},sortOpts:function(){return Object.assign({orders:["asc","desc",null]},_conf.default.table.sortConfig,this.sortConfig)},filterOpts:function(){return Object.assign({},_conf.default.table.filterConfig,this.filterConfig)},mouseOpts:function(){return Object.assign({},_conf.default.table.mouseConfig,this.mouseConfig)},areaOpts:function(){return Object.assign({},_conf.default.table.areaConfig,this.areaConfig)},keyboardOpts:function(){return Object.assign({},_conf.default.table.keyboardConfig,this.keyboardConfig)},clipOpts:function(){return Object.assign({},_conf.default.table.clipConfig,this.clipConfig)},fnrOpts:function(){return Object.assign({},_conf.default.table.fnrConfig,this.fnrConfig)},hasTip:function(){return _vXETable.default._tooltip},headerCtxMenu:function(){var e=this.ctxMenuOpts.header;return e&&e.options?e.options:[]},bodyCtxMenu:function(){var e=this.ctxMenuOpts.body;return e&&e.options?e.options:[]},footerCtxMenu:function(){var e=this.ctxMenuOpts.footer;return e&&e.options?e.options:[]},isCtxMenu:function(){return!(!this.contextMenu&&!this.menuConfig||!(0,_utils.isEnableConf)(this.ctxMenuOpts)||!(this.headerCtxMenu.length||this.bodyCtxMenu.length||this.footerCtxMenu.length))},ctxMenuOpts:function(){return Object.assign({},_conf.default.table.menuConfig,this.contextMenu,this.menuConfig)},ctxMenuList:function(){var t=[];return this.ctxMenuStore.list.forEach(function(e){e.forEach(function(e){t.push(e)})}),t},exportOpts:function(){return Object.assign({},_conf.default.table.exportConfig,this.exportConfig)},importOpts:function(){return Object.assign({},_conf.default.table.importConfig,this.importConfig)},printOpts:function(){return Object.assign({},_conf.default.table.printConfig,this.printConfig)},expandOpts:function(){return Object.assign({},_conf.default.table.expandConfig,this.expandConfig)},treeOpts:function(){return Object.assign({},_conf.default.table.treeConfig,this.treeConfig)},emptyOpts:function(){return Object.assign({},_conf.default.table.emptyRender,this.emptyRender)},cellOffsetWidth:function(){return this.border?Math.max(2,Math.ceil(this.scrollbarWidth/this.tableColumn.length)):1},customOpts:function(){return Object.assign({},_conf.default.table.customConfig,this.customConfig)},tableBorder:function(){var e=this.border;return!0===e?"full":e||"default"},isAllCheckboxDisabled:function(){var e=this.tableFullData,t=this.tableData,o=(this.treeConfig,this.checkboxOpts),n=o.strict,i=o.checkMethod;return!!n&&(!t.length&&!e.length||!!i&&e.every(function(e){return!i({row:e})}))}},watch:{data:function(e){var t=this,o=this.inited,n=this.initStatus;this.loadTableData(e).then(function(){t.inited=!0,t.initStatus=!0,n||t.handleLoadDefaults(),o||t.handleInitDefaults(),(t.scrollXLoad||t.scrollYLoad)&&t.expandColumn&&(0,_log.warnLog)("vxe.error.scrollErrProp",["column.type=expand"]),t.recalculate()})},staticColumns:function(e){this.handleColumn(e)},tableColumn:function(){this.analyColumnWidth()},showHeader:function(){var e=this;this.$nextTick(function(){e.recalculate(!0).then(function(){return e.refreshScroll()})})},showFooter:function(){var e=this;this.$nextTick(function(){e.recalculate(!0).then(function(){return e.refreshScroll()})})},height:function(){var e=this;this.$nextTick(function(){return e.recalculate(!0)})},maxHeight:function(){var e=this;this.$nextTick(function(){return e.recalculate(!0)})},syncResize:function(e){var t=this;e&&(handleUupdateResize(this),this.$nextTick(function(){handleUupdateResize(t),setTimeout(function(){return handleUupdateResize(t)})}))},mergeCells:function(e){var t=this;this.clearMergeCells(),this.$nextTick(function(){return t.setMergeCells(e)})},mergeFooterItems:function(e){var t=this;this.clearMergeFooterItems(),this.$nextTick(function(){return t.setMergeFooterItems(e)})}},created:function(){var e=this,t=Object.assign(this,{tZindex:0,elemStore:{},scrollXStore:{},scrollYStore:{},tooltipStore:{},tableWidth:0,tableHeight:0,headerHeight:0,footerHeight:0,lastScrollLeft:0,lastScrollTop:0,radioReserveRow:null,checkboxReserveRowMap:{},rowExpandedReserveRowMap:{},treeExpandedReserveRowMap:{},tableFullData:[],afterFullData:[],collectColumn:[],tableFullColumn:[],visibleColumn:[],fullAllDataRowMap:new Map,fullAllDataRowIdData:{},fullDataRowMap:new Map,fullDataRowIdData:{},fullColumnMap:new Map,fullColumnIdData:{},fullColumnFieldData:{}}),o=t.scrollXStore,n=t.sYOpts,i=t.scrollYStore,r=t.data,l=t.editOpts,s=t.treeOpts,a=t.treeConfig,u=t.showOverflow,t=t.rowOpts;if("development"===process.env.NODE_ENV&&(this.rowId||t.keyField||!(this.checkboxOpts.reserve||this.checkboxOpts.checkRowKeys||this.radioOpts.reserve||this.radioOpts.checkRowKey||this.expandOpts.expandRowKeys||this.treeOpts.expandRowKeys)||(0,_log.warnLog)("vxe.error.reqProp",["row-config.keyField"]),this.editConfig&&l.showStatus&&!this.keepSource&&(0,_log.warnLog)("vxe.error.reqProp",["keep-source"]),!a||!s.line||this.rowKey&&t.useKey&&u||(0,_log.warnLog)("vxe.error.reqProp",["row-config.useKey | show-overflow"]),this.showFooter&&!this.footerMethod&&(0,_log.warnLog)("vxe.error.reqProp",["footer-method"]),a&&this.stripe&&(0,_log.warnLog)("vxe.error.noTree",["stripe"]),this.tooltipOpts.enabled&&(0,_log.warnLog)("vxe.error.delProp",["tooltip-config.enabled","tooltip-config.showAll"]),t=this.exportConfig,c=this.exportOpts,u=this.importConfig,a=this.importOpts,u&&a.types&&!a.importMethod&&!_xeUtils.default.includeArrays(_vXETable.default.config.importTypes,a.types)&&(0,_log.warnLog)("vxe.error.errProp",["export-config.types=".concat(a.types.join(",")),a.types.filter(function(e){return _xeUtils.default.includes(_vXETable.default.config.importTypes,e)}).join(",")||_vXETable.default.config.importTypes.join(",")]),t&&c.types&&!c.exportMethod&&!_xeUtils.default.includeArrays(_vXETable.default.config.exportTypes,c.types)&&(0,_log.warnLog)("vxe.error.errProp",["export-config.types=".concat(c.types.join(",")),c.types.filter(function(e){return _xeUtils.default.includes(_vXETable.default.config.exportTypes,e)}).join(",")||_vXETable.default.config.exportTypes.join(",")])),"development"===process.env.NODE_ENV){var c=this.customOpts;if(!this.id&&this.customConfig&&(!0===c.storage||c.storage&&c.storage.resizable||c.storage&&c.storage.visible)&&(0,_log.errLog)("vxe.error.reqProp",["id"]),this.treeConfig&&this.checkboxOpts.range&&(0,_log.errLog)("vxe.error.noTree",["checkbox-config.range"]),this.rowOpts.height&&!this.showOverflow&&(0,_log.warnLog)("vxe.error.notProp",["table.show-overflow"]),!this.handleUpdateCellAreas&&(this.clipConfig&&(0,_log.warnLog)("vxe.error.notProp",["clip-config"]),this.fnrConfig&&(0,_log.warnLog)("vxe.error.notProp",["fnr-config"]),this.mouseOpts.area))return void(0,_log.errLog)("vxe.error.notProp",["mouse-config.area"]);this.mouseOpts.area&&this.mouseOpts.selected&&(0,_log.warnLog)("vxe.error.errConflicts",["mouse-config.area","mouse-config.selected"]),this.mouseOpts.area&&this.checkboxOpts.range&&(0,_log.warnLog)("vxe.error.errConflicts",["mouse-config.area","checkbox-config.range"]),this.treeConfig&&this.mouseOpts.area&&(0,_log.errLog)("vxe.error.noTree",["mouse-config.area"])}"development"===process.env.NODE_ENV&&(this.contextMenu&&((0,_log.warnLog)("vxe.error.delProp",["context-menu","menu-config"]),_xeUtils.default.isObject(this.contextMenu)||(0,_log.warnLog)("vxe.error.errProp",["table.context-menu=".concat(this.contextMenu),"table.context-menu={}"])),this.menuConfig&&!_xeUtils.default.isObject(this.menuConfig)&&(0,_log.warnLog)("vxe.error.errProp",["table.menu-config=".concat(this.menuConfig),"table.menu-config={}"]),this.exportConfig&&!_xeUtils.default.isObject(this.exportConfig)&&(0,_log.warnLog)("vxe.error.errProp",["table.export-config=".concat(this.exportConfig),"table.export-config={}"]),this.importConfig&&!_xeUtils.default.isObject(this.importConfig)&&(0,_log.warnLog)("vxe.error.errProp",["table.import-config=".concat(this.importConfig),"table.import-config={}"]),this.printConfig&&!_xeUtils.default.isObject(this.printConfig)&&(0,_log.warnLog)("vxe.error.errProp",["table.print-config=".concat(this.printConfig),"table.print-config={}"]),this.treeConfig&&!_xeUtils.default.isObject(this.treeConfig)&&(0,_log.warnLog)("vxe.error.errProp",["table.tree-config=".concat(this.treeConfig),"table.tree-config={}"]),this.customConfig&&!_xeUtils.default.isObject(this.customConfig)&&(0,_log.warnLog)("vxe.error.errProp",["table.custom-config=".concat(this.customConfig),"table.custom-config={}"]),this.editConfig&&!_xeUtils.default.isObject(this.editConfig)&&(0,_log.warnLog)("vxe.error.errProp",["table.edit-config=".concat(this.editConfig),"table.edit-config={}"]),this.emptyRender&&!_xeUtils.default.isObject(this.emptyRender)&&(0,_log.warnLog)("vxe.error.errProp",["table.empty-render=".concat(this.emptyRender),"table.empty-render={}"])),"development"===process.env.NODE_ENV&&(this.editConfig&&!this._insert&&(0,_log.errLog)("vxe.error.reqModule",["Edit"]),this.editRules&&!this._validate&&(0,_log.errLog)("vxe.error.reqModule",["Validator"]),(this.checkboxOpts.range||this.keyboardConfig||this.mouseConfig)&&!this.triggerCellMousedownEvent&&(0,_log.errLog)("vxe.error.reqModule",["Keyboard"]),(this.printConfig||this.importConfig||this.exportConfig)&&!this._exportData&&(0,_log.errLog)("vxe.error.reqModule",["Export"])),Object.assign(i,{startIndex:0,endIndex:1,visibleSize:0,adaptive:!1!==n.adaptive}),Object.assign(o,{startIndex:0,endIndex:1,visibleSize:0}),this.loadTableData(r).then(function(){r&&r.length&&(e.inited=!0,e.initStatus=!0,e.handleLoadDefaults(),e.handleInitDefaults()),e.updateStyle()}),_event.GlobalEvent.on(this,"paste",this.handleGlobalPasteEvent),_event.GlobalEvent.on(this,"copy",this.handleGlobalCopyEvent),_event.GlobalEvent.on(this,"cut",this.handleGlobalCutEvent),_event.GlobalEvent.on(this,"mousedown",this.handleGlobalMousedownEvent),_event.GlobalEvent.on(this,"blur",this.handleGlobalBlurEvent),_event.GlobalEvent.on(this,"mousewheel",this.handleGlobalMousewheelEvent),_event.GlobalEvent.on(this,"keydown",this.handleGlobalKeydownEvent),_event.GlobalEvent.on(this,"resize",this.handleGlobalResizeEvent),_event.GlobalEvent.on(this,"contextmenu",this.handleGlobalContextmenuEvent),this.preventEvent(null,"created")},mounted:function(){var e,t=this;"development"===process.env.NODE_ENV&&(e=this.$listeners,!this.menuConfig&&(e["menu-click"]||e["cell-menu"]||e["header-cell-menu"]||e["footer-cell-menu"])&&(0,_log.warnLog)("vxe.error.reqProp",["menu-config"]),this.tooltipConfig||!e["cell-mouseenter"]&&!e["cell-mouseleave"]||(0,_log.warnLog)("vxe.error.reqProp",["tooltip-config"])),this.autoResize&&((e=(0,_resize.createResizeEvent)(function(){return t.recalculate(!0)})).observe(this.$el),e.observe(this.getParentElem()),this.$resize=e),this.preventEvent(null,"mounted")},activated:function(){var e=this;this.recalculate().then(function(){return e.refreshScroll()}),this.preventEvent(null,"activated")},deactivated:function(){this.preventEvent(null,"deactivated")},beforeDestroy:function(){this.$resize&&this.$resize.disconnect(),this.closeFilter(),this.closeMenu(),this.preventEvent(null,"beforeDestroy")},destroyed:function(){_event.GlobalEvent.off(this,"paste"),_event.GlobalEvent.off(this,"copy"),_event.GlobalEvent.off(this,"cut"),_event.GlobalEvent.off(this,"mousedown"),_event.GlobalEvent.off(this,"blur"),_event.GlobalEvent.off(this,"mousewheel"),_event.GlobalEvent.off(this,"keydown"),_event.GlobalEvent.off(this,"resize"),_event.GlobalEvent.off(this,"contextmenu"),this.preventEvent(null,"destroyed")},render:function(e){var t=this._e,o=this.tId,n=this.tableData,i=this.tableColumn,r=this.tableGroupColumn,l=this.isGroup,s=this.loading,a=this.stripe,u=this.showHeader,c=this.height,f=this.tableBorder,h=this.treeOpts,d=this.treeConfig,p=this.mouseConfig,g=this.mouseOpts,b=this.vSize,v=this.validOpts,m=this.showFooter,x=this.overflowX,C=this.overflowY,_=this.scrollXLoad,O=this.scrollYLoad,y=this.scrollbarHeight,w=this.highlightCell,j=this.highlightHoverRow,S=this.highlightHoverColumn,E=this.editConfig,L=this.validTipOpts,M=this.tooltipOpts,R=this.initStore,T=this.columnStore,z=this.filterStore,D=this.ctxMenuStore,F=this.ctxMenuOpts,k=this.footerTableData,B=this.hasTip,G=this.columnOpts,P=this.rowOpts,q=T.leftList,T=T.rightList;return e("div",{class:["vxe-table","vxe-table--render-default","tid_".concat(o),b?"size--".concat(b):"","border--".concat(f),{"vxe-editable":!!E,"cell--highlight":w,"cell--selected":p&&g.selected,"cell--area":p&&g.area,"row--highlight":P.isHover||j,"column--highlight":G.isHover||S,"is--header":u,"is--footer":m,"is--group":l,"is--tree-line":d&&h.line,"is--fixed-left":q.length,"is--fixed-right":T.length,"is--animat":!!this.animat,"is--round":this.round,"is--stripe":!d&&a,"is--loading":s,"is--empty":!s&&!n.length,"is--scroll-y":C,"is--scroll-x":x,"is--virtual-x":_,"is--virtual-y":O}],on:{keydown:this.keydownEvent}},[e("div",{class:"vxe-table-slots",ref:"hideColumn"},this.$slots.default),e("div",{class:"vxe-table--render-wrapper"},[e("div",{class:"vxe-table--main-wrapper"},[u?e("vxe-table-header",{ref:"tableHeader",props:{tableData:n,tableColumn:i,tableGroupColumn:r,size:b}}):t(),e("vxe-table-body",{ref:"tableBody",props:{tableData:n,tableColumn:i,size:b}}),m?e("vxe-table-footer",{ref:"tableFooter",props:{footerTableData:k,tableColumn:i,size:b}}):t()]),e("div",{class:"vxe-table--fixed-wrapper"},[q&&q.length&&x?renderFixed(e,this,"left"):t(),T&&T.length&&x?renderFixed(e,this,"right"):t()])]),e("div",{ref:"emptyPlaceholder",class:"vxe-table--empty-placeholder"},[e("div",{class:"vxe-table--empty-content"},renderEmptyContenet(e,this))]),e("div",{class:"vxe-table--border-line"}),e("div",{class:"vxe-table--resizable-bar",style:x?{"padding-bottom":"".concat(y,"px")}:null,ref:"resizeBar"}),e("div",{class:["vxe-table--loading vxe-loading",{"is--visible":s}]},[e("div",{class:"vxe-loading--spinner"})]),R.filter?e("vxe-table-filter",{ref:"filterWrapper",props:{filterStore:z}}):t(),R.import&&this.importConfig?e("vxe-import-panel",{props:{defaultOptions:this.importParams,storeData:this.importStore}}):t(),R.export&&(this.exportConfig||this.printConfig)?e("vxe-export-panel",{props:{defaultOptions:this.exportParams,storeData:this.exportStore}}):t(),D.visible&&this.isCtxMenu?e("vxe-table-context-menu",{ref:"ctxWrapper",props:{ctxMenuStore:D,ctxMenuOpts:F}}):t(),B?e("vxe-tooltip",{ref:"commTip",props:{isArrow:!1,enterable:!1}}):t(),B?e("vxe-tooltip",{ref:"tooltip",props:M}):t(),B&&this.editRules&&v.showMessage&&("default"===v.message?!c:"tooltip"===v.message)?e("vxe-tooltip",{ref:"validTip",class:"vxe-table--valid-error",props:"tooltip"===v.message||1===n.length?L:null}):t()])},methods:_methods.default};exports.default=_default2;
1
+ "use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils")),_conf=_interopRequireDefault(require("../../v-x-e-table/src/conf")),_vXETable=_interopRequireDefault(require("../../v-x-e-table")),_body=_interopRequireDefault(require("./body")),_size=_interopRequireDefault(require("../../mixins/size")),_utils=require("../../tools/utils"),_resize=require("../../tools/resize"),_event=require("../../tools/event"),_methods=_interopRequireDefault(require("./methods")),_log=require("../../tools/log");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function ownKeys(t,e){var o,n=Object.keys(t);return Object.getOwnPropertySymbols&&(o=Object.getOwnPropertySymbols(t),e&&(o=o.filter(function(e){return Object.getOwnPropertyDescriptor(t,e).enumerable})),n.push.apply(n,o)),n}function _objectSpread(t){for(var e=1;e<arguments.length;e++){var o=null!=arguments[e]?arguments[e]:{};e%2?ownKeys(Object(o),!0).forEach(function(e){_defineProperty(t,e,o[e])}):Object.getOwnPropertyDescriptors?Object.defineProperties(t,Object.getOwnPropertyDescriptors(o)):ownKeys(Object(o)).forEach(function(e){Object.defineProperty(t,e,Object.getOwnPropertyDescriptor(o,e))})}return t}function _defineProperty(e,t,o){return t in e?Object.defineProperty(e,t,{value:o,enumerable:!0,configurable:!0,writable:!0}):e[t]=o,e}function renderFixed(e,t,o){var n=t._e,i=t.tableData,r=t.tableColumn,l=t.tableGroupColumn,s=t.vSize,a=t.showHeader,u=t.showFooter,c=t.columnStore,t=t.footerTableData,c=c["".concat(o,"List")];return e("div",{class:"vxe-table--fixed-".concat(o,"-wrapper"),ref:"".concat(o,"Container")},[a?e("vxe-table-header",{props:{fixedType:o,tableData:i,tableColumn:r,tableGroupColumn:l,size:s,fixedColumn:c},ref:"".concat(o,"Header")}):n(),e("vxe-table-body",{props:{fixedType:o,tableData:i,tableColumn:r,fixedColumn:c,size:s},ref:"".concat(o,"Body")}),u?e("vxe-table-footer",{props:{footerTableData:t,tableColumn:r,fixedColumn:c,fixedType:o,size:s},ref:"".concat(o,"Footer")}):n()])}function renderEmptyContenet(e,t){var o=t.$scopedSlots,n=t.emptyOpts,i={$table:t};return o.empty?o.empty.call(t,i,e):(o=(o=n.name?_vXETable.default.renderer.get(n.name):null)?o.renderEmpty:null)?o.call(t,e,n,i):(0,_utils.getFuncText)(t.emptyText)||_conf.default.i18n("vxe.table.emptyText")}function handleUupdateResize(e){var t=e.$el;t&&t.clientWidth&&t.clientHeight&&e.recalculate()}var _default2={name:"VxeTable",mixins:[_size.default],props:{id:String,data:Array,height:[Number,String],maxHeight:[Number,String],resizable:{type:Boolean,default:function(){return _conf.default.table.resizable}},stripe:{type:Boolean,default:function(){return _conf.default.table.stripe}},border:{type:[Boolean,String],default:function(){return _conf.default.table.border}},round:{type:Boolean,default:function(){return _conf.default.table.round}},size:{type:String,default:function(){return _conf.default.table.size||_conf.default.size}},fit:{type:Boolean,default:function(){return _conf.default.table.fit}},loading:Boolean,align:{type:String,default:function(){return _conf.default.table.align}},headerAlign:{type:String,default:function(){return _conf.default.table.headerAlign}},footerAlign:{type:String,default:function(){return _conf.default.table.footerAlign}},showHeader:{type:Boolean,default:function(){return _conf.default.table.showHeader}},highlightCurrentRow:{type:Boolean,default:function(){return _conf.default.table.highlightCurrentRow}},highlightHoverRow:{type:Boolean,default:function(){return _conf.default.table.highlightHoverRow}},highlightCurrentColumn:{type:Boolean,default:function(){return _conf.default.table.highlightCurrentColumn}},highlightHoverColumn:{type:Boolean,default:function(){return _conf.default.table.highlightHoverColumn}},highlightCell:Boolean,showFooter:Boolean,footerMethod:Function,rowClassName:[String,Function],cellClassName:[String,Function],headerRowClassName:[String,Function],headerCellClassName:[String,Function],footerRowClassName:[String,Function],footerCellClassName:[String,Function],cellStyle:[Object,Function],headerCellStyle:[Object,Function],footerCellStyle:[Object,Function],rowStyle:[Object,Function],headerRowStyle:[Object,Function],footerRowStyle:[Object,Function],mergeCells:Array,mergeFooterItems:Array,spanMethod:Function,footerSpanMethod:Function,showOverflow:{type:[Boolean,String],default:function(){return _conf.default.table.showOverflow}},showHeaderOverflow:{type:[Boolean,String],default:function(){return _conf.default.table.showHeaderOverflow}},showFooterOverflow:{type:[Boolean,String],default:function(){return _conf.default.table.showFooterOverflow}},columnKey:Boolean,rowKey:Boolean,rowId:{type:String,default:function(){return _conf.default.table.rowId}},zIndex:Number,emptyText:{type:String,default:function(){return _conf.default.table.emptyText}},keepSource:{type:Boolean,default:function(){return _conf.default.table.keepSource}},autoResize:{type:Boolean,default:function(){return _conf.default.table.autoResize}},syncResize:[Boolean,String,Number],columnConfig:Object,rowConfig:Object,resizableConfig:Object,seqConfig:Object,sortConfig:Object,filterConfig:Object,radioConfig:Object,checkboxConfig:Object,tooltipConfig:Object,exportConfig:[Boolean,Object],importConfig:[Boolean,Object],printConfig:Object,expandConfig:Object,treeConfig:[Boolean,Object],menuConfig:[Boolean,Object],contextMenu:[Boolean,Object],mouseConfig:Object,areaConfig:Object,keyboardConfig:Object,clipConfig:Object,fnrConfig:Object,editConfig:[Boolean,Object],validConfig:Object,editRules:Object,emptyRender:[Boolean,Object],customConfig:[Boolean,Object],scrollX:Object,scrollY:Object,animat:{type:Boolean,default:function(){return _conf.default.table.animat}},delayHover:{type:Number,default:function(){return _conf.default.table.delayHover}},params:Object},components:{VxeTableBody:_body.default},provide:function(){return{$xetable:this,xecolgroup:null}},inject:{$xegrid:{default:null}},data:function(){return{tId:"".concat(_xeUtils.default.uniqueId()),staticColumns:[],tableGroupColumn:[],tableColumn:[],tableData:[],scrollXLoad:!1,scrollYLoad:!1,overflowY:!0,overflowX:!1,scrollbarWidth:0,scrollbarHeight:0,rowHeight:0,parentHeight:0,isGroup:!1,isAllOverflow:!1,isAllSelected:!1,isIndeterminate:!1,selection:[],currentRow:null,currentColumn:null,selectRow:null,footerTableData:[],expandColumn:null,hasFixedColumn:!1,treeNodeColumn:null,rowExpandeds:[],expandLazyLoadeds:[],treeExpandeds:[],treeLazyLoadeds:[],treeIndeterminates:[],mergeList:[],mergeFooterList:[],initStore:{filter:!1,import:!1,export:!1},filterStore:{isAllSelected:!1,isIndeterminate:!1,style:null,options:[],column:null,multiple:!1,visible:!1,maxHeight:null},columnStore:{leftList:[],centerList:[],rightList:[],resizeList:[],pxList:[],pxMinList:[],scaleList:[],scaleMinList:[],autoList:[]},ctxMenuStore:{selected:null,visible:!1,showChild:!1,selectChild:null,list:[],style:null},editStore:{indexs:{columns:[]},titles:{columns:[]},selected:{row:null,column:null},copyed:{cut:!1,rows:[],columns:[]},actived:{row:null,column:null},insertList:[],removeList:[]},tooltipStore:{row:null,column:null,visible:!1,currOpts:null},validStore:{visible:!1,row:null,column:null,content:"",rule:null,isArrow:!1},importStore:{inited:!1,file:null,type:"",modeList:[],typeList:[],filename:"",visible:!1},importParams:{mode:"",types:null,message:!0},exportStore:{inited:!1,name:"",modeList:[],typeList:[],columns:[],isPrint:!1,hasFooter:!1,hasTree:!1,hasMerge:!1,hasColgroup:!1,visible:!1},exportParams:{filename:"",sheetName:"",mode:"",type:"",isColgroup:!1,isMerge:!1,isAllExpand:!1,useStyle:!1,original:!1,message:!0,isHeader:!1,isFooter:!1}}},computed:{validOpts:function(){return Object.assign({message:"default"},_conf.default.table.validConfig,this.validConfig)},sXOpts:function(){return Object.assign({},_conf.default.table.scrollX,this.scrollX)},sYOpts:function(){return Object.assign({},_conf.default.table.scrollY,this.scrollY)},rowHeightMaps:function(){return{default:48,medium:44,small:40,mini:36}},columnOpts:function(){return Object.assign({},_conf.default.table.columnConfig,this.columnConfig)},rowOpts:function(){return Object.assign({},_conf.default.table.rowConfig,this.rowConfig)},resizableOpts:function(){return Object.assign({},_conf.default.table.resizableConfig,this.resizableConfig)},seqOpts:function(){return Object.assign({startIndex:0},_conf.default.table.seqConfig,this.seqConfig)},radioOpts:function(){return Object.assign({},_conf.default.table.radioConfig,this.radioConfig)},checkboxOpts:function(){return Object.assign({},_conf.default.table.checkboxConfig,this.checkboxConfig)},tooltipOpts:function(){return Object.assign({},_conf.default.tooltip,_conf.default.table.tooltipConfig,this.tooltipConfig)},tipConfig:function(){return _objectSpread(_objectSpread({},this.tooltipOpts),this.tooltipStore.currOpts)},validTipOpts:function(){return Object.assign({isArrow:!1},this.tooltipOpts)},editOpts:function(){return Object.assign({},_conf.default.table.editConfig,this.editConfig)},sortOpts:function(){return Object.assign({orders:["asc","desc",null]},_conf.default.table.sortConfig,this.sortConfig)},filterOpts:function(){return Object.assign({},_conf.default.table.filterConfig,this.filterConfig)},mouseOpts:function(){return Object.assign({},_conf.default.table.mouseConfig,this.mouseConfig)},areaOpts:function(){return Object.assign({},_conf.default.table.areaConfig,this.areaConfig)},keyboardOpts:function(){return Object.assign({},_conf.default.table.keyboardConfig,this.keyboardConfig)},clipOpts:function(){return Object.assign({},_conf.default.table.clipConfig,this.clipConfig)},fnrOpts:function(){return Object.assign({},_conf.default.table.fnrConfig,this.fnrConfig)},hasTip:function(){return _vXETable.default._tooltip},headerCtxMenu:function(){var e=this.ctxMenuOpts.header;return e&&e.options?e.options:[]},bodyCtxMenu:function(){var e=this.ctxMenuOpts.body;return e&&e.options?e.options:[]},footerCtxMenu:function(){var e=this.ctxMenuOpts.footer;return e&&e.options?e.options:[]},isCtxMenu:function(){return!(!this.contextMenu&&!this.menuConfig||!(0,_utils.isEnableConf)(this.ctxMenuOpts)||!(this.headerCtxMenu.length||this.bodyCtxMenu.length||this.footerCtxMenu.length))},ctxMenuOpts:function(){return Object.assign({},_conf.default.table.menuConfig,this.contextMenu,this.menuConfig)},ctxMenuList:function(){var t=[];return this.ctxMenuStore.list.forEach(function(e){e.forEach(function(e){t.push(e)})}),t},exportOpts:function(){return Object.assign({},_conf.default.table.exportConfig,this.exportConfig)},importOpts:function(){return Object.assign({},_conf.default.table.importConfig,this.importConfig)},printOpts:function(){return Object.assign({},_conf.default.table.printConfig,this.printConfig)},expandOpts:function(){return Object.assign({},_conf.default.table.expandConfig,this.expandConfig)},treeOpts:function(){return Object.assign({},_conf.default.table.treeConfig,this.treeConfig)},emptyOpts:function(){return Object.assign({},_conf.default.table.emptyRender,this.emptyRender)},cellOffsetWidth:function(){return this.border?Math.max(2,Math.ceil(this.scrollbarWidth/this.tableColumn.length)):1},customOpts:function(){return Object.assign({},_conf.default.table.customConfig,this.customConfig)},tableBorder:function(){var e=this.border;return!0===e?"full":e||"default"},isAllCheckboxDisabled:function(){var e=this.tableFullData,t=this.tableData,o=(this.treeConfig,this.checkboxOpts),n=o.strict,i=o.checkMethod;return!!n&&(!t.length&&!e.length||!!i&&e.every(function(e){return!i({row:e})}))}},watch:{data:function(e){var t=this,o=this.inited,n=this.initStatus;this.loadTableData(e).then(function(){t.inited=!0,t.initStatus=!0,n||t.handleLoadDefaults(),o||t.handleInitDefaults(),(t.scrollXLoad||t.scrollYLoad)&&t.expandColumn&&(0,_log.warnLog)("vxe.error.scrollErrProp",["column.type=expand"]),t.recalculate()})},staticColumns:function(e){this.handleColumn(e)},tableColumn:function(){this.analyColumnWidth()},showHeader:function(){var e=this;this.$nextTick(function(){e.recalculate(!0).then(function(){return e.refreshScroll()})})},showFooter:function(){var e=this;this.$nextTick(function(){e.recalculate(!0).then(function(){return e.refreshScroll()})})},height:function(){var e=this;this.$nextTick(function(){return e.recalculate(!0)})},maxHeight:function(){var e=this;this.$nextTick(function(){return e.recalculate(!0)})},syncResize:function(e){var t=this;e&&(handleUupdateResize(this),this.$nextTick(function(){handleUupdateResize(t),setTimeout(function(){return handleUupdateResize(t)})}))},mergeCells:function(e){var t=this;this.clearMergeCells(),this.$nextTick(function(){return t.setMergeCells(e)})},mergeFooterItems:function(e){var t=this;this.clearMergeFooterItems(),this.$nextTick(function(){return t.setMergeFooterItems(e)})}},created:function(){var e=this,t=Object.assign(this,{tZindex:0,elemStore:{},scrollXStore:{},scrollYStore:{},tableWidth:0,tableHeight:0,headerHeight:0,footerHeight:0,lastScrollLeft:0,lastScrollTop:0,radioReserveRow:null,checkboxReserveRowMap:{},rowExpandedReserveRowMap:{},treeExpandedReserveRowMap:{},tableFullData:[],afterFullData:[],collectColumn:[],tableFullColumn:[],visibleColumn:[],fullAllDataRowMap:new Map,fullAllDataRowIdData:{},fullDataRowMap:new Map,fullDataRowIdData:{},fullColumnMap:new Map,fullColumnIdData:{},fullColumnFieldData:{}}),o=t.scrollXStore,n=t.sYOpts,i=t.scrollYStore,r=t.data,l=t.editOpts,s=t.treeOpts,a=t.treeConfig,u=t.showOverflow,t=t.rowOpts;if("development"===process.env.NODE_ENV&&(this.rowId||t.keyField||!(this.checkboxOpts.reserve||this.checkboxOpts.checkRowKeys||this.radioOpts.reserve||this.radioOpts.checkRowKey||this.expandOpts.expandRowKeys||this.treeOpts.expandRowKeys)||(0,_log.warnLog)("vxe.error.reqProp",["row-config.keyField"]),this.editConfig&&l.showStatus&&!this.keepSource&&(0,_log.warnLog)("vxe.error.reqProp",["keep-source"]),!a||!s.line||(this.rowKey||t.useKey)&&u||(0,_log.warnLog)("vxe.error.reqProp",["row-config.useKey | show-overflow"]),this.showFooter&&!this.footerMethod&&(0,_log.warnLog)("vxe.error.reqProp",["footer-method"]),a&&this.stripe&&(0,_log.warnLog)("vxe.error.noTree",["stripe"]),this.tooltipOpts.enabled&&(0,_log.warnLog)("vxe.error.delProp",["tooltip-config.enabled","tooltip-config.showAll"]),t=this.exportConfig,c=this.exportOpts,u=this.importConfig,a=this.importOpts,u&&a.types&&!a.importMethod&&!_xeUtils.default.includeArrays(_vXETable.default.config.importTypes,a.types)&&(0,_log.warnLog)("vxe.error.errProp",["export-config.types=".concat(a.types.join(",")),a.types.filter(function(e){return _xeUtils.default.includes(_vXETable.default.config.importTypes,e)}).join(",")||_vXETable.default.config.importTypes.join(",")]),t&&c.types&&!c.exportMethod&&!_xeUtils.default.includeArrays(_vXETable.default.config.exportTypes,c.types)&&(0,_log.warnLog)("vxe.error.errProp",["export-config.types=".concat(c.types.join(",")),c.types.filter(function(e){return _xeUtils.default.includes(_vXETable.default.config.exportTypes,e)}).join(",")||_vXETable.default.config.exportTypes.join(",")])),"development"===process.env.NODE_ENV){var c=this.customOpts;if(!this.id&&this.customConfig&&(!0===c.storage||c.storage&&c.storage.resizable||c.storage&&c.storage.visible)&&(0,_log.errLog)("vxe.error.reqProp",["id"]),this.treeConfig&&this.checkboxOpts.range&&(0,_log.errLog)("vxe.error.noTree",["checkbox-config.range"]),this.rowOpts.height&&!this.showOverflow&&(0,_log.warnLog)("vxe.error.notProp",["table.show-overflow"]),!this.handleUpdateCellAreas&&(this.clipConfig&&(0,_log.warnLog)("vxe.error.notProp",["clip-config"]),this.fnrConfig&&(0,_log.warnLog)("vxe.error.notProp",["fnr-config"]),this.mouseOpts.area))return void(0,_log.errLog)("vxe.error.notProp",["mouse-config.area"]);this.mouseOpts.area&&this.mouseOpts.selected&&(0,_log.warnLog)("vxe.error.errConflicts",["mouse-config.area","mouse-config.selected"]),this.mouseOpts.area&&this.checkboxOpts.range&&(0,_log.warnLog)("vxe.error.errConflicts",["mouse-config.area","checkbox-config.range"]),this.treeConfig&&this.mouseOpts.area&&(0,_log.errLog)("vxe.error.noTree",["mouse-config.area"])}"development"===process.env.NODE_ENV&&(this.contextMenu&&((0,_log.warnLog)("vxe.error.delProp",["context-menu","menu-config"]),_xeUtils.default.isObject(this.contextMenu)||(0,_log.warnLog)("vxe.error.errProp",["table.context-menu=".concat(this.contextMenu),"table.context-menu={}"])),this.menuConfig&&!_xeUtils.default.isObject(this.menuConfig)&&(0,_log.warnLog)("vxe.error.errProp",["table.menu-config=".concat(this.menuConfig),"table.menu-config={}"]),this.exportConfig&&!_xeUtils.default.isObject(this.exportConfig)&&(0,_log.warnLog)("vxe.error.errProp",["table.export-config=".concat(this.exportConfig),"table.export-config={}"]),this.importConfig&&!_xeUtils.default.isObject(this.importConfig)&&(0,_log.warnLog)("vxe.error.errProp",["table.import-config=".concat(this.importConfig),"table.import-config={}"]),this.printConfig&&!_xeUtils.default.isObject(this.printConfig)&&(0,_log.warnLog)("vxe.error.errProp",["table.print-config=".concat(this.printConfig),"table.print-config={}"]),this.treeConfig&&!_xeUtils.default.isObject(this.treeConfig)&&(0,_log.warnLog)("vxe.error.errProp",["table.tree-config=".concat(this.treeConfig),"table.tree-config={}"]),this.customConfig&&!_xeUtils.default.isObject(this.customConfig)&&(0,_log.warnLog)("vxe.error.errProp",["table.custom-config=".concat(this.customConfig),"table.custom-config={}"]),this.editConfig&&!_xeUtils.default.isObject(this.editConfig)&&(0,_log.warnLog)("vxe.error.errProp",["table.edit-config=".concat(this.editConfig),"table.edit-config={}"]),this.emptyRender&&!_xeUtils.default.isObject(this.emptyRender)&&(0,_log.warnLog)("vxe.error.errProp",["table.empty-render=".concat(this.emptyRender),"table.empty-render={}"])),"development"===process.env.NODE_ENV&&(this.editConfig&&!this._insert&&(0,_log.errLog)("vxe.error.reqModule",["Edit"]),this.editRules&&!this._validate&&(0,_log.errLog)("vxe.error.reqModule",["Validator"]),(this.checkboxOpts.range||this.keyboardConfig||this.mouseConfig)&&!this.triggerCellMousedownEvent&&(0,_log.errLog)("vxe.error.reqModule",["Keyboard"]),(this.printConfig||this.importConfig||this.exportConfig)&&!this._exportData&&(0,_log.errLog)("vxe.error.reqModule",["Export"])),Object.assign(i,{startIndex:0,endIndex:1,visibleSize:0,adaptive:!1!==n.adaptive}),Object.assign(o,{startIndex:0,endIndex:1,visibleSize:0}),this.loadTableData(r).then(function(){r&&r.length&&(e.inited=!0,e.initStatus=!0,e.handleLoadDefaults(),e.handleInitDefaults()),e.updateStyle()}),_event.GlobalEvent.on(this,"paste",this.handleGlobalPasteEvent),_event.GlobalEvent.on(this,"copy",this.handleGlobalCopyEvent),_event.GlobalEvent.on(this,"cut",this.handleGlobalCutEvent),_event.GlobalEvent.on(this,"mousedown",this.handleGlobalMousedownEvent),_event.GlobalEvent.on(this,"blur",this.handleGlobalBlurEvent),_event.GlobalEvent.on(this,"mousewheel",this.handleGlobalMousewheelEvent),_event.GlobalEvent.on(this,"keydown",this.handleGlobalKeydownEvent),_event.GlobalEvent.on(this,"resize",this.handleGlobalResizeEvent),_event.GlobalEvent.on(this,"contextmenu",this.handleGlobalContextmenuEvent),this.preventEvent(null,"created")},mounted:function(){var e,t=this;"development"===process.env.NODE_ENV&&(e=this.$listeners,!this.menuConfig&&(e["menu-click"]||e["cell-menu"]||e["header-cell-menu"]||e["footer-cell-menu"])&&(0,_log.warnLog)("vxe.error.reqProp",["menu-config"]),this.tooltipConfig||!e["cell-mouseenter"]&&!e["cell-mouseleave"]||(0,_log.warnLog)("vxe.error.reqProp",["tooltip-config"])),this.autoResize&&((e=(0,_resize.createResizeEvent)(function(){return t.recalculate(!0)})).observe(this.$el),e.observe(this.getParentElem()),this.$resize=e),this.preventEvent(null,"mounted")},activated:function(){var e=this;this.recalculate().then(function(){return e.refreshScroll()}),this.preventEvent(null,"activated")},deactivated:function(){this.preventEvent(null,"deactivated")},beforeDestroy:function(){this.$resize&&this.$resize.disconnect(),this.closeFilter(),this.closeMenu(),this.preventEvent(null,"beforeDestroy")},destroyed:function(){_event.GlobalEvent.off(this,"paste"),_event.GlobalEvent.off(this,"copy"),_event.GlobalEvent.off(this,"cut"),_event.GlobalEvent.off(this,"mousedown"),_event.GlobalEvent.off(this,"blur"),_event.GlobalEvent.off(this,"mousewheel"),_event.GlobalEvent.off(this,"keydown"),_event.GlobalEvent.off(this,"resize"),_event.GlobalEvent.off(this,"contextmenu"),this.preventEvent(null,"destroyed")},render:function(e){var t=this._e,o=this.tId,n=this.tableData,i=this.tableColumn,r=this.tableGroupColumn,l=this.isGroup,s=this.loading,a=this.stripe,u=this.showHeader,c=this.height,f=this.tableBorder,d=this.treeOpts,h=this.treeConfig,p=this.mouseConfig,g=this.mouseOpts,b=this.vSize,v=this.validOpts,m=this.showFooter,x=this.overflowX,C=this.overflowY,O=this.scrollXLoad,_=this.scrollYLoad,y=this.scrollbarHeight,w=this.highlightCell,j=this.highlightHoverRow,S=this.highlightHoverColumn,E=this.editConfig,L=this.validTipOpts,M=this.initStore,R=this.columnStore,D=this.filterStore,T=this.ctxMenuStore,z=this.ctxMenuOpts,P=this.footerTableData,F=this.hasTip,k=this.columnOpts,B=this.rowOpts,G=R.leftList,R=R.rightList;return e("div",{class:["vxe-table","vxe-table--render-default","tid_".concat(o),b?"size--".concat(b):"","border--".concat(f),{"vxe-editable":!!E,"cell--highlight":w,"cell--selected":p&&g.selected,"cell--area":p&&g.area,"row--highlight":B.isHover||j,"column--highlight":k.isHover||S,"is--header":u,"is--footer":m,"is--group":l,"is--tree-line":h&&d.line,"is--fixed-left":G.length,"is--fixed-right":R.length,"is--animat":!!this.animat,"is--round":this.round,"is--stripe":!h&&a,"is--loading":s,"is--empty":!s&&!n.length,"is--scroll-y":C,"is--scroll-x":x,"is--virtual-x":O,"is--virtual-y":_}],on:{keydown:this.keydownEvent}},[e("div",{class:"vxe-table-slots",ref:"hideColumn"},this.$slots.default),e("div",{class:"vxe-table--render-wrapper"},[e("div",{class:"vxe-table--main-wrapper"},[u?e("vxe-table-header",{ref:"tableHeader",props:{tableData:n,tableColumn:i,tableGroupColumn:r,size:b}}):t(),e("vxe-table-body",{ref:"tableBody",props:{tableData:n,tableColumn:i,size:b}}),m?e("vxe-table-footer",{ref:"tableFooter",props:{footerTableData:P,tableColumn:i,size:b}}):t()]),e("div",{class:"vxe-table--fixed-wrapper"},[G&&G.length&&x?renderFixed(e,this,"left"):t(),R&&R.length&&x?renderFixed(e,this,"right"):t()])]),e("div",{ref:"emptyPlaceholder",class:"vxe-table--empty-placeholder"},[e("div",{class:"vxe-table--empty-content"},renderEmptyContenet(e,this))]),e("div",{class:"vxe-table--border-line"}),e("div",{class:"vxe-table--resizable-bar",style:x?{"padding-bottom":"".concat(y,"px")}:null,ref:"resizeBar"}),e("div",{class:["vxe-table--loading vxe-loading",{"is--visible":s}]},[e("div",{class:"vxe-loading--spinner"})]),M.filter?e("vxe-table-filter",{ref:"filterWrapper",props:{filterStore:D}}):t(),M.import&&this.importConfig?e("vxe-import-panel",{props:{defaultOptions:this.importParams,storeData:this.importStore}}):t(),M.export&&(this.exportConfig||this.printConfig)?e("vxe-export-panel",{props:{defaultOptions:this.exportParams,storeData:this.exportStore}}):t(),T.visible&&this.isCtxMenu?e("vxe-table-context-menu",{ref:"ctxWrapper",props:{ctxMenuStore:T,ctxMenuOpts:z}}):t(),F?e("vxe-tooltip",{ref:"commTip",props:{isArrow:!1,enterable:!1}}):t(),F?e("vxe-tooltip",{ref:"tooltip",props:this.tipConfig}):t(),F&&this.editRules&&v.showMessage&&("default"===v.message?!c:"tooltip"===v.message)?e("vxe-tooltip",{ref:"validTip",class:"vxe-table--valid-error",props:"tooltip"===v.message||1===n.length?L:null}):t()])},methods:_methods.default};exports.default=_default2;
@@ -9,6 +9,8 @@ exports.clearTableDefaultStatus = clearTableDefaultStatus;
9
9
  exports.getColMinWidth = getColMinWidth;
10
10
  exports.getColumnConfig = getColumnConfig;
11
11
  exports.getOffsetSize = getOffsetSize;
12
+ exports.getRowid = getRowid;
13
+ exports.getRowkey = getRowkey;
12
14
  exports.handleFieldOrColumn = handleFieldOrColumn;
13
15
  exports.isColumnInfo = isColumnInfo;
14
16
  exports.mergeBodyMethod = mergeBodyMethod;
@@ -62,6 +64,18 @@ function restoreScrollListener(scrollElem) {
62
64
  if (scrollElem && scrollElem._onscroll) {
63
65
  scrollElem.onscroll = scrollElem._onscroll;
64
66
  }
67
+ } // 行主键 key
68
+
69
+
70
+ function getRowkey($xetable) {
71
+ return $xetable.rowOpts.keyField || $xetable.rowId || '_X_ROW_KEY';
72
+ } // 行主键 value
73
+
74
+
75
+ function getRowid($xetable, row) {
76
+ var rowid = _xeUtils.default.get(row, getRowkey($xetable));
77
+
78
+ return _xeUtils.default.eqNull(rowid) ? '' : encodeURIComponent(rowid);
65
79
  }
66
80
 
67
81
  function getPaddingLeftRightSize(elem) {
@@ -1 +1 @@
1
- "use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.calcTreeLine=calcTreeLine,exports.clearTableAllStatus=clearTableAllStatus,exports.clearTableDefaultStatus=clearTableDefaultStatus,exports.getColMinWidth=getColMinWidth,exports.getColumnConfig=getColumnConfig,exports.getOffsetSize=getOffsetSize,exports.handleFieldOrColumn=handleFieldOrColumn,exports.isColumnInfo=isColumnInfo,exports.mergeBodyMethod=mergeBodyMethod,exports.removeScrollListener=removeScrollListener,exports.restoreScrollListener=restoreScrollListener,exports.restoreScrollLocation=restoreScrollLocation,exports.toFilters=toFilters,exports.toTreePathSeq=toTreePathSeq;var _vXETable=_interopRequireDefault(require("../../v-x-e-table")),_xeUtils=_interopRequireDefault(require("xe-utils")),_columnInfo=require("./columnInfo"),_dom=_interopRequireDefault(require("../../tools/dom"));function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}var lineOffsetSizes={mini:3,small:2,medium:1};function restoreScrollLocation(e,t,l){return e.clearScroll().then(function(){if(t||l)return e.lastScrollLeft=0,e.lastScrollTop=0,e.scrollTo(t,l)})}function toTreePathSeq(e){return e.map(function(e,t){return t%2==0?Number(e)+1:"."}).join("")}function removeScrollListener(e){e&&e._onscroll&&(e.onscroll=null)}function restoreScrollListener(e){e&&e._onscroll&&(e.onscroll=e._onscroll)}function getPaddingLeftRightSize(e){if(e){e=getComputedStyle(e);return _xeUtils.default.toNumber(e.paddingLeft)+_xeUtils.default.toNumber(e.paddingRight)}return 0}function getElemenMarginWidth(e){if(e){var t=getComputedStyle(e),l=_xeUtils.default.toNumber(t.marginLeft),t=_xeUtils.default.toNumber(t.marginRight);return e.offsetWidth+l+t}return 0}function handleFieldOrColumn(e,t){return t?_xeUtils.default.isString(t)?e.getColumnByField(t):t:null}function queryCellElement(e,t){return e.querySelector(".vxe-cell"+t)}function toFilters(e){return e&&_xeUtils.default.isArray(e)?e.map(function(e){var t=e.label,l=e.value,r=e.data,n=e.resetValue,e=e.checked;return{label:t,value:l,data:r,resetValue:n,checked:!!e,_checked:!!e}}):e}function getColMinWidth(e){var t=e.$table,l=e.column,r=e.cell,n=t.showHeaderOverflow,o=t.resizableOpts.minWidth;if(o){var i=_xeUtils.default.isFunction(o)?o(e):o;if("auto"!==i)return Math.max(1,_xeUtils.default.toNumber(i))}var a=l.showHeaderOverflow,u=l.minWidth,e=_xeUtils.default.isUndefined(a)||_xeUtils.default.isNull(a)?n:a,o="title"===e||(!0===e||"tooltip"===e)||"ellipsis"===e,i=_xeUtils.default.floor(1.6*(_xeUtils.default.toNumber(getComputedStyle(r).fontSize)||14))+(getPaddingLeftRightSize(r)+getPaddingLeftRightSize(queryCellElement(r,"")));if(o&&(l=getPaddingLeftRightSize(queryCellElement(r,"--title>.vxe-cell--checkbox")),n=getElemenMarginWidth(queryCellElement(r,">.vxe-cell--required-icon")),a=getElemenMarginWidth(queryCellElement(r,">.vxe-cell--edit-icon")),e=getElemenMarginWidth(queryCellElement(r,">.vxe-cell-help-icon")),o=getElemenMarginWidth(queryCellElement(r,">.vxe-cell--sort")),i+=l+n+a+e+getElemenMarginWidth(queryCellElement(r,">.vxe-cell--filter"))+o),u){t=t.$refs.tableBody,t=t?t.$el:null;if(t){if(_dom.default.isScale(u)){t=(t.clientWidth-1)/100;return Math.max(i,Math.floor(_xeUtils.default.toInteger(u)*t))}if(_dom.default.isPx(u))return Math.max(i,_xeUtils.default.toInteger(u))}}return i}function countTreeExpand(e,t){var l=1;if(!e)return l;var r=t.$table,n=e[r.treeOpts.children];if(r.isTreeExpandByRow(e))for(var o=0;o<n.length;o++)l+=countTreeExpand(n[o],t);return l}function getOffsetSize(e){return lineOffsetSizes[e.vSize]||0}function calcTreeLine(e,t,l){var r=e.$table,n=1;return l&&(n=countTreeExpand(t[l-1],e)),r.rowHeight*n-(l?1:12-getOffsetSize(r))}function mergeBodyMethod(e,t,l){for(var r=0;r<e.length;r++){var n=e[r],o=n.row,i=n.col,a=n.rowspan,n=n.colspan;if(-1<i&&-1<o&&a&&n){if(o===t&&i===l)return{rowspan:a,colspan:n};if(o<=t&&t<o+a&&i<=l&&l<i+n)return{rowspan:0,colspan:0}}}}function clearTableDefaultStatus(e){return e.initStatus=!1,e.clearSort(),e.clearCurrentRow(),e.clearCurrentColumn(),e.clearRadioRow(),e.clearRadioReserve(),e.clearCheckboxRow(),e.clearCheckboxReserve(),e.clearRowExpand(),e.clearTreeExpand(),e.clearTreeExpandReserve(),e.clearActived&&_vXETable.default._edit&&e.clearActived(),e.clearSelected&&(e.keyboardConfig||e.mouseConfig)&&e.clearSelected(),e.clearCellAreas&&e.mouseConfig&&(e.clearCellAreas(),e.clearCopyCellArea()),e.clearScroll()}function clearTableAllStatus(e){return e.clearFilter&&_vXETable.default._filter&&e.clearFilter(),clearTableDefaultStatus(e)}function isColumnInfo(e){return e instanceof _columnInfo.ColumnInfo}function getColumnConfig(e,t,l){return isColumnInfo(t)?t:new _columnInfo.ColumnInfo(e,t,l)}
1
+ "use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.calcTreeLine=calcTreeLine,exports.clearTableAllStatus=clearTableAllStatus,exports.clearTableDefaultStatus=clearTableDefaultStatus,exports.getColMinWidth=getColMinWidth,exports.getColumnConfig=getColumnConfig,exports.getOffsetSize=getOffsetSize,exports.getRowid=getRowid,exports.getRowkey=getRowkey,exports.handleFieldOrColumn=handleFieldOrColumn,exports.isColumnInfo=isColumnInfo,exports.mergeBodyMethod=mergeBodyMethod,exports.removeScrollListener=removeScrollListener,exports.restoreScrollListener=restoreScrollListener,exports.restoreScrollLocation=restoreScrollLocation,exports.toFilters=toFilters,exports.toTreePathSeq=toTreePathSeq;var _vXETable=_interopRequireDefault(require("../../v-x-e-table")),_xeUtils=_interopRequireDefault(require("xe-utils")),_columnInfo=require("./columnInfo"),_dom=_interopRequireDefault(require("../../tools/dom"));function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}var lineOffsetSizes={mini:3,small:2,medium:1};function restoreScrollLocation(e,t,l){return e.clearScroll().then(function(){if(t||l)return e.lastScrollLeft=0,e.lastScrollTop=0,e.scrollTo(t,l)})}function toTreePathSeq(e){return e.map(function(e,t){return t%2==0?Number(e)+1:"."}).join("")}function removeScrollListener(e){e&&e._onscroll&&(e.onscroll=null)}function restoreScrollListener(e){e&&e._onscroll&&(e.onscroll=e._onscroll)}function getRowkey(e){return e.rowOpts.keyField||e.rowId||"_X_ROW_KEY"}function getRowid(e,t){e=_xeUtils.default.get(t,getRowkey(e));return _xeUtils.default.eqNull(e)?"":encodeURIComponent(e)}function getPaddingLeftRightSize(e){if(e){e=getComputedStyle(e);return _xeUtils.default.toNumber(e.paddingLeft)+_xeUtils.default.toNumber(e.paddingRight)}return 0}function getElemenMarginWidth(e){if(e){var t=getComputedStyle(e),l=_xeUtils.default.toNumber(t.marginLeft),t=_xeUtils.default.toNumber(t.marginRight);return e.offsetWidth+l+t}return 0}function handleFieldOrColumn(e,t){return t?_xeUtils.default.isString(t)?e.getColumnByField(t):t:null}function queryCellElement(e,t){return e.querySelector(".vxe-cell"+t)}function toFilters(e){return e&&_xeUtils.default.isArray(e)?e.map(function(e){var t=e.label,l=e.value,r=e.data,o=e.resetValue,e=e.checked;return{label:t,value:l,data:r,resetValue:o,checked:!!e,_checked:!!e}}):e}function getColMinWidth(e){var t=e.$table,l=e.column,r=e.cell,o=t.showHeaderOverflow,n=t.resizableOpts.minWidth;if(n){var i=_xeUtils.default.isFunction(n)?n(e):n;if("auto"!==i)return Math.max(1,_xeUtils.default.toNumber(i))}var a=l.showHeaderOverflow,u=l.minWidth,e=_xeUtils.default.isUndefined(a)||_xeUtils.default.isNull(a)?o:a,n="title"===e||(!0===e||"tooltip"===e)||"ellipsis"===e,i=_xeUtils.default.floor(1.6*(_xeUtils.default.toNumber(getComputedStyle(r).fontSize)||14))+(getPaddingLeftRightSize(r)+getPaddingLeftRightSize(queryCellElement(r,"")));if(n&&(l=getPaddingLeftRightSize(queryCellElement(r,"--title>.vxe-cell--checkbox")),o=getElemenMarginWidth(queryCellElement(r,">.vxe-cell--required-icon")),a=getElemenMarginWidth(queryCellElement(r,">.vxe-cell--edit-icon")),e=getElemenMarginWidth(queryCellElement(r,">.vxe-cell-help-icon")),n=getElemenMarginWidth(queryCellElement(r,">.vxe-cell--sort")),i+=l+o+a+e+getElemenMarginWidth(queryCellElement(r,">.vxe-cell--filter"))+n),u){t=t.$refs.tableBody,t=t?t.$el:null;if(t){if(_dom.default.isScale(u)){t=(t.clientWidth-1)/100;return Math.max(i,Math.floor(_xeUtils.default.toInteger(u)*t))}if(_dom.default.isPx(u))return Math.max(i,_xeUtils.default.toInteger(u))}}return i}function countTreeExpand(e,t){var l=1;if(!e)return l;var r=t.$table,o=e[r.treeOpts.children];if(r.isTreeExpandByRow(e))for(var n=0;n<o.length;n++)l+=countTreeExpand(o[n],t);return l}function getOffsetSize(e){return lineOffsetSizes[e.vSize]||0}function calcTreeLine(e,t,l){var r=e.$table,o=1;return l&&(o=countTreeExpand(t[l-1],e)),r.rowHeight*o-(l?1:12-getOffsetSize(r))}function mergeBodyMethod(e,t,l){for(var r=0;r<e.length;r++){var o=e[r],n=o.row,i=o.col,a=o.rowspan,o=o.colspan;if(-1<i&&-1<n&&a&&o){if(n===t&&i===l)return{rowspan:a,colspan:o};if(n<=t&&t<n+a&&i<=l&&l<i+o)return{rowspan:0,colspan:0}}}}function clearTableDefaultStatus(e){return e.initStatus=!1,e.clearSort(),e.clearCurrentRow(),e.clearCurrentColumn(),e.clearRadioRow(),e.clearRadioReserve(),e.clearCheckboxRow(),e.clearCheckboxReserve(),e.clearRowExpand(),e.clearTreeExpand(),e.clearTreeExpandReserve(),e.clearActived&&_vXETable.default._edit&&e.clearActived(),e.clearSelected&&(e.keyboardConfig||e.mouseConfig)&&e.clearSelected(),e.clearCellAreas&&e.mouseConfig&&(e.clearCellAreas(),e.clearCopyCellArea()),e.clearScroll()}function clearTableAllStatus(e){return e.clearFilter&&_vXETable.default._filter&&e.clearFilter(),clearTableDefaultStatus(e)}function isColumnInfo(e){return e instanceof _columnInfo.ColumnInfo}function getColumnConfig(e,t,l){return isColumnInfo(t)?t:new _columnInfo.ColumnInfo(e,t,l)}
package/lib/tools/log.js CHANGED
@@ -12,7 +12,7 @@ var _conf = _interopRequireDefault(require("../v-x-e-table/src/conf"));
12
12
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
13
13
 
14
14
  function getLog(message, params) {
15
- return "[vxe-table v".concat(process.env.VUE_APP_VXE_TABLE_VERSION, "] ").concat(_conf.default.i18n(message, params));
15
+ return "[vxe-table v".concat("3.5.0-beta.3", "] ", _conf.default.i18n(message, params));
16
16
  }
17
17
 
18
18
  function outLog(type) {
@@ -1 +1 @@
1
- "use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.errLog=void 0,exports.getLog=getLog,exports.warnLog=void 0;var _conf=_interopRequireDefault(require("../v-x-e-table/src/conf"));function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function getLog(e,o){return"[vxe-table v".concat(process.env.VUE_APP_VXE_TABLE_VERSION,"] ").concat(_conf.default.i18n(e,o))}function outLog(r){return function(e,o){o=getLog(e,o);return console[r](o),o}}var warnLog=outLog("warn");exports.warnLog=warnLog;var errLog=outLog("error");exports.errLog=errLog;
1
+ "use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.errLog=void 0,exports.getLog=getLog,exports.warnLog=void 0;var _conf=_interopRequireDefault(require("../v-x-e-table/src/conf"));function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function getLog(e,r){return"[vxe-table v".concat("3.5.0-beta.3","] ",_conf.default.i18n(e,r))}function outLog(o){return function(e,r){r=getLog(e,r);return console[o](r),r}}var warnLog=outLog("warn");exports.warnLog=warnLog;var errLog=outLog("error");exports.errLog=errLog;
@@ -7,7 +7,6 @@ exports.default = exports.UtilTools = void 0;
7
7
  exports.eqEmptyValue = eqEmptyValue;
8
8
  exports.getColumnList = getColumnList;
9
9
  exports.getFuncText = getFuncText;
10
- exports.getRowkey = getRowkey;
11
10
  exports.isEnableConf = isEnableConf;
12
11
 
13
12
  var _xeUtils = _interopRequireDefault(require("xe-utils"));
@@ -47,11 +46,6 @@ function eqEmptyValue(cellValue) {
47
46
 
48
47
  function getFuncText(content) {
49
48
  return _xeUtils.default.isFunction(content) ? content() : _conf.default.translate ? _conf.default.translate(content) : content;
50
- } // 行主键 key
51
-
52
-
53
- function getRowkey($xetable) {
54
- return $xetable.rowOpts.keyField || $xetable.rowId || '_X_ID';
55
49
  } // 获取所有的列,排除分组
56
50
 
57
51
 
@@ -71,13 +65,6 @@ var UtilTools = {
71
65
  getLastZIndex: function getLastZIndex() {
72
66
  return lastZindex;
73
67
  },
74
- getRowkey: getRowkey,
75
- // 行主键 value
76
- getRowid: function getRowid($xetable, row) {
77
- var rowid = _xeUtils.default.get(row, getRowkey($xetable));
78
-
79
- return _xeUtils.default.eqNull(rowid) ? '' : encodeURIComponent(rowid);
80
- },
81
68
  getColumnList: getColumnList,
82
69
  getClass: function getClass(property, params) {
83
70
  return property ? _xeUtils.default.isFunction(property) ? property(params) : property : '';
@@ -1 +1 @@
1
- "use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=exports.UtilTools=void 0,exports.eqEmptyValue=eqEmptyValue,exports.getColumnList=getColumnList,exports.getFuncText=getFuncText,exports.getRowkey=getRowkey,exports.isEnableConf=isEnableConf;var _xeUtils=_interopRequireDefault(require("xe-utils")),_conf=_interopRequireDefault(require("../v-x-e-table/src/conf")),_log=require("../tools/log");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function _toConsumableArray(e){return _arrayWithoutHoles(e)||_iterableToArray(e)||_unsupportedIterableToArray(e)||_nonIterableSpread()}function _nonIterableSpread(){throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function _unsupportedIterableToArray(e,t){if(e){if("string"==typeof e)return _arrayLikeToArray(e,t);var n=Object.prototype.toString.call(e).slice(8,-1);return"Map"===(n="Object"===n&&e.constructor?e.constructor.name:n)||"Set"===n?Array.from(e):"Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)?_arrayLikeToArray(e,t):void 0}}function _iterableToArray(e){if("undefined"!=typeof Symbol&&null!=e[Symbol.iterator]||null!=e["@@iterator"])return Array.from(e)}function _arrayWithoutHoles(e){if(Array.isArray(e))return _arrayLikeToArray(e)}function _arrayLikeToArray(e,t){(null==t||t>e.length)&&(t=e.length);for(var n=0,r=new Array(t);n<t;n++)r[n]=e[n];return r}var zindexIndex=0,lastZindex=1;function isEnableConf(e){return e&&!1!==e.enabled}function eqEmptyValue(e){return""===e||_xeUtils.default.eqNull(e)}function getFuncText(e){return _xeUtils.default.isFunction(e)?e():_conf.default.translate?_conf.default.translate(e):e}function getRowkey(e){return e.rowOpts.keyField||e.rowId||"_X_ID"}function getColumnList(e){var t=[];return e.forEach(function(e){t.push.apply(t,_toConsumableArray(e.children&&e.children.length?getColumnList(e.children):[e]))}),t}var UtilTools={nextZIndex:function(){return lastZindex=_conf.default.zIndex+zindexIndex++},getLastZIndex:function(){return lastZindex},getRowkey:getRowkey,getRowid:function(e,t){e=_xeUtils.default.get(t,getRowkey(e));return _xeUtils.default.eqNull(e)?"":encodeURIComponent(e)},getColumnList:getColumnList,getClass:function(e,t){return e?_xeUtils.default.isFunction(e)?e(t):e:""},formatText:function(e,t){return""+(""===e||null==e?t?_conf.default.emptyCell:"":e)},getCellValue:function(e,t){return _xeUtils.default.get(e,t.property)},setCellValue:function(e,t,n){return _xeUtils.default.set(e,t.property,n)},assemColumn:function(e){var t=e.$el,n=e.$xetable,r=e.$xecolumn,o=e.columnConfig,l=r?r.columnConfig:null;o.slots=e.$scopedSlots,l?("development"===process.env.NODE_ENV&&("vxe-table-column"===r.$options._componentTag?(0,_log.errLog)("vxe.error.groupTag",["<vxe-table-colgroup title=".concat(r.title," ...>"),"<vxe-table-column title=".concat(r.title," ...>")]):"vxe-column"===r.$options._componentTag&&(0,_log.warnLog)("vxe.error.groupTag",["<vxe-colgroup title=".concat(r.title," ...>"),"<vxe-column title=".concat(r.title," ...>")])),l.children||(l.children=[]),l.children.splice([].indexOf.call(r.$el.children,t),0,o)):n.staticColumns.splice([].indexOf.call(n.$refs.hideColumn.children,t),0,o)},destroyColumn:function(e){var t=e.$xetable,n=e.columnConfig,t=_xeUtils.default.findTree(t.staticColumns,function(e){return e===n});t&&t.items.splice(t.index,1)},hasChildrenList:function(e){return e&&e.children&&0<e.children.length},parseFile:function(e){var t=e.name,n=_xeUtils.default.lastIndexOf(t,"."),e=t.substring(n+1,t.length);return{filename:t.substring(0,n),type:e}},isNumVal:function(e){return!isNaN(parseFloat(""+e))}},_default=exports.UtilTools=UtilTools;exports.default=_default;
1
+ "use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=exports.UtilTools=void 0,exports.eqEmptyValue=eqEmptyValue,exports.getColumnList=getColumnList,exports.getFuncText=getFuncText,exports.isEnableConf=isEnableConf;var _xeUtils=_interopRequireDefault(require("xe-utils")),_conf=_interopRequireDefault(require("../v-x-e-table/src/conf")),_log=require("../tools/log");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function _toConsumableArray(e){return _arrayWithoutHoles(e)||_iterableToArray(e)||_unsupportedIterableToArray(e)||_nonIterableSpread()}function _nonIterableSpread(){throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function _unsupportedIterableToArray(e,t){if(e){if("string"==typeof e)return _arrayLikeToArray(e,t);var n=Object.prototype.toString.call(e).slice(8,-1);return"Map"===(n="Object"===n&&e.constructor?e.constructor.name:n)||"Set"===n?Array.from(e):"Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)?_arrayLikeToArray(e,t):void 0}}function _iterableToArray(e){if("undefined"!=typeof Symbol&&null!=e[Symbol.iterator]||null!=e["@@iterator"])return Array.from(e)}function _arrayWithoutHoles(e){if(Array.isArray(e))return _arrayLikeToArray(e)}function _arrayLikeToArray(e,t){(null==t||t>e.length)&&(t=e.length);for(var n=0,r=new Array(t);n<t;n++)r[n]=e[n];return r}var zindexIndex=0,lastZindex=1;function isEnableConf(e){return e&&!1!==e.enabled}function eqEmptyValue(e){return""===e||_xeUtils.default.eqNull(e)}function getFuncText(e){return _xeUtils.default.isFunction(e)?e():_conf.default.translate?_conf.default.translate(e):e}function getColumnList(e){var t=[];return e.forEach(function(e){t.push.apply(t,_toConsumableArray(e.children&&e.children.length?getColumnList(e.children):[e]))}),t}var UtilTools={nextZIndex:function(){return lastZindex=_conf.default.zIndex+zindexIndex++},getLastZIndex:function(){return lastZindex},getColumnList:getColumnList,getClass:function(e,t){return e?_xeUtils.default.isFunction(e)?e(t):e:""},formatText:function(e,t){return""+(""===e||null==e?t?_conf.default.emptyCell:"":e)},getCellValue:function(e,t){return _xeUtils.default.get(e,t.property)},setCellValue:function(e,t,n){return _xeUtils.default.set(e,t.property,n)},assemColumn:function(e){var t=e.$el,n=e.$xetable,r=e.$xecolumn,o=e.columnConfig,l=r?r.columnConfig:null;o.slots=e.$scopedSlots,l?("development"===process.env.NODE_ENV&&("vxe-table-column"===r.$options._componentTag?(0,_log.errLog)("vxe.error.groupTag",["<vxe-table-colgroup title=".concat(r.title," ...>"),"<vxe-table-column title=".concat(r.title," ...>")]):"vxe-column"===r.$options._componentTag&&(0,_log.warnLog)("vxe.error.groupTag",["<vxe-colgroup title=".concat(r.title," ...>"),"<vxe-column title=".concat(r.title," ...>")])),l.children||(l.children=[]),l.children.splice([].indexOf.call(r.$el.children,t),0,o)):n.staticColumns.splice([].indexOf.call(n.$refs.hideColumn.children,t),0,o)},destroyColumn:function(e){var t=e.$xetable,n=e.columnConfig,t=_xeUtils.default.findTree(t.staticColumns,function(e){return e===n});t&&t.items.splice(t.index,1)},hasChildrenList:function(e){return e&&e.children&&0<e.children.length},parseFile:function(e){var t=e.name,n=_xeUtils.default.lastIndexOf(t,"."),e=t.substring(n+1,t.length);return{filename:t.substring(0,n),type:e}},isNumVal:function(e){return!isNaN(parseFloat(""+e))}},_default=exports.UtilTools=UtilTools;exports.default=_default;
@@ -82,6 +82,34 @@ function showTip(_vm) {
82
82
  return _vm.updatePlacement();
83
83
  }
84
84
 
85
+ function renderContent(h, _vm) {
86
+ var $scopedSlots = _vm.$scopedSlots,
87
+ useHTML = _vm.useHTML,
88
+ tipContent = _vm.tipContent;
89
+
90
+ if ($scopedSlots.content) {
91
+ return h('div', {
92
+ key: 1,
93
+ class: 'vxe-table--tooltip-content'
94
+ }, $scopedSlots.content.call(this, {}));
95
+ }
96
+
97
+ if (useHTML) {
98
+ return h('div', {
99
+ key: 2,
100
+ class: 'vxe-table--tooltip-content',
101
+ domProps: {
102
+ innerHTML: tipContent
103
+ }
104
+ });
105
+ }
106
+
107
+ return h('div', {
108
+ key: 3,
109
+ class: 'vxe-table--tooltip-content'
110
+ }, _utils.default.formatText(tipContent));
111
+ }
112
+
85
113
  var _default2 = {
86
114
  name: 'VxeTooltip',
87
115
  mixins: [_size.default],
@@ -105,7 +133,11 @@ var _default2 = {
105
133
  return _conf.default.tooltip.theme;
106
134
  }
107
135
  },
108
- content: [String, Number],
136
+ content: {
137
+ type: [String, Number],
138
+ default: null
139
+ },
140
+ useHTML: Boolean,
109
141
  zIndex: [String, Number],
110
142
  isArrow: {
111
143
  type: Boolean,
@@ -123,14 +155,13 @@ var _default2 = {
123
155
  default: function _default() {
124
156
  return _conf.default.tooltip.leaveDelay;
125
157
  }
126
- },
127
- leaveMethod: Function
158
+ }
128
159
  },
129
160
  data: function data() {
130
161
  return {
131
162
  isUpdate: false,
132
163
  visible: false,
133
- message: '',
164
+ tipContent: '',
134
165
  tipActive: false,
135
166
  tipTarget: null,
136
167
  tipZindex: 0,
@@ -143,7 +174,7 @@ var _default2 = {
143
174
  },
144
175
  watch: {
145
176
  content: function content(value) {
146
- this.message = value;
177
+ this.tipContent = value;
147
178
  },
148
179
  value: function value(_value) {
149
180
  if (!this.isUpdate) {
@@ -172,7 +203,7 @@ var _default2 = {
172
203
  value = this.value;
173
204
  var parentNode = $el.parentNode;
174
205
  var target;
175
- this.message = content;
206
+ this.tipContent = content;
176
207
  this.tipZindex = _utils.default.nextZIndex();
177
208
 
178
209
  _xeUtils.default.arrayEach($el.children, function (elem, index) {
@@ -226,7 +257,6 @@ var _default2 = {
226
257
  var $scopedSlots = this.$scopedSlots,
227
258
  vSize = this.vSize,
228
259
  theme = this.theme,
229
- message = this.message,
230
260
  tipActive = this.tipActive,
231
261
  isArrow = this.isArrow,
232
262
  visible = this.visible,
@@ -246,16 +276,14 @@ var _default2 = {
246
276
  style: tipStore.style,
247
277
  ref: 'tipWrapper',
248
278
  on: on
249
- }, [h('div', {
250
- class: 'vxe-table--tooltip-content'
251
- }, $scopedSlots.content ? $scopedSlots.content.call(this, {}) : message), h('div', {
279
+ }, [renderContent(h, this), h('div', {
252
280
  class: 'vxe-table--tooltip-arrow',
253
281
  style: tipStore.arrowStyle
254
282
  })].concat($scopedSlots.default ? $scopedSlots.default.call(this, {}) : []));
255
283
  },
256
284
  methods: {
257
- open: function open(target, message) {
258
- return this.toVisible(target || this.target, message);
285
+ open: function open(target, content) {
286
+ return this.toVisible(target || this.target, content);
259
287
  },
260
288
  close: function close() {
261
289
  this.tipTarget = null;
@@ -283,15 +311,15 @@ var _default2 = {
283
311
  this.tipZindex = _utils.default.nextZIndex();
284
312
  }
285
313
  },
286
- toVisible: function toVisible(target, message) {
314
+ toVisible: function toVisible(target, content) {
287
315
  if (target) {
288
316
  var trigger = this.trigger,
289
317
  enterDelay = this.enterDelay;
290
318
  this.tipActive = true;
291
319
  this.tipTarget = target;
292
320
 
293
- if (message) {
294
- this.message = message;
321
+ if (content) {
322
+ this.tipContent = content;
295
323
  }
296
324
 
297
325
  if (enterDelay && trigger === 'hover') {
@@ -351,25 +379,20 @@ var _default2 = {
351
379
  wrapperMouseenterEvent: function wrapperMouseenterEvent() {
352
380
  this.tipActive = true;
353
381
  },
354
- wrapperMouseleaveEvent: function wrapperMouseleaveEvent(evnt) {
382
+ wrapperMouseleaveEvent: function wrapperMouseleaveEvent() {
355
383
  var _this4 = this;
356
384
 
357
- var leaveMethod = this.leaveMethod,
358
- trigger = this.trigger,
385
+ var trigger = this.trigger,
359
386
  enterable = this.enterable,
360
387
  leaveDelay = this.leaveDelay;
361
388
  this.tipActive = false;
362
389
 
363
- if (!leaveMethod || leaveMethod({
364
- $event: evnt
365
- }) !== false) {
366
- if (enterable && trigger === 'hover') {
367
- setTimeout(function () {
368
- if (!_this4.tipActive) {
369
- _this4.close();
370
- }
371
- }, leaveDelay);
372
- }
390
+ if (enterable && trigger === 'hover') {
391
+ setTimeout(function () {
392
+ if (!_this4.tipActive) {
393
+ _this4.close();
394
+ }
395
+ }, leaveDelay);
373
396
  }
374
397
  }
375
398
  }