@hi-ui/table 4.0.0-alpha.21 → 4.0.0-alpha.25

package/lib/cjs/TableBody.js

@@ -21,12 +21,16 @@ var classname = require('@hi-ui/classname');
 
 var env = require('@hi-ui/env');
 
+var useLatest = require('@hi-ui/use-latest');
+
+var typeAssertion = require('@hi-ui/type-assertion');
+
+var emptyState = require('@hi-ui/empty-state');
+
 var TableRow = require('./TableRow.js');
 
 var context = require('./context.js');
 
-var useLatest = require('@hi-ui/use-latest');
-
 function _interopDefaultLegacy(e) {
   return e && _typeof(e) === 'object' && 'default' in e ? e : {
     'default': e
@@ -48,8 +52,9 @@ var TableBody = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
       prefixCls = _ref$prefixCls === void 0 ? _prefix : _ref$prefixCls;
 
   var _useTableContext = context.useTableContext(),
+      columns = _useTableContext.columns,
       leafColumns = _useTableContext.leafColumns,
-      firstRowElementRef = _useTableContext.firstRowElementRef,
+      measureRowElementRef = _useTableContext.measureRowElementRef,
       isExpandTreeRows = _useTableContext.isExpandTreeRows,
       transitionData = _useTableContext.transitionData,
       getColgroupProps = _useTableContext.getColgroupProps,
@@ -57,15 +62,13 @@ var TableBody = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
       scrollBodyElementRef = _useTableContext.scrollBodyElementRef,
       onTableBodyScroll = _useTableContext.onTableBodyScroll,
       maxHeight = _useTableContext.maxHeight,
-      canScroll = _useTableContext.canScroll;
-
-  var cls = classname.cx(prefixCls + "__body"); // const calcColPosition = (col, idx) => {
-  //   // TODO: 前缀和优化
-  //   return fixedColWidth
-  //     .slice(0, idx)
-  //     .reduce((accumulator, currentValue) => accumulator + currentValue, 0)
-  // }
+      canScroll = _useTableContext.canScroll,
+      hasAvgColumn = _useTableContext.hasAvgColumn,
+      avgRow = _useTableContext.avgRow,
+      hasSumColumn = _useTableContext.hasSumColumn,
+      sumRow = _useTableContext.sumRow;
 
+  var cls = classname.cx(prefixCls + "-body");
   var getRequiredProps = useLatest.useLatestCallback(function (id) {
     return {
       // @ts-ignore
@@ -76,50 +79,72 @@ var TableBody = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
       // focused: focusedId === id,
 
     };
-  }); // TODO: 空状态
-
-  return (
-    /*#__PURE__*/
-    // 外层增加 div 作为滚动容器
-    React__default['default'].createElement("div", {
-      ref: scrollBodyElementRef,
-      className: cls,
-      onScroll: onTableBodyScroll,
-      style: {
-        maxHeight: maxHeight || 'auto',
-        // maxHeight 小于 table 实际高度才出现纵向滚动条
-        overflowY: maxHeight !== undefined && bodyTableRef.current && bodyTableRef.current.clientHeight > maxHeight ? 'scroll' : undefined,
-        // 表格宽度大于div宽度才出现横向滚动条
-        overflowX: canScroll ? 'scroll' : undefined
-      }
-    }, /*#__PURE__*/React__default['default'].createElement("table", {
-      ref: bodyTableRef,
-      style: {
-        width: '100%'
-      }
-    }, /*#__PURE__*/React__default['default'].createElement("colgroup", null, leafColumns.map(function (col, idx) {
-      return /*#__PURE__*/React__default['default'].createElement("col", Object.assign({
-        key: idx,
-        className: prefixCls + "-col"
-      }, getColgroupProps(col, idx)));
-    })), /*#__PURE__*/React__default['default'].createElement("tbody", null, transitionData.map(function (row, index) {
-      return /*#__PURE__*/React__default['default'].createElement(TableRow.TableRow, Object.assign({
-        ref: index === 0 ? firstRowElementRef : null,
-        // key={depth + index}
-        key: row.id,
-        // @ts-ignore
-        rowIndex: index,
-        rowData: row,
-        setDragRowKey: function setDragRowKey() {},
-        setDragStatus: function setDragStatus() {}
-      }, getRequiredProps(row.id)));
-    }))))
-  );
+  }); // 外层增加 div 作为滚动容器
+
+  return /*#__PURE__*/React__default['default'].createElement("div", {
+    ref: scrollBodyElementRef,
+    className: cls,
+    onScroll: onTableBodyScroll,
+    style: {
+      maxHeight: maxHeight !== undefined ? maxHeight : undefined,
+      // maxHeight 小于 table 实际高度才出现纵向滚动条
+      overflowY: maxHeight !== undefined && bodyTableRef.current && bodyTableRef.current.clientHeight > maxHeight ? 'scroll' : undefined,
+      // 表格宽度大于div宽度才出现横向滚动条
+      overflowX: canScroll ? 'scroll' : undefined
+    }
+  }, /*#__PURE__*/React__default['default'].createElement("table", {
+    ref: bodyTableRef,
+    style: {
+      width: '100%'
+    }
+  }, /*#__PURE__*/React__default['default'].createElement("colgroup", null, leafColumns.map(function (col, idx) {
+    return /*#__PURE__*/React__default['default'].createElement("col", Object.assign({
+      key: idx,
+      className: prefixCls + "-col"
+    }, getColgroupProps(col, idx)));
+  })), /*#__PURE__*/React__default['default'].createElement("tbody", null, typeAssertion.isArrayNonEmpty(transitionData) ? /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, transitionData.map(function (row, index) {
+    return /*#__PURE__*/React__default['default'].createElement(TableRow.TableRow, Object.assign({
+      ref: index === 0 ? measureRowElementRef : null,
+      // key={depth + index}
+      key: row.id,
+      // @ts-ignore
+      rowIndex: index,
+      rowData: row
+    }, getRequiredProps(row.id)));
+  }), hasSumColumn ? /*#__PURE__*/React__default['default'].createElement(TableRow.TableRow, {
+    key: sumRow.id,
+    rowIndex: transitionData.length,
+    rowData: sumRow,
+    isSumRow: true
+  }) : null, hasAvgColumn ? /*#__PURE__*/React__default['default'].createElement(TableRow.TableRow, {
+    key: avgRow.id,
+    rowIndex: transitionData.length + 1,
+    rowData: avgRow,
+    isAvgRow: true
+  }) : null) : // 空状态，colSpan 占满表格整行
+  renderEmptyContent({
+    className: prefixCls + "-empty-content",
+    colSpan: columns.length
+  }))));
 });
 
 if (env.__DEV__) {
   TableBody.displayName = 'TableBody';
 }
+/**
+ * 负责空状态渲染
+ */
+
+
+var renderEmptyContent = function renderEmptyContent(_ref2) {
+  var className = _ref2.className,
+      colSpan = _ref2.colSpan;
+  return /*#__PURE__*/React__default['default'].createElement("tr", {
+    className: className
+  }, /*#__PURE__*/React__default['default'].createElement("td", {
+    colSpan: colSpan
+  }, /*#__PURE__*/React__default['default'].createElement(emptyState.EmptyState, null)));
+};
 
 exports.TableBody = TableBody;
 //# sourceMappingURL=TableBody.js.map

package/lib/cjs/TableBody.js.map

@@ -1 +1 @@
-{"version":3,"file":"TableBody.js","sources":["../../src/TableBody.tsx"],"sourcesContent":[null],"names":["_role","_prefix","getPrefixCls","TableBody","forwardRef","ref","prefixCls","useTableContext","leafColumns","firstRowElementRef","isExpandTreeRows","transitionData","getColgroupProps","bodyTableRef","scrollBodyElementRef","onTableBodyScroll","maxHeight","canScroll","cls","cx","getRequiredProps","useLatestCallback","id","expandedTree","React","className","onScroll","style","overflowY","undefined","current","clientHeight","overflowX","width","map","col","idx","key","row","index","TableRow","rowIndex","rowData","setDragRowKey","setDragStatus","__DEV__","displayName"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAQA,IAAMA,KAAK,GAAG,OAAd;;AACA,IAAMC,OAAO,GAAGC,sBAAAA,CAAaF,KAAbE,CAAhB;AAEA;;;;;IAGaC,SAAS,gBAAGC,gBAAAA,CACvB,cAAA,EAA0BC,GAA1B;4BAAGC;MAAAA,wCAAYL;;yBAcTM,uBAAAA;MAXFC,WAFF,oBAEEA;MACAC,kBAHF,oBAGEA;MACAC,gBAJF,oBAIEA;MACAC,cALF,oBAKEA;MACAC,gBANF,oBAMEA;MACAC,YAPF,oBAOEA;MACAC,oBARF,oBAQEA;MACAC,iBATF,oBASEA;MACAC,SAVF,oBAUEA;MACAC,SAXF,oBAWEA;;MAIIC,GAAG,GAAGC,YAAAA,CAAMb,SAAJ,WAAFa;;;;;;;MASNC,gBAAgB,GAAGC,2BAAAA,CACvB,UAACC,EAAD;WACS;;AAELC,MAAAA,YAAY,EAAEb,gBAAgB,CAACY,EAAD,CAFzB;;;;;;AAAA;AAF+B,GAAjBD;;;;;AAkBvBG,IAAAA,yBAAAA,cAAAA,MAAAA;AACEnB,MAAAA,GAAG,EAAES;AACLW,MAAAA,SAAS,EAAEP;AACXQ,MAAAA,QAAQ,EAAEX;AACVY,MAAAA,KAAK,EAAE;AACLX,QAAAA,SAAS,EAAEA,SAAS,IAAI,MADnB;;AAGLY,QAAAA,SAAS,EACPZ,SAAS,KAAKa,SAAdb,IACAH,YAAY,CAACiB,OADbd,IAEAH,YAAY,CAACiB,OAAbjB,CAAqBkB,YAArBlB,GAAoCG,SAFpCA,GAGI,QAHJA,GAIIa,SARD;;AAULG,QAAAA,SAAS,EAAEf,SAAS,GAAG,QAAH,GAAcY;AAV7B;KAJTL,eAiBEA,yBAAAA,cAAAA,QAAAA;AAAOnB,MAAAA,GAAG,EAAEQ;AAAcc,MAAAA,KAAK,EAAE;AAAEM,QAAAA,KAAK,EAAE;AAAT;KAAjCT,eACEA,yBAAAA,cAAAA,WAAAA,MAAAA,EACGhB,WAAW,CAAC0B,GAAZ1B,CAAgB,UAAC2B,GAAD,EAAWC,GAAX;0BAEbZ,yBAAAA,cAAAA,MAAAA;AAAKa,QAAAA,GAAG,EAAED;AAAKX,QAAAA,SAAS,EAAKnB,SAAL;SAA0BM,gBAAgB,CAACuB,GAAD,EAAMC,GAAN,EAAlEZ;AAFH,KAAAhB,CADHgB,CADFA,eAQEA,yBAAAA,cAAAA,QAAAA,MAAAA,EACGb,cAAc,CAACuB,GAAfvB,CAAmB,UAAC2B,GAAD,EAAMC,KAAN;0BAEhBf,yBAAAA,cAAAA,CAACgB,iBAADhB;AACEnB,QAAAA,GAAG,EAAEkC,KAAK,KAAK,CAAVA,GAAc9B,kBAAd8B,GAAmC;;AAExCF,QAAAA,GAAG,EAAEC,GAAG,CAAChB;;AAETmB,QAAAA,QAAQ,EAAEF;AACVG,QAAAA,OAAO,EAAEJ;AACTK,QAAAA,aAAa,EAAE,sBAAA;AACfC,QAAAA,aAAa,EAAE,sBAAA;SAEXxB,gBAAgB,CAACkB,GAAG,CAAChB,EAAL,EAVtBE;AAFH,KAAAb,CADHa,CARFA,CAjBFA;;AA5C6B,CAAVpB;;AAoGzB,IAAIyC,WAAJ,EAAa;AACX1C,EAAAA,SAAS,CAAC2C,WAAV3C,GAAwB,WAAxBA;;;"}
+{"version":3,"file":"TableBody.js","sources":["../../src/TableBody.tsx"],"sourcesContent":[null],"names":["_role","_prefix","getPrefixCls","TableBody","forwardRef","ref","prefixCls","useTableContext","columns","leafColumns","measureRowElementRef","isExpandTreeRows","transitionData","getColgroupProps","bodyTableRef","scrollBodyElementRef","onTableBodyScroll","maxHeight","canScroll","hasAvgColumn","avgRow","hasSumColumn","sumRow","cls","cx","getRequiredProps","useLatestCallback","id","expandedTree","React","className","onScroll","style","undefined","overflowY","current","clientHeight","overflowX","width","map","col","idx","key","isArrayNonEmpty","row","index","TableRow","rowIndex","rowData","length","isSumRow","isAvgRow","renderEmptyContent","colSpan","__DEV__","displayName","EmptyState"],"mappings":"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"}

package/lib/cjs/TableCell.js

@@ -21,15 +21,15 @@ var classname = require('@hi-ui/classname');
 
 var env = require('@hi-ui/env');
 
-var context = require('./context.js');
-
 var times = require('@hi-ui/times');
 
+var typeAssertion = require('@hi-ui/type-assertion');
+
 var iconButton = require('@hi-ui/icon-button');
 
-var index = require('./icons/index.js');
+var context = require('./context.js');
 
-var typeAssertion = require('@hi-ui/type-assertion');
+var index = require('./icons/index.js');
 
 function _interopDefaultLegacy(e) {
   return e && _typeof(e) === 'object' && 'default' in e ? e : {
@@ -41,7 +41,7 @@ var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 
 var _prefix = classname.getPrefixCls('table-cell');
 /**
- * TODO: What is TableCell
+ * 表格 body 单元格渲染
  */
 
 
@@ -50,97 +50,88 @@ var TableCell = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
       prefixCls = _ref$prefixCls === void 0 ? _prefix : _ref$prefixCls,
       className = _ref.className,
       column = _ref.column,
+      rowData = _ref.rowData,
       rowIndex = _ref.rowIndex,
-      depth = _ref.depth,
-      columnIndex = _ref.columnIndex,
-      expandedTree = _ref.expandedTree,
+      _ref$isSwitcherCol = _ref.isSwitcherCol,
+      isSwitcherCol = _ref$isSwitcherCol === void 0 ? false : _ref$isSwitcherCol,
+      _ref$expandedTree = _ref.expandedTree,
+      expandedTree = _ref$expandedTree === void 0 ? false : _ref$expandedTree,
       _ref$expandIcon = _ref.expandIcon,
       expandIcon = _ref$expandIcon === void 0 ? index.defaultExpandIcon : _ref$expandIcon,
       _ref$collapseIcon = _ref.collapseIcon,
       collapseIcon = _ref$collapseIcon === void 0 ? index.defaultCollapseIcon : _ref$collapseIcon,
       _ref$leafIcon = _ref.leafIcon,
-      leafIcon = _ref$leafIcon === void 0 ? index.defaultLeafIcon : _ref$leafIcon,
-      rowData = _ref.rowData;
+      leafIcon = _ref$leafIcon === void 0 ? index.defaultLeafIcon : _ref$leafIcon;
 
   var _useTableContext = context.useTableContext(),
       isHighlightedCol = _useTableContext.isHighlightedCol,
       onLoadChildren = _useTableContext.onLoadChildren,
+      isHoveredHighlightCol = _useTableContext.isHoveredHighlightCol,
       showColHighlight = _useTableContext.showColHighlight,
       onHoveredColChange = _useTableContext.onHoveredColChange,
       onTreeNodeSwitch = _useTableContext.onTreeNodeSwitch,
       getStickyColProps = _useTableContext.getStickyColProps,
       canScroll = _useTableContext.canScroll,
       isTree = _useTableContext.isTree,
-      cellRender = _useTableContext.cellRender;
-
-  var _React$useState = React__default['default'].useState(false),
-      loading = _React$useState[0];
+      cellRender = _useTableContext.cellRender,
+      isLoadingTreeNodeId = _useTableContext.isLoadingTreeNodeId;
 
-  var rawColumn = column.raw,
+  var dataKey = column.id,
       leftStickyWidth = column.leftStickyWidth,
-      rightStickyWidth = column.rightStickyWidth;
-  var rawRender = rawColumn.render,
-      dataKey = rawColumn.dataKey;
+      rightStickyWidth = column.rightStickyWidth,
+      rawRender = column.render;
+  var depth = rowData.depth,
+      rowId = rowData.id;
   /**
    * normalize 单元格渲染内容，支持自定义 render
    */
 
   var cellContent = React__default['default'].useMemo(function () {
-    var content = rowData.raw[dataKey];
+    var row = rowData.raw;
+    var content = row[dataKey];
 
     if (typeAssertion.isFunction(rawRender)) {
-      content = rawRender(content, rowData, rowIndex, dataKey);
+      content = rawRender(content, row, rowIndex, dataKey);
     } else if (typeAssertion.isFunction(cellRender)) {
       content = cellRender(content);
     } //  处理单元格内容，重载支持配置式合并单元格
 
 
-    var isMergedCell = typeAssertion.isObject(content) && ! /*#__PURE__*/React__default['default'].isValidElement(content);
+    var childrenMaybePropsReturn = typeAssertion.isObject(content) && ! /*#__PURE__*/React__default['default'].isValidElement(content);
 
-    if (isMergedCell) {
+    if (childrenMaybePropsReturn) {
       return content;
     }
 
     return {
       children: content,
       props: {
-        colSpan: '',
-        rowSpan: ''
+        colSpan: undefined,
+        rowSpan: undefined
       }
     };
-  }, [rawRender, dataKey, rowData, rowIndex, cellRender]);
+  }, [rawRender, dataKey, rowData, rowIndex, cellRender]); // 将被其它单元格（用户配置）合并，不进行渲染
 
   if (cellContent.props.colSpan === 0 || cellContent.props.rowSpan === 0) {
     return null;
-  } // const cellTextAlign = alignRightColumns.includes(dataKey) ? 'right' : align
-
-  /**
-   * 点击展开节点时触发
-   */
-
-
-  var onNodeExpand = function onNodeExpand(shouldExpanded) {
-    // console.log(shouldExpanded)
-    onTreeNodeSwitch(rowData, shouldExpanded);
-  };
+  }
 
+  var loading = isLoadingTreeNodeId(rowId);
   var sticky = typeof rightStickyWidth !== 'undefined' || typeof leftStickyWidth !== 'undefined';
-  var cls = classname.cx(prefixCls, className, isHighlightedCol(dataKey) && prefixCls + "__col--highlight", // isHoveredCol(dataKey) && `${prefixCls}__col--hovered-highlight`,
-  canScroll && sticky && prefixCls + "__col--sticky"); // 交互：第一列为操作节点列
-
-  var isSwitcherCol = columnIndex === 0;
+  var cls = classname.cx(prefixCls, className, canScroll && sticky && prefixCls + "__col--sticky", isHighlightedCol(dataKey) && prefixCls + "__col--highlight", isHoveredHighlightCol(dataKey) && prefixCls + "__col--hovered-highlight");
   return /*#__PURE__*/React__default['default'].createElement("td", Object.assign({
+    ref: ref,
     key: dataKey,
     className: cls
   }, getStickyColProps(column), {
     colSpan: cellContent.props.colSpan,
     rowSpan: cellContent.props.rowSpan,
-    // 按需绑定函数，避免频繁的 setState 特别消耗性能
+    // 按需绑定函数，避免频繁调用 setState 特别消耗性能
     onMouseEnter: showColHighlight ? function () {
-      return onHoveredColChange(rawColumn, true);
+      return onHoveredColChange(column, true);
     } : undefined,
     onMouseLeave: showColHighlight ? function () {
-      return onHoveredColChange(rawColumn, false);
+      return onHoveredColChange(column, false);
     } : undefined
   }), isSwitcherCol && depth > 0 ? renderIndent({
     depth: depth,
@@ -155,7 +146,9 @@ var TableCell = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
     leafIcon: leafIcon,
     onLoadChildren: onLoadChildren,
     isTree: isTree,
-    onNodeExpand: onNodeExpand
+    onNodeExpand: function onNodeExpand(shouldExpanded) {
+      return onTreeNodeSwitch(rowData, shouldExpanded);
+    }
   }) : null, cellContent.children);
 });
 
@@ -207,10 +200,11 @@ var renderSwitcher = function renderSwitcher(_ref3) {
   if (hasChildren || canLoadChildren) {
     return /*#__PURE__*/React__default['default'].createElement(iconButton.IconButton, {
       tabIndex: -1,
-      className: classname.cx(prefixCls + "__switcher", expanded ? prefixCls + "__switcher--expanded" : prefixCls + "__switcher--collapse"),
+      className: classname.cx(prefixCls + "__switcher", prefixCls + "__switcher--" + (expanded ? 'expanded' : 'collapse')),
       icon: expanded ? expandIcon : collapseIcon,
       onClick: function onClick() {
-        return onNodeExpand(!expanded);
+        var shouldExpanded = !expanded;
+        onNodeExpand(shouldExpanded);
       }
     });
   }
@@ -218,12 +212,12 @@ var renderSwitcher = function renderSwitcher(_ref3) {
   if (isTree) {
     return /*#__PURE__*/React__default['default'].createElement(iconButton.IconButton, {
       tabIndex: -1,
-      icon: leafIcon,
-      className: classname.cx(prefixCls + "__switcher", prefixCls + "__switcher--noop")
+      className: classname.cx(prefixCls + "__switcher", prefixCls + "__switcher--noop"),
+      icon: leafIcon
     });
   }
 
-  return null; // return renderIndent({ depth: 1, prefixCls })
+  return null;
 };
 
 exports.TableCell = TableCell;

package/lib/cjs/TableCell.js.map

@@ -1 +1 @@
-{"version":3,"file":"TableCell.js","sources":["../../src/TableCell.tsx"],"sourcesContent":[null],"names":["_prefix","getPrefixCls","TableCell","forwardRef","ref","prefixCls","className","column","rowIndex","depth","columnIndex","expandedTree","expandIcon","defaultExpandIcon","collapseIcon","defaultCollapseIcon","leafIcon","defaultLeafIcon","rowData","useTableContext","isHighlightedCol","onLoadChildren","showColHighlight","onHoveredColChange","onTreeNodeSwitch","getStickyColProps","canScroll","isTree","cellRender","React","useState","loading","rawColumn","raw","leftStickyWidth","rightStickyWidth","rawRender","render","dataKey","cellContent","useMemo","content","isFunction","isMergedCell","isObject","isValidElement","children","props","colSpan","rowSpan","onNodeExpand","shouldExpanded","sticky","cls","cx","isSwitcherCol","key","onMouseEnter","undefined","onMouseLeave","renderIndent","renderSwitcher","node","expanded","__DEV__","displayName","times","index","IconButton","icon","defaultLoadingIcon","hasChildren","length","canLoadChildren","isLeaf","tabIndex","onClick"],"mappings":"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"}
+{"version":3,"file":"TableCell.js","sources":["../../src/TableCell.tsx"],"sourcesContent":[null],"names":["_prefix","getPrefixCls","TableCell","forwardRef","ref","prefixCls","className","column","rowData","rowIndex","isSwitcherCol","expandedTree","expandIcon","defaultExpandIcon","collapseIcon","defaultCollapseIcon","leafIcon","defaultLeafIcon","useTableContext","isHighlightedCol","onLoadChildren","isHoveredHighlightCol","showColHighlight","onHoveredColChange","onTreeNodeSwitch","getStickyColProps","canScroll","isTree","cellRender","isLoadingTreeNodeId","dataKey","id","leftStickyWidth","rightStickyWidth","rawRender","render","depth","rowId","cellContent","React","useMemo","row","raw","content","isFunction","childrenMaybePropsReturn","isObject","isValidElement","children","props","colSpan","undefined","rowSpan","loading","sticky","cls","cx","key","onMouseEnter","onMouseLeave","renderIndent","renderSwitcher","node","expanded","onNodeExpand","shouldExpanded","__DEV__","displayName","times","index","IconButton","icon","defaultLoadingIcon","hasChildren","length","canLoadChildren","isLeaf","tabIndex","onClick"],"mappings":"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"}

package/lib/cjs/TableColumnMenu.js

@@ -15,8 +15,6 @@ Object.defineProperty(exports, '__esModule', {
   value: true
 });
 
-var tslib = require('tslib');
-
 var React = require('react');
 
 var classname = require('@hi-ui/classname');
@@ -45,17 +43,14 @@ var Popper__default = /*#__PURE__*/_interopDefaultLegacy(Popper);
 
 var _prefix = classname.getPrefixCls('table-column-menu');
 /**
- * TODO: What is Table
+ * 表头每列下拉式菜单，包含冻结、高亮、递增、递减操作
  */
 
 
-var TableColumnMenu = /*#__PURE__*/React.forwardRef(function (_a, ref) {
-  var _a$prefixCls = _a.prefixCls,
-      prefixCls = _a$prefixCls === void 0 ? _prefix : _a$prefixCls,
-      columnKey = _a.columnKey,
-      column = _a.column;
-
-  tslib.__rest(_a, ["prefixCls", "role", "className", "columnKey", "column"]);
+var TableColumnMenu = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
+  var _ref$prefixCls = _ref.prefixCls,
+      prefixCls = _ref$prefixCls === void 0 ? _prefix : _ref$prefixCls,
+      column = _ref.column;
 
   var _useTableContext = context.useTableContext(),
       activeSorterType = _useTableContext.activeSorterType,
@@ -67,7 +62,9 @@ var TableColumnMenu = /*#__PURE__*/React.forwardRef(function (_a, ref) {
       isHighlightedCol = _useTableContext.isHighlightedCol,
       onHighlightedColChange = _useTableContext.onHighlightedColChange;
 
-  var canSort = !!column.raw.sorter;
+  var dataKey = column.id,
+      columnRaw = column.raw;
+  var canSort = !!columnRaw.sorter;
 
   var _useToggle = useToggle.useToggle(),
       menuVisible = _useToggle[0],
@@ -75,8 +72,7 @@ var TableColumnMenu = /*#__PURE__*/React.forwardRef(function (_a, ref) {
 
   var _React$useState = React__default['default'].useState(null),
       menuTrigger = _React$useState[0],
-      setMenuTrigger = _React$useState[1]; // TODO：处理 column 模型支持 cellRender，一直出 checkbox、expandIcon 高级选项
-
+      setMenuTrigger = _React$useState[1];
 
   return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement(iconButton.IconButton, {
     className: prefixCls + "__trigger",
@@ -94,63 +90,63 @@ var TableColumnMenu = /*#__PURE__*/React.forwardRef(function (_a, ref) {
     className: prefixCls + "__content"
   }, canSort ? /*#__PURE__*/React__default['default'].createElement(TableColumnMenuItem, {
     prefixCls: prefixCls,
-    active: activeSorterType === 'ascend' && activeSorterColumn === columnKey,
+    active: activeSorterType === 'ascend' && activeSorterColumn === dataKey,
     // {/* TODO: 国际化 */}
     // {/* {localeDatas.table.ascend} */}
     content: '递增',
     icon: /*#__PURE__*/React__default['default'].createElement(icons.SortAscendingOutlined, null),
-    onClick: function onClick() {
-      if (activeSorterType === 'ascend' && activeSorterColumn === columnKey) {
+    onSwitch: function onSwitch(shouldActive) {
+      if (shouldActive) {
+        setActiveSorterType('ascend');
+        setActiveSorterColumn(dataKey);
+      } else {
         setActiveSorterType(null);
         setActiveSorterColumn(null);
-      } else {
-        setActiveSorterType('ascend');
-        setActiveSorterColumn(columnKey);
       }
 
       menuVisibleAction.off();
     }
   }) : null, canSort ? /*#__PURE__*/React__default['default'].createElement(TableColumnMenuItem, {
     prefixCls: prefixCls,
-    active: activeSorterType === 'descend' && activeSorterColumn === columnKey,
+    active: activeSorterType === 'descend' && activeSorterColumn === dataKey,
     // {/* TODO: 国际化 */}
     // {/* {localeDatas.table.descend} */}
     content: '递减',
     icon: /*#__PURE__*/React__default['default'].createElement(icons.SortDescendingOutlined, null),
-    onClick: function onClick() {
-      if (activeSorterType === 'descend' && activeSorterColumn === columnKey) {
+    onSwitch: function onSwitch(shouldActive) {
+      if (shouldActive) {
+        setActiveSorterType('descend');
+        setActiveSorterColumn(dataKey);
+      } else {
         setActiveSorterType(null);
         setActiveSorterColumn(null);
-      } else {
-        setActiveSorterType('descend');
-        setActiveSorterColumn(columnKey);
       }
 
       menuVisibleAction.off();
     }
   }) : null, /*#__PURE__*/React__default['default'].createElement(TableColumnMenuItem, {
     prefixCls: prefixCls,
-    active: isHighlightedCol(columnKey),
+    active: isHighlightedCol(dataKey),
     // {/* TODO: 国际化 */}
     // {/* {localeDatas.table.highlight} */}
     content: '高亮',
     icon: /*#__PURE__*/React__default['default'].createElement(icons.ColumnHeightOutlined, null),
-    onClick: function onClick() {
-      onHighlightedColChange(column, !isHighlightedCol(columnKey));
+    onSwitch: function onSwitch(shouldActive) {
+      onHighlightedColChange(column, shouldActive);
       menuVisibleAction.off();
     }
   }), /*#__PURE__*/React__default['default'].createElement(TableColumnMenuItem, {
     prefixCls: prefixCls,
-    active: leftFreezeColumn === columnKey,
+    active: leftFreezeColumn === dataKey,
     // {/* TODO: 国际化 */}
     // {/* {localeDatas.table.freeze} */}
     content: '冻结',
     icon: /*#__PURE__*/React__default['default'].createElement(icons.LockOutlined, null),
-    onClick: function onClick() {
-      if (leftFreezeColumn === columnKey) {
-        setLeftFreezeColumn(null);
+    onSwitch: function onSwitch(shouldActive) {
+      if (shouldActive) {
+        setLeftFreezeColumn(dataKey);
       } else {
-        setLeftFreezeColumn(columnKey);
+        setLeftFreezeColumn('');
       }
 
       menuVisibleAction.off();
@@ -162,15 +158,17 @@ if (env.__DEV__) {
   TableColumnMenu.displayName = 'TableColumnMenu';
 }
 
-var TableColumnMenuItem = function TableColumnMenuItem(_ref) {
-  var prefixCls = _ref.prefixCls,
-      active = _ref.active,
-      onClick = _ref.onClick,
-      content = _ref.content,
-      icon = _ref.icon;
+var TableColumnMenuItem = function TableColumnMenuItem(_ref2) {
+  var prefixCls = _ref2.prefixCls,
+      active = _ref2.active,
+      onSwitch = _ref2.onSwitch,
+      content = _ref2.content,
+      icon = _ref2.icon;
   return /*#__PURE__*/React__default['default'].createElement("div", {
     className: classname.cx(prefixCls + "__item", active && prefixCls + "__item--active"),
-    onClick: onClick
+    onClick: function onClick() {
+      return onSwitch(!active);
+    }
   }, /*#__PURE__*/React__default['default'].createElement("span", null, content), icon);
 };
 

package/lib/cjs/TableColumnMenu.js.map

@@ -1 +1 @@
-{"version":3,"file":"TableColumnMenu.js","sources":["../../src/TableColumnMenu.tsx"],"sourcesContent":[null],"names":["_prefix","getPrefixCls","TableColumnMenu","forwardRef","_a","ref","prefixCls","columnKey","column","useTableContext","activeSorterType","activeSorterColumn","setActiveSorterType","setActiveSorterColumn","leftFreezeColumn","setLeftFreezeColumn","isHighlightedCol","onHighlightedColChange","canSort","raw","sorter","useToggle","menuVisible","menuVisibleAction","React","useState","menuTrigger","setMenuTrigger","IconButton","className","onClick","not","icon","DownOutlined","Popper","visible","attachEl","onClose","off","zIndex","TableColumnMenuItem","active","content","SortAscendingOutlined","SortDescendingOutlined","ColumnHeightOutlined","LockOutlined","__DEV__","displayName","cx"],"mappings":"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"}
+{"version":3,"file":"TableColumnMenu.js","sources":["../../src/TableColumnMenu.tsx"],"sourcesContent":[null],"names":["_prefix","getPrefixCls","TableColumnMenu","forwardRef","ref","prefixCls","column","useTableContext","activeSorterType","activeSorterColumn","setActiveSorterType","setActiveSorterColumn","leftFreezeColumn","setLeftFreezeColumn","isHighlightedCol","onHighlightedColChange","dataKey","id","columnRaw","raw","canSort","sorter","useToggle","menuVisible","menuVisibleAction","React","useState","menuTrigger","setMenuTrigger","IconButton","className","onClick","not","icon","DownOutlined","Popper","visible","attachEl","onClose","off","zIndex","TableColumnMenuItem","active","content","SortAscendingOutlined","onSwitch","shouldActive","SortDescendingOutlined","ColumnHeightOutlined","LockOutlined","__DEV__","displayName","cx"],"mappings":"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"}