linkmore-design 1.1.21 → 1.1.22-beta.1

package/lib/LmEditTable/EditTable.js

@@ -303,7 +303,7 @@ var Opetate = function Opetate(_ref) {
   }), (options === null || options === void 0 ? void 0 : options.includes('add')) && (options === null || options === void 0 ? void 0 : options.includes('addInChildren')) ? /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Popover, {
     placement: "bottom",
     overlayClassName: 'lm_table_append_add_popover',
-    open: open,
+    // open={open}
     title: null,
     content: /*#__PURE__*/_react.default.createElement("ul", null, /*#__PURE__*/_react.default.createElement("li", {
       onClick: appendAdd
@@ -723,6 +723,8 @@ var EditableCell = function EditableCell(props) {
 };
 
 var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
+  var _a, _b;
+
   var defaultData = props.value,
       columns = props.columns,
       isEdit = props.isEdit,
@@ -762,24 +764,36 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   var _useState5 = (0, _react.useState)({}),
       _useState6 = (0, _slicedToArray2.default)(_useState5, 2),
       _valid = _useState6[0],
-      setValid = _useState6[1];
+      setValid = _useState6[1]; // const [localRowSelectList, setLocalRowSelectList] = useState([])
+
+
+  var transformRowSelect = function transformRowSelect(selectedRowKeys, selectedRows, info) {
+    var _a;
+
+    return (_a = rowSelection === null || rowSelection === void 0 ? void 0 : rowSelection.onChange) === null || _a === void 0 ? void 0 : _a.call(rowSelection, selectedRowKeys, selectedRows, info);
+  };
+
+  var _useControllableValue3 = (0, _ahooks.useControllableValue)({
+    value: {
+      selectedRows: (rowSelection === null || rowSelection === void 0 ? void 0 : rowSelection.selectedRows) || (rowSelection === null || rowSelection === void 0 ? void 0 : rowSelection.selectedRowKeys) || []
+    },
+    onChange: (rowSelection === null || rowSelection === void 0 ? void 0 : rowSelection.onChange) ? transformRowSelect : undefined
+  }),
+      _useControllableValue4 = (0, _slicedToArray2.default)(_useControllableValue3, 2),
+      localRowSelectList = _useControllableValue4[0],
+      setLocalRowSelectList = _useControllableValue4[1];
 
   var _useState7 = (0, _react.useState)([]),
       _useState8 = (0, _slicedToArray2.default)(_useState7, 2),
-      localRowSelectList = _useState8[0],
-      setLocalRowSelectList = _useState8[1];
-
-  var _useState9 = (0, _react.useState)([]),
-      _useState10 = (0, _slicedToArray2.default)(_useState9, 2),
-      sortEditTable = _useState10[0],
-      setCallBackFalg = _useState10[1];
+      sortEditTable = _useState8[0],
+      setCallBackFalg = _useState8[1];
   /** 当前展开的列 */
 
 
-  var _useState11 = (0, _react.useState)([]),
-      _useState12 = (0, _slicedToArray2.default)(_useState11, 2),
-      expandedRowKeys = _useState12[0],
-      setExpandedRowKeys = _useState12[1];
+  var _useState9 = (0, _react.useState)([]),
+      _useState10 = (0, _slicedToArray2.default)(_useState9, 2),
+      expandedRowKeys = _useState10[0],
+      setExpandedRowKeys = _useState10[1];
 
   var dataSourceRef = (0, _react.useRef)([]);
   var sortDataSorceRef = (0, _react.useRef)([]);
@@ -800,10 +814,10 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     var _a;
 
     var oldIndex = columns.findIndex(function (item) {
-      return item.dataIndex === active;
+      return item['dataIndex'] === active;
     });
     var newIndex = columns.findIndex(function (item) {
-      return item.dataIndex === over;
+      return item['dataIndex'] === over;
     });
     filterChange === null || filterChange === void 0 ? void 0 : filterChange((_a = (0, _sortable.arrayMove)(columns, oldIndex, newIndex)) === null || _a === void 0 ? void 0 : _a.map(function (item, index) {
       return Object.assign(Object.assign({}, item), {
@@ -852,25 +866,19 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
         sortDataSorceRef.current = dataSource;
       }
     }
-  }, [dataSource]);
-  /** 本地缓存一个选择数据 */
-
-  (0, _react.useEffect)(function () {
-    if (rowSelection) {
-      var selectedRowKeys = rowSelection.selectedRowKeys;
-
-      if (selectedRowKeys) {
-        setLocalRowSelectList(localRowSelectList || []);
-      }
-    }
-  }, [rowSelection]);
-
-  var editTableRowChange = function editTableRowChange(selectRows) {
-    var _a;
-
-    setLocalRowSelectList(selectRows);
-    (_a = rowSelection === null || rowSelection === void 0 ? void 0 : rowSelection.onChange) === null || _a === void 0 ? void 0 : _a.call(rowSelection, selectRows);
-  };
+  }, [dataSource]); // /** 本地缓存一个选择数据 */
+  // useEffect(() => {
+  //   if (rowSelection) {
+  //     const { selectedRowKeys } = rowSelection
+  //     if (selectedRowKeys) {
+  //       setLocalRowSelectList(localRowSelectList || [])
+  //     }
+  //   }
+  // }, [rowSelection])
+  // const editTableRowChange = (selectRows) => {
+  //   setLocalRowSelectList(selectRows);
+  //   // (rowSelection?.onChange as any)?.(selectRows)
+  // }
 
   var handleSave = function handleSave(row, options) {
     var _a, _b;
@@ -1076,12 +1084,12 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     var hasOnlyOptionsDatas = columns.filter(function (item) {
       var _a;
 
-      return (_a = item === null || item === void 0 ? void 0 : item.componentProps) === null || _a === void 0 ? void 0 : _a.optionOnly;
+      return (_a = item === null || item === void 0 ? void 0 : item['componentProps']) === null || _a === void 0 ? void 0 : _a.optionOnly;
     });
 
     if (hasOnlyOptionsDatas.length) {
       return hasOnlyOptionsDatas === null || hasOnlyOptionsDatas === void 0 ? void 0 : hasOnlyOptionsDatas.map(function (item) {
-        return item.dataIndex;
+        return item['dataIndex'];
       });
     }
 
@@ -1091,7 +1099,7 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
 
   var DisableOptions = (0, _react.useMemo)(function () {
     var newColumns = columns === null || columns === void 0 ? void 0 : columns.map(function (item) {
-      var _ref5 = item.componentProps || {},
+      var _ref5 = item['componentProps'] || {},
           optionOnly = _ref5.optionOnly,
           options = _ref5.options;
 
@@ -1106,7 +1114,7 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
           });
         });
         return Object.assign(Object.assign({}, item), {
-          componentProps: Object.assign(Object.assign({}, item.componentProps), {
+          componentProps: Object.assign(Object.assign({}, item['componentProps']), {
             options: newOptions
           })
         });
@@ -1149,7 +1157,7 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     });
     localColumns = localColumns.map(function (item, index) {
       return Object.assign(Object.assign({}, item), {
-        order: [null, undefined].includes(item.order) ? index : item.order
+        order: [null, undefined].includes(item['order']) ? index : item['order']
       });
     }).sort(function (a, b) {
       return a.order - b.order;
@@ -1296,6 +1304,19 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   (0, _react.useImperativeHandle)(ref, function () {
     return {
       setRow: handleSave,
+      getCheckboxRecords: function getCheckboxRecords() {
+        return localRowSelectList.selectedRows;
+      },
+      clearSelect: function clearSelect() {
+        setLocalRowSelectList({
+          selectedRows: []
+        });
+      },
+      customSetCheckboxRecords: function customSetCheckboxRecords(value) {
+        setLocalRowSelectList({
+          selectedRows: value
+        });
+      },
       valid: function valid() {
         return _valid;
       }
@@ -1321,17 +1342,19 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       bordered: true,
       pagination: false,
       // components={tableComponents}
-      rowSelection: !rowSelection ? undefined : {
+      rowSelection: !rowSelection ? undefined : Object.assign(Object.assign({
         fixed: true,
         type: 'checkbox',
-        columnWidth: 36,
-        selectedRowKeys: localRowSelectList.map(function (v) {
-          return v[_rowKey];
+        columnWidth: 36
+      }, rowSelection), {
+        selectedRowKeys: (_a = localRowSelectList === null || localRowSelectList === void 0 ? void 0 : localRowSelectList.selectedRows) === null || _a === void 0 ? void 0 : _a.map(function (v) {
+          return (0, _lodash.isObject)(v) ? v[_rowKey] : v;
         }),
-        onChange: function onChange(selectedRowKeys, selectedRows) {
-          editTableRowChange(selectedRows);
+        onChange: function onChange(selectedRowKeys, selectedRows, info) {
+          // editTableRowChange(selectedRowKeys, selectedRows, info)
+          setLocalRowSelectList(selectedRowKeys, selectedRows, info);
         }
-      },
+      }),
       dataSource: dataSource
     })))), isShowAddAction && /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Button, {
       className: "lm_editTable_add_bar",
@@ -1362,17 +1385,18 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
         return setExpandedRowKeys(expandedRows);
       }
     },
-    rowSelection: !rowSelection ? undefined : {
+    rowSelection: !rowSelection ? undefined : Object.assign(Object.assign({
       fixed: true,
       type: 'checkbox',
-      columnWidth: 36,
-      selectedRowKeys: localRowSelectList === null || localRowSelectList === void 0 ? void 0 : localRowSelectList.map(function (v) {
-        return v[_rowKey];
+      columnWidth: 36
+    }, rowSelection), {
+      selectedRowKeys: (_b = localRowSelectList === null || localRowSelectList === void 0 ? void 0 : localRowSelectList.selectedRows) === null || _b === void 0 ? void 0 : _b.map(function (v) {
+        return (0, _lodash.isObject)(v) ? v[_rowKey] : v;
       }),
-      onChange: function onChange(selectedRowKeys, selectedRows) {
-        editTableRowChange(selectedRows);
+      onChange: function onChange(selectedRowKeys, selectedRows, info) {
+        setLocalRowSelectList(selectedRowKeys, selectedRows, info);
       }
-    },
+    }),
     dataSource: dataSource
   })), isShowAddAction && /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Button, {
     className: "lm_editTable_add_bar",

package/lib/LmFilter/components/DropdownFIlter.js

@@ -216,7 +216,8 @@ var FilterItem = /*#__PURE__*/_react.default.memo(function (_ref4) {
   var filterValue = instance.filterValue,
       setFilterValue = instance.setFilterValue;
   var title = item.title,
-      colon = item.colon; // 是否有筛选值/是否处于筛选状态
+      colon = item.colon,
+      clearIconTrigger = item.clearIconTrigger; // 是否有筛选值/是否处于筛选状态
 
   var active = (0, _react.useMemo)(function () {
     return (0, _utils.getIsHas)(filterValue);
@@ -231,6 +232,29 @@ var FilterItem = /*#__PURE__*/_react.default.memo(function (_ref4) {
       e.stopPropagation();
       setFilterValue((0, _utils.getValueForType)(item.type));
     }
+  }; // Icon展示方式
+
+
+  var Icon = function Icon() {
+    // hover时出现清空
+    if (clearIconTrigger === 'hover') {
+      return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_linkmoreDesign.IconFont, {
+        type: "lmweb-close-circle-fill",
+        onClick: handleClear,
+        className: "icon_clear"
+      }), /*#__PURE__*/_react.default.createElement(_linkmoreDesign.IconFont, {
+        type: "lmweb-down",
+        className: "icon_down"
+      }));
+    } // 日期类型并且未选中时返回日期自带icon
+
+
+    if (item.type === 'date' && !active) return null; // 选中时展示清楚按钮
+
+    return /*#__PURE__*/_react.default.createElement(_linkmoreDesign.IconFont, {
+      type: active ? 'lmweb-close-circle-fill' : 'lmweb-down',
+      onClick: handleClear
+    });
   };
 
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, (title || showColon) && /*#__PURE__*/_react.default.createElement("div", {
@@ -244,10 +268,7 @@ var FilterItem = /*#__PURE__*/_react.default.memo(function (_ref4) {
     item: item
   })), /*#__PURE__*/_react.default.createElement("div", {
     className: "filter_item_icon addon_after"
-  }, item.type !== 'date' || active ? /*#__PURE__*/_react.default.createElement(_linkmoreDesign.IconFont, {
-    type: active ? 'lmweb-close-circle-fill' : 'lmweb-down',
-    onClick: handleClear
-  }) : null));
+  }, /*#__PURE__*/_react.default.createElement(Icon, null)));
 });
 /*
  * css样式控制

package/lib/LmFilter/style/index.css

@@ -108,6 +108,9 @@
 .lm_filter_basic_item .filter_item_icon.addon_before {
   color: var(--font-color);
 }
+.lm_filter_basic_item .filter_item_icon .icon_clear {
+  display: none;
+}
 .lm_filter_basic_item.expand .filter_item_icon.addon_after {
   transform: rotateX(180deg);
 }
@@ -121,6 +124,12 @@
 .lm_filter_basic_item.active.lm_filter_complex_item .filter_item_label {
   color: var(--primary-color);
 }
+.lm_filter_basic_item.active:hover .icon_down {
+  display: none;
+}
+.lm_filter_basic_item.active:hover .icon_clear {
+  display: inline-block;
+}
 .ant-dropdown.filter_dropdown_container_cascader > div {
   transform: translateY(-4px);
 }

package/lib/LmFilter/style/variables.css

@@ -108,6 +108,9 @@
 .lm_filter_basic_item .filter_item_icon.addon_before {
   color: var(--font-color);
 }
+.lm_filter_basic_item .filter_item_icon .icon_clear {
+  display: none;
+}
 .lm_filter_basic_item.expand .filter_item_icon.addon_after {
   transform: rotateX(180deg);
 }
@@ -121,6 +124,12 @@
 .lm_filter_basic_item.active.lm_filter_complex_item .filter_item_label {
   color: var(--primary-color);
 }
+.lm_filter_basic_item.active:hover .icon_down {
+  display: none;
+}
+.lm_filter_basic_item.active:hover .icon_clear {
+  display: inline-block;
+}
 .ant-dropdown.filter_dropdown_container_cascader > div {
   transform: translateY(-4px);
 }