linkmore-design 1.0.41 → 1.0.44

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),
@@ -113,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 () {
@@ -145,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

@@ -73,8 +73,10 @@ var ImgTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   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 {
@@ -82,21 +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 () {}, []);
+  (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",

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", "onChange", "tableRowType", "size"],
+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;
@@ -79,6 +79,7 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       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,
@@ -183,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 () {
@@ -387,10 +387,9 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   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];
-      }
+      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;
@@ -398,7 +397,9 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
 
       return obj;
     });
-    onChange === null || onChange === void 0 ? void 0 : onChange(resultColumns, pagination, filters, sorter, extra);
+    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", {

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.41",
+  "version": "1.0.44",
   "author": {
     "name": "nowthen",
     "email": "rnlvwyx@gmail.com"