@kdcloudjs/table 1.2.0-canary.15 → 1.2.0-canary.16-hotfix

package/es/table/pivot/cross-tree-table/buildCrossTreeTable.js

@@ -1,49 +1,40 @@
 import _defineProperty from "@babel/runtime-corejs3/helpers/defineProperty";
 import _extends from "@babel/runtime-corejs3/helpers/extends";
 import _toConsumableArray from "@babel/runtime-corejs3/helpers/toConsumableArray";
-
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof _Symbol !== "undefined" && _getIteratorMethod(o) || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
-
 function _unsupportedIterableToArray(o, minLen) { var _context4; if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = _sliceInstanceProperty(_context4 = Object.prototype.toString.call(o)).call(_context4, 8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return _Array$from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
-
 import _Object$getOwnPropertySymbols from "@babel/runtime-corejs3/core-js-stable/object/get-own-property-symbols";
 import _concatInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/concat";
 import _sliceInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/slice";
 import _Array$from from "@babel/runtime-corejs3/core-js-stable/array/from";
 import _Symbol from "@babel/runtime-corejs3/core-js-stable/symbol";
 import _getIteratorMethod from "@babel/runtime-corejs3/core-js/get-iterator-method";
-
 var __rest = this && this.__rest || function (s, e) {
   var t = {};
-
   for (var p in s) {
     if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0) t[p] = s[p];
   }
-
   if (s != null && typeof _Object$getOwnPropertySymbols === "function") for (var i = 0, p = _Object$getOwnPropertySymbols(s); i < p.length; i++) {
     if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i])) t[p[i]] = s[p[i]];
   }
   return t;
 };
-
 import { noop } from 'rxjs';
 import { features, TablePipeline } from '../../pipeline';
 import { isLeafNode as standardIsLeafNode } from '../../utils';
 import { ROW_KEY } from '../cross-table';
 export default function buildCrossTreeTable(options) {
   var _a, _b;
-
   var primaryColumn = options.primaryColumn,
-      openKeys = options.openKeys,
-      onChangeOpenKeys = options.onChangeOpenKeys,
-      indentSize = options.indentSize,
-      _options$isLeafNode = options.isLeafNode,
-      isLeafNodeOpt = _options$isLeafNode === void 0 ? standardIsLeafNode : _options$isLeafNode; // 有的时候 leftTree/topTree 是通过 node.children 传入的
+    openKeys = options.openKeys,
+    onChangeOpenKeys = options.onChangeOpenKeys,
+    indentSize = options.indentSize,
+    _options$isLeafNode = options.isLeafNode,
+    isLeafNodeOpt = _options$isLeafNode === void 0 ? standardIsLeafNode : _options$isLeafNode;
+  // 有的时候 leftTree/topTree 是通过 node.children 传入的
   // 此时 leftTree/topTree 等于 null 和等于空数组是等价的
   // 故在这里兼容 leftTree/topTree 为空的情况
-
   var leftTree = (_a = options.leftTree) !== null && _a !== void 0 ? _a : [];
   var topTree = (_b = options.topTree) !== null && _b !== void 0 ? _b : [];
   var pipeline = new TablePipeline({
@@ -71,10 +62,8 @@ export default function buildCrossTreeTable(options) {
     columns: pipeline.getColumns()
   };
   /** 获取表格的列配置 */
-
   function getColumns() {
     var _context;
-
     return _concatInstanceProperty(_context = [_extends(_extends({}, primaryColumn), {
       getValue: function getValue(row) {
         return row.node.value;
@@ -88,35 +77,28 @@ export default function buildCrossTreeTable(options) {
         if (primaryColumn.render) {
           return primaryColumn.render(row.node, row.nodes.length - 1);
         }
-
         return value;
       }
     })]).call(_context, _toConsumableArray(getDataPartColumns()));
     /** 获取表格数据部分的列配置 */
-
     function getDataPartColumns() {
       return dfs(topTree, {
         depth: 0
       });
-
       function dfs(nodes, ctx) {
         var result = [];
-
         var _iterator = _createForOfIteratorHelper(nodes),
-            _step;
-
+          _step;
         try {
           for (_iterator.s(); !(_step = _iterator.n()).done;) {
             var node = _step.value;
-
             if (standardIsLeafNode(node)) {
               result.push(getDataColumn(node, ctx.depth));
             } else {
               var key = node.key,
-                  value = node.value,
-                  children = node.children,
-                  others = __rest(node, ["key", "value", "children"]);
-
+                value = node.value,
+                children = node.children,
+                others = __rest(node, ["key", "value", "children"]);
               result.push(_extends(_extends({}, others), {
                 name: value,
                 children: dfs(children, {
@@ -130,23 +112,19 @@ export default function buildCrossTreeTable(options) {
         } finally {
           _iterator.f();
         }
-
         return result;
       }
     }
-
     function getDataColumn(topNode, topDepth) {
       var columnGetValue = function columnGetValue(row) {
         var leftDepth = row.nodes.length - 1;
         var leftNode = row.node;
         return options.getValue(leftNode, topNode, leftDepth, topDepth);
       };
-
       var key = topNode.key,
-          value = topNode.value,
-          children = topNode.children,
-          others = __rest(topNode, ["key", "value", "children"]);
-
+        value = topNode.value,
+        children = topNode.children,
+        others = __rest(topNode, ["key", "value", "children"]);
       return _extends(_extends({}, others), {
         getValue: columnGetValue,
         name: value,
@@ -157,7 +135,6 @@ export default function buildCrossTreeTable(options) {
             var leftNode = row.node;
             return options.render(value, leftNode, topNode, leftDepth, topDepth);
           }
-
           return value;
         },
         getCellProps: function getCellProps(value, row) {
@@ -170,36 +147,27 @@ export default function buildCrossTreeTable(options) {
       });
     }
   }
-
   function getDataSource() {
     return dfs(leftTree, {
       nodes: []
     });
-
     function dfs(nodes, ctx) {
       var result = [];
-
       var _iterator2 = _createForOfIteratorHelper(nodes),
-          _step2;
-
+        _step2;
       try {
         for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
           var node = _step2.value;
-
           if (node.hidden) {
             // 跳过被隐藏的节点
             continue;
           }
-
           if (standardIsLeafNode(node)) {
             var _context2, _result$push;
-
             result.push((_result$push = {}, _defineProperty(_result$push, ROW_KEY, node.key), _defineProperty(_result$push, "node", node), _defineProperty(_result$push, "nodes", _concatInstanceProperty(_context2 = []).call(_context2, _toConsumableArray(ctx.nodes), [node])), _result$push));
           } else {
             var _context3, _result$push2;
-
             var _nodes = _concatInstanceProperty(_context3 = []).call(_context3, _toConsumableArray(ctx.nodes), [node]);
-
             ctx.nodes.push(node);
             var children = dfs(node.children, ctx);
             result.push((_result$push2 = {}, _defineProperty(_result$push2, ROW_KEY, node.key), _defineProperty(_result$push2, "node", node), _defineProperty(_result$push2, "nodes", _nodes), _defineProperty(_result$push2, "children", children), _result$push2));
@@ -211,7 +179,6 @@ export default function buildCrossTreeTable(options) {
       } finally {
         _iterator2.f();
       }
-
       return result;
     }
   }

package/es/table/pivot/cross-tree-table/cross-tree-table.js

@@ -5,97 +5,78 @@ import _createClass from "@babel/runtime-corejs3/helpers/createClass";
 import _inherits from "@babel/runtime-corejs3/helpers/inherits";
 import _possibleConstructorReturn from "@babel/runtime-corejs3/helpers/possibleConstructorReturn";
 import _getPrototypeOf from "@babel/runtime-corejs3/helpers/getPrototypeOf";
-
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = _Reflect$construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
-
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !_Reflect$construct) return false; if (_Reflect$construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(_Reflect$construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
-
 import _Object$getOwnPropertySymbols from "@babel/runtime-corejs3/core-js-stable/object/get-own-property-symbols";
-
 var __rest = this && this.__rest || function (s, e) {
   var t = {};
-
   for (var p in s) {
     if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0) t[p] = s[p];
   }
-
   if (s != null && typeof _Object$getOwnPropertySymbols === "function") for (var i = 0, p = _Object$getOwnPropertySymbols(s); i < p.length; i++) {
     if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i])) t[p[i]] = s[p[i]];
   }
   return t;
 };
-
 import React from 'react';
 import { noop } from 'rxjs';
 import { Table } from '../../base';
 import { ROW_KEY } from '../cross-table';
 import buildCrossTreeTable from './buildCrossTreeTable';
-
 var CrossTreeTable = /*#__PURE__*/function (_React$Component) {
   _inherits(CrossTreeTable, _React$Component);
-
   var _super = _createSuper(CrossTreeTable);
-
   function CrossTreeTable(props) {
     var _this;
-
     _classCallCheck(this, CrossTreeTable);
-
     _this = _super.call(this, props);
-
     _this.onChangeOpenKeys = function (nextOpenKeys) {
       _this.props.onChangeOpenKeys(nextOpenKeys);
-
       if (!('openKeys' in _this.props)) {
         _this.setState({
           openKeys: nextOpenKeys
         });
       }
     };
-
     _this.state = {
       openKeys: props.defaultOpenKeys
     };
     return _this;
   }
-
   _createClass(CrossTreeTable, [{
     key: "render",
     value: function render() {
       var _a = this.props,
-          _a$BaseTableComponent = _a.BaseTableComponent,
-          BaseTableComponent = _a$BaseTableComponent === void 0 ? Table : _a$BaseTableComponent,
-          leftTree = _a.leftTree,
-          topTree = _a.topTree,
-          getValue = _a.getValue,
-          getCellProps = _a.getCellProps,
-          primaryColumn = _a.primaryColumn,
-          render = _a.render,
-          openKeysProp = _a.openKeys,
-          defaultOpenKeys = _a.defaultOpenKeys,
-          onChangeOpenKeys = _a.onChangeOpenKeys,
-          indentSize = _a.indentSize,
-          isLeafNode = _a.isLeafNode,
-          baseTableRef = _a.baseTableRef,
-          others = __rest(_a, ["BaseTableComponent", "leftTree", "topTree", "getValue", "getCellProps", "primaryColumn", "render", "openKeys", "defaultOpenKeys", "onChangeOpenKeys", "indentSize", "isLeafNode", "baseTableRef"]);
-
+        _a$BaseTableComponent = _a.BaseTableComponent,
+        BaseTableComponent = _a$BaseTableComponent === void 0 ? Table : _a$BaseTableComponent,
+        leftTree = _a.leftTree,
+        topTree = _a.topTree,
+        getValue = _a.getValue,
+        getCellProps = _a.getCellProps,
+        primaryColumn = _a.primaryColumn,
+        render = _a.render,
+        openKeysProp = _a.openKeys,
+        defaultOpenKeys = _a.defaultOpenKeys,
+        onChangeOpenKeys = _a.onChangeOpenKeys,
+        indentSize = _a.indentSize,
+        isLeafNode = _a.isLeafNode,
+        baseTableRef = _a.baseTableRef,
+        others = __rest(_a, ["BaseTableComponent", "leftTree", "topTree", "getValue", "getCellProps", "primaryColumn", "render", "openKeys", "defaultOpenKeys", "onChangeOpenKeys", "indentSize", "isLeafNode", "baseTableRef"]);
       var openKeys = openKeysProp !== null && openKeysProp !== void 0 ? openKeysProp : this.state.openKeys;
-
       var _buildCrossTreeTable = buildCrossTreeTable({
-        leftTree: leftTree,
-        topTree: topTree,
-        getValue: getValue,
-        getCellProps: getCellProps,
-        render: render,
-        primaryColumn: primaryColumn,
-        openKeys: openKeys,
-        onChangeOpenKeys: this.onChangeOpenKeys,
-        indentSize: indentSize,
-        isLeafNode: isLeafNode
-      }),
-          dataSource = _buildCrossTreeTable.dataSource,
-          columns = _buildCrossTreeTable.columns;
-
+          leftTree: leftTree,
+          topTree: topTree,
+          getValue: getValue,
+          getCellProps: getCellProps,
+          render: render,
+          primaryColumn: primaryColumn,
+          openKeys: openKeys,
+          onChangeOpenKeys: this.onChangeOpenKeys,
+          indentSize: indentSize,
+          isLeafNode: isLeafNode
+        }),
+        dataSource = _buildCrossTreeTable.dataSource,
+        columns = _buildCrossTreeTable.columns;
       return /*#__PURE__*/React.createElement(BaseTableComponent, _extends({
         ref: baseTableRef
       }, others, {
@@ -112,14 +93,11 @@ var CrossTreeTable = /*#__PURE__*/function (_React$Component) {
           openKeys: nextProps.openKeys
         };
       }
-
       return null;
     }
   }]);
-
   return CrossTreeTable;
 }(React.Component);
-
 export { CrossTreeTable as default };
 CrossTreeTable.defaultProps = {
   defaultOpenKeys: [],

package/es/table/pivot/pivot-utils/buildDrillTree.js

@@ -4,25 +4,22 @@ import { groupBy } from '../../utils';
 import { always } from '../../utils/others';
 import simpleEncode from './simpleEncode';
 /** 根据指定的 code 序列计算下钻树 */
-
 export default function buildDrillTree(data, codes) {
   var _ref = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {},
-      _ref$encode = _ref.encode,
-      encode = _ref$encode === void 0 ? simpleEncode : _ref$encode,
-      _ref$totalValue = _ref.totalValue,
-      totalValue = _ref$totalValue === void 0 ? '总计' : _ref$totalValue,
-      _ref$includeTopWrappe = _ref.includeTopWrapper,
-      includeTopWrapper = _ref$includeTopWrappe === void 0 ? false : _ref$includeTopWrappe,
-      _ref$isExpand = _ref.isExpand,
-      isExpand = _ref$isExpand === void 0 ? always(true) : _ref$isExpand,
-      _ref$enforceExpandTot = _ref.enforceExpandTotalNode,
-      enforceExpandTotalNode = _ref$enforceExpandTot === void 0 ? true : _ref$enforceExpandTot;
-
+    _ref$encode = _ref.encode,
+    encode = _ref$encode === void 0 ? simpleEncode : _ref$encode,
+    _ref$totalValue = _ref.totalValue,
+    totalValue = _ref$totalValue === void 0 ? '总计' : _ref$totalValue,
+    _ref$includeTopWrappe = _ref.includeTopWrapper,
+    includeTopWrapper = _ref$includeTopWrappe === void 0 ? false : _ref$includeTopWrappe,
+    _ref$isExpand = _ref.isExpand,
+    isExpand = _ref$isExpand === void 0 ? always(true) : _ref$isExpand,
+    _ref$enforceExpandTot = _ref.enforceExpandTotalNode,
+    enforceExpandTotalNode = _ref$enforceExpandTot === void 0 ? true : _ref$enforceExpandTot;
   var emptyPath = [];
   var totalKey = encode(emptyPath);
   var array;
   var hasChild = false;
-
   if (codes.length === 0) {
     array = [];
   } else if (!enforceExpandTotalNode && !isExpand(totalKey)) {
@@ -31,7 +28,6 @@ export default function buildDrillTree(data, codes) {
   } else {
     array = dfs(data, []);
   }
-
   if (includeTopWrapper) {
     var rootNode = {
       key: totalKey,
@@ -39,14 +35,11 @@ export default function buildDrillTree(data, codes) {
       path: emptyPath,
       children: array
     };
-
     if (hasChild) {
       rootNode.hasChild = hasChild;
     }
-
     return [rootNode];
   }
-
   if (includeTopWrapper) {
     return [{
       key: totalKey,
@@ -55,9 +48,7 @@ export default function buildDrillTree(data, codes) {
       children: array
     }];
   }
-
   return array;
-
   function dfs(slice, path) {
     var depth = path.length;
     var array = [];
@@ -65,7 +56,6 @@ export default function buildDrillTree(data, codes) {
     var groups = groupBy(slice, function (row) {
       return row[code];
     });
-
     for (var _i = 0, _Object$keys = _Object$keys2(groups); _i < _Object$keys.length; _i++) {
       var groupKey = _Object$keys[_i];
       path.push(groupKey);
@@ -76,7 +66,6 @@ export default function buildDrillTree(data, codes) {
       };
       array.push(node);
       var group = groups[groupKey];
-
       if (group.length > 0 && depth < codes.length - 1) {
         if (isExpand(node.key)) {
           node.children = dfs(group, path);
@@ -84,10 +73,8 @@ export default function buildDrillTree(data, codes) {
           node.hasChild = true;
         }
       }
-
       path.pop();
     }
-
     return array;
   }
 }

package/es/table/pivot/pivot-utils/builders.js

@@ -3,13 +3,9 @@ import _Array$from from "@babel/runtime-corejs3/core-js-stable/array/from";
 import _Symbol from "@babel/runtime-corejs3/core-js-stable/symbol";
 import _getIteratorMethod from "@babel/runtime-corejs3/core-js/get-iterator-method";
 import _slicedToArray from "@babel/runtime-corejs3/helpers/slicedToArray";
-
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof _Symbol !== "undefined" && _getIteratorMethod(o) || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
-
 function _unsupportedIterableToArray(o, minLen) { var _context5; if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = _sliceInstanceProperty(_context5 = Object.prototype.toString.call(o)).call(_context5, 8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return _Array$from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
-
 import _Set from "@babel/runtime-corejs3/core-js-stable/set";
 import _mapInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/map";
 import _filterInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/filter";
@@ -18,54 +14,46 @@ import { groupBy, isLeafNode } from '../../utils';
 import { always, fromEntries } from '../../utils/others';
 import buildDrillTree from './buildDrillTree';
 import simpleEncode from './simpleEncode';
-
 function fallbackAggregate(slice) {
   return slice.length === 1 ? slice[0] : {};
 }
 /** 根据表格左侧与上方的下钻树，从全量明细数据中计算对应的数据立方 */
-
-
 export function buildRecordMatrix(_ref) {
   var data = _ref.data,
-      leftCodes = _ref.leftCodes,
-      topCodes = _ref.topCodes,
-      _ref$aggregate = _ref.aggregate,
-      aggregate = _ref$aggregate === void 0 ? fallbackAggregate : _ref$aggregate,
-      _ref$encode = _ref.encode,
-      encode = _ref$encode === void 0 ? simpleEncode : _ref$encode,
-      _ref$isLeftExpand = _ref.isLeftExpand,
-      isLeftExpand = _ref$isLeftExpand === void 0 ? always(true) : _ref$isLeftExpand,
-      _ref$isTopExpand = _ref.isTopExpand,
-      isTopExpand = _ref$isTopExpand === void 0 ? always(true) : _ref$isTopExpand,
-      prebuiltLeftTree = _ref.prebuiltLeftTree,
-      prebuiltTopTree = _ref.prebuiltTopTree;
+    leftCodes = _ref.leftCodes,
+    topCodes = _ref.topCodes,
+    _ref$aggregate = _ref.aggregate,
+    aggregate = _ref$aggregate === void 0 ? fallbackAggregate : _ref$aggregate,
+    _ref$encode = _ref.encode,
+    encode = _ref$encode === void 0 ? simpleEncode : _ref$encode,
+    _ref$isLeftExpand = _ref.isLeftExpand,
+    isLeftExpand = _ref$isLeftExpand === void 0 ? always(true) : _ref$isLeftExpand,
+    _ref$isTopExpand = _ref.isTopExpand,
+    isTopExpand = _ref$isTopExpand === void 0 ? always(true) : _ref$isTopExpand,
+    prebuiltLeftTree = _ref.prebuiltLeftTree,
+    prebuiltTopTree = _ref.prebuiltTopTree;
   var ctx = {
     peculiarity: new _Set()
   };
-
   var _ref2 = prebuiltLeftTree !== null && prebuiltLeftTree !== void 0 ? prebuiltLeftTree : buildDrillTree(data, leftCodes, {
-    encode: encode,
-    includeTopWrapper: true,
-    isExpand: isLeftExpand
-  }),
-      _ref3 = _slicedToArray(_ref2, 1),
-      leftRootDrillNode = _ref3[0];
-
+      encode: encode,
+      includeTopWrapper: true,
+      isExpand: isLeftExpand
+    }),
+    _ref3 = _slicedToArray(_ref2, 1),
+    leftRootDrillNode = _ref3[0];
   var _ref4 = prebuiltTopTree !== null && prebuiltTopTree !== void 0 ? prebuiltTopTree : buildDrillTree(data, topCodes, {
-    encode: encode,
-    includeTopWrapper: true,
-    isExpand: isTopExpand
-  }),
-      _ref5 = _slicedToArray(_ref4, 1),
-      topRootDrillNode = _ref5[0];
-
+      encode: encode,
+      includeTopWrapper: true,
+      isExpand: isTopExpand
+    }),
+    _ref5 = _slicedToArray(_ref4, 1),
+    topRootDrillNode = _ref5[0];
   var transientMatrixRow = buildByLeft(ctx, data, leftRootDrillNode, 0);
   return makeMatrix(transientMatrixRow);
-
   function buildByLeft(ctx, slice, drillNode, depth) {
     var children = null;
     var col;
-
     if (isLeafNode(drillNode)) {
       col = buildByTop(ctx, slice, topRootDrillNode, 0);
     } else {
@@ -75,15 +63,12 @@ export function buildRecordMatrix(_ref) {
         return dwdRow[code];
       });
       ctx.peculiarity.add(code);
-
       var _iterator = _createForOfIteratorHelper(drillNode.children),
-          _step;
-
+        _step;
       try {
         for (_iterator.s(); !(_step = _iterator.n()).done;) {
           var child = _step.value;
           var group = groups[child.value];
-
           if (group) {
             children.push(buildByLeft(ctx, group, child, depth + 1));
           }
@@ -93,24 +78,20 @@ export function buildRecordMatrix(_ref) {
       } finally {
         _iterator.f();
       }
-
       ctx.peculiarity.delete(code);
       col = mergeColsByTopTree(ctx, _mapInstanceProperty(children).call(children, function (child) {
         return child.col;
       }));
     }
-
     return {
       leftKey: drillNode.key,
       children: children,
       col: col
     };
   }
-
   function buildByTop(ctx, slice, drillNode, depth) {
     var children = null;
     var record;
-
     if (isLeafNode(drillNode)) {
       record = aggregate(slice, ctx);
     } else {
@@ -120,15 +101,12 @@ export function buildRecordMatrix(_ref) {
         return dwdRow[code];
       });
       ctx.peculiarity.add(code);
-
       var _iterator2 = _createForOfIteratorHelper(drillNode.children),
-          _step2;
-
+        _step2;
       try {
         for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
           var child = _step2.value;
           var group = groups[child.value];
-
           if (group) {
             children.push(buildByTop(ctx, group, child, depth + 1));
           }
@@ -138,13 +116,11 @@ export function buildRecordMatrix(_ref) {
       } finally {
         _iterator2.f();
       }
-
       ctx.peculiarity.delete(code);
       record = aggregate(_mapInstanceProperty(children).call(children, function (child) {
         return child.record;
       }), ctx);
     }
-
     return {
       topKey: drillNode.key,
       topValue: drillNode.value,
@@ -152,45 +128,35 @@ export function buildRecordMatrix(_ref) {
       record: record
     };
   }
-
   function mergeColsByTopTree(ctx, colsToMerge) {
     return dfs(ctx, colsToMerge, topRootDrillNode, 0);
-
     function dfs(ctx, cols, topDrillNode, depth) {
       var children = null;
       var record = aggregate(_mapInstanceProperty(cols).call(cols, function (c) {
         return c.record;
       }), ctx);
-
       if (!isLeafNode(topDrillNode)) {
         var _context, _context3;
-
         var topCode = topCodes[depth];
         ctx.peculiarity.add(topCode);
         var drillChildDict = fromEntries(_mapInstanceProperty(_context = topDrillNode.children).call(_context, function (child) {
           return [child.value, child];
         }));
-
         var colChildDictArray = _mapInstanceProperty(cols).call(cols, function (col) {
           var _context2;
-
           return fromEntries(_mapInstanceProperty(_context2 = col.children).call(_context2, function (child) {
             return [child.topValue, child];
           }));
         });
-
         children = _mapInstanceProperty(_context3 = topDrillNode.children).call(_context3, function (item) {
           var _context4;
-
           var childCols = _filterInstanceProperty(_context4 = _mapInstanceProperty(colChildDictArray).call(colChildDictArray, function (colChildDict) {
             return colChildDict[item.value];
           })).call(_context4, Boolean);
-
           return dfs(ctx, childCols, drillChildDict[item.value], depth + 1);
         });
         ctx.peculiarity.delete(topCode);
       }
-
       return {
         topKey: topDrillNode.key,
         topValue: topDrillNode.value,
@@ -199,27 +165,22 @@ export function buildRecordMatrix(_ref) {
       };
     }
   }
-
   function makeMatrix(rootRow) {
     var result = new _Map();
     dfsRow(result, rootRow);
     return result;
-
     function dfsRow(matrix, row) {
       var subMap = new _Map();
       matrix.set(row.leftKey, subMap);
       dfsCol(subMap, row.col);
-
       if (!isLeafNode(row)) {
         row.children.forEach(function (childRow) {
           dfsRow(matrix, childRow);
         });
       }
     }
-
     function dfsCol(subMap, col) {
       subMap.set(col.topKey, col.record);
-
       if (!isLeafNode(col)) {
         col.children.forEach(function (childCol) {
           dfsCol(subMap, childCol);
@@ -230,14 +191,13 @@ export function buildRecordMatrix(_ref) {
 }
 /** buildRecordMatrix 的简化版本，只能处理一个维度序列，返回一个 Map。
  * 相当于只处理 matrix 的第一行（汇总行） */
-
 export function buildRecordMap(_ref6) {
   var codes = _ref6.codes,
-      _ref6$encode = _ref6.encode,
-      encode = _ref6$encode === void 0 ? simpleEncode : _ref6$encode,
-      data = _ref6.data,
-      aggregate = _ref6.aggregate,
-      isExpand = _ref6.isExpand;
+    _ref6$encode = _ref6.encode,
+    encode = _ref6$encode === void 0 ? simpleEncode : _ref6$encode,
+    data = _ref6.data,
+    aggregate = _ref6.aggregate,
+    isExpand = _ref6.isExpand;
   var matrix = buildRecordMatrix({
     data: data,
     leftCodes: [],