linkmore-design 1.0.38 → 1.0.41

package/es/LeftTable/style/style.css

@@ -506,7 +506,7 @@ html {
 .lm_grid_tree {
   position: relative;
   font-size: 12px;
-  height: calc(100% - 36px);
+  height: calc(100% - 39px);
   width: 168px;
   border: 1px solid var(--line-color);
   transition: all 0.3s;

package/es/LmTable/ImgList/footer.js

@@ -9,17 +9,17 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
-require("antd/es/pagination/style");
-
-var _pagination = _interopRequireDefault(require("antd/es/pagination"));
-
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/extends"));
 
+var _linkmoreDesign = require("linkmore-design");
+
 var _react = _interopRequireWildcard(require("react"));
 
 var _context = _interopRequireDefault(require("./context"));
 
-var Footer = function Footer() {
+var Footer = function Footer(_ref) {
+  var customCheck = _ref.customCheck;
+
   var _useContext = (0, _react.useContext)(_context.default),
       dispatch = _useContext.dispatch,
       data = _useContext.data,
@@ -44,7 +44,9 @@ var Footer = function Footer() {
       pageSize: (defaultPage === null || defaultPage === void 0 ? void 0 : defaultPage.pageSize) || 20
     };
   }, [defaultPage]);
-  return /*#__PURE__*/_react.default.createElement(_pagination.default, (0, _extends2.default)({
+  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, !!customCheck && /*#__PURE__*/_react.default.createElement("div", {
+    className: "lm_customCheck"
+  }, customCheck), /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Pagination, (0, _extends2.default)({
     showSizeChanger: true,
     showQuickJumper: true,
     showTotal: function showTotal(total) {
@@ -52,7 +54,7 @@ var Footer = function Footer() {
     },
     size: "small",
     onChange: onPageChange
-  }, config));
+  }, config)));
 };
 
 var _default = Footer;

package/es/LmTable/ImgList/imgCell.js

@@ -95,11 +95,14 @@ var Cell = function Cell(props) {
       code: 'code',
       state: 'state',
       tags: 'tags',
+
+      /** 是否支持选择 */
       checkbox: false,
       singleRender: stateRender,
       mapRender: function mapRender(v, i) {
         return /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Button, {
           key: i,
+          size: 'small',
           icon: v.icon || /*#__PURE__*/_react.default.createElement(_icons.StarFilled, {
             style: {
               color: 'rgb(253,77,78)'

package/es/LmTable/ImgList/imgTable.js

@@ -25,7 +25,7 @@ var _context = _interopRequireDefault(require("./context"));
 
 var _footer = _interopRequireDefault(require("./footer"));
 
-var _excluded = ["style", "defaultPage"];
+var _excluded = ["style", "defaultPage", "customCheck", "rowSelection"];
 var initialState = {
   // 选中的数据
   checkList: [],
@@ -66,6 +66,8 @@ var reducer = function reducer(state, action) {
 var ImgTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   var style = props.style,
       defaultPage = props.defaultPage,
+      customCheck = props.customCheck,
+      rowSelection = props.rowSelection,
       resetProps = (0, _objectWithoutProperties2.default)(props, _excluded);
 
   var _useReducer = (0, _react.useReducer)(reducer, initialState),
@@ -88,6 +90,7 @@ var ImgTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     };
   });
 
+  (0, _react.useEffect)(function () {}, []);
   return /*#__PURE__*/_react.default.createElement(_context.default.Provider, {
     value: (0, _objectSpread2.default)((0, _objectSpread2.default)({
       dispatch: dispatch
@@ -104,7 +107,9 @@ var ImgTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     })
   }, /*#__PURE__*/_react.default.createElement(_body.default, null)), /*#__PURE__*/_react.default.createElement("div", {
     className: "lm_img_footer"
-  }, /*#__PURE__*/_react.default.createElement(_footer.default, null))));
+  }, /*#__PURE__*/_react.default.createElement(_footer.default, {
+    customCheck: customCheck
+  }))));
 });
 var _default = ImgTable;
 exports.default = _default;

package/es/LmTable/Table.js

@@ -13,29 +13,53 @@ require("antd/es/config-provider/style");
 
 var _configProvider = _interopRequireDefault(require("antd/es/config-provider"));
 
-var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/extends"));
-
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/toConsumableArray"));
 
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/objectSpread2"));
 
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/extends"));
+
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/slicedToArray"));
 
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/objectWithoutProperties"));
 
+var _icons = require("@ant-design/icons");
+
 var _proTable = _interopRequireDefault(require("@ant-design/pro-table"));
 
+var _sortable = require("@dnd-kit/sortable");
+
 var _lodash = require("lodash");
 
 var _react = _interopRequireWildcard(require("react"));
 
+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", "customCheck", "rowSelection", "columnsState", "tableRowType"];
+var _excluded = ["dataSource", "autoSize", "columns", "rowClick", "onDoubleClick", "checkConfig", "summary", "pagination", "hiddenPage", "loading", "virtual", "sortOpen", "customCheck", "rowSelection", "columnsState", "onChange", "tableRowType", "size"],
+    _excluded2 = ["className", "style"];
 var Summary = _proTable.default.Summary;
 exports.Summary = Summary;
+var DragHandle = (0, _reactSortableHoc.SortableHandle)(function () {
+  return /*#__PURE__*/_react.default.createElement(_icons.MenuOutlined, {
+    style: {
+      cursor: 'grab',
+      color: '#999'
+    }
+  });
+});
+var sortDefaultColumnItem = {
+  title: '排序',
+  dataIndex: 'sort',
+  width: 60,
+  className: 'drag-visible',
+  render: function render() {
+    return /*#__PURE__*/_react.default.createElement(DragHandle, null);
+  }
+};
 var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   var dataSource = props.dataSource,
       autoSize = props.autoSize,
@@ -49,11 +73,16 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       loading = props.loading,
       _props$virtual = props.virtual,
       virtual = _props$virtual === void 0 ? false : _props$virtual,
+      _props$sortOpen = props.sortOpen,
+      sortOpen = _props$sortOpen === void 0 ? false : _props$sortOpen,
       customCheck = props.customCheck,
       rowSelection = props.rowSelection,
       columnsState = props.columnsState,
+      onChange = props.onChange,
       _props$tableRowType = props.tableRowType,
       tableRowType = _props$tableRowType === void 0 ? 'default' : _props$tableRowType,
+      _props$size = props.size,
+      size = _props$size === void 0 ? 'default' : _props$size,
       resetProps = (0, _objectWithoutProperties2.default)(props, _excluded);
   var _resetProps$rowKey = resetProps.rowKey,
       rowKey = _resetProps$rowKey === void 0 ? 'id' : _resetProps$rowKey;
@@ -81,7 +110,48 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   var _useState7 = (0, _react.useState)(),
       _useState8 = (0, _slicedToArray2.default)(_useState7, 2),
       columnsStateMap = _useState8[0],
-      setColumnsStateMap = _useState8[1]; // 原宽度，先宽度，序号
+      setColumnsStateMap = _useState8[1];
+
+  var SortableItem = (0, _reactSortableHoc.SortableElement)(function (props) {
+    return /*#__PURE__*/_react.default.createElement("tr", props);
+  });
+  var SortContainer = (0, _reactSortableHoc.SortableContainer)(function (props) {
+    return /*#__PURE__*/_react.default.createElement("tbody", props);
+  });
+
+  var onSortEnd = function onSortEnd(_ref) {
+    var oldIndex = _ref.oldIndex,
+        newIndex = _ref.newIndex;
+
+    if (oldIndex !== newIndex) {
+      var newData = (0, _sortable.arrayMove)(dataSource, oldIndex, newIndex).filter(function (el) {
+        return !!el;
+      });
+      console.log(newData, 'nnnnnn'); // setDataSource([...newData])
+    }
+  };
+
+  var DraggableContainer = function DraggableContainer(props) {
+    return /*#__PURE__*/_react.default.createElement(SortContainer, (0, _extends2.default)({
+      useDragHandle: true,
+      disableAutoscroll: true,
+      helperClass: "row-dragging",
+      onSortEnd: onSortEnd
+    }, props));
+  };
+
+  var DraggableBodyRow = function DraggableBodyRow(props) {
+    var className = props.className,
+        style = props.style,
+        restProps = (0, _objectWithoutProperties2.default)(props, _excluded2);
+    var index = dataSource.findIndex(function (x) {
+      return x[rowKey || 'index'] === restProps['data-row-key'];
+    });
+    console.log(dataSource, restProps, 222, index);
+    return /*#__PURE__*/_react.default.createElement(SortableItem, (0, _extends2.default)({
+      index: index
+    }, restProps));
+  }; // 原宽度，先宽度，序号
 
 
   var handleResize = function handleResize(sc, size, index) {
@@ -98,7 +168,7 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   };
 
   var resetColumns = (0, _react.useCallback)(function () {
-    return useColumns.filter(function (item) {
+    var result = useColumns.filter(function (item) {
       return item.show !== false;
     }).map(function (col, index) {
       return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, col), {}, {
@@ -113,7 +183,9 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
         }
       });
     });
-  }, [useColumns]);
+    console.log(sortOpen ? [sortDefaultColumnItem].concat((0, _toConsumableArray2.default)(result)) : result, sortOpen, 111);
+    return sortOpen ? [sortDefaultColumnItem].concat((0, _toConsumableArray2.default)(result)) : result;
+  }, [useColumns, sortOpen]);
   (0, _react.useEffect)(function () {
     setColumns(columns);
   }, [columns]); // 行点击事件
@@ -170,7 +242,6 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       columnsState: {
         value: columnsStateMap,
         onChange: function onChange(k) {
-          console.log(k, 'kkk');
           setColumnsStateMap(k);
         }
       },
@@ -215,7 +286,8 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       rowClassName: function rowClassName(record) {
         return record[rowKey] === useActiveKey ? 'row-active' : '';
       },
-      columns: resetColumns()
+      columns: resetColumns(),
+      size: size
     }, resetProps);
   }, [useColumns, useSelectedRows, columnsStateMap, resetProps, autoSize.height]);
   var resultColumns = (0, _react.useMemo)(function () {
@@ -250,10 +322,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 _ref = obj[item.dataIndex || item.key] || {},
-          order = _ref.order,
-          show = _ref.show,
-          fixed = _ref.fixed;
+      var _ref2 = obj[item.dataIndex || item.key] || {},
+          order = _ref2.order,
+          show = _ref2.show,
+          fixed = _ref2.fixed;
 
       obj[item.dataIndex || item.key] = {
         fixed: fixed || item.fixed,
@@ -312,6 +384,23 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     }), /*#__PURE__*/_react.default.createElement("span", null, "\u6682\u65E0\u6570\u636E"));
   };
 
+  var onTableChange = function onTableChange(pagination, filters, sorter, extra) {
+    var resultColumns = useColumns.map(function (item) {
+      var obj = (0, _objectSpread2.default)({}, item);
+
+      if (filters[obj.dataIndex]) {
+        obj['filteredValue'] = filters[obj.dataIndex];
+      }
+
+      if ((sorter === null || sorter === void 0 ? void 0 : sorter.field) === obj.dataIndex) {
+        obj['sortOrder'] = sorter.order;
+      }
+
+      return obj;
+    });
+    onChange === null || onChange === void 0 ? void 0 : onChange(resultColumns, pagination, filters, sorter, extra);
+  };
+
   return /*#__PURE__*/_react.default.createElement("div", {
     style: {
       height: '100%',
@@ -322,7 +411,13 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   }, /*#__PURE__*/_react.default.createElement(_proTable.default, (0, _extends2.default)({}, config, {
     loading: loading,
     dataSource: dataSource,
-    components: virtual ? vComponents : null,
+    components: sortOpen ? {
+      body: {
+        wrapper: DraggableContainer,
+        row: DraggableBodyRow
+      }
+    } : null,
+    onChange: onTableChange,
     tableClassName: "lm_protable",
     summary: function summary(pageData) {
       return _summary && _summary(pageData, resultColumns);