linkmore-design 1.0.47 → 1.0.50

package/lib/LmTable/Table.js

@@ -43,7 +43,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", "resizeable", "customCheck", "rowSelection", "columnsState", "onChange", "filterChange", "tableRowType", "size"],
+var _excluded = ["dataSource", "autoSize", "columns", "rowClick", "onDoubleClick", "checkConfig", "summary", "pagination", "hiddenPage", "loading", "virtual", "sortOpen", "resizeable", "customCheck", "components", "rowSelection", "columnsState", "onChange", "filterChange", "tableRowType", "size"],
     _excluded2 = ["className", "style"],
     _excluded3 = ["onResize", "width", "onResizeStop"];
 var Summary = _proTable.default.Summary;
@@ -83,6 +83,7 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       _props$resizeable = props.resizeable,
       resizeable = _props$resizeable === void 0 ? false : _props$resizeable,
       customCheck = props.customCheck,
+      components = props.components,
       rowSelection = props.rowSelection,
       columnsState = props.columnsState,
       onChange = props.onChange,
@@ -217,6 +218,7 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
         }
       });
     });
+    console.log(sortOpen ? [sortDefaultColumnItem].concat((0, _toConsumableArray2.default)(result)) : result, 'sortOpen ? [sortDefaultColumnItem, ...result] : result');
     return sortOpen ? [sortDefaultColumnItem].concat((0, _toConsumableArray2.default)(result)) : result;
   }, [useColumns, sortOpen]);
   (0, _react.useEffect)(function () {
@@ -246,10 +248,11 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
         setSelectedRows({
           selectedRows: selectedRows
         });
+        rowClick === null || rowClick === void 0 ? void 0 : rowClick(selectedRows);
       }
+    } else {
+      rowClick === null || rowClick === void 0 ? void 0 : rowClick(record);
     }
-
-    rowClick === null || rowClick === void 0 ? void 0 : rowClick(record);
   }; // 重写表格，增加虚拟滚动
   // const vComponents = useMemo(() => {
   //   return VList({
@@ -295,6 +298,11 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
         showTotal: function showTotal(total) {
           return "\u5171 ".concat(total, " \u6761");
         },
+        locale: {
+          items_per_page: '/条',
+          jump_to: '前往',
+          page: '页'
+        },
         size: 'small'
       }, pagination),
       rowSelection: rowSelection === false ? undefined : (0, _objectSpread2.default)({
@@ -401,7 +409,8 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
         });
         rowClick === null || rowClick === void 0 ? void 0 : rowClick(value);
       },
-      checkboxRecords: useSelectedRows.selectedRows
+      checkboxRecords: useSelectedRows.selectedRows,
+      columns: (0, _lodash.omit)(useColumns, ['render', 'sorter', 'onFilter', 'filters'])
     };
   }); // loading触发清空选中状态
 
@@ -484,8 +493,17 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       };
     }
 
+    if (components) {
+      var _components$body = components.body,
+          body = _components$body === void 0 ? {} : _components$body,
+          _components$header = components.header,
+          header = _components$header === void 0 ? {} : _components$header;
+      obj['body'] = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, obj['body']), body);
+      obj['header'] = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, obj['header']), header);
+    }
+
     return obj;
-  }, [sortOpen, resizeable]);
+  }, [sortOpen, resizeable, components]);
   return /*#__PURE__*/_react.default.createElement("div", {
     style: {
       height: '100%',

package/lib/Select/style/index.css

@@ -506,6 +506,9 @@ html {
 .lm_select.ant-select {
   font-size: 12px;
 }
+.lm_select.ant-select-focused:not(.ant-select-disabled).ant-select:not(.ant-select-customize-input) .ant-select-selector {
+  box-shadow: none;
+}
 .lm_select_dropdown .ant-select-item-option-active:not(.ant-select-item-option-disabled) {
   background-color: var(--background-color);
 }

package/lib/index.d.ts

@@ -46,3 +46,5 @@ export type { UploadProps, UploadFile, RcFile } from './Upload';
 export { default as Tooltip } from './Tooltip';
 export { default as Form } from './Form';
 export { default as Spin } from './Spin';
+export { default as LmEditTable } from './LmEditTable';
+export { default as List } from './List';

package/lib/index.js

@@ -137,6 +137,18 @@ Object.defineProperty(exports, "LeftTable", {
     return _LeftTable.default;
   }
 });
+Object.defineProperty(exports, "List", {
+  enumerable: true,
+  get: function get() {
+    return _List.default;
+  }
+});
+Object.defineProperty(exports, "LmEditTable", {
+  enumerable: true,
+  get: function get() {
+    return _LmEditTable.default;
+  }
+});
 Object.defineProperty(exports, "LmSelect", {
   enumerable: true,
   get: function get() {
@@ -380,4 +392,8 @@ var _Tooltip = _interopRequireDefault(require("./Tooltip"));
 
 var _Form = _interopRequireDefault(require("./Form"));
 
-var _Spin = _interopRequireDefault(require("./Spin"));
+var _Spin = _interopRequireDefault(require("./Spin"));
+
+var _LmEditTable = _interopRequireDefault(require("./LmEditTable"));
+
+var _List = _interopRequireDefault(require("./List"));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "linkmore-design",
-  "version": "1.0.47",
+  "version": "1.0.50",
   "author": {
     "name": "nowthen",
     "email": "rnlvwyx@gmail.com"
@@ -62,6 +62,7 @@
     "axios": "^0.21.0",
     "classnames": "^2.3.1",
     "dayjs": "^1.9.7",
+    "immer": "^9.0.15",
     "lodash": "^4.17.21",
     "react-cookies": "^0.1.1",
     "react-query": "^3.34.15",