linkmore-design 1.0.39 → 1.0.42

package/lib/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/lib/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/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/lib/LmTable/ImgList/imgCell.js

@@ -33,12 +33,12 @@ var _classnames = _interopRequireDefault(require("classnames"));
 
 var _linkmoreDesign = require("linkmore-design");
 
-var _context = _interopRequireDefault(require("./context"));
-
 var _react = _interopRequireWildcard(require("react"));
 
 var _EnlargeImg = _interopRequireDefault(require("../../EnlargeImg"));
 
+var _context = _interopRequireDefault(require("./context"));
+
 var Paragraph = _typography.default.Paragraph;
 
 var stateRender = function stateRender(v) {
@@ -82,7 +82,8 @@ var Cell = function Cell(props) {
       desc = _useContext.desc,
       footer = _useContext.footer,
       _onDoubleClick = _useContext.onDoubleClick,
-      expand = _useContext.expand;
+      expand = _useContext.expand,
+      rowSelectChange = _useContext.rowSelectChange;
 
   var _useState = (0, _react.useState)(false),
       _useState2 = (0, _slicedToArray2.default)(_useState, 2),
@@ -95,11 +96,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)'
@@ -110,15 +114,21 @@ var Cell = function Cell(props) {
     }, config);
   }, []); // 多选事件
 
-  var onChange = function onChange(e) {
-    var bol = e.target.checked;
-    var nValue = bol ? [].concat((0, _toConsumableArray2.default)(defaultValue), [item]) : defaultValue.filter(function (v) {
-      return v[rowKey] !== item[rowKey];
-    });
-    dispatch({
-      type: 'changeList',
-      checkList: nValue
-    });
+  var _onChange = function onChange(e) {
+    var selectKey = e[rowKey];
+
+    if (![undefined, null].includes(selectKey)) {
+      var nValue = defaultValue.find(function (item) {
+        return item[rowKey] === selectKey;
+      }) ? defaultValue.filter(function (v) {
+        return v[rowKey] !== item[rowKey];
+      }) : [].concat((0, _toConsumableArray2.default)(defaultValue), [item]);
+      dispatch({
+        type: 'changeList',
+        checkList: nValue
+      });
+      rowSelectChange === null || rowSelectChange === void 0 ? void 0 : rowSelectChange(nValue);
+    }
   };
 
   (0, _react.useEffect)(function () {
@@ -142,7 +152,9 @@ var Cell = function Cell(props) {
   }, defaultConfig.checkbox && /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Checkbox, {
     className: "checkBox",
     checked: useCheck,
-    onChange: onChange
+    onChange: function onChange(e) {
+      return _onChange(item);
+    }
   }), expand && /*#__PURE__*/_react.default.createElement("div", {
     className: "more"
   }, /*#__PURE__*/_react.default.createElement(_dropdown.default, {

package/lib/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,13 +66,17 @@ 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),
       _useReducer2 = (0, _slicedToArray2.default)(_useReducer, 2),
       state = _useReducer2[0],
-      dispatch = _useReducer2[1]; // 将节点方法给外部使用
+      dispatch = _useReducer2[1];
 
+  var selectedRows = rowSelection.selectedRows,
+      rowSelectChange = rowSelection.onChange; // 将节点方法给外部使用
 
   _react.default.useImperativeHandle(ref, function () {
     return {
@@ -80,20 +84,37 @@ var ImgTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
         return state.checkList;
       },
       clearSelect: function clearSelect() {
-        return dispatch({
+        dispatch({
           type: 'changeList',
           checkList: []
         });
+        rowSelectChange === null || rowSelectChange === void 0 ? void 0 : rowSelectChange(data);
+      },
+      customSetCheckboxRecords: function customSetCheckboxRecords(data) {
+        dispatch({
+          type: 'changeList',
+          checkList: data || []
+        });
+        rowSelectChange === null || rowSelectChange === void 0 ? void 0 : rowSelectChange(data);
       }
     };
   });
 
+  (0, _react.useEffect)(function () {
+    if (selectedRows) {
+      dispatch({
+        type: 'changeList',
+        checkList: selectedRows || []
+      });
+    }
+  }, [selectedRows]);
   return /*#__PURE__*/_react.default.createElement(_context.default.Provider, {
     value: (0, _objectSpread2.default)((0, _objectSpread2.default)({
       dispatch: dispatch
     }, resetProps), {}, {
       defaultValue: state.checkList,
-      defaultPage: defaultPage
+      defaultPage: defaultPage,
+      rowSelectChange: rowSelectChange
     })
   }, /*#__PURE__*/_react.default.createElement("div", {
     className: "lm_pro_component_img_table",
@@ -104,7 +125,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/lib/LmTable/Table.js

@@ -39,7 +39,7 @@ 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", "tableRowType"],
+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 Summary = _proTable.default.Summary;
 exports.Summary = Summary;
@@ -78,8 +78,12 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       customCheck = props.customCheck,
       rowSelection = props.rowSelection,
       columnsState = props.columnsState,
+      onChange = props.onChange,
+      filterChange = props.filterChange,
       _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;
@@ -180,7 +184,6 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
         }
       });
     });
-    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 () {
@@ -239,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);
         }
       },
@@ -284,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 () {
@@ -381,6 +384,24 @@ 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);
+      obj['filteredValue'] = filters[obj.dataIndex] || []; // 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;
+    });
+    setColumns(resultColumns);
+    filterChange === null || filterChange === void 0 ? void 0 : filterChange(resultColumns);
+    onChange === null || onChange === void 0 ? void 0 : onChange(pagination, filters, sorter, extra);
+  };
+
   return /*#__PURE__*/_react.default.createElement("div", {
     style: {
       height: '100%',
@@ -397,6 +418,7 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
         row: DraggableBodyRow
       }
     } : null,
+    onChange: onTableChange,
     tableClassName: "lm_protable",
     summary: function summary(pageData) {
       return _summary && _summary(pageData, resultColumns);