linkmore-design 1.1.5 → 1.1.7

package/lib/LmEditTable/EditTable.js

@@ -467,6 +467,7 @@ var EditableCell = function EditableCell(props) {
 
   var Control = function Control(con) {
     var resultComponentProps = (0, _lodash.isFunction)(componentProps) ? componentProps === null || componentProps === void 0 ? void 0 : componentProps(record, col) : componentProps;
+    var clearAttrComponentProps = (0, _lodash.omit)(resultComponentProps, ['optionOnly', 'isOnlyValue']);
 
     switch (con) {
       case 'input':
@@ -475,7 +476,7 @@ var EditableCell = function EditableCell(props) {
           onBlur: handleFormItemChange,
           ref: inputRef,
           placeholder: "\u8BF7\u8F93\u5165"
-        }, resultComponentProps, {
+        }, clearAttrComponentProps, {
           addonBefore: resultComponentProps.addonBefore ? /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Form.Item, {
             name: [col.dataIndex, 'addonBeforeValue'],
             noStyle: true
@@ -515,13 +516,13 @@ var EditableCell = function EditableCell(props) {
           },
           placeholder: "\u8BF7\u8F93\u5165",
           ref: inputRef
-        }, resultComponentProps));
+        }, clearAttrComponentProps));
 
       case 'date':
         // @ts-ignore
         return /*#__PURE__*/_react.default.createElement(_linkmoreDesign.DatePicker, Object.assign({
           onChange: handleFormItemChange
-        }, resultComponentProps));
+        }, clearAttrComponentProps));
 
       case 'select':
         return /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Select, Object.assign({
@@ -534,7 +535,7 @@ var EditableCell = function EditableCell(props) {
 
             return ((_b = (_a = option.children) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === null || _b === void 0 ? void 0 : _b.indexOf(input.toLowerCase())) >= 0;
           }
-        }, resultComponentProps, {
+        }, clearAttrComponentProps, {
           // open={true}
           onChange: handleFormItemChange
         }));
@@ -553,30 +554,30 @@ var EditableCell = function EditableCell(props) {
           },
           onChange: handleFormItemChange,
           onDeselect: handleFormItemChange
-        }, resultComponentProps));
+        }, clearAttrComponentProps));
 
       case 'checkbox':
         return /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Checkbox.Group, Object.assign({
           onChange: handleFormItemChange,
           ref: inputRef
-        }, resultComponentProps));
+        }, clearAttrComponentProps));
 
       case 'radio':
         return /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Radio, Object.assign({
           onChange: handleFormItemChange,
           ref: inputRef
-        }, resultComponentProps));
+        }, clearAttrComponentProps));
 
       case 'radioGroup':
         return /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Radio.Group, Object.assign({
           onChange: handleFormItemChange,
           ref: inputRef
-        }, resultComponentProps));
+        }, clearAttrComponentProps));
 
       case 'switch':
         return /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Switch, Object.assign({
           size: 'small'
-        }, resultComponentProps, {
+        }, clearAttrComponentProps, {
           onChange: handleFormItemChange
         }));
 
@@ -605,7 +606,7 @@ var EditableCell = function EditableCell(props) {
           var fromData = form.getFieldsValue();
           return render === null || render === void 0 ? void 0 : render(Object.assign(Object.assign({}, !(0, _util.isObjEmpty)(fromData) ? Object.assign(Object.assign({}, record), (0, _defineProperty2.default)({}, dataIndex, fromData[dataIndex])) : record), {
             onChange: save
-          })); // return render?.({ ...(!isObjEmpty(fromData) ? {...record, ...fromData} : record), onChange: save })
+          }));
         }
 
       default:
@@ -637,7 +638,7 @@ var EditableCell = function EditableCell(props) {
         onClick: toggleEdit
       }, childNode);
     } else if (isEdit && editable) {
-      childNode = /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Form.Item, Object.assign({
+      childNode = /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, (0, _util.isExpandRow)(childNode) && childNode[0], /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Form.Item, Object.assign({
         errorPlacement: "right",
         valuePropName: editable === 'switch' ? 'checked' : 'value',
         style: {
@@ -645,17 +646,17 @@ var EditableCell = function EditableCell(props) {
         }
       }, formProps, {
         name: dataIndex
-      }), Control(editable));
+      }), Control(editable)));
 
       if (editable === 'input' && ((resultComponentProps === null || resultComponentProps === void 0 ? void 0 : resultComponentProps.addonBefore) || (resultComponentProps === null || resultComponentProps === void 0 ? void 0 : resultComponentProps.addonAfter))) {
-        childNode = /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Form.Item, Object.assign({
+        childNode = /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, (0, _util.isExpandRow)(childNode) && childNode[0], /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Form.Item, Object.assign({
           errorPlacement: "right",
           style: {
             margin: 0
           }
         }, formProps, {
           name: [dataIndex, 'value']
-        }), Control(editable));
+        }), Control(editable)));
       }
     } else if (!isEdit && (componentProps === null || componentProps === void 0 ? void 0 : componentProps.options)) {
       return ((_b = (_a = componentProps === null || componentProps === void 0 ? void 0 : componentProps.options) === null || _a === void 0 ? void 0 : _a.find(function (item) {
@@ -683,7 +684,7 @@ var EditableCell = function EditableCell(props) {
     // }
 
   }, [record]);
-  return /*#__PURE__*/_react.default.createElement("td", Object.assign({}, clearProps, {
+  return /*#__PURE__*/_react.default.createElement("td", Object.assign({}, (0, _lodash.omit)(clearProps, ['dataIndex']), {
     className: (0, _classnames.default)(clearProps === null || clearProps === void 0 ? void 0 : clearProps.className, 'lm_custom_cell_td'),
     key: "r".concat(rowIndex, "_c").concat(colIndex)
   }), getMemoChildNode);
@@ -736,9 +737,17 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       _useState12 = (0, _slicedToArray2.default)(_useState11, 2),
       sortEditTable = _useState12[0],
       setCallBackFalg = _useState12[1];
+  /** 当前展开的列 */
+
+
+  var _useState13 = (0, _react.useState)([]),
+      _useState14 = (0, _slicedToArray2.default)(_useState13, 2),
+      expandedRowKeys = _useState14[0],
+      setExpandedRowKeys = _useState14[1];
 
   var dataSourceRef = (0, _react.useRef)([]);
   var sortDataSorceRef = (0, _react.useRef)([]);
+  var deepDataSourceRef = (0, _react.useRef)([]);
 
   var onSortEnd = function onSortEnd(active, over) {
     var cloneArr = (0, _toConsumableArray2.default)(dataSourceRef.current);
@@ -830,26 +839,72 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   };
 
   var handleSave = function handleSave(row, options) {
+    var _a, _b;
+
+    var preKeys = (_b = (_a = deepDataSourceRef === null || deepDataSourceRef === void 0 ? void 0 : deepDataSourceRef.current) === null || _a === void 0 ? void 0 : _a[row[_rowKey]]) === null || _b === void 0 ? void 0 : _b.preKeys;
     var res = (0, _immer.produce)(dataSourceRef.current, function (draft) {
       if (options === null || options === void 0 ? void 0 : options.only) {
         var _ref2 = options === null || options === void 0 ? void 0 : options.only,
             key = _ref2.key,
             value = _ref2.value;
 
-        draft.forEach(function (item, index) {
-          if (row[_rowKey] === item[_rowKey]) {
-            draft[index] = row;
-          } else {
-            draft[index][key] = value;
-          }
-        });
+        if ((preKeys === null || preKeys === void 0 ? void 0 : preKeys.length) > 1) {
+          var deeps = function deeps(children) {
+            children.forEach(function (item) {
+              var _a;
+
+              if (preKeys.includes(item[_rowKey])) {
+                if (item[_rowKey] === row[_rowKey]) {
+                  children.forEach(function (c) {
+                    c[key] = value;
+                  });
+                  (_a = Object.keys(item)) === null || _a === void 0 ? void 0 : _a.forEach(function (v) {
+                    item[v] = row[v] || item[v];
+                  });
+                } else if (item.children) {
+                  deeps(item.children);
+                }
+              }
+            });
+          };
+
+          deeps(draft);
+        } else {
+          draft.forEach(function (item, index) {
+            if (row[_rowKey] === item[_rowKey]) {
+              draft[index] = row;
+            } else {
+              draft[index][key] = value;
+            }
+          });
+        }
       } else {
-        var index = draft.findIndex(function (item) {
-          return row[_rowKey] === item[_rowKey];
-        });
+        if ((preKeys === null || preKeys === void 0 ? void 0 : preKeys.length) > 1) {
+          var _deeps = function _deeps(children) {
+            children.forEach(function (item) {
+              var _a;
+
+              if (preKeys.includes(item[_rowKey])) {
+                if (item[_rowKey] === row[_rowKey]) {
+                  (_a = Object.keys(row)) === null || _a === void 0 ? void 0 : _a.forEach(function (v) {
+                    item[v] = row[v] || item[v];
+                  });
+                } else if (item.children) {
+                  _deeps(item.children);
+                }
+              }
+            });
+          };
 
-        if (index !== -1) {
-          draft[index] = row;
+          _deeps(draft);
+        } else {
+          var index = draft.findIndex(function (item) {
+            return row[_rowKey] === item[_rowKey];
+          });
+
+          if (index !== -1) {
+            draft[index] = row;
+          }
         }
       }
     });
@@ -871,60 +926,93 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
         return item;
       });
     });
-  }; // 校验保存
-  // const save = async (row) => {
-  //   try {
-  //     const values = row || (await form.getFieldsValue())
-  //     handleSave({ ...record, ...values })
-  //     await form.validateFields()
-  //     // 清空异常校验
-  //     setValid((old) => {
-  //       const obj = { ...old }
-  //       delete obj[record[rowKey]]
-  //       return obj
-  //     })
-  //   } catch (errInfo) {
-  //     // 加入异常校验
-  //     setValid((old) => ({ ...old, [record[rowKey]]: errInfo.errorFields }))
-  //   }
-  // }
-  // @ts-ignore
+  }; // @ts-ignore
 
 
   var handleTableRowDelete = function handleTableRowDelete(key) {
-    var _a;
+    var _a, _b, _c;
 
-    if (((_a = dataSourceRef.current) === null || _a === void 0 ? void 0 : _a.length) === 1 && !quickOpetateClearAll) {
-      return false;
-    }
+    var preKeys = (_b = (_a = deepDataSourceRef === null || deepDataSourceRef === void 0 ? void 0 : deepDataSourceRef.current) === null || _a === void 0 ? void 0 : _a[key]) === null || _b === void 0 ? void 0 : _b.preKeys;
 
-    var res = (0, _immer.produce)(dataSourceRef.current, function (draft) {
-      var index = draft.findIndex(function (item) {
-        return key === item[_rowKey];
-      });
+    if (preKeys.length > 1) {
+      /** 说明删除的是children中的数据 */
+      var filter = function filter(data, key) {
+        var newData = data.filter(function (x) {
+          return x[_rowKey] !== key;
+        });
+        newData.forEach(function (x) {
+          if (x.children) {
+            var c = filter(x.children, key);
+            x.children = c;
+
+            if (!c.length) {
+              delete x.children;
+            }
+          }
+        });
+        return newData;
+      };
 
-      if (index !== -1) {
-        draft.splice(index, 1);
-      }
-    });
+      var res = filter(dataSource, key);
 
-    if (onChange) {
-      onChange === null || onChange === void 0 ? void 0 : onChange(res);
+      if (onChange) {
+        onChange === null || onChange === void 0 ? void 0 : onChange(res);
+      } else {
+        setDataSource(res);
+      }
     } else {
-      setDataSource(res);
-    } // setDataSource(res)
-    // onChange?.(res)
+      if (((_c = dataSourceRef.current) === null || _c === void 0 ? void 0 : _c.length) === 1 && !quickOpetateClearAll) {
+        return false;
+      }
+
+      var _res = (0, _immer.produce)(dataSourceRef.current, function (draft) {
+        var index = draft.findIndex(function (item) {
+          return key === item[_rowKey];
+        });
+
+        if (index !== -1) {
+          draft.splice(index, 1);
+        }
+      });
 
+      if (onChange) {
+        onChange === null || onChange === void 0 ? void 0 : onChange(_res);
+      } else {
+        setDataSource(_res);
+      }
+    }
   };
+  /** 快捷添加 */
+
 
   var handleTableRowAdd = function handleTableRowAdd(record) {
+    var _a, _b;
+
+    console.log(record, '-rrrrr');
+    var preKeys = (_b = (_a = deepDataSourceRef === null || deepDataSourceRef === void 0 ? void 0 : deepDataSourceRef.current) === null || _a === void 0 ? void 0 : _a[record[_rowKey]]) === null || _b === void 0 ? void 0 : _b.preKeys;
     var res = (0, _immer.produce)(dataSourceRef.current, function (draft) {
-      var index = draft.findIndex(function (item) {
-        return record[_rowKey] === item[_rowKey];
-      });
+      if (preKeys.length > 1) {
+        var deeps = function deeps(children) {
+          children.forEach(function (item, index) {
+            if (preKeys.includes(item[_rowKey])) {
+              if (item[_rowKey] === record[_rowKey]) {
+                children.splice(index + 1, 0, (0, _defineProperty2.default)({}, _rowKey, "".concat(Date.now())));
+              } else if (item.children) {
+                deeps(item.children);
+              }
+            }
+          });
+        };
+
+        deeps(draft);
+      } else {
+        var index = draft.findIndex(function (item) {
+          return record[_rowKey] === item[_rowKey];
+        });
 
-      if (index !== -1) {
-        draft.splice(index + 1, 0, (0, _defineProperty2.default)({}, _rowKey, "".concat(Date.now())));
+        if (index !== -1) {
+          draft.splice(index + 1, 0, (0, _defineProperty2.default)({}, _rowKey, "".concat(Date.now())));
+        }
       }
     });
 
@@ -1105,52 +1193,7 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
 
     var res = localColumns.map(function (col, index) {
       return mapColumns(col, index);
-    }); // const res = localColumns.map((col, index) => {
-    //   if (!col.editable) {
-    //     return col
-    //   }
-    //   return {
-    //     ...col,
-    //     shouldCellUpdate: (record, prevRecord) => {
-    //       const { dataIndex, editable, relevanceCols } = col
-    //       if (col?.fixed ||
-    //         (hasDisableOptions && hasDisableOptions.includes(dataIndex)) ||
-    //         col.componentProps?.options ||
-    //         editable === 'render' ||
-    //         !!relevanceCols || !!shouldUpdate) {
-    //         return true
-    //       }
-    //       return record[dataIndex] !== prevRecord[dataIndex]
-    //     },
-    //     onCell: (record, rowIndex) => {
-    //       return {
-    //         getLength: dataSource.length,
-    //         rowKey,
-    //         record,
-    //         col,
-    //         rowIndex,
-    //         colIndex: index,
-    //         quickOpetateClearAll,
-    //         handleTableRowDelete,
-    //         handleTableRowAdd,
-    //         editable: col.editable,
-    //         dataIndex: col.dataIndex,
-    //         itemProps: col.itemProps,
-    //         setValid,
-    //         isEdit,
-    //         isHoverEdit,
-    //         handleAdd,
-    //         handleDelete,
-    //         handleCopy,
-    //         editEnum: typeof col.editEnum === 'function' ? col.editEnum(record) : col.editEnum,
-    //         valueType: typeof col.valueType === 'function' ? col.valueType(record) : col.valueType,
-    //         handleSave,
-    //         reWriteOriginSource,
-    //       }
-    //     },
-    //   }
-    // })
-
+    });
     return res;
   }, [columns, isAdd, sortOpen, useQuickOpetate, sortEditTable, dataSource, (0, _toConsumableArray2.default)(memoOptions)]);
   var DraggableContainer = (0, _react.useCallback)(function (_a) {
@@ -1210,9 +1253,32 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     }, resetProps);
   }, [resultColumns, dataSource, sortOpen, colSortOpen, size]);
   (0, _react.useEffect)(function () {
-    setDataSource(defaultData === null || defaultData === void 0 ? void 0 : defaultData.map(function (v, idx) {
+    // setDataSource(defaultData?.map((v, idx) => ({ ...v, [rowKey]: v[rowKey] || `v${idx + 1}` })))
+    var addRowKey = function addRowKey(children, pkey) {
+      return children === null || children === void 0 ? void 0 : children.map(function (item, index) {
+        if (item.children) {
+          var _Object$assign5;
+
+          var rchildren = addRowKey(item.children, "".concat(pkey, "_").concat(index + 1));
+          return Object.assign(Object.assign({}, item), (_Object$assign5 = {}, (0, _defineProperty2.default)(_Object$assign5, _rowKey, item[_rowKey] || "".concat(pkey, "_").concat(index + 1)), (0, _defineProperty2.default)(_Object$assign5, "children", rchildren), _Object$assign5));
+        }
+
+        return Object.assign(Object.assign({}, item), (0, _defineProperty2.default)({}, _rowKey, item[_rowKey] || "".concat(pkey, "_").concat(index + 1)));
+      });
+    };
+
+    var res = defaultData === null || defaultData === void 0 ? void 0 : defaultData.map(function (v, idx) {
+      if (v.children) {
+        var _Object$assign7;
+
+        var rchildren = addRowKey(v.children, v[_rowKey] || "v".concat(idx + 1));
+        return Object.assign(Object.assign({}, v), (_Object$assign7 = {}, (0, _defineProperty2.default)(_Object$assign7, _rowKey, v[_rowKey] || "v".concat(idx + 1)), (0, _defineProperty2.default)(_Object$assign7, "children", rchildren), _Object$assign7));
+      }
+
       return Object.assign(Object.assign({}, v), (0, _defineProperty2.default)({}, _rowKey, v[_rowKey] || "v".concat(idx + 1)));
-    }));
+    });
+    deepDataSourceRef.current = (0, _util.deepDataSourcePreKeys)(res, _rowKey);
+    setDataSource(res);
   }, [defaultData]);
   (0, _react.useImperativeHandle)(ref, function () {
     return {
@@ -1276,6 +1342,13 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     bordered: true,
     pagination: false,
     // components={tableComponents}
+    expandable: (resetProps === null || resetProps === void 0 ? void 0 : resetProps.expandable) || {
+      expandedRowKeys: expandedRowKeys,
+      fixed: true,
+      onExpandedRowsChange: function onExpandedRowsChange(expandedRows) {
+        return setExpandedRowKeys(expandedRows);
+      }
+    },
     rowSelection: !rowSelection ? undefined : {
       fixed: true,
       type: 'checkbox',

package/lib/LmEditTable/style/index.css

@@ -556,6 +556,9 @@ p {
   flex: 1;
   max-width: 100%;
 }
+.lm_editTable_warpper .lm_custom_cell_td .ant-table-row-expand-icon {
+  margin-top: 6px;
+}
 .lm_editTable_warpper .lm_editTable_cell_edit {
   height: 40px;
   padding: 8px 8px !important;

package/lib/LmEditTable/style/variables.css

@@ -45,6 +45,9 @@
   flex: 1;
   max-width: 100%;
 }
+.lm_editTable_warpper .lm_custom_cell_td .ant-table-row-expand-icon {
+  margin-top: 6px;
+}
 .lm_editTable_warpper .lm_editTable_cell_edit {
   height: 40px;
   padding: 8px 8px !important;

package/lib/LmEditTable/util.d.ts

@@ -1 +1,7 @@
 export declare function isObjEmpty(obj: Record<string, any>): boolean;
+export declare function deepDataSourcePreKeys(dataSource: any[], rowKey: string): any;
+export declare function isExpandRow(children: any): boolean;
+declare const _default: {
+    isObjEmpty: typeof isObjEmpty;
+};
+export default _default;

package/lib/LmEditTable/util.js

@@ -1,12 +1,51 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.deepDataSourcePreKeys = deepDataSourcePreKeys;
+exports.default = void 0;
+exports.isExpandRow = isExpandRow;
 exports.isObjEmpty = isObjEmpty;
 
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
+
+var _lodash = require("lodash");
+
 function isObjEmpty(obj) {
   var _a;
 
   return ((_a = Object.keys(obj || {})) === null || _a === void 0 ? void 0 : _a.length) === 0;
-}
+}
+
+function deepDataSourcePreKeys(dataSource, rowKey) {
+  var deepDataSource = [];
+
+  var eachChildren = function eachChildren(children, preKeys) {
+    children.forEach(function (item) {
+      deepDataSource.push(Object.assign(Object.assign({}, item), {
+        preKeys: [].concat((0, _toConsumableArray2.default)(preKeys), [item[rowKey]])
+      }));
+
+      if (item.children) {
+        eachChildren(item.children, [].concat((0, _toConsumableArray2.default)(preKeys), [item[rowKey]])); // deepDataSource.push({ ...item, preKeys: [...preKeys, item[rowKey]] })
+      }
+    });
+  };
+
+  eachChildren(dataSource, []);
+  return (0, _lodash.keyBy)(deepDataSource, rowKey);
+}
+
+function isExpandRow(children) {
+  var _a, _b, _c, _d, _e;
+
+  return ['Collapse row', 'Expand row'].includes((_e = (_d = (_c = (_b = (_a = children === null || children === void 0 ? void 0 : children[0]) === null || _a === void 0 ? void 0 : _a.props) === null || _b === void 0 ? void 0 : _b.children) === null || _c === void 0 ? void 0 : _c[1]) === null || _d === void 0 ? void 0 : _d.props) === null || _e === void 0 ? void 0 : _e['aria-label']);
+}
+
+var _default = {
+  isObjEmpty: isObjEmpty
+};
+exports.default = _default;

package/lib/LmFilter/clearFilter/index.js

@@ -13,7 +13,9 @@ var _linkmoreDesign = require("linkmore-design");
 
 var LmFilterClear = /*#__PURE__*/_react.default.memo(function (_ref) {
   var instance = _ref.instance;
-  var onClearChange = instance.onClearChange;
+  var onClearChange = instance.onClearChange,
+      getHasFilter = instance.getHasFilter;
+  if (!getHasFilter()) return null;
 
   var handleClear = function handleClear() {
     onClearChange();

package/lib/LmFilter/components/EmptyFilter.js

@@ -9,13 +9,13 @@ exports.default = void 0;
 
 var _react = _interopRequireDefault(require("react"));
 
-var _empty = _interopRequireDefault(require("../assets/empty.png"));
+var emptyBase64 = "data:image/png;base64,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";
 
 var EmptyFilter = function EmptyFilter() {
   return /*#__PURE__*/_react.default.createElement("div", {
     className: "filter_empty"
   }, /*#__PURE__*/_react.default.createElement("img", {
-    src: _empty.default,
+    src: emptyBase64,
     alt: "empty",
     width: 81
   }), /*#__PURE__*/_react.default.createElement("div", {

package/lib/LmFilter/filterFns/index.d.ts

@@ -51,6 +51,7 @@ declare const useCoreOptions: ({ state, dispatch, props }: {
             };
             type: string;
         };
+        getHasFilter: () => boolean;
         setFilterValue: (itemValue: any, item: any) => void;
         setFilterFieldValue: (field: any, value: any) => void;
         setLocalization: (localization?: any) => void;

package/lib/LmFilter/filterFns/index.js

@@ -167,7 +167,11 @@ var useCoreOptions = function useCoreOptions(_ref) {
       searchKey = props.searchKey,
       searchConfig = props.searchConfig,
       customOptions = props.customOptions,
-      enableAutoString = props.enableAutoString; // 转换一级查询结构 object => array
+      enableAutoString = props.enableAutoString; // 获取是否存在过滤值
+
+  var getHasFilter = (0, _react.useCallback)(function () {
+    return (0, _utils.getIsHas)(state.basicFilter) || (0, _utils.getIsHas)(state.searchFilter);
+  }, [state.basicFilter, state.searchFilter]); // 转换一级查询结构 object => array
 
   var tranformGlobalQuery = (0, _react.useCallback)(function (obj) {
     var _a;
@@ -628,6 +632,7 @@ var useCoreOptions = function useCoreOptions(_ref) {
     },
     getFilterValue: getFilterValue,
     getFilterQuery: getFilterQuery,
+    getHasFilter: getHasFilter,
     setFilterValue: setFilterValue,
     setFilterFieldValue: setFilterFieldValue,
     setLocalization: setLocalization,

package/lib/LmFilter/wrapper/FilterRoot.js

@@ -132,7 +132,7 @@ var getInitialState = function getInitialState(props) {
       basicFilter = _initLocalization.basicFilter,
       basicQuery = _initLocalization.basicQuery,
       customQuery = _initLocalization.customQuery,
-      customFilter = _initLocalization.customFilter; // 字段对应关系 basicQuery => filterQuery; customQuery => globalQuery; searchQuery => fuzzyQuery 
+      customFilter = _initLocalization.customFilter; // 字段对应关系 basicQuery => filterQuery; customQuery => globalQuery; searchQuery => fuzzyQuery
 
 
   return {

package/lib/LmTable/Table.js

@@ -1126,7 +1126,7 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
           items_per_page: '/条',
           jump_to: '前往',
           page: '页'
-        } : locale.Pagination || {},
+        } : (locale === null || locale === void 0 ? void 0 : locale.Pagination) || {},
         size: 'small'
       }, pagination),
       rowSelection: rowSelection === false ? undefined : (0, _objectSpread2.default)({

package/lib/LmUpload/LmUpload.js

@@ -84,6 +84,7 @@ var LmUpload = function LmUpload(_a, ref) {
   var defaultProps = Object.assign({
     size: 100,
     fileSize: 10,
+    fileSizeType: 'M',
     uid: 'uid',
     accept: '',
     type: ['jpg', 'jpeg', 'png'],

package/lib/LmUpload/fns/index.d.ts

@@ -6,7 +6,7 @@ declare const useCoreOptions: ({ state, dispatch, props }: {
     CoreMethods: {
         getIsMaxCount: () => boolean;
         getFileFields: (fileParams: any) => {};
-        beforeUpload: (e: any) => false | import("../../message").MessageType;
+        beforeUpload: (e: any) => Promise<void>;
         checkOver: (file: any) => Promise<void>;
         getUploadStatus: () => {
             uploading: boolean;