linkmore-design 1.0.32 → 1.0.35

package/es/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/es/IconFont/style/index.js

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

package/es/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/esm/extends"));
 
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/toConsumableArray"));
@@ -25,9 +29,11 @@ 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"];
+var _excluded = ["dataSource", "autoSize", "columns", "rowClick", "onDoubleClick", "checkConfig", "summary", "pagination", "hiddenPage", "loading", "virtual", "customCheck", "rowSelection", "columnsState", "tableRowType"];
 var Summary = _proTable.default.Summary;
 exports.Summary = Summary;
 var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
@@ -45,6 +51,9 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       virtual = _props$virtual === void 0 ? false : _props$virtual,
       customCheck = props.customCheck,
       rowSelection = props.rowSelection,
+      columnsState = props.columnsState,
+      _props$tableRowType = props.tableRowType,
+      tableRowType = _props$tableRowType === void 0 ? 'default' : _props$tableRowType,
       resetProps = (0, _objectWithoutProperties2.default)(props, _excluded);
   var _resetProps$rowKey = resetProps.rowKey,
       rowKey = _resetProps$rowKey === void 0 ? 'id' : _resetProps$rowKey;
@@ -89,7 +98,9 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   };
 
   var resetColumns = (0, _react.useCallback)(function () {
-    return useColumns.map(function (col, index) {
+    return useColumns.filter(function (item) {
+      return item.show !== false;
+    }).map(function (col, index) {
       return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, col), {}, {
         width: col.width,
         onHeaderCell: function onHeaderCell(column) {
@@ -112,20 +123,25 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
         trigger = _Object$assign.trigger,
         highlight = _Object$assign.highlight;
 
+    console.log(trigger, highlight, 'rowclick');
+
     if (highlight) {
       setActiveKey(record[rowKey]);
     }
 
     if (trigger === 'row') {
       var selectedRows = useSelectedRows.selectedRows;
-      var selectedRowKeys = selectedRows.map(function (v) {
-        return v[rowKey];
-      });
-      var Idx = selectedRowKeys.indexOf(record[rowKey]);
-      Idx >= 0 ? selectedRows.splice(Idx, 1) : selectedRows.push(record);
-      setSelectedRows({
-        selectedRows: selectedRows
-      });
+
+      if (tableRowType === 'select' || tableRowType === 'default' && selectedRows.length) {
+        var selectedRowKeys = selectedRows.map(function (v) {
+          return v[rowKey];
+        });
+        var Idx = selectedRowKeys.indexOf(record[rowKey]);
+        Idx >= 0 ? selectedRows.splice(Idx, 1) : selectedRows.push(record);
+        setSelectedRows({
+          selectedRows: selectedRows
+        });
+      }
     }
 
     rowClick === null || rowClick === void 0 ? void 0 : rowClick(record);
@@ -139,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',
@@ -155,6 +170,7 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       columnsState: {
         value: columnsStateMap,
         onChange: function onChange(k) {
+          console.log(k, 'kkk');
           setColumnsStateMap(k);
         }
       },
@@ -172,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,
@@ -231,16 +247,29 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   // }, [columns, autoSize.width])
 
   (0, _react.useEffect)(function () {
-    var obj = {};
+    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])
+  // useEffect(() => {
   //   rowClick?.()
   // }, [useSelectedRows])
   // 将节点方法给外部使用
@@ -272,11 +301,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,
@@ -285,7 +326,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));
 }); // 监听大小: 这里的高度是整个表格的高度，表体需要减去列头和分页的高度
@@ -385,7 +426,6 @@ var ResizeSize = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
         _tableWarpRef$current7 = _tableWarpRef$current5.height,
         height = _tableWarpRef$current7 === void 0 ? '100%' : _tableWarpRef$current7;
 
-    console.log(width, height, '--tableWarpReftableWarpRef', tableWarpRef.current);
     var value = summary ? 48 : 0;
     resizeRef.current = window.addEventListener('resize', handResize);
     setTableSize({

package/es/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;
 }
@@ -1118,6 +1121,9 @@ html {
 #lm_protable_warp .ant-pro-card-body {
   padding: 0;
 }
+#lm_protable_warp .lm_protable .ant-table {
+  font-size: 12px;
+}
 #lm_protable_warp .lm_protable .ant-card-body,
 #lm_protable_warp .lm_protable .ant-pro-card-body {
   padding: 0;
@@ -1167,6 +1173,7 @@ html {
 #lm_protable_warp .lm_protable .ant-table-thead > tr > th {
   background: var(--color-4);
   font-size: 12px;
+  padding: 8px;
 }
 #lm_protable_warp .lm_protable .ant-table.ant-table-small {
   font-size: 12px;
@@ -1276,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);
@@ -1359,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/es/LoadingPage/style/index.js

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

package/es/Radio/style/style.css

@@ -30,7 +30,7 @@
   font-size: 12px;
   line-height: 30px;
   height: 32px;
-  padding: 1px 8px;
+  padding: 1px 12px;
   color: var(--font-color);
   vertical-align: middle;
 }
@@ -73,6 +73,7 @@
 .lm-radio-group.ant-radio-group-small .ant-radio-button-wrapper {
   line-height: 22px;
   height: 24px;
+  padding: 1px 8px;
 }
 .lm-radio-group.ant-radio-group-small .ant-radio-button-wrapper > span:last-child {
   line-height: 22px;

package/es/Tag/index.js

@@ -16,7 +16,7 @@ var __rest = this && this.__rest || function (s, e) {
 
 import React, { forwardRef } from 'react';
 import classNames from 'classnames';
-export var PresetColorTypes = ['pink', 'red', 'yellow', 'orange', 'cyan', 'green', 'blue', 'purple', 'geekblue', 'magenta', 'volcano', 'gold', 'lime'];
+export var PresetColorTypes = ['pink', 'red', 'yellow', 'orange', 'cyan', 'green', 'blue', 'purple', 'geekblue', 'magenta', 'volcano', 'gold', 'lime', 'theme'];
 var prefixCls = 'lm_tag';
 var LmTag = /*#__PURE__*/forwardRef(function (props, ref) {
   var className = props.className,
@@ -29,7 +29,7 @@ var LmTag = /*#__PURE__*/forwardRef(function (props, ref) {
     color: color,
     className: classNames(prefixCls, {
       lm_tag_noborder: !!props.noborder
-    }, className, PresetColorTypes.includes(color) && "lm_tag_main_color")
+    }, className, PresetColorTypes.includes(color) && "lm_tag_main_color lm_tag_main_".concat(color))
   }));
 });
 LmTag.CheckableTag = _Tag.CheckableTag;

package/es/Tag/style/index.css

@@ -512,6 +512,10 @@ html {
 .lm_tag.ant-tag .anticon-close {
   margin-left: 6px;
 }
+.lm_tag.ant-tag.lm_tag_main_theme {
+  background: var(--tree-select-bg);
+  color: var(--primary-color);
+}
 .lm_tag.lm_tag_noborder {
   border-color: transparent;
 }

package/es/Tooltip/index.d.ts

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

package/es/Tooltip/index.js

@@ -0,0 +1,3 @@
+import "antd/es/tooltip/style";
+import _Tooltip from "antd/es/tooltip";
+export default _Tooltip;