linkmore-design 1.0.43 → 1.0.46

package/lib/LmTable/Table.js

@@ -13,10 +13,10 @@ require("antd/es/config-provider/style");
 
 var _configProvider = _interopRequireDefault(require("antd/es/config-provider"));
 
-var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
-
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
+
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
@@ -29,18 +29,23 @@ var _proTable = _interopRequireDefault(require("@ant-design/pro-table"));
 
 var _sortable = require("@dnd-kit/sortable");
 
+var _classnames = _interopRequireDefault(require("classnames"));
+
 var _lodash = require("lodash");
 
 var _react = _interopRequireWildcard(require("react"));
 
+var _reactResizable = require("react-resizable");
+
 var _reactSortableHoc = require("react-sortable-hoc");
 
 var _empty = _interopRequireDefault(require("./assets/empty.png"));
 
 var _resetConfig = _interopRequireDefault(require("./resetConfig"));
 
-var _excluded = ["dataSource", "autoSize", "columns", "rowClick", "onDoubleClick", "checkConfig", "summary", "pagination", "hiddenPage", "loading", "virtual", "sortOpen", "customCheck", "rowSelection", "columnsState", "onChange", "filterChange", "tableRowType", "size"],
-    _excluded2 = ["className", "style"];
+var _excluded = ["dataSource", "autoSize", "columns", "rowClick", "onDoubleClick", "checkConfig", "summary", "pagination", "hiddenPage", "loading", "virtual", "sortOpen", "resizeable", "customCheck", "rowSelection", "columnsState", "onChange", "filterChange", "tableRowType", "size"],
+    _excluded2 = ["className", "style"],
+    _excluded3 = ["onResize", "width", "onResizeStop"];
 var Summary = _proTable.default.Summary;
 exports.Summary = Summary;
 var DragHandle = (0, _reactSortableHoc.SortableHandle)(function () {
@@ -75,6 +80,8 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       virtual = _props$virtual === void 0 ? false : _props$virtual,
       _props$sortOpen = props.sortOpen,
       sortOpen = _props$sortOpen === void 0 ? false : _props$sortOpen,
+      _props$resizeable = props.resizeable,
+      resizeable = _props$resizeable === void 0 ? false : _props$resizeable,
       customCheck = props.customCheck,
       rowSelection = props.rowSelection,
       columnsState = props.columnsState,
@@ -127,8 +134,7 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     if (oldIndex !== newIndex) {
       var newData = (0, _sortable.arrayMove)(dataSource, oldIndex, newIndex).filter(function (el) {
         return !!el;
-      });
-      console.log(newData, 'nnnnnn'); // setDataSource([...newData])
+      }); // setDataSource([...newData])
     }
   };
 
@@ -153,19 +159,46 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       index: index
     }, restProps));
   }; // 原宽度，先宽度，序号
-
-
-  var handleResize = function handleResize(sc, size, index) {
-    var preCountW = (0, _lodash.sumBy)(useColumns, 'width') + 36;
-    var curCountW = preCountW - sc + size;
-    var scale = curCountW > preCountW ? subtract(preCountW, size) / subtract(preCountW, sc) : subtract(autoSize.width, size) / subtract(autoSize.width, sc);
-    var nValue = useColumns.map(function (v, idx) {
-      var w = curCountW < autoSize.width ? scale * v.width : v.width;
-      return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, v), {}, {
-        width: idx === index ? size : w
+  // const handleResize = (sc, size, index) => {
+  //   // const preCountW = sumBy(useColumns, 'width') + 36
+  //   // const curCountW = preCountW - sc + size
+  //   // const scale =
+  //   //   curCountW > preCountW
+  //   //     ? subtract(preCountW, size) / subtract(preCountW, sc)
+  //   //     : subtract(autoSize.width, size) / subtract(autoSize.width, sc)
+  //   // const nValue = useColumns.map((v, idx) => {
+  //   //   const w = curCountW < autoSize.width ? scale * v.width : v.width
+  //   //   return {
+  //   //     ...v,
+  //   //     width: idx === index ? size : w,
+  //   //   }
+  //   // })
+  //   // setColumns([...nValue])
+  //   console.log(sc, size, index, 666)
+  //   const nextColumns = [...useColumns]
+  //   nextColumns[index] = {
+  //     ...nextColumns[index],
+  //     width: size.width,
+  //   }
+  //   setColumns(nextColumns)
+  // }
+
+
+  var handleResize = function handleResize(index) {
+    return function (e, _ref2) {
+      var size = _ref2.size;
+      var nextColumns = (0, _toConsumableArray2.default)(useColumns);
+      nextColumns[index] = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, nextColumns[index]), {}, {
+        width: size.width
       });
+      setColumns(nextColumns);
+    };
+  };
+
+  var endResize = function endResize(e, data) {
+    setTimeout(function () {
+      filterChange === null || filterChange === void 0 ? void 0 : filterChange(useColumns);
     });
-    setColumns((0, _toConsumableArray2.default)(nValue));
   };
 
   var resetColumns = (0, _react.useCallback)(function () {
@@ -177,9 +210,9 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
         onHeaderCell: function onHeaderCell(column) {
           return {
             width: column.width,
-            onResize: function onResize(e, size) {
-              return handleResize(e, size, index);
-            }
+            // onResize: (e, size) => handleResize(e, size, index),
+            onResize: handleResize(index),
+            onResizeStop: endResize
           };
         }
       });
@@ -249,15 +282,20 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       tableAlertRender: false,
       checkConfig: checkConfig,
       // components: vComponents,
-      scroll: resetProps.autoSizer || resetProps.scroll ? (0, _objectSpread2.default)({
+      scroll: resetProps.autoSizer || resetProps.scroll ? Object.assign((0, _objectSpread2.default)({
         y: autoSize.height
-      }, resetProps.scroll) : null,
+      }, resetProps.scroll), resizeable ? {
+        x: '100%'
+      } : {}) : resizeable ? {
+        x: '100%'
+      } : null,
       pagination: !hiddenPage && (0, _objectSpread2.default)({
         showSizeChanger: true,
         showQuickJumper: true,
         showTotal: function showTotal(total) {
           return "\u5171 ".concat(total, " \u6761");
-        }
+        },
+        size: 'small'
       }, pagination),
       rowSelection: rowSelection === false ? undefined : (0, _objectSpread2.default)({
         fixed: true,
@@ -289,7 +327,7 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       columns: resetColumns(),
       size: size
     }, resetProps);
-  }, [useColumns, useSelectedRows, columnsStateMap, resetProps, autoSize.height]);
+  }, [useColumns, useSelectedRows, columnsStateMap, resetProps, autoSize.height, resizeable]);
   var resultColumns = (0, _react.useMemo)(function () {
     var result = useColumns.map(function (item, index) {
       var _columnsStateMap$item, _columnsStateMap$item2, _columnsStateMap$item3, _columnsStateMap$item4;
@@ -322,10 +360,10 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     var obj = (0, _objectSpread2.default)({}, columnsState);
     columns === null || columns === void 0 ? void 0 : columns.forEach(function (item) {
       /** 目前支持三种 */
-      var _ref2 = obj[item.dataIndex || item.key] || {},
-          order = _ref2.order,
-          show = _ref2.show,
-          fixed = _ref2.fixed;
+      var _ref3 = obj[item.dataIndex || item.key] || {},
+          order = _ref3.order,
+          show = _ref3.show,
+          fixed = _ref3.fixed;
 
       obj[item.dataIndex || item.key] = {
         fixed: fixed || item.fixed,
@@ -335,7 +373,6 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       //   obj[item.dataIndex || item.key] = { ...(obj[item.dataIndex || item.key] || {}), fixed: item.fixed }
       // }
     });
-    console.log(obj, 'oobjb');
     setColumnsStateMap(obj);
   }, [columnsState]); // useEffect(() => {
   //   console.log(props.columnsStateValue, 'v vv')
@@ -401,7 +438,54 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     filterChange === null || filterChange === void 0 ? void 0 : filterChange(resultColumns);
     onChange === null || onChange === void 0 ? void 0 : onChange(pagination, filters, sorter, extra);
   };
+  /** 排序的表头 */
+
 
+  var ResizableTitle = function ResizableTitle(props) {
+    var onResize = props.onResize,
+        width = props.width,
+        onResizeStop = props.onResizeStop,
+        restProps = (0, _objectWithoutProperties2.default)(props, _excluded3);
+
+    if (!width) {
+      return /*#__PURE__*/_react.default.createElement("th", restProps);
+    }
+
+    return /*#__PURE__*/_react.default.createElement(_reactResizable.Resizable, {
+      width: width,
+      height: 0,
+      handle: /*#__PURE__*/_react.default.createElement("span", {
+        className: "react-resizable-handle",
+        onClick: function onClick(e) {
+          e.stopPropagation();
+        }
+      }),
+      onResize: onResize,
+      onResizeStop: onResizeStop,
+      draggableOpts: {
+        enableUserSelectHack: false
+      }
+    }, /*#__PURE__*/_react.default.createElement("th", restProps));
+  };
+
+  var tableComponents = (0, _react.useMemo)(function () {
+    var obj = {};
+
+    if (sortOpen) {
+      obj['body'] = {
+        wrapper: DraggableContainer,
+        row: DraggableBodyRow
+      };
+    }
+
+    if (resizeable) {
+      obj['header'] = {
+        cell: ResizableTitle
+      };
+    }
+
+    return obj;
+  }, [sortOpen, resizeable]);
   return /*#__PURE__*/_react.default.createElement("div", {
     style: {
       height: '100%',
@@ -412,14 +496,9 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   }, /*#__PURE__*/_react.default.createElement(_proTable.default, (0, _extends2.default)({}, config, {
     loading: loading,
     dataSource: dataSource,
-    components: sortOpen ? {
-      body: {
-        wrapper: DraggableContainer,
-        row: DraggableBodyRow
-      }
-    } : null,
+    components: tableComponents,
     onChange: onTableChange,
-    tableClassName: "lm_protable",
+    tableClassName: (0, _classnames.default)('lm_protable', resizeable && 'lm_resizeable'),
     summary: function summary(pageData) {
       return _summary && _summary(pageData, resultColumns);
     }
@@ -494,15 +573,15 @@ var ResizeSize = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   }, [tableSize, props]);
 
   var changeSize = function changeSize() {
-    var _tableWarpRef$current4;
+    var _tableWarpRef$current;
 
     var value = props.summary ? 48 : 0;
 
-    var _tableWarpRef$current = (_tableWarpRef$current4 = tableWarpRef.current) === null || _tableWarpRef$current4 === void 0 ? void 0 : _tableWarpRef$current4.getBoundingClientRect(),
-        _tableWarpRef$current2 = _tableWarpRef$current.width,
-        width = _tableWarpRef$current2 === void 0 ? '100%' : _tableWarpRef$current2,
-        _tableWarpRef$current3 = _tableWarpRef$current.height,
-        height = _tableWarpRef$current3 === void 0 ? '100%' : _tableWarpRef$current3;
+    var _ref4 = ((_tableWarpRef$current = tableWarpRef.current) === null || _tableWarpRef$current === void 0 ? void 0 : _tableWarpRef$current.getBoundingClientRect()) || {},
+        _ref4$width = _ref4.width,
+        width = _ref4$width === void 0 ? '100%' : _ref4$width,
+        _ref4$height = _ref4.height,
+        height = _ref4$height === void 0 ? '100%' : _ref4$height;
 
     setTableSize({
       width: width,
@@ -516,13 +595,13 @@ var ResizeSize = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
         customCheck = props.customCheck,
         summary = props.summary;
     setTimeout(function () {
-      var _tableWarpRef$current8;
+      var _tableWarpRef$current5;
 
-      var _tableWarpRef$current5 = (_tableWarpRef$current8 = tableWarpRef.current) === null || _tableWarpRef$current8 === void 0 ? void 0 : _tableWarpRef$current8.getBoundingClientRect(),
-          _tableWarpRef$current6 = _tableWarpRef$current5.width,
-          width = _tableWarpRef$current6 === void 0 ? '100%' : _tableWarpRef$current6,
-          _tableWarpRef$current7 = _tableWarpRef$current5.height,
-          height = _tableWarpRef$current7 === void 0 ? '100%' : _tableWarpRef$current7;
+      var _tableWarpRef$current2 = (_tableWarpRef$current5 = tableWarpRef.current) === null || _tableWarpRef$current5 === void 0 ? void 0 : _tableWarpRef$current5.getBoundingClientRect(),
+          _tableWarpRef$current3 = _tableWarpRef$current2.width,
+          width = _tableWarpRef$current3 === void 0 ? '100%' : _tableWarpRef$current3,
+          _tableWarpRef$current4 = _tableWarpRef$current2.height,
+          height = _tableWarpRef$current4 === void 0 ? '100%' : _tableWarpRef$current4;
 
       var value = summary ? 48 : 0;
       setTableSize({

package/lib/LmTable/style/style.css

@@ -1450,3 +1450,12 @@ html {
 .ant-table.ant-table-middle tfoot > tr > td {
   padding: 12px 8px;
 }
+.react-resizable-handle {
+  position: absolute;
+  right: -5px;
+  bottom: 0;
+  z-index: 1;
+  width: 10px;
+  height: 100%;
+  cursor: col-resize;
+}

package/lib/Tabs/index.js

@@ -32,11 +32,15 @@ var prefixCls = 'lm_tabs';
 
 var LMTabs = function LMTabs(props) {
   var className = props.className,
+      _props$size = props.size,
+      size = _props$size === void 0 ? "middle" : _props$size,
       _props$noBorder = props.noBorder,
       noBorder = _props$noBorder === void 0 ? false : _props$noBorder,
-      others = __rest(props, ["className", "noBorder"]);
+      others = __rest(props, ["className", "size", "noBorder"]);
 
-  return /*#__PURE__*/_react.default.createElement(_tabs.default, Object.assign({}, others, {
+  return /*#__PURE__*/_react.default.createElement(_tabs.default, Object.assign({
+    size: size
+  }, others, {
     className: (0, _classnames.default)(className, prefixCls, noBorder && 'lm_tabs_noborder')
   }));
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "linkmore-design",
-  "version": "1.0.43",
+  "version": "1.0.46",
   "author": {
     "name": "nowthen",
     "email": "rnlvwyx@gmail.com"