linkmore-design 1.0.20 → 1.0.23

package/lib/LmTable/ImgList/imgCell.js

@@ -17,31 +17,23 @@ require("antd/es/dropdown/style");
 
 var _dropdown = _interopRequireDefault(require("antd/es/dropdown"));
 
-require("antd/es/checkbox/style");
-
-var _checkbox = _interopRequireDefault(require("antd/es/checkbox"));
-
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 
-require("antd/es/button/style");
-
-var _button = _interopRequireDefault(require("antd/es/button"));
-
 require("antd/es/typography/style");
 
 var _typography = _interopRequireDefault(require("antd/es/typography"));
 
-var _react = _interopRequireWildcard(require("react"));
-
 var _icons = require("@ant-design/icons");
 
 var _classnames = _interopRequireDefault(require("classnames"));
 
-var _context = _interopRequireDefault(require("./context"));
+var _linkmoreDesign = require("linkmore-design");
+
+var _react = _interopRequireWildcard(require("react"));
 
 var _EnlargeImg = _interopRequireDefault(require("../../EnlargeImg"));
 
@@ -50,21 +42,21 @@ var Paragraph = _typography.default.Paragraph;
 var stateRender = function stateRender(v) {
   switch (v) {
     case 'ok':
-      return /*#__PURE__*/_react.default.createElement(_button.default, null, /*#__PURE__*/_react.default.createElement(_icons.CheckCircleFilled, {
+      return /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Button, null, /*#__PURE__*/_react.default.createElement(_icons.CheckCircleFilled, {
         style: {
           color: 'rgb(253,77,78)'
         }
       }), "\u5DF2\u5BA1\u6838");
 
     case 'wait':
-      return /*#__PURE__*/_react.default.createElement(_button.default, null, /*#__PURE__*/_react.default.createElement(_icons.ClockCircleFilled, {
+      return /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Button, null, /*#__PURE__*/_react.default.createElement(_icons.ClockCircleFilled, {
         style: {
           color: 'rgb(253,77,78)'
         }
       }), "\u5F85\u5BA1\u6838");
 
     default:
-      return /*#__PURE__*/_react.default.createElement(_button.default, null, /*#__PURE__*/_react.default.createElement(_icons.StopOutlined, {
+      return /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Button, null, /*#__PURE__*/_react.default.createElement(_icons.StopOutlined, {
         style: {
           color: 'rgb(253,77,78)'
         }
@@ -79,7 +71,7 @@ var Cell = function Cell(props) {
       style = props.style,
       className = props.className;
 
-  var _useContext = (0, _react.useContext)(_context.default),
+  var _useContext = (0, _react.useContext)(Context),
       dispatch = _useContext.dispatch,
       defaultValue = _useContext.defaultValue,
       _useContext$rowKey = _useContext.rowKey,
@@ -104,7 +96,7 @@ var Cell = function Cell(props) {
       checkbox: false,
       singleRender: stateRender,
       mapRender: function mapRender(v, i) {
-        return /*#__PURE__*/_react.default.createElement(_button.default, {
+        return /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Button, {
           key: i,
           icon: v.icon || /*#__PURE__*/_react.default.createElement(_icons.StarFilled, {
             style: {
@@ -145,7 +137,7 @@ var Cell = function Cell(props) {
     }
   }, /*#__PURE__*/_react.default.createElement("div", {
     className: "img_cell_thum"
-  }, defaultConfig.checkbox && /*#__PURE__*/_react.default.createElement(_checkbox.default, {
+  }, defaultConfig.checkbox && /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Checkbox, {
     className: "checkBox",
     checked: useCheck,
     onChange: onChange

package/lib/LmTable/Table.js

@@ -162,7 +162,6 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       checkConfig: checkConfig,
       // components: vComponents,
       scroll: (0, _objectSpread2.default)({
-        x: '100%',
         y: autoSize.height
       }, props.scroll),
       pagination: !hiddenPage && (0, _objectSpread2.default)({
@@ -304,32 +303,31 @@ var ResizeSize = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   var defaultRef = ref || (0, _react.useRef)(null);
   var tableWarpRef = (0, _react.useRef)(null);
   var resizeRef = (0, _react.useRef)(null);
-  var throttleSize = (0, _react.useCallback)(function () {
-    console.log(tableSize, '211');
-    var width = tableSize.width,
-        height = tableSize.height;
-
-    var resetHeight = function resetHeight() {
-      var h = height - 48;
+  var resetHeight = (0, _react.useMemo)(function () {
+    var height = tableSize.height;
+    console.log(3);
+    var h = height - 48;
 
-      if (!props.hiddenPage || props.customCheck) {
-        h -= 32;
-      }
-
-      if (props.columns.some(function (v) {
-        return v.children;
-      })) {
-        h -= 32;
-      }
+    if (!props.hiddenPage || props.customCheck) {
+      h -= 32;
+    }
 
-      return h;
-    };
+    if (props.columns.some(function (v) {
+      return v.children;
+    })) {
+      h -= 32;
+    }
 
+    return h;
+  }, [props.hiddenPage, props.customCheck, props.column, tableSize]);
+  var throttleSize = (0, _react.useCallback)(function () {
+    var width = tableSize.width,
+        height = tableSize.height;
     return /*#__PURE__*/_react.default.createElement(ResetTable, (0, _extends2.default)({
       ref: defaultRef
     }, props, {
       autoSize: {
-        height: resetHeight(),
+        height: resetHeight,
         width: width
       }
     }));
@@ -371,7 +369,7 @@ var ResizeSize = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     resizeRef.current = window.addEventListener('resize', handResize);
     setTableSize({
       width: width,
-      height: typeof height === 'string' ? "calc(".concat(height, " - ").concat(value, "px)") : height - value - 32
+      height: typeof height === 'string' ? "calc(".concat(height, " - ").concat(value, "px)") : height - value
     });
     return function () {
       window.removeEventListener('resize', handResize);

package/lib/LmTable/style/style.css

@@ -72,8 +72,12 @@
   line-height: 1;
 }
 .ant-notification-notice .ant-notification-notice-content .ant-notification-notice-message {
+  font-size: 14px;
   font-weight: 500;
 }
+.ant-notification-notice .ant-notification-notice-description {
+  font-size: 12px;
+}
 @font-face {
   font-family: 'iconfont';
   /* Project id 2966019 */
@@ -906,7 +910,7 @@ html {
 .lm_img_table .lm_imgList .img_cell_wrap .img_cell_body .img_cell_tags button.ant-btn-sm {
   border: 0;
   background: var(--background-color-hover);
-  margin: 0 4px 6px 4px;
+  margin: 0 4px 6px 0px;
 }
 .lm_img_table .lm_imgList .img_cell_wrap .img_cell_body.checked {
   border-color: #2593f9;

package/lib/Modal/style/index.css

@@ -72,8 +72,12 @@
   line-height: 1;
 }
 .ant-notification-notice .ant-notification-notice-content .ant-notification-notice-message {
+  font-size: 14px;
   font-weight: 500;
 }
+.ant-notification-notice .ant-notification-notice-description {
+  font-size: 12px;
+}
 @font-face {
   font-family: 'iconfont';
   /* Project id 2966019 */
@@ -505,6 +509,12 @@ html {
 .lm_modal.lm_modal_info .ant-modal-body {
   padding: 24px;
 }
+.lm_modal.lm_modal_info .ant-modal-confirm-title {
+  font-size: 14px;
+}
+.lm_modal.lm_modal_info .ant-modal-confirm-content {
+  font-size: 12px;
+}
 .lm_modal.lm_modal_info .ant-modal-confirm-btns button {
   height: 32px;
   padding: 6px 12px;

package/lib/Notification/index.js

@@ -12,14 +12,12 @@ require("antd/es/notification/style");
 var _notification2 = _interopRequireDefault(require("antd/es/notification"));
 
 var _default = _notification2.default; // const prefixCls = 'lm_notification'
-// const LMNotification: React.FC<INotificationProps> = (props) => {
-//   const { children, className, ...others } = props
-//   return (
-//     <div className={classNames(className, prefixCls)} {...others}>
-//       {children}
-//     </div>
-//   )
-// }
+// const LMNotification = cloneDeep(notification)
+// var paramsList = ['success', 'error', 'info', 'warning', 'warn', 'open'];
+// paramsList.forEach(item => {
+//   LMNotification[item] = (config) => notification[item]?.({ ...config, classNames: classNames(config.className, prefixCls) })
+// })
+// console.log(LMNotification, 'fff', notification)
 // export default LMNotification
 
 exports.default = _default;

package/lib/Notification/style/index.css

@@ -72,8 +72,12 @@
   line-height: 1;
 }
 .ant-notification-notice .ant-notification-notice-content .ant-notification-notice-message {
+  font-size: 14px;
   font-weight: 500;
 }
+.ant-notification-notice .ant-notification-notice-description {
+  font-size: 12px;
+}
 @font-face {
   font-family: 'iconfont';
   /* Project id 2966019 */
@@ -493,3 +497,6 @@ html {
 .card_cell_content:hover .card_cell_body .card_cell_checkbox {
   opacity: 1;
 }
+.ant-notification-notice-message {
+  font-size: 14px;
+}

package/lib/Pagination/index.js

@@ -38,7 +38,12 @@ var LMPagination = function LMPagination(props) {
   return /*#__PURE__*/_react.default.createElement(_pagination.default, Object.assign({
     className: (0, _classnames.default)(className, prefixCls),
     size: "small"
-  }, others));
+  }, others, {
+    locale: {
+      items_per_page: '/条',
+      jump_to: '前往'
+    }
+  }));
 };
 
 var _default = LMPagination;

package/lib/Pagination/style/index.css

@@ -72,8 +72,12 @@
   line-height: 1;
 }
 .ant-notification-notice .ant-notification-notice-content .ant-notification-notice-message {
+  font-size: 14px;
   font-weight: 500;
 }
+.ant-notification-notice .ant-notification-notice-description {
+  font-size: 12px;
+}
 @font-face {
   font-family: 'iconfont';
   /* Project id 2966019 */
@@ -496,6 +500,10 @@ html {
 .lm_pagination.ant-pagination li {
   font-size: 12px;
   line-height: 24px !important;
+  color: var(--color-65);
+}
+.lm_pagination.ant-pagination li.ant-pagination-total-text {
+  color: var(--color-65);
 }
 .lm_pagination.ant-pagination li.ant-pagination-item {
   border: 0;
@@ -507,9 +515,16 @@ html {
 .lm_pagination.ant-pagination li .ant-pagination-item-link {
   border: 0;
 }
+.lm_pagination.ant-pagination li .ant-pagination-item-link .anticon {
+  color: var(--color-85);
+}
 .lm_pagination.ant-pagination li > a {
   color: var(--color-65);
 }
+.lm_pagination.ant-pagination li.ant-pagination-options .ant-select-selection-item {
+  color: var(--color-65);
+  font-size: 12px;
+}
 .lm_pagination.ant-pagination li.ant-pagination-item-active {
   background-color: var(--primary-color);
   color: #fff;
@@ -517,3 +532,17 @@ html {
 .lm_pagination.ant-pagination li.ant-pagination-item-active > a {
   color: #fff;
 }
+.lm_pagination.ant-pagination li .ant-pagination-options-quick-jumper input {
+  width: 38px;
+  font-size: 12px;
+  color: var(--color-65);
+}
+.lm_pagination.ant-pagination li.ant-pagination-simple-pager input {
+  width: 48px;
+  font-size: 12px;
+  color: var(--color-65);
+  height: 22px;
+}
+.lm_pagination.ant-pagination li.ant-pagination-simple-pager .ant-pagination-slash {
+  margin-right: 14px;
+}

package/lib/PopTable/style/style.css

@@ -72,8 +72,12 @@
   line-height: 1;
 }
 .ant-notification-notice .ant-notification-notice-content .ant-notification-notice-message {
+  font-size: 14px;
   font-weight: 500;
 }
+.ant-notification-notice .ant-notification-notice-description {
+  font-size: 12px;
+}
 @font-face {
   font-family: 'iconfont';
   /* Project id 2966019 */

package/lib/ProTable/style/style.css

@@ -72,8 +72,12 @@
   line-height: 1;
 }
 .ant-notification-notice .ant-notification-notice-content .ant-notification-notice-message {
+  font-size: 14px;
   font-weight: 500;
 }
+.ant-notification-notice .ant-notification-notice-description {
+  font-size: 12px;
+}
 @font-face {
   font-family: 'iconfont';
   /* Project id 2966019 */
@@ -575,6 +579,7 @@ html {
 .lm_operate .operate_left,
 .lm_operate .operate_right {
   display: flex;
+  gap: 8px;
 }
 .lm_operate .operate_left:empty,
 .lm_operate .operate_right:empty {

package/lib/Radio/index.js

@@ -37,6 +37,7 @@ LMRadio.Group = function (props) {
       _props$direction = props.direction,
       direction = _props$direction === void 0 ? 'row' : _props$direction,
       restProps = (0, _objectWithoutProperties2.default)(props, _excluded2);
+  console.log(children, 'rrr');
   return /*#__PURE__*/_react.default.createElement(_radio.default.Group, (0, _extends2.default)({
     className: (0, _classnames.default)('lm-radio-group', "lm-radio-group-".concat(direction))
   }, restProps), children);

package/lib/Select/style/index.css

@@ -72,8 +72,12 @@
   line-height: 1;
 }
 .ant-notification-notice .ant-notification-notice-content .ant-notification-notice-message {
+  font-size: 14px;
   font-weight: 500;
 }
+.ant-notification-notice .ant-notification-notice-description {
+  font-size: 12px;
+}
 @font-face {
   font-family: 'iconfont';
   /* Project id 2966019 */

package/lib/Space/style/index.css

@@ -72,8 +72,12 @@
   line-height: 1;
 }
 .ant-notification-notice .ant-notification-notice-content .ant-notification-notice-message {
+  font-size: 14px;
   font-weight: 500;
 }
+.ant-notification-notice .ant-notification-notice-description {
+  font-size: 12px;
+}
 @font-face {
   font-family: 'iconfont';
   /* Project id 2966019 */

package/lib/styles/main.css

@@ -72,8 +72,12 @@
   line-height: 1;
 }
 .ant-notification-notice .ant-notification-notice-content .ant-notification-notice-message {
+  font-size: 14px;
   font-weight: 500;
 }
+.ant-notification-notice .ant-notification-notice-description {
+  font-size: 12px;
+}
 @font-face {
   font-family: 'iconfont';
   /* Project id 2966019 */

package/lib/styles/resetAntd.css

@@ -72,5 +72,9 @@
   line-height: 1;
 }
 .ant-notification-notice .ant-notification-notice-content .ant-notification-notice-message {
+  font-size: 14px;
   font-weight: 500;
 }
+.ant-notification-notice .ant-notification-notice-description {
+  font-size: 12px;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "linkmore-design",
-  "version": "1.0.20",
+  "version": "1.0.23",
   "author": {
     "name": "nowthen",
     "email": "rnlvwyx@gmail.com"
@@ -48,7 +48,7 @@
   "dependencies": {
     "@ant-design/compatible": "^1.0.8",
     "@ant-design/icons": "^4.3.0",
-    "@ant-design/pro-table": "^2.58.1",
+    "@ant-design/pro-table": "^2.77.0",
     "@babel/runtime": "^7.17.9",
     "@typescript-eslint/eslint-plugin": "^5.28.0",
     "@typescript-eslint/parser": "^5.28.0",