linkmore-design 1.0.32 → 1.0.33

package/lib/LmTable/Table.js

@@ -27,7 +27,7 @@ var _react = _interopRequireWildcard(require("react"));
 
 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 +45,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 +92,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 +117,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);
@@ -147,7 +157,7 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       debounceTime: 300,
       revalidateOnFocus: false,
       options: {
-        setting: false,
+        setting: true,
         density: false,
         fullScreen: false,
         reload: false
@@ -155,6 +165,7 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       columnsState: {
         value: columnsStateMap,
         onChange: function onChange(k) {
+          console.log(k, 'kkk');
           setColumnsStateMap(k);
         }
       },
@@ -231,7 +242,7 @@ 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] = {
@@ -241,6 +252,10 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     });
     setColumnsStateMap(obj);
   }, []); // useEffect(() => {
+  //   console.log(props.columnsStateValue, 'v vv')
+  //   setColumnsStateMap(props.columnsStateValue)
+  // }, [props.columnsStateValue])
+  // useEffect(() => {
   //   rowClick?.()
   // }, [useSelectedRows])
   // 将节点方法给外部使用
@@ -385,7 +400,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/lib/LmTable/style/style.css

@@ -1118,6 +1118,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 +1170,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;

package/lib/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/lib/Tag/index.js

@@ -30,7 +30,7 @@ var __rest = void 0 && (void 0).__rest || function (s, e) {
   return t;
 };
 
-var PresetColorTypes = ['pink', 'red', 'yellow', 'orange', 'cyan', 'green', 'blue', 'purple', 'geekblue', 'magenta', 'volcano', 'gold', 'lime'];
+var PresetColorTypes = ['pink', 'red', 'yellow', 'orange', 'cyan', 'green', 'blue', 'purple', 'geekblue', 'magenta', 'volcano', 'gold', 'lime', 'theme'];
 exports.PresetColorTypes = PresetColorTypes;
 var prefixCls = 'lm_tag';
 var LmTag = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
@@ -44,7 +44,7 @@ var LmTag = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     color: color,
     className: (0, _classnames.default)(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.default.CheckableTag;

package/lib/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/lib/index.js

@@ -35,6 +35,12 @@ Object.defineProperty(exports, "CkFilter", {
     return _CkFilter.default;
   }
 });
+Object.defineProperty(exports, "CustomTableOption", {
+  enumerable: true,
+  get: function get() {
+    return _CustomTableOption.default;
+  }
+});
 Object.defineProperty(exports, "CustomerService", {
   enumerable: true,
   get: function get() {
@@ -332,4 +338,6 @@ var _Table = _interopRequireDefault(require("./Table"));
 
 var _Switch = _interopRequireDefault(require("./Switch"));
 
-var _Image = _interopRequireDefault(require("./Image"));
+var _Image = _interopRequireDefault(require("./Image"));
+
+var _CustomTableOption = _interopRequireDefault(require("./CustomTableOption"));

package/lib/message/style/index.css

@@ -504,6 +504,6 @@ html {
   opacity: 1;
 }
 .ant-message .ant-message-notice-content {
-  padding: 7px 16px;
+  padding: 8px 16px;
   font-size: 12px;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "linkmore-design",
-  "version": "1.0.32",
+  "version": "1.0.33",
   "author": {
     "name": "nowthen",
     "email": "rnlvwyx@gmail.com"