linkmore-design 1.0.53 → 1.0.56

package/lib/CardTable/card/PictureTextRowOperate.js

@@ -0,0 +1,130 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+require("antd/es/message/style");
+
+var _message2 = _interopRequireDefault(require("antd/es/message"));
+
+require("antd/es/image/style");
+
+var _image = _interopRequireDefault(require("antd/es/image"));
+
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+
+require("antd/es/typography/style");
+
+var _typography = _interopRequireDefault(require("antd/es/typography"));
+
+var _react = _interopRequireDefault(require("react"));
+
+var _classnames = _interopRequireDefault(require("classnames"));
+
+var _linkmoreDesign = require("linkmore-design");
+
+var Paragraph = _typography.default.Paragraph; // 左图右文
+
+var PictureTextRowOperate = function PictureTextRowOperate(_ref) {
+  var index = _ref.index,
+      cell = _ref.cell,
+      table = _ref.table,
+      checked = _ref.checked;
+  var cellKey = table.cellKey,
+      state = table.state,
+      defaultConfig = table.defaultConfig,
+      cellClick = table.cellClick,
+      cellDoubleClick = table.cellDoubleClick,
+      toggleCheckboxKey = table.toggleCheckboxKey,
+      checkboxChange = table.checkboxChange;
+  var trigger = state.checkboxConfig.trigger;
+  var resetDefaultConfig = (0, _objectSpread2.default)({
+    checkbox: true,
+    imgurl: 'imgurl',
+    title: function title() {
+      return '物料名称';
+    },
+    code: 'code',
+    desc: 'desc',
+    operate: null,
+    extend: null,
+    columns: null
+  }, defaultConfig); // 复选框改变事件, 将复选数据保存到缓存中
+
+  var onSelctChange = function onSelctChange(val) {
+    toggleCheckboxKey(cell[cellKey]);
+    checkboxChange === null || checkboxChange === void 0 ? void 0 : checkboxChange(val, cell, index);
+  }; // 单元格单击事件
+
+
+  var onClick = function onClick() {
+    cellClick === null || cellClick === void 0 ? void 0 : cellClick(cell, index);
+
+    if (trigger === 'cell') {
+      onSelctChange === null || onSelctChange === void 0 ? void 0 : onSelctChange(!checked);
+    }
+  }; // 单元格双击事件: 双击时避免单击事件触发自己实现
+
+
+  var onDoubleClick = function onDoubleClick() {
+    cellDoubleClick === null || cellDoubleClick === void 0 ? void 0 : cellDoubleClick(cell, index);
+  };
+
+  return /*#__PURE__*/_react.default.createElement("div", {
+    className: "card_PTRO"
+  }, /*#__PURE__*/_react.default.createElement("div", {
+    className: (0, _classnames.default)('card_PTRO_container', checked && 'checked')
+  }, /*#__PURE__*/_react.default.createElement("div", {
+    className: "card_PTRO_body",
+    onClick: onClick,
+    onDoubleClick: onDoubleClick
+  }, resetDefaultConfig.checkbox && /*#__PURE__*/_react.default.createElement("div", {
+    className: "card_checkbox",
+    onClick: function onClick(e) {
+      return e.stopPropagation();
+    }
+  }, /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Checkbox, {
+    checked: checked,
+    onChange: function onChange(e) {
+      return onSelctChange(e.target.checked);
+    }
+  })), /*#__PURE__*/_react.default.createElement("div", {
+    className: "card_PTRO_left"
+  }, typeof resetDefaultConfig.imgurl === 'function' ? resetDefaultConfig.imgurl(cell, table) : /*#__PURE__*/_react.default.createElement(_image.default, {
+    src: cell[resetDefaultConfig.imgurl],
+    fallback: ""
+  })), /*#__PURE__*/_react.default.createElement("div", {
+    className: "card_PTRO_right"
+  }, resetDefaultConfig.title ? /*#__PURE__*/_react.default.createElement("div", {
+    className: "card_title lm-font-middle-bold"
+  }, typeof resetDefaultConfig.title === 'function' ? resetDefaultConfig.title(cell, table) : cell[resetDefaultConfig.title]) : null, resetDefaultConfig.code ? /*#__PURE__*/_react.default.createElement("div", {
+    className: "card_copy_text"
+  }, typeof resetDefaultConfig.code === 'function' ? resetDefaultConfig.code(cell, table) : /*#__PURE__*/_react.default.createElement(Paragraph, {
+    copyable: {
+      tooltips: false,
+      onCopy: function onCopy() {
+        return _message2.default.success('复制成功！', 1.5);
+      }
+    },
+    ellipsis: true
+  }, cell[resetDefaultConfig.code])) : null, resetDefaultConfig.columns ? /*#__PURE__*/_react.default.createElement("div", {
+    className: "PTRO_column"
+  }, resetDefaultConfig.columns.map(function (v, idx) {
+    return /*#__PURE__*/_react.default.createElement("span", {
+      key: (v === null || v === void 0 ? void 0 : v.dataIndex) || idx
+    }, v.title, ": ", cell[v.dataIndex]);
+  })) : null, resetDefaultConfig.extend ? /*#__PURE__*/_react.default.createElement("div", {
+    className: "PTRO_extend"
+  }, resetDefaultConfig.extend(cell, table)) : null, resetDefaultConfig.desc ? /*#__PURE__*/_react.default.createElement("div", {
+    className: "PTRO_desc"
+  }, typeof resetDefaultConfig.desc === 'function' ? resetDefaultConfig.desc(cell, table) : cell[resetDefaultConfig.desc]) : null)), /*#__PURE__*/_react.default.createElement("div", {
+    className: "card_PTRO_footer"
+  }, resetDefaultConfig.operate ? resetDefaultConfig.operate(cell, table) : null)));
+};
+
+var _default = PictureTextRowOperate;
+exports.default = _default;

package/lib/CardTable/fns/index.js

@@ -10,15 +10,17 @@ exports.default = void 0;
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 
 // 操作方法集合
-var setOptions = function setOptions(_ref) {
+var CoreOptions = function CoreOptions(_ref) {
   var state = _ref.state,
       dispatch = _ref.dispatch,
       props = _ref.props;
   var checkboxConfig = state.checkboxConfig;
   var dataSource = props.dataSource,
-      cellKey = props.cellKey;
+      cellKey = props.cellKey,
+      checkboxChange = props.checkboxChange;
   var checkKeys = checkboxConfig.checkKeys,
-      checkValues = checkboxConfig.checkValues; // 设置选中的值: 第一个参数是数据的键，第二个参数是选中与否, 第三个参数控制是否重置
+      checkValues = checkboxConfig.checkValues,
+      checkMethod = checkboxConfig.checkMethod; // 设置选中的值: 第一个参数是数据的键，第二个参数是选中与否, 第三个参数控制是否重置
   // 未做key是否属于数据源校验，用于分页时保存之前的选中状态
 
   var setCheckboxKeys = function setCheckboxKeys(keys, checked, reset) {
@@ -65,15 +67,43 @@ var setOptions = function setOptions(_ref) {
 
 
   var toggleCheckboxKey = function toggleCheckboxKey(k) {
+    var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+    var _options$trigger = options.trigger,
+        trigger = _options$trigger === void 0 ? 'default' : _options$trigger,
+        cell = options.cell,
+        cellIndex = options.cellIndex;
     var nKeys = [k],
-        isChecked = true,
+        isCheck = true,
         reset = false; // 单个切换
 
     if (!Array.isArray(k)) {
-      isChecked = !(checkKeys === null || checkKeys === void 0 ? void 0 : checkKeys.some(function (v) {
+      var isCanCheck = checkMethod; // 是否可选中
+
+      isCheck = !(checkKeys === null || checkKeys === void 0 ? void 0 : checkKeys.some(function (v) {
         return v === k;
       }));
-    } // 多个切换
+      var record = cell || ''; // 检测选中前置阻挡事件
+
+      if (typeof checkMethod === 'function') {
+        record = record || (dataSource === null || dataSource === void 0 ? void 0 : dataSource.find(function (v) {
+          return v[cellKey] === k;
+        }));
+        isCanCheck = checkMethod(record, state, trigger);
+      }
+
+      if (!isCanCheck) return; // 触发复选框改变事件: 仅手动触发有效
+
+      if (typeof checkboxChange === 'function') {
+        record = record || (dataSource === null || dataSource === void 0 ? void 0 : dataSource.find(function (v) {
+          return v[cellKey] === k;
+        }));
+        checkboxChange === null || checkboxChange === void 0 ? void 0 : checkboxChange({
+          checked: isCheck,
+          cell: record,
+          cellIndex: cellIndex
+        });
+      }
+    } // 多个切换 通过重置去除选中项保留切换项
 
 
     if (Array.isArray(k)) {
@@ -93,7 +123,7 @@ var setOptions = function setOptions(_ref) {
       reset = true;
     }
 
-    setCheckboxKeys(nKeys, isChecked, reset);
+    setCheckboxKeys(nKeys, isCheck, reset);
   };
 
   return {
@@ -102,5 +132,5 @@ var setOptions = function setOptions(_ref) {
   };
 };
 
-var _default = setOptions;
+var _default = CoreOptions;
 exports.default = _default;

package/lib/CardTable/pager/index.js

@@ -0,0 +1,48 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _react = _interopRequireDefault(require("react"));
+
+var _TablePagination = _interopRequireDefault(require("./TablePagination"));
+
+var CardTablePager = /*#__PURE__*/_react.default.memo(function (_ref) {
+  var table = _ref.table;
+  var pagination = table.pagination,
+      pagerConfig = table.pagerConfig; // left || right:插槽
+
+  var left = pagerConfig.left,
+      right = pagerConfig.right; // 底部工具栏左侧插槽: 默认空 div 标签占位
+
+  var LeftSlot = function LeftSlot() {
+    if (!left) {
+      return /*#__PURE__*/_react.default.createElement("div", null);
+    }
+
+    ;
+    return typeof left === 'function' ? left(table) : left;
+  }; // 底部工具栏右侧插槽
+
+
+  var RighSlot = function RighSlot() {
+    if (!right) {
+      return pagination ? /*#__PURE__*/_react.default.createElement(_TablePagination.default, {
+        table: table
+      }) : null;
+    }
+
+    return typeof right === 'function' ? right(table, _TablePagination.default) : right;
+  };
+
+  return /*#__PURE__*/_react.default.createElement("div", {
+    className: "lm_card_table_pager"
+  }, /*#__PURE__*/_react.default.createElement(LeftSlot, null), /*#__PURE__*/_react.default.createElement(RighSlot, null));
+});
+
+var _default = CardTablePager;
+exports.default = _default;

package/lib/CardTable/style/index.css

@@ -24,12 +24,12 @@
 .lm_card_table_wrapper .lm_card_table_container .lm_card_table .lm_card_table_body .lm_card_table_body_row .lm_card_table_body_cell.cell_checked {
   border-color: var(--primary-color);
 }
-.lm_card_table_wrapper .lm_card_table_toolbar_bottom {
+.lm_card_table_wrapper .lm_card_table_pager {
   display: flex;
   align-items: center;
   justify-content: space-between;
 }
-.lm_card_table_wrapper .lm_card_table_toolbar_bottom .lm_card_table_pagination {
+.lm_card_table_wrapper .lm_card_table_pager .lm_card_table_pagination {
   display: flex;
   align-items: center;
   height: 48px;
@@ -182,7 +182,7 @@
   top: 0;
 }
 .card_PTR .card_PTR_container .card_PTR_body .card_PTR_left {
-  width: 40%;
+  width: 35%;
   min-width: 126px;
   border-radius: 2px;
   background: var(--color-15);
@@ -211,6 +211,8 @@
   font-size: 12px;
   color: var(--color-45);
   margin-top: 4px;
+  padding-bottom: 6px;
+  border-bottom: 1px solid var(--line-color);
 }
 .card_PTR .card_PTR_container .card_PTR_body .card_PTR_right .card_copy_text .ant-typography {
   margin: 0;
@@ -222,18 +224,20 @@
 .card_PTR .card_PTR_container .card_PTR_body .card_PTR_right .card_copy_text .ant-typography .ant-typography-copy.ant-typography-copy-success {
   color: var(--success-color);
 }
-.card_PTR .card_PTR_container .card_PTR_body .card_PTR_right .PTR_extend {
+.card_PTR .card_PTR_container .card_PTR_body .card_PTR_right .PTR_column {
   flex: 1 1 0;
-  display: flex;
-  flex-wrap: wrap;
-  gap: 8px;
-  row-gap: 126px;
+}
+.card_PTR .card_PTR_container .card_PTR_body .card_PTR_right .PTR_column .PTR_column_box {
+  font-size: 12px;
+  display: grid;
+  grid-template-columns: repeat(2, 1fr);
+  color: var(--color-65);
   margin-top: 8px;
-  overflow: hidden;
 }
-.card_PTR .card_PTR_container .card_PTR_body .card_PTR_right .PTR_extend button {
-  border: none;
-  background-color: var(--background-color);
+.card_PTR .card_PTR_container .card_PTR_body .card_PTR_right .PTR_column .PTR_column_box span {
+  display: inline-flex;
+  align-items: center;
+  min-height: 20px;
 }
 .card_PTR .card_PTR_container .card_PTR_body .card_PTR_right .PTR_desc {
   font-size: 12px;
@@ -280,6 +284,150 @@
 .card_PTR .card_PTR_container:hover .card_PTR_body .card_checkbox {
   opacity: 1;
 }
+.card_PTRO {
+  height: 100%;
+}
+.card_PTRO .card_PTRO_container {
+  height: 100%;
+  display: flex;
+  flex-flow: column;
+  border-radius: 2px;
+  background-color: var(--background-color);
+  transition: 0.3s;
+}
+.card_PTRO .card_PTRO_container .card_PTRO_body {
+  position: relative;
+  display: flex;
+  flex: 1;
+  gap: var(--gap);
+  padding: calc(var(--gap) * 2);
+  overflow: hidden;
+}
+.card_PTRO .card_PTRO_container .card_PTRO_body .card_checkbox {
+  position: absolute;
+  top: 8px;
+  left: 8px;
+  z-index: 1;
+  opacity: 0;
+  transition: 0.3s;
+}
+.card_PTRO .card_PTRO_container .card_PTRO_body .card_checkbox .lm-checkbox {
+  font-size: 0;
+  border: 8px solid rgba(255, 255, 255, 0.625);
+  border-radius: 2px;
+  line-height: 1;
+}
+.card_PTRO .card_PTRO_container .card_PTRO_body .card_checkbox .ant-checkbox {
+  margin: 0;
+  top: 0;
+}
+.card_PTRO .card_PTRO_container .card_PTRO_body .card_PTRO_left {
+  width: 40%;
+  min-width: 126px;
+  border-radius: 2px;
+  background: var(--color-15);
+  overflow: hidden;
+}
+.card_PTRO .card_PTRO_container .card_PTRO_body .card_PTRO_left .ant-image {
+  width: 100%;
+  height: 100%;
+}
+.card_PTRO .card_PTRO_container .card_PTRO_body .card_PTRO_left .ant-image .ant-image-img {
+  width: 100%;
+  height: 100%;
+  object-fit: cover;
+}
+.card_PTRO .card_PTRO_container .card_PTRO_body .card_PTRO_right {
+  flex: 1;
+  display: flex;
+  flex-flow: column;
+}
+.card_PTRO .card_PTRO_container .card_PTRO_body .card_PTRO_right .card_title {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+.card_PTRO .card_PTRO_container .card_PTRO_body .card_PTRO_right .card_copy_text {
+  font-size: 12px;
+  color: var(--color-45);
+  margin-top: 4px;
+}
+.card_PTRO .card_PTRO_container .card_PTRO_body .card_PTRO_right .card_copy_text .ant-typography {
+  margin: 0;
+  color: inherit;
+}
+.card_PTRO .card_PTRO_container .card_PTRO_body .card_PTRO_right .card_copy_text .ant-typography .ant-typography-copy {
+  color: inherit;
+}
+.card_PTRO .card_PTRO_container .card_PTRO_body .card_PTRO_right .card_copy_text .ant-typography .ant-typography-copy.ant-typography-copy-success {
+  color: var(--success-color);
+}
+.card_PTRO .card_PTRO_container .card_PTRO_body .card_PTRO_right .PTRO_column {
+  display: grid;
+  grid-template-columns: repeat(2, 1fr);
+  font-size: 12px;
+  color: var(--color-65);
+}
+.card_PTRO .card_PTRO_container .card_PTRO_body .card_PTRO_right .PTRO_extend {
+  font-size: 12px;
+  flex: 1 1 0;
+  display: flex;
+  flex-wrap: wrap;
+  gap: 8px;
+  row-gap: 126px;
+  margin-top: 8px;
+  overflow: hidden;
+  color: var(--color-65);
+}
+.card_PTRO .card_PTRO_container .card_PTRO_body .card_PTRO_right .PTRO_extend button {
+  border: none;
+  background-color: var(--background-color);
+}
+.card_PTRO .card_PTRO_container .card_PTRO_body .card_PTRO_right .PTRO_desc {
+  font-size: 12px;
+  color: var(--color-65);
+  overflow: hidden;
+  text-overflow: ellipsis;
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+  -webkit-line-clamp: 2;
+}
+.card_PTRO .card_PTRO_container .card_PTRO_footer {
+  position: relative;
+  display: flex;
+  align-items: center;
+  background-color: var(--background-color);
+}
+.card_PTRO .card_PTRO_container .card_PTRO_footer > * {
+  flex: 1;
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  max-width: initial;
+  height: 40px;
+  border: none;
+  background-color: var(--background-color);
+}
+.card_PTRO .card_PTRO_container .card_PTRO_footer > *::after {
+  content: '';
+  position: absolute;
+  right: 0;
+  top: 50%;
+  -webkit-transform: translateY(-50%);
+  transform: translateY(-50%);
+  height: 18px;
+  width: 1px;
+  background-color: var(--color-15);
+}
+.card_PTRO .card_PTRO_container .card_PTRO_footer > *:last-child::after {
+  display: none;
+}
+.card_PTRO .card_PTRO_container:hover {
+  background-color: var(--color-6);
+}
+.card_PTRO .card_PTRO_container:hover .card_PTRO_body .card_checkbox {
+  opacity: 1;
+}
 .hasChecked .card_PTC .card_PTC_container .card_checkbox,
 .hasChecked .card_PTR .card_PTR_container .card_PTR_body .card_checkbox {
   opacity: 1;

package/lib/CardTable/table/TableRoot.js

@@ -9,10 +9,10 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
-var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
-
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 
+var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
+
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 
 var _react = _interopRequireWildcard(require("react"));
@@ -21,7 +21,8 @@ var _TableWrapper = _interopRequireDefault(require("./TableWrapper"));
 
 var _fns = _interopRequireDefault(require("../fns"));
 
-var _excluded = ["rowConfig", "cellConfig", "defaultConfig", "checkboxConfig"];
+var _excluded = ["checkKeys", "trigger", "checkMethod"],
+    _excluded2 = ["rowConfig", "cellConfig", "defaultConfig", "checkboxConfig", "pagerConfig", "toolbarConfig"];
 
 var reducer = function reducer(state, action) {
   var page = action.page,
@@ -70,6 +71,9 @@ var getInitialState = function getInitialState(props) {
       checkKeys = _props$checkboxConfig2 === void 0 ? [] : _props$checkboxConfig2,
       _props$checkboxConfig3 = _props$checkboxConfig.trigger,
       trigger = _props$checkboxConfig3 === void 0 ? 'default' : _props$checkboxConfig3,
+      _props$checkboxConfig4 = _props$checkboxConfig.checkMethod,
+      checkMethod = _props$checkboxConfig4 === void 0 ? true : _props$checkboxConfig4,
+      resetCheckCOnfig = (0, _objectWithoutProperties2.default)(_props$checkboxConfig, _excluded),
       _props$dataSource = props.dataSource,
       dataSource = _props$dataSource === void 0 ? [] : _props$dataSource,
       cellKey = props.cellKey;
@@ -78,11 +82,12 @@ var getInitialState = function getInitialState(props) {
   }) || [];
   return {
     // 复选框的配置
-    checkboxConfig: {
+    checkboxConfig: (0, _objectSpread2.default)({
       checkKeys: checkKeys,
       checkValues: checkValues,
-      trigger: trigger
-    },
+      trigger: trigger,
+      checkMethod: checkMethod
+    }, resetCheckCOnfig),
     // 分页的配置
     page: {
       pageIndex: 1,
@@ -114,18 +119,17 @@ var LmCardTableRoot = function LmCardTableRoot(props, ref) {
   var _useState = (0, _react.useState)(false),
       _useState2 = (0, _slicedToArray2.default)(_useState, 2),
       isFullScreen = _useState2[0],
-      setIsFullScreen = _useState2[1];
+      setIsFullScreen = _useState2[1]; // 配置对象收集
 
-  var _state$checkboxConfig = state.checkboxConfig,
-      checkKeys = _state$checkboxConfig.checkKeys,
-      checkValues = _state$checkboxConfig.checkValues; // 配置对象收集
 
   var configProps = (0, _react.useMemo)(function () {
     var rowConfig = props.rowConfig,
         cellConfig = props.cellConfig,
         defaultConfig = props.defaultConfig,
         checkboxConfig = props.checkboxConfig,
-        resetProps = (0, _objectWithoutProperties2.default)(props, _excluded);
+        pagerConfig = props.pagerConfig,
+        toolbarConfig = props.toolbarConfig,
+        resetProps = (0, _objectWithoutProperties2.default)(props, _excluded2);
     return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, resetProps), {}, {
       rowConfig: (0, _objectSpread2.default)({
         // 行配置
@@ -137,22 +141,20 @@ var LmCardTableRoot = function LmCardTableRoot(props, ref) {
         height: 282
       }, cellConfig),
       checkboxConfig: (0, _objectSpread2.default)({}, checkboxConfig),
-      toolbarConfig: {
-        pager: {},
-        toolbarBottom: {}
-      },
+      pagerConfig: (0, _objectSpread2.default)({}, pagerConfig),
+      toolbarConfig: (0, _objectSpread2.default)({}, toolbarConfig),
       defaultConfig: defaultConfig
     });
   }, [props]); // 方法收集
 
-  var EventProps = (0, _react.useMemo)(function () {
+  var eventProps = (0, _react.useMemo)(function () {
     return (0, _fns.default)({
       state: state,
       dispatch: dispatch,
       props: props
     });
   }, [state, dispatch, props]);
-  var table = (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, configProps), EventProps), {}, {
+  var table = (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, configProps), eventProps), {}, {
     state: state,
     dispatch: dispatch
   }); // 向外暴露出的方法
@@ -162,7 +164,7 @@ var LmCardTableRoot = function LmCardTableRoot(props, ref) {
       getCheckboxRecords: function getCheckboxRecords() {
         return state.checkboxConfig.checkValues;
       }
-    }, EventProps);
+    }, eventProps);
   });
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, !isFullScreen && /*#__PURE__*/_react.default.createElement(_TableWrapper.default, {
     table: table

package/lib/CardTable/table/TableWrapper.js

@@ -13,6 +13,8 @@ var _react = _interopRequireDefault(require("react"));
 
 var _TableContainer = _interopRequireDefault(require("./TableContainer"));
 
+var _pager = _interopRequireDefault(require("../pager"));
+
 var _ToolBarBottom = _interopRequireDefault(require("../toolbar/ToolBarBottom"));
 
 // 包裹表格外围区域: 工具栏操作区域/主体区域/工具栏底部区域
@@ -27,6 +29,8 @@ var LmCardTableWrapper = /*#__PURE__*/_react.default.memo(function (_ref) {
     }, style)
   }, /*#__PURE__*/_react.default.createElement(_TableContainer.default, {
     table: table
+  }), /*#__PURE__*/_react.default.createElement(_pager.default, {
+    table: table
   }), /*#__PURE__*/_react.default.createElement(_ToolBarBottom.default, {
     table: table
   }));

package/lib/CardTable/toolbar/ToolBarBottom.js

@@ -9,38 +9,19 @@ exports.default = void 0;
 
 var _react = _interopRequireDefault(require("react"));
 
-var _TablePagination = _interopRequireDefault(require("./TablePagination"));
-
 var CardToolBarBottom = /*#__PURE__*/_react.default.memo(function (_ref) {
   var table = _ref.table;
   var pagination = table.pagination,
-      _table$toolbarConfig = table.toolbarConfig,
-      toolbarBottom = _table$toolbarConfig.toolbarBottom,
-      pager = _table$toolbarConfig.pager; // toolbarBottom与pager一致: 用于插槽
-
-  var _ref2 = toolbarBottom || pager,
-      left = _ref2.left,
-      right = _ref2.right;
-
-  var LeftSlot = function LeftSlot() {
-    return left;
-  };
-
-  var RighSlot = function RighSlot() {
-    if (!right) {
-      return pagination && /*#__PURE__*/_react.default.createElement(_TablePagination.default, {
-        table: table
-      });
-    }
+      toolbarBottom = table.toolbarConfig.toolbarBottom;
 
-    if (right) {
-      typeof right === 'function' ? right(_TablePagination.default) : right;
-    }
-  };
+  if (!toolbarBottom) {
+    return null;
+  }
 
-  return /*#__PURE__*/_react.default.createElement("div", {
-    className: "lm_card_table_toolbar_bottom"
-  }, /*#__PURE__*/_react.default.createElement("div", null), /*#__PURE__*/_react.default.createElement(RighSlot, null));
+  return typeof toolbarBottom === 'function' ? toolbarBottom(table) : toolbarBottom // <div className='lm_card_table_toolbar_bottom'>
+  //   <ToolbarBottomSlot />
+  // </div>
+  ;
 });
 
 var _default = CardToolBarBottom;