linkmore-design 1.1.7 → 1.1.9

package/es/LmUpload/components/Preview.js

@@ -0,0 +1,43 @@
+import React, { useMemo } from 'react';
+import { ImageViewer } from 'linkmore-design';
+
+var Preview = function Preview(_ref) {
+  var instance = _ref.instance;
+  var enabledPreview = instance.enabledPreview,
+      state = instance.state,
+      dispatch = instance.dispatch,
+      getFileList = instance.getFileList;
+  if (!enabledPreview) return null; // 与展示顺序保持一致
+
+  var fileList = useMemo(function () {
+    var _a;
+
+    return (_a = getFileList()) === null || _a === void 0 ? void 0 : _a.sort(function (a, b) {
+      return a.seq - b.seq;
+    });
+  }, [getFileList]);
+  var config = useMemo(function () {
+    var _state$preview = state.preview,
+        index = _state$preview.index,
+        visible = _state$preview.visible;
+    return {
+      urlList: fileList === null || fileList === void 0 ? void 0 : fileList.map(function (_ref2) {
+        var url = _ref2.url;
+        return url;
+      }),
+      initialIndex: index,
+      visible: visible,
+      close: function close() {
+        dispatch({
+          type: 'changePreview',
+          preview: {
+            visible: false
+          }
+        });
+      }
+    };
+  }, [fileList, state.preview]);
+  return /*#__PURE__*/React.createElement(ImageViewer, Object.assign({}, config));
+};
+
+export default /*#__PURE__*/React.memo(Preview);

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

@@ -5,6 +5,7 @@ declare const useCoreOptions: ({ state, dispatch, props }: {
 }) => {
     CoreMethods: {
         getIsMaxCount: () => boolean;
+        getFileHasValue: (obj: any) => string;
         getFileFields: (fileParams: any) => {};
         beforeUpload: (e: any) => Promise<void>;
         checkOver: (file: any) => Promise<void>;

package/es/LmUpload/fns/index.js

@@ -49,7 +49,25 @@ var useCoreOptions = function useCoreOptions(_ref) {
       fileAreaSize = props.fileAreaSize,
       enabledOss = props.enabledOss,
       enableCrop = props.enableCrop,
-      ossConfig = props.ossConfig; // 获取当前的文件列表
+      ossConfig = props.ossConfig; // 获取两个对象是否存在指定值相等
+
+  var getHasEqual = useCallback(function (obj1, obj2) {
+    var extend = [uid, 'fileName'];
+    var flag = false;
+    extend.forEach(function (v) {
+      if (!flag) flag = obj1[v] === obj2[v];
+    });
+    return flag;
+  }, []); // 从对象中读取存在的指定属性
+
+  var getFileHasValue = useCallback(function (obj) {
+    var extend = [uid, 'fileName'];
+    var val = '';
+    extend.forEach(function (v) {
+      if (!val) val = obj[v];
+    });
+    return val;
+  }, [uid]); // 获取当前的文件列表
 
   var getFileList = useCallback(function () {
     return props.fileList || state.fileList;
@@ -416,7 +434,7 @@ var useCoreOptions = function useCoreOptions(_ref) {
 
               if (res) {
                 fileList = (_b = getFileList()) === null || _b === void 0 ? void 0 : _b.filter(function (v) {
-                  return v[uid] !== file[uid];
+                  return !getHasEqual(v, file);
                 });
                 dispatch({
                   type: 'changeFileList',
@@ -435,7 +453,7 @@ var useCoreOptions = function useCoreOptions(_ref) {
         }
       }, _callee4);
     }));
-  }, [props.onRemove, getFileList, onChange, dispatch, uid]); // 点击文件链接或预览图标时的回调
+  }, [props.onRemove, getFileList, onChange, dispatch, getHasEqual]); // 点击文件链接或预览图标时的回调
 
   var preview = useCallback(function (file) {
     var _a;
@@ -450,6 +468,7 @@ var useCoreOptions = function useCoreOptions(_ref) {
   }, [props.onDownload]);
   var CoreMethods = {
     getIsMaxCount: getIsMaxCount,
+    getFileHasValue: getFileHasValue,
     getFileFields: getFileFields,
     beforeUpload: beforeUpload,
     checkOver: checkOver,

package/es/LmUpload/wrapper/UploadWrapper.js

@@ -3,6 +3,7 @@ import React from 'react';
 import LmUploadContainer from './UploadContainer';
 import LmUploadView from '../view';
 import Crop from '../components/Crop';
+import Preview from '../components/Preview';
 
 var LmUploadWrapper = function LmUploadWrapper(_ref) {
   var instance = _ref.instance;
@@ -14,6 +15,8 @@ var LmUploadWrapper = function LmUploadWrapper(_ref) {
     instance: instance
   }), /*#__PURE__*/React.createElement(Crop, {
     instance: instance
+  }), /*#__PURE__*/React.createElement(Preview, {
+    instance: instance
   }));
 };
 

package/es/LmUpload/wrapper/reducer.d.ts

@@ -5,5 +5,9 @@ export declare const initialState: (props: any) => {
     status: string;
     fileList: any;
     cropFile: any;
+    preview: {
+        index: number;
+        visible: boolean;
+    };
 };
 export default reducer;

package/es/LmUpload/wrapper/reducer.js

@@ -2,7 +2,8 @@
 export var reducer = function reducer(state, action) {
   var fileList = action.fileList,
       percent = action.percent,
-      cropFile = action.cropFile;
+      cropFile = action.cropFile,
+      preview = action.preview;
 
   switch (action.type) {
     case 'changeFileList':
@@ -20,6 +21,11 @@ export var reducer = function reducer(state, action) {
         cropFile: cropFile
       });
 
+    case 'changePreview':
+      return Object.assign(Object.assign({}, state), {
+        preview: Object.assign(Object.assign({}, state.preview), preview)
+      });
+
     default:
       throw new Error();
   }
@@ -33,8 +39,11 @@ export var initialState = function initialState(props) {
     process: 0,
     status: 'done',
     fileList: defaultFileList,
-    cropFile: null // 需要裁剪的图片
-
+    cropFile: null,
+    preview: {
+      index: 0,
+      visible: false
+    }
   };
 };
 export default reducer;

package/es/styles/variables.css

@@ -9764,6 +9764,9 @@ p {
 .lm_editTable_warpper .icon_drag:hover {
   color: var(--text-color);
 }
+.lm_editTable_warpper .ant-table .ant-table-tbody > .ant-table-measure-row > td {
+  padding: 0 !important;
+}
 .lm_editTable_warpper .ant-picker {
   height: 24px !important;
   padding: 2px 8px;
@@ -9844,11 +9847,15 @@ p {
   background-color: var(--background-color-hover);
 }
 .lm_filter_wrapper .lm_filter_container .lm_filter .lm_filter_search {
+  width: 140px;
   max-width: 140px;
 }
 .lm_filter_wrapper .lm_filter_container .lm_filter .lm_filter_complex {
   display: inline-flex;
 }
+.lm_filter_wrapper .lm_filter_container .lm_filter.lm_filter_small .lm_filter_custom_line {
+  height: 24px;
+}
 .lm_filter_basic_item {
   font-size: 12px;
   display: inline-flex;
@@ -11259,6 +11266,9 @@ p {
   height: 48px;
   font-size: 12px;
 }
+#lm_protable_warp .ant-table-tbody > tr.ant-table-measure-row > td {
+  padding: 0 !important;
+}
 .row-dragging {
   display: flex;
   align-items: center;
@@ -11611,9 +11621,6 @@ button.ant-table-row-expand-icon::before,
 button.ant-table-row-expand-icon::after {
   color: #bfbfbf;
 }
-.ant-table-tbody > tr.ant-table-measure-row > td {
-  padding: 0 !important;
-}
 .react-resizable-handle {
   position: absolute;
   right: -5px;

package/lib/Form/FormItem/index.d.ts

@@ -1,5 +1,6 @@
 import type { FormInstance } from 'rc-field-form';
 import type { FieldProps } from 'rc-field-form/lib/Field';
+import type { Rule } from 'rc-field-form/lib/interface';
 import * as React from 'react';
 import useFormItemStatus from '../hooks/useFormItemStatus';
 import type { FormItemInputProps } from '../FormItemInput';
@@ -9,7 +10,10 @@ export declare type ValidateStatus = typeof ValidateStatuses[number];
 declare type RenderChildren<Values = any> = (form: FormInstance<Values>) => React.ReactNode;
 declare type RcFieldProps<Values = any> = Omit<FieldProps<Values>, 'children'>;
 declare type ChildrenType<Values = any> = RenderChildren<Values> | React.ReactNode;
-export interface FormItemProps<Values = any> extends FormItemLabelProps, FormItemInputProps, RcFieldProps<Values> {
+export declare type LmRule = Rule & {
+    time?: number;
+};
+export interface FormItemProps<Values = any> extends FormItemLabelProps, FormItemInputProps, Omit<RcFieldProps<Values>, 'rules'> {
     prefixCls?: string;
     noStyle?: boolean;
     style?: React.CSSProperties;
@@ -25,6 +29,8 @@ export interface FormItemProps<Values = any> extends FormItemLabelProps, FormIte
     tooltip?: LabelTooltipType;
     /** @deprecated No need anymore */
     fieldKey?: React.Key | React.Key[];
+    /** 变更 */
+    rules?: LmRule[];
     errorPlacement?: string;
     responsive?: boolean;
 }

package/lib/Form/FormItem/index.js

@@ -9,15 +9,17 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
-var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
-
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 
+var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
+
+var _createForOfIteratorHelper2 = _interopRequireDefault(require("@babel/runtime/helpers/createForOfIteratorHelper"));
+
 var _rcFieldForm = require("rc-field-form");
 
-var _useState3 = _interopRequireDefault(require("rc-util/lib/hooks/useState"));
+var _useState7 = _interopRequireDefault(require("rc-util/lib/hooks/useState"));
 
 var _ref2 = require("rc-util/lib/ref");
 
@@ -70,6 +72,31 @@ function genEmptyMeta() {
   };
 }
 
+function getRuleTime(rules) {
+  if (!rules) {
+    return 0;
+  }
+
+  var _iterator = (0, _createForOfIteratorHelper2.default)(rules),
+      _step;
+
+  try {
+    for (_iterator.s(); !(_step = _iterator.n()).done;) {
+      var rule = _step.value;
+
+      if (rule && (0, _typeof2.default)(rule) === 'object' && rule.time) {
+        return rule.time;
+      }
+    }
+  } catch (err) {
+    _iterator.e(err);
+  } finally {
+    _iterator.f();
+  }
+
+  return 0;
+}
+
 function InternalFormItem(props) {
   var name = props.name,
       noStyle = props.noStyle,
@@ -85,6 +112,17 @@ function InternalFormItem(props) {
       trigger = _props$trigger === void 0 ? 'onChange' : _props$trigger,
       validateTrigger = props.validateTrigger,
       hidden = props.hidden;
+  var timerRef = (0, React.useRef)(null);
+
+  var _useState = (0, _useState7.default)([]),
+      _useState2 = (0, _slicedToArray2.default)(_useState, 2),
+      mergedErrors = _useState2[0],
+      setMergedErrors = _useState2[1];
+
+  var _useState3 = (0, _useState7.default)([]),
+      _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
+      mergedWarnings = _useState4[0],
+      setMergedWarnings = _useState4[1];
 
   var _useContext = (0, React.useContext)(_ConfigProvider.ConfigContext),
       getPrefixCls = _useContext.getPrefixCls;
@@ -113,12 +151,12 @@ function InternalFormItem(props) {
       setSubFieldErrors = _useFrameState2[1]; // >>>>> Current field errors
 
 
-  var _useState = (0, _useState3.default)(function () {
+  var _useState5 = (0, _useState7.default)(function () {
     return genEmptyMeta();
   }),
-      _useState2 = (0, _slicedToArray2.default)(_useState, 2),
-      meta = _useState2[0],
-      setMeta = _useState2[1];
+      _useState6 = (0, _slicedToArray2.default)(_useState5, 2),
+      meta = _useState6[0],
+      setMeta = _useState6[1];
 
   var onMetaChange = function onMetaChange(nextMeta) {
     // This keyInfo is not correct when field is removed
@@ -171,19 +209,25 @@ function InternalFormItem(props) {
   }; // >>>>> Get merged errors
 
 
-  var _React$useMemo = React.useMemo(function () {
+  (0, React.useEffect)(function () {
     var errorList = (0, _toConsumableArray2.default)(meta.errors);
     var warningList = (0, _toConsumableArray2.default)(meta.warnings);
     Object.values(subFieldErrors).forEach(function (subFieldError) {
       errorList.push.apply(errorList, (0, _toConsumableArray2.default)(subFieldError.errors || []));
       warningList.push.apply(warningList, (0, _toConsumableArray2.default)(subFieldError.warnings || []));
     });
-    return [errorList, warningList];
-  }, [subFieldErrors, meta.errors, meta.warnings]),
-      _React$useMemo2 = (0, _slicedToArray2.default)(_React$useMemo, 2),
-      mergedErrors = _React$useMemo2[0],
-      mergedWarnings = _React$useMemo2[1]; // ===================== Children Ref =====================
-
+    setMergedErrors(errorList);
+    setMergedWarnings(warningList);
+    var time = getRuleTime(rules);
+
+    if (time) {
+      clearTimeout(timerRef.current);
+      timerRef.current = setTimeout(function () {
+        setMergedErrors([]);
+        setMergedWarnings([]);
+      }, time);
+    }
+  }, [subFieldErrors, meta.errors, meta.warnings]); // ===================== Children Ref =====================
 
   var getItemRef = (0, _useItemRef.default)(); // ======================== Render ========================
 

package/lib/LmEditTable/EditTable.js

@@ -766,13 +766,15 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   };
 
   var onColSortEnd = function onColSortEnd(active, over) {
+    var _a;
+
     var oldIndex = columns.findIndex(function (item) {
       return item.dataIndex === active;
     });
     var newIndex = columns.findIndex(function (item) {
       return item.dataIndex === over;
     });
-    filterChange === null || filterChange === void 0 ? void 0 : filterChange((0, _sortable.arrayMove)(columns, oldIndex, newIndex).map(function (item, index) {
+    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), {
         order: index
       });
@@ -806,7 +808,7 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     dataSourceRef.current = dataSource;
 
     if (sortOpen) {
-      var dataSourceKeys = dataSource.map(function (item) {
+      var dataSourceKeys = dataSource === null || dataSource === void 0 ? void 0 : dataSource.map(function (item) {
         return item[_rowKey];
       }).join(',');
       var setCallBackFalgKeys = ((_a = sortDataSorceRef.current) === null || _a === void 0 ? void 0 : _a.map(function (item) {
@@ -850,12 +852,12 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
 
         if ((preKeys === null || preKeys === void 0 ? void 0 : preKeys.length) > 1) {
           var deeps = function deeps(children) {
-            children.forEach(function (item) {
+            children === null || children === void 0 ? void 0 : children.forEach(function (item) {
               var _a;
 
               if (preKeys.includes(item[_rowKey])) {
                 if (item[_rowKey] === row[_rowKey]) {
-                  children.forEach(function (c) {
+                  children === null || children === void 0 ? void 0 : children.forEach(function (c) {
                     c[key] = value;
                   });
                   (_a = Object.keys(item)) === null || _a === void 0 ? void 0 : _a.forEach(function (v) {
@@ -870,7 +872,7 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
 
           deeps(draft);
         } else {
-          draft.forEach(function (item, index) {
+          draft === null || draft === void 0 ? void 0 : draft.forEach(function (item, index) {
             if (row[_rowKey] === item[_rowKey]) {
               draft[index] = row;
             } else {
@@ -881,7 +883,7 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       } else {
         if ((preKeys === null || preKeys === void 0 ? void 0 : preKeys.length) > 1) {
           var _deeps = function _deeps(children) {
-            children.forEach(function (item) {
+            children === null || children === void 0 ? void 0 : children.forEach(function (item) {
               var _a;
 
               if (preKeys.includes(item[_rowKey])) {
@@ -918,7 +920,7 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
 
   var reWriteOriginSource = function reWriteOriginSource(rowKey, rowValue, dataIndex, nextValue) {
     setDataSource(function (prevDataSource) {
-      return prevDataSource.map(function (item) {
+      return prevDataSource === null || prevDataSource === void 0 ? void 0 : prevDataSource.map(function (item) {
         if ((0, _lodash.get)(item, rowKey) === rowValue) {
           (0, _lodash.set)(item, dataIndex, nextValue);
         }
@@ -937,10 +939,10 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     if (preKeys.length > 1) {
       /** 说明删除的是children中的数据 */
       var filter = function filter(data, key) {
-        var newData = data.filter(function (x) {
+        var newData = data === null || data === void 0 ? void 0 : data.filter(function (x) {
           return x[_rowKey] !== key;
         });
-        newData.forEach(function (x) {
+        newData === null || newData === void 0 ? void 0 : newData.forEach(function (x) {
           if (x.children) {
             var c = filter(x.children, key);
             x.children = c;
@@ -988,13 +990,12 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   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) {
       if (preKeys.length > 1) {
         var deeps = function deeps(children) {
-          children.forEach(function (item, index) {
-            if (preKeys.includes(item[_rowKey])) {
+          children === null || children === void 0 ? void 0 : children.forEach(function (item, index) {
+            if (preKeys === null || preKeys === void 0 ? void 0 : 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) {
@@ -1025,7 +1026,7 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
 
   var handleCopy = function handleCopy(key, value) {
     var res = (0, _immer.produce)(dataSourceRef.current, function (draft) {
-      draft.forEach(function (item) {
+      draft === null || draft === void 0 ? void 0 : draft.forEach(function (item) {
         return item[key] = value;
       });
     });
@@ -1047,7 +1048,7 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     });
 
     if (hasOnlyOptionsDatas.length) {
-      return hasOnlyOptionsDatas.map(function (item) {
+      return hasOnlyOptionsDatas === null || hasOnlyOptionsDatas === void 0 ? void 0 : hasOnlyOptionsDatas.map(function (item) {
         return item.dataIndex;
       });
     }
@@ -1064,10 +1065,10 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
 
       if (optionOnly && options) {
         var dataIndex = item.dataIndex;
-        var dataIndexData = dataSource.map(function (d) {
+        var dataIndexData = dataSource === null || dataSource === void 0 ? void 0 : dataSource.map(function (d) {
           return d[dataIndex];
         });
-        var newOptions = options.map(function (o) {
+        var newOptions = options === null || options === void 0 ? void 0 : options.map(function (o) {
           return Object.assign(Object.assign({}, o), {
             disabled: !!dataIndexData.includes(o === null || o === void 0 ? void 0 : o.value)
           });
@@ -1123,7 +1124,7 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     var leftColumns = [];
     var mainColumns = [];
     var rightColumns = [];
-    localColumns.forEach(function (item) {
+    localColumns === null || localColumns === void 0 ? void 0 : localColumns.forEach(function (item) {
       if ((item === null || item === void 0 ? void 0 : item.fixed) === 'left') {
         leftColumns.push(item);
       } else if ((item === null || item === void 0 ? void 0 : item.fixed) === 'right') {
@@ -1136,7 +1137,7 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     /** 为了支持colums中的分组之后，进行递归处理 */
 
     var mapColumns = function mapColumns(col, index) {
-      var _a;
+      var _a, _b;
 
       if (!col.editable && !((_a = col.children) === null || _a === void 0 ? void 0 : _a.length)) {
         return col;
@@ -1185,7 +1186,7 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       });
 
       if (col === null || col === void 0 ? void 0 : col.children) {
-        newCol.children = col.children.map(mapColumns);
+        newCol.children = (_b = col.children) === null || _b === void 0 ? void 0 : _b.map(mapColumns);
       }
 
       return newCol;
@@ -1210,9 +1211,11 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     }, /*#__PURE__*/_react.default.createElement("tbody", Object.assign({}, props))));
   }, [sortEditTable]);
   var colDraggableContainer = (0, _react.useCallback)(function (_a) {
+    var _b;
+
     var props = __rest(_a, []);
 
-    return /*#__PURE__*/_react.default.createElement("tr", null, _react.default.Children.map(props.children, function (child) {
+    return /*#__PURE__*/_react.default.createElement("tr", null, (_b = _react.default.Children) === null || _b === void 0 ? void 0 : _b.map(props.children, function (child) {
       var _a, _b;
 
       if ((_b = (_a = child === null || child === void 0 ? void 0 : child.props) === null || _a === void 0 ? void 0 : _a.column) === null || _b === void 0 ? void 0 : _b.fixed) {
@@ -1353,7 +1356,7 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       fixed: true,
       type: 'checkbox',
       columnWidth: 36,
-      selectedRowKeys: localRowSelectList.map(function (v) {
+      selectedRowKeys: localRowSelectList === null || localRowSelectList === void 0 ? void 0 : localRowSelectList.map(function (v) {
         return v[_rowKey];
       }),
       onChange: function onChange(selectedRowKeys, selectedRows) {

package/lib/LmEditTable/style/index.css

@@ -576,6 +576,9 @@ p {
 .lm_editTable_warpper .icon_drag:hover {
   color: var(--text-color);
 }
+.lm_editTable_warpper .ant-table .ant-table-tbody > .ant-table-measure-row > td {
+  padding: 0 !important;
+}
 .lm_editTable_warpper .ant-picker {
   height: 24px !important;
   padding: 2px 8px;

package/lib/LmEditTable/style/variables.css

@@ -65,6 +65,9 @@
 .lm_editTable_warpper .icon_drag:hover {
   color: var(--text-color);
 }
+.lm_editTable_warpper .ant-table .ant-table-tbody > .ant-table-measure-row > td {
+  padding: 0 !important;
+}
 .lm_editTable_warpper .ant-picker {
   height: 24px !important;
   padding: 2px 8px;

package/lib/LmEditTable/util.js

@@ -24,13 +24,13 @@ function deepDataSourcePreKeys(dataSource, rowKey) {
   var deepDataSource = [];
 
   var eachChildren = function eachChildren(children, preKeys) {
-    children.forEach(function (item) {
+    children === null || children === void 0 ? void 0 : children.forEach(function (item) {
       deepDataSource.push(Object.assign(Object.assign({}, item), {
-        preKeys: [].concat((0, _toConsumableArray2.default)(preKeys), [item[rowKey]])
+        preKeys: [].concat((0, _toConsumableArray2.default)(preKeys), [item === null || item === void 0 ? void 0 : item[rowKey]])
       }));
 
-      if (item.children) {
-        eachChildren(item.children, [].concat((0, _toConsumableArray2.default)(preKeys), [item[rowKey]])); // deepDataSource.push({ ...item, preKeys: [...preKeys, item[rowKey]] })
+      if (item === null || item === void 0 ? void 0 : item.children) {
+        eachChildren(item === null || item === void 0 ? void 0 : item.children, [].concat((0, _toConsumableArray2.default)(preKeys), [item === null || item === void 0 ? void 0 : item[rowKey]])); // deepDataSource.push({ ...item, preKeys: [...preKeys, item[rowKey]] })
       }
     });
   };

package/lib/LmFilter/clearFilter/index.js

@@ -14,7 +14,8 @@ var _linkmoreDesign = require("linkmore-design");
 var LmFilterClear = /*#__PURE__*/_react.default.memo(function (_ref) {
   var instance = _ref.instance;
   var onClearChange = instance.onClearChange,
-      getHasFilter = instance.getHasFilter;
+      getHasFilter = instance.getHasFilter,
+      size = instance.size;
   if (!getHasFilter()) return null;
 
   var handleClear = function handleClear() {
@@ -25,6 +26,7 @@ var LmFilterClear = /*#__PURE__*/_react.default.memo(function (_ref) {
     className: "lm_filter_clear"
   }, /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Button, {
     type: "link",
+    size: size,
     onClick: handleClear
   }, "\u4E00\u952E\u6E05\u7A7A"));
 });

package/lib/LmFilter/complexFilter/index.js

@@ -24,7 +24,8 @@ var _utils = require("../utils");
 var LmFilterComplex = function LmFilterComplex(_ref) {
   var instance = _ref.instance;
   var state = instance.state,
-      dispatch = instance.dispatch;
+      dispatch = instance.dispatch,
+      size = instance.size;
   var expand = (0, _react.useMemo)(function () {
     return state.complexDrawer.visible;
   }, [state.complexDrawer.visible]);
@@ -44,7 +45,7 @@ var LmFilterComplex = function LmFilterComplex(_ref) {
   return /*#__PURE__*/_react.default.createElement("div", {
     className: "lm_filter_complex"
   }, /*#__PURE__*/_react.default.createElement("div", {
-    className: (0, _classnames.default)('lm_filter_basic_item lm_filter_complex_item', {
+    className: (0, _classnames.default)('lm_filter_basic_item lm_filter_complex_item', size, {
       expand: expand,
       active: active
     }),

package/lib/LmFilter/components/DropdownFIlter.js

@@ -98,7 +98,8 @@ var getPlacehodler = function getPlacehodler(props) {
 }; // 根据不同的类型展示文本内容
 
 
-var getLabel = function getLabel(filterValue, item) {
+var getLabel = function getLabel(resetInstance, item) {
+  var filterValue = resetInstance.filterValue;
   var type = item.type,
       data = item.data; // 不存在筛选时
 
@@ -151,7 +152,7 @@ var getLabel = function getLabel(filterValue, item) {
 
 
       var _labels = data === null || data === void 0 ? void 0 : (_data$filter = data.filter(function (v) {
-        return filterValue.includes(v.value);
+        return (0, _utils.toStringIsEqual)(v.value, filterValue, 'includes');
       })) === null || _data$filter === void 0 ? void 0 : _data$filter.map(function (v) {
         return v.label;
       });
@@ -180,7 +181,7 @@ var getLabel = function getLabel(filterValue, item) {
 
 
     var label = (data === null || data === void 0 ? void 0 : (_data$find = data.find(function (v) {
-      return (v === null || v === void 0 ? void 0 : v.value) === filterValue;
+      return (0, _utils.toStringIsEqual)(v === null || v === void 0 ? void 0 : v.value, filterValue);
     })) === null || _data$find === void 0 ? void 0 : _data$find.label) || filterValue;
     return label;
   } catch (error) {
@@ -203,7 +204,8 @@ var DropdownFilter = /*#__PURE__*/_react.default.memo(function (_ref2) {
       visible = _useState2[0],
       setVisible = _useState2[1];
 
-  var filterValue = instance.filterValue; // 触发查询时关闭下拉框
+  var filterValue = instance.filterValue,
+      size = instance.size; // 触发查询时关闭下拉框
 
   var setFilterValue = function setFilterValue(obj) {
     instance.setFilterValue(obj);
@@ -244,7 +246,7 @@ var DropdownFilter = /*#__PURE__*/_react.default.memo(function (_ref2) {
     ,
     destroyPopupOnHide: true
   }, /*#__PURE__*/_react.default.createElement("div", {
-    className: (0, _classnames.default)('lm_filter_basic_item', {
+    className: (0, _classnames.default)('lm_filter_basic_item', size, {
       expand: visible,
       active: active
     })
@@ -252,7 +254,7 @@ var DropdownFilter = /*#__PURE__*/_react.default.memo(function (_ref2) {
     className: "filter_item_label"
   }, item === null || item === void 0 ? void 0 : item.title, ":"), /*#__PURE__*/_react.default.createElement("div", {
     className: "filter_item_value"
-  }, getLabel(filterValue, item)), /*#__PURE__*/_react.default.createElement("div", {
+  }, getLabel(resetInstance, 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',