vxe-table 3.7.9-beta.0 → 3.7.9-beta.2

package/lib/index.umd.js

@@ -10276,7 +10276,8 @@ var iconPrefix = 'vxe-icon-';
       // trigger: 'default',
       // orders: ['asc', 'desc', null],
       // sortMethod: null,
-      showIcon: true
+      showIcon: true,
+      iconLayout: 'vertical'
     },
     filterConfig: {
       // remote: false,
@@ -10348,6 +10349,7 @@ var iconPrefix = 'vxe-icon-';
     // loading
     LOADING: iconPrefix + 'spinner roll vxe-loading--default-icon',
     // table
+    // TABLE_SORT_NONE: '',
     TABLE_SORT_ASC: iconPrefix + 'caret-up',
     TABLE_SORT_DESC: iconPrefix + 'caret-down',
     TABLE_FILTER_NONE: iconPrefix + 'funnel',
@@ -10593,7 +10595,7 @@ var es_array_concat = __webpack_require__(2222);
 
 
 function getLog(message, params) {
-  return "[vxe-table v".concat("3.7.9-beta.0", "] ").concat(conf.i18n(message, params));
+  return "[vxe-table v".concat("3.7.9-beta.2", "] ").concat(conf.i18n(message, params));
 }
 function outLog(type) {
   return function (message, params) {
@@ -12025,7 +12027,7 @@ var setup = config;
 var globalStore = {};
 var VXETable = {
   v: v,
-  version: "3.7.9-beta.0",
+  version: "3.7.9-beta.2",
   reg: reg,
   use: use,
   setup: setup,
@@ -12418,9 +12420,11 @@ var DomTools = {
     });
   },
   getAbsolutePos: function getAbsolutePos(elem) {
+    // 当主页面嵌套在iframe时，elem.getBoundingClientRect()仅计算在当前body内的边界距离，忽略了body所在的边界距离
+    var bodyBounding = document.body.getBoundingClientRect();
     var bounding = elem.getBoundingClientRect();
-    var boundingTop = bounding.top;
-    var boundingLeft = bounding.left;
+    var boundingTop = bounding.top - bodyBounding.top;
+    var boundingLeft = bounding.left - bodyBounding.left;
     var _getDomNode = getDomNode(),
       scrollTop = _getDomNode.scrollTop,
       scrollLeft = _getDomNode.scrollLeft,
@@ -12810,6 +12814,7 @@ function getSlotVNs(vns) {
 
 
 
+
 var renderType = 'body';
 
 // 滚动、拖动过程中不需要触发
@@ -12895,7 +12900,8 @@ function renderColumn(h, _vm, $xetable, seq, rowid, fixedType, rowLevel, row, ro
     align = column.align,
     showOverflow = column.showOverflow,
     className = column.className,
-    treeNode = column.treeNode;
+    treeNode = column.treeNode,
+    slots = column.slots;
   var actived = editStore.actived;
   var scrollYRHeight = sYOpts.rHeight;
   var rowHeight = rowOpts.height;
@@ -13073,12 +13079,15 @@ function renderColumn(h, _vm, $xetable, seq, rowid, fixedType, rowLevel, row, ro
       }
     }, column.renderCell(h, params))]));
     if (showValidTip && errorValidItem) {
+      var errRule = errorValidItem.rule;
+      var validSlot = slots ? slots.valid : null;
+      var validParams = _objectSpread2(_objectSpread2({}, params), errorValidItem);
       tdVNs.push(h('div', {
-        class: 'vxe-cell--valid-error-hint',
-        style: errorValidItem.rule && errorValidItem.rule.maxWidth ? {
-          width: "".concat(errorValidItem.rule.maxWidth, "px")
+        class: ['vxe-cell--valid-error-hint', utils.getClass(validOpts.className, errorValidItem)],
+        style: errRule && errRule.maxWidth ? {
+          width: "".concat(errRule.maxWidth, "px")
         } : null
-      }, [h('span', {
+      }, validSlot ? $xetable.callSlot(validSlot, validParams, h) : [h('span', {
         class: 'vxe-cell--valid-error-msg'
       }, errorValidItem.content)]));
     }
@@ -15045,10 +15054,11 @@ var Cell = {
       column = params.column;
     var _$table$sortOpts = $table.sortOpts,
       showIcon = _$table$sortOpts.showIcon,
+      iconLayout = _$table$sortOpts.iconLayout,
       iconAsc = _$table$sortOpts.iconAsc,
       iconDesc = _$table$sortOpts.iconDesc;
     return showIcon ? [h('span', {
-      class: 'vxe-cell--sort'
+      class: ['vxe-cell--sort', "vxe-cell--sort-".concat(iconLayout, "-layout")]
     }, [h('i', {
       class: ['vxe-sort--asc-btn', iconAsc || conf.icon.TABLE_SORT_ASC, {
         'sort--active': column.order === 'asc'
@@ -15964,6 +15974,7 @@ var Methods = {
       }
       external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(rows, function (childRow, index, items, path, parent, nodes) {
         var rowid = getRowid(_this12, childRow);
+        var parentRow = parent || row;
         var rest = {
           row: childRow,
           rowid: rowid,
@@ -15972,7 +15983,7 @@ var Methods = {
           _index: -1,
           $index: -1,
           items: items,
-          parent: parent,
+          parent: parentRow,
           level: parentLevel + nodes.length
         };
         fullDataRowIdData[rowid] = rest;
@@ -16806,7 +16817,8 @@ var Methods = {
         rowid = getRowid(this, rowOrRowid);
       }
       if (rowid) {
-        return fullDataRowIdData[rowid] ? fullDataRowIdData[rowid].parent : null;
+        var rest = fullDataRowIdData[rowid];
+        return rest ? rest.parent : null;
       }
     }
     return null;
@@ -23739,7 +23751,7 @@ function insertTreeRow(_vm, newRecords, isAppend) {
         _index: -1,
         $index: -1,
         items: parentChilds,
-        parent: parent,
+        parent: parentRow,
         level: parentLevel + 1
       };
       fullDataRowIdData[rowid] = rest;
@@ -23785,7 +23797,7 @@ function handleInsertRowAt(_vm, records, row, isInsertNextRow) {
     var _ref;
     return Object.assign(treeConfig && transform ? (_ref = {}, _defineProperty(_ref, mapChildrenField, []), _defineProperty(_ref, childrenField, []), _ref) : {}, record);
   }));
-  if (!row) {
+  if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(row)) {
     // 如果为虚拟树
     if (treeConfig && transform) {
       insertTreeRow(_vm, newRecords, false);
@@ -40025,6 +40037,7 @@ var Pulldown = Object.assign(pulldown, {
       confirmFilter: '筛选',
       resetFilter: '重置',
       allFilter: '全部',
+      sortSingle: '点击排序',
       sortAsc: '升序：最低到最高',
       sortDesc: '降序：最高到最低',
       filter: '对所选的列启用筛选',