linkmore-design 1.0.33 → 1.0.36

package/lib/IconFont/index.js

@@ -8,8 +8,8 @@ exports.default = void 0;
 var _icons = require("@ant-design/icons");
 
 var IconFont = (0, _icons.createFromIconfontCN)({
-  scriptUrl: '//at.alicdn.com/t/font_2966019_8aij0300kjo.js' // 在 iconfont.cn 上生成
-
+  // scriptUrl: '//at.alicdn.com/t/font_2966019_8aij0300kjo.js', // 在 iconfont.cn 上生成
+  scriptUrl: require('./font/iconfont.js')
 });
 var _default = IconFont;
 exports.default = _default;

package/lib/IconFont/style/index.js

@@ -1 +1,3 @@
-"use strict";
+"use strict";
+
+require("./index.css");

package/lib/Input/index.d.ts

@@ -0,0 +1,11 @@
+import { Input } from 'antd';
+import type { InputProps, InputRef } from 'antd';
+import React from 'react';
+interface ILmInput extends React.ForwardRefExoticComponent<InputProps & React.RefAttributes<InputRef>> {
+    Group: typeof Input.Group;
+    Search: typeof Input.Search;
+    TextArea: typeof Input.TextArea;
+    Password: typeof Input.Password;
+}
+declare const LmInput: ILmInput;
+export default LmInput;

package/lib/Input/index.js

@@ -1,9 +1,9 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-
 var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -13,22 +13,29 @@ require("antd/es/input/style");
 
 var _input = _interopRequireDefault(require("antd/es/input"));
 
-var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
-
-var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
-
 var _react = _interopRequireWildcard(require("react"));
 
 var _IconFont = _interopRequireDefault(require("../IconFont"));
 
-var _excluded = ["allowClear"],
-    _excluded2 = ["allowClear"],
-    _excluded3 = ["allowClear"];
+var __rest = void 0 && (void 0).__rest || function (s, e) {
+  var t = {};
+
+  for (var p in s) {
+    if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0) t[p] = s[p];
+  }
+
+  if (s != null && typeof Object.getOwnPropertySymbols === "function") for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+    if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i])) t[p[i]] = s[p[i]];
+  }
+  return t;
+};
+
 var LmInput = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   var _props$allowClear = props.allowClear,
       allowClear = _props$allowClear === void 0 ? true : _props$allowClear,
-      rest = (0, _objectWithoutProperties2.default)(props, _excluded);
-  return /*#__PURE__*/_react.default.createElement(_input.default, (0, _extends2.default)({
+      rest = __rest(props, ["allowClear"]);
+
+  return /*#__PURE__*/_react.default.createElement(_input.default, Object.assign({
     ref: ref,
     className: "lm_input"
   }, rest, {
@@ -39,8 +46,9 @@ LmInput.Group = _input.default.Group;
 LmInput.Search = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   var _props$allowClear2 = props.allowClear,
       allowClear = _props$allowClear2 === void 0 ? true : _props$allowClear2,
-      rest = (0, _objectWithoutProperties2.default)(props, _excluded2);
-  return /*#__PURE__*/_react.default.createElement(_input.default.Search, (0, _extends2.default)({
+      rest = __rest(props, ["allowClear"]);
+
+  return /*#__PURE__*/_react.default.createElement(_input.default.Search, Object.assign({
     enterButton: /*#__PURE__*/_react.default.createElement(_IconFont.default, {
       type: "lmweb-search"
     })
@@ -55,8 +63,9 @@ LmInput.TextArea = _input.default.TextArea;
 LmInput.Password = function (props) {
   var _props$allowClear3 = props.allowClear,
       allowClear = _props$allowClear3 === void 0 ? true : _props$allowClear3,
-      rest = (0, _objectWithoutProperties2.default)(props, _excluded3);
-  return /*#__PURE__*/_react.default.createElement(_input.default.Password, (0, _extends2.default)({
+      rest = __rest(props, ["allowClear"]);
+
+  return /*#__PURE__*/_react.default.createElement(_input.default.Password, Object.assign({
     className: "lm_input_password",
     iconRender: function iconRender(visible) {
       return visible ? /*#__PURE__*/_react.default.createElement(_IconFont.default, {

package/lib/LmTable/Table.js

@@ -9,6 +9,10 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = exports.Summary = void 0;
 
+require("antd/es/config-provider/style");
+
+var _configProvider = _interopRequireDefault(require("antd/es/config-provider"));
+
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
@@ -25,6 +29,8 @@ var _lodash = require("lodash");
 
 var _react = _interopRequireWildcard(require("react"));
 
+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", "customCheck", "rowSelection", "columnsState", "tableRowType"];
@@ -149,7 +155,6 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
 
 
   var config = (0, _react.useMemo)(function () {
-    console.log(resetProps, 'resetPropsresetProps');
     return (0, _objectSpread2.default)({
       defaultSize: 'small',
       tableLayout: 'fixed',
@@ -157,7 +162,7 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       debounceTime: 300,
       revalidateOnFocus: false,
       options: {
-        setting: true,
+        setting: false,
         density: false,
         fullScreen: false,
         reload: false
@@ -183,7 +188,7 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
           return "\u5171 ".concat(total, " \u6761");
         }
       }, pagination),
-      rowSelection: rowSelection === false ? null : (0, _objectSpread2.default)({
+      rowSelection: rowSelection === false ? undefined : (0, _objectSpread2.default)({
         fixed: true,
         type: 'checkbox',
         columnWidth: 36,
@@ -244,14 +249,23 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   (0, _react.useEffect)(function () {
     var obj = (0, _objectSpread2.default)({}, columnsState);
     columns === null || columns === void 0 ? void 0 : columns.forEach(function (item) {
-      if (item.fixed) {
-        obj[item.dataIndex || item.key] = {
-          fixed: item.fixed
-        };
-      }
+      /** 目前支持三种 */
+      var _ref = obj[item.dataIndex || item.key] || {},
+          order = _ref.order,
+          show = _ref.show,
+          fixed = _ref.fixed;
+
+      obj[item.dataIndex || item.key] = {
+        fixed: fixed || item.fixed,
+        show: show === false ? false : item.show || true,
+        order: order || item.order
+      }; // if (item.fixed && !fixed) {
+      //   obj[item.dataIndex || item.key] = { ...(obj[item.dataIndex || item.key] || {}), fixed: item.fixed }
+      // }
     });
+    console.log(obj, 'oobjb');
     setColumnsStateMap(obj);
-  }, []); // useEffect(() => {
+  }, [columnsState]); // useEffect(() => {
   //   console.log(props.columnsStateValue, 'v vv')
   //   setColumnsStateMap(props.columnsStateValue)
   // }, [props.columnsStateValue])
@@ -277,7 +291,8 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
           selectedRows: value
         });
         rowClick === null || rowClick === void 0 ? void 0 : rowClick(value);
-      }
+      },
+      checkboxRecords: useSelectedRows.selectedRows
     };
   }); // loading触发清空选中状态
 
@@ -287,11 +302,23 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       selectedRows: []
     });
   }, [loading]);
+  /** 自定义空状态 */
+
+  var customizeRenderEmpty = function customizeRenderEmpty() {
+    return /*#__PURE__*/_react.default.createElement("div", {
+      className: "lm_table_empty"
+    }, /*#__PURE__*/_react.default.createElement("img", {
+      src: _empty.default
+    }), /*#__PURE__*/_react.default.createElement("span", null, "\u6682\u65E0\u6570\u636E"));
+  };
+
   return /*#__PURE__*/_react.default.createElement("div", {
     style: {
       height: '100%',
       width: '100%'
     }
+  }, /*#__PURE__*/_react.default.createElement(_configProvider.default, {
+    renderEmpty: customizeRenderEmpty
   }, /*#__PURE__*/_react.default.createElement(_proTable.default, (0, _extends2.default)({}, config, {
     loading: loading,
     dataSource: dataSource,
@@ -300,7 +327,7 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     summary: function summary(pageData) {
       return _summary && _summary(pageData, resultColumns);
     }
-  })), !!customCheck && /*#__PURE__*/_react.default.createElement("div", {
+  }))), !!customCheck && /*#__PURE__*/_react.default.createElement("div", {
     className: "lm_customCheck"
   }, customCheck));
 }); // 监听大小: 这里的高度是整个表格的高度，表体需要减去列头和分页的高度
@@ -311,6 +338,18 @@ var ResizeSize = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   var _props$autoSizer = props.autoSizer,
       autoSizer = _props$autoSizer === void 0 ? false : _props$autoSizer;
 
+  var _useState9 = (0, _react.useState)({
+    width: '100%',
+    height: '100%'
+  }),
+      _useState10 = (0, _slicedToArray2.default)(_useState9, 2),
+      tableSize = _useState10[0],
+      setTableSize = _useState10[1];
+
+  var defaultRef = ref || (0, _react.useRef)(null);
+  var tableWarpRef = (0, _react.useRef)(null);
+  var resizeRef = (0, _react.useRef)(null);
+
   if (!autoSizer) {
     return /*#__PURE__*/_react.default.createElement("div", {
       ref: tableWarpRef,
@@ -329,17 +368,6 @@ var ResizeSize = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     })));
   }
 
-  var _useState9 = (0, _react.useState)({
-    width: '100%',
-    height: '100%'
-  }),
-      _useState10 = (0, _slicedToArray2.default)(_useState9, 2),
-      tableSize = _useState10[0],
-      setTableSize = _useState10[1];
-
-  var defaultRef = ref || (0, _react.useRef)(null);
-  var tableWarpRef = (0, _react.useRef)(null);
-  var resizeRef = (0, _react.useRef)(null);
   var resetHeight = (0, _react.useMemo)(function () {
     var height = tableSize.height;
     var h = height - 32;

package/lib/LmTable/style/style.css

@@ -770,6 +770,9 @@ html {
 .lm_grid .ant-pro-table .ant-table-row .operate_fixed_right .operate_btn .ant-space-item {
   cursor: pointer;
 }
+.lm_grid .ant-pro-table .ant-table-row .operate_fixed_right .lm_table_operate {
+  color: var(--font-color);
+}
 .lm_grid .ant-pro-table .ant-table-row .operate_fixed_right .ant-btn {
   font-size: 12px;
 }
@@ -1280,6 +1283,25 @@ html {
 #lm_protable_warp .lm_protable .ant-pro-table .ant-table-row .operate_fixed_right .ant-btn {
   font-size: 12px;
 }
+#lm_protable_warp .lm_protable .ant-table-expanded-row .ant-table-thead > tr > th:first-child::before {
+  content: '';
+  position: absolute;
+  width: 32px;
+  height: 1px;
+  bottom: 0;
+  left: -32px;
+  top: 100%;
+  background: #f0f0f0;
+}
+#lm_protable_warp .lm_protable .ant-table-expanded-row .ant-table-row > td:first-child::before {
+  content: '';
+  position: absolute;
+  width: 32px;
+  height: 1px;
+  bottom: -1px;
+  left: -32px;
+  background: #f0f0f0;
+}
 #lm_protable_warp .lm_protable .ant-table-expanded-row > td {
   padding: 0px;
   background: var(--color-4);
@@ -1363,6 +1385,19 @@ html {
 #lm_protable_warp .lm_protable .ant-table-pagination.ant-pagination li.ant-pagination-simple-pager .ant-pagination-slash {
   margin-right: 14px;
 }
+#lm_protable_warp .lm_protable .lm_table_empty {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+}
+#lm_protable_warp .lm_protable .lm_table_empty > img {
+  width: 130px;
+  height: 80px;
+  margin-bottom: 8px;
+}
+#lm_protable_warp .lm_protable .lm_table_empty > span {
+  color: var(--font-color);
+}
 #lm_protable_warp .ant-table-expand-icon-col {
   width: 32px;
 }

package/lib/LoadingPage/style/index.js

@@ -1 +1,3 @@
-"use strict";
+"use strict";
+
+require("./index.css");

package/lib/Radio/index.js

@@ -20,7 +20,7 @@ var _classnames = _interopRequireDefault(require("classnames"));
 var _react = _interopRequireDefault(require("react"));
 
 var _excluded = ["children"],
-    _excluded2 = ["children", "size", "buttonStyle", "direction"];
+    _excluded2 = ["children", "size", "buttonStyle", "direction", "className"];
 
 var LMRadio = function LMRadio(props) {
   var children = props.children,
@@ -37,10 +37,11 @@ LMRadio.Group = function (props) {
       buttonStyle = props.buttonStyle,
       _props$direction = props.direction,
       direction = _props$direction === void 0 ? 'row' : _props$direction,
+      className = props.className,
       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)),
+    className: (0, _classnames.default)(className, 'lm-radio-group', "lm-radio-group-".concat(direction)),
     size: size
   }, restProps), children);
 };

package/lib/Radio/style/style.css

@@ -119,6 +119,10 @@
 .lm-radio-group .ant-radio-button-wrapper-disabled:hover {
   color: var(--disabled-font-color);
 }
+.lm-radio-group.lm-radio-group-row {
+  display: flex;
+  flex-direction: row;
+}
 .lm-radio-group.lm-radio-group-column {
   display: flex;
   flex-direction: column;

package/lib/Tooltip/index.d.ts

@@ -0,0 +1,2 @@
+import { Tooltip } from 'antd';
+export default Tooltip;

package/lib/Tooltip/index.js

@@ -0,0 +1,15 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+require("antd/es/tooltip/style");
+
+var _tooltip = _interopRequireDefault(require("antd/es/tooltip"));
+
+var _default = _tooltip.default;
+exports.default = _default;