linkmore-design 1.1.7 → 1.1.9

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (73) hide show
  1. package/CHANGELOG.md +1056 -9
  2. package/dist/Form/FormItem/index.d.ts +7 -1
  3. package/dist/Form/demos/ruleTime.d.ts +2 -0
  4. package/dist/LmFilter/utils.d.ts +1 -0
  5. package/dist/LmTable/hooks/useRowSelectControllableValue.d.ts +2 -0
  6. package/dist/LmUpload/UploadList/ItemPictureCard.d.ts +2 -1
  7. package/dist/LmUpload/components/Preview.d.ts +5 -0
  8. package/dist/LmUpload/fns/index.d.ts +1 -0
  9. package/dist/LmUpload/wrapper/reducer.d.ts +4 -0
  10. package/dist/index.umd.js +582 -333
  11. package/dist/index.umd.min.js +16 -16
  12. package/dist/variables.css +10 -3
  13. package/es/Form/FormItem/index.d.ts +7 -1
  14. package/es/Form/FormItem/index.js +56 -13
  15. package/es/LmEditTable/EditTable.js +24 -21
  16. package/es/LmEditTable/style/index.css +3 -0
  17. package/es/LmEditTable/style/variables.css +3 -0
  18. package/es/LmEditTable/util.js +4 -4
  19. package/es/LmFilter/clearFilter/index.js +3 -1
  20. package/es/LmFilter/complexFilter/index.js +3 -2
  21. package/es/LmFilter/components/DropdownFIlter.js +8 -6
  22. package/es/LmFilter/style/index.css +4 -0
  23. package/es/LmFilter/style/variables.css +4 -0
  24. package/es/LmFilter/utils.js +18 -0
  25. package/es/LmFilter/wrapper/Filter.js +6 -2
  26. package/es/LmTable/Table.js +90 -84
  27. package/es/LmTable/hooks/useRowSelectControllableValue.js +67 -0
  28. package/es/LmTable/style/index.css +3 -3
  29. package/es/LmTable/style/variables.css +3 -3
  30. package/es/LmTable/util.js +9 -5
  31. package/es/LmUpload/LmUpload.js +1 -0
  32. package/es/LmUpload/UploadList/ItemPictureCard.d.ts +2 -1
  33. package/es/LmUpload/UploadList/ItemPictureCard.js +19 -5
  34. package/es/LmUpload/UploadList/index.js +13 -9
  35. package/es/LmUpload/components/Preview.d.ts +5 -0
  36. package/es/LmUpload/components/Preview.js +43 -0
  37. package/es/LmUpload/fns/index.d.ts +1 -0
  38. package/es/LmUpload/fns/index.js +22 -3
  39. package/es/LmUpload/wrapper/UploadWrapper.js +3 -0
  40. package/es/LmUpload/wrapper/reducer.d.ts +4 -0
  41. package/es/LmUpload/wrapper/reducer.js +12 -3
  42. package/es/styles/variables.css +10 -3
  43. package/lib/Form/FormItem/index.d.ts +7 -1
  44. package/lib/Form/FormItem/index.js +58 -14
  45. package/lib/LmEditTable/EditTable.js +24 -21
  46. package/lib/LmEditTable/style/index.css +3 -0
  47. package/lib/LmEditTable/style/variables.css +3 -0
  48. package/lib/LmEditTable/util.js +4 -4
  49. package/lib/LmFilter/clearFilter/index.js +3 -1
  50. package/lib/LmFilter/complexFilter/index.js +3 -2
  51. package/lib/LmFilter/components/DropdownFIlter.js +8 -6
  52. package/lib/LmFilter/style/index.css +4 -0
  53. package/lib/LmFilter/style/variables.css +4 -0
  54. package/lib/LmFilter/utils.js +18 -0
  55. package/lib/LmFilter/wrapper/Filter.js +6 -2
  56. package/lib/LmTable/Table.js +90 -84
  57. package/lib/LmTable/hooks/useRowSelectControllableValue.js +67 -0
  58. package/lib/LmTable/style/index.css +3 -3
  59. package/lib/LmTable/style/variables.css +3 -3
  60. package/lib/LmTable/util.js +9 -5
  61. package/lib/LmUpload/LmUpload.js +1 -0
  62. package/lib/LmUpload/UploadList/ItemPictureCard.d.ts +2 -1
  63. package/lib/LmUpload/UploadList/ItemPictureCard.js +19 -5
  64. package/lib/LmUpload/UploadList/index.js +15 -9
  65. package/lib/LmUpload/components/Preview.d.ts +5 -0
  66. package/lib/LmUpload/components/Preview.js +55 -0
  67. package/lib/LmUpload/fns/index.d.ts +1 -0
  68. package/lib/LmUpload/fns/index.js +22 -3
  69. package/lib/LmUpload/wrapper/UploadWrapper.js +4 -0
  70. package/lib/LmUpload/wrapper/reducer.d.ts +4 -0
  71. package/lib/LmUpload/wrapper/reducer.js +12 -3
  72. package/lib/styles/variables.css +10 -3
  73. package/package.json +15 -3
@@ -9764,6 +9764,9 @@ p {
9764
9764
  .lm_editTable_warpper .icon_drag:hover {
9765
9765
  color: var(--text-color);
9766
9766
  }
9767
+ .lm_editTable_warpper .ant-table .ant-table-tbody > .ant-table-measure-row > td {
9768
+ padding: 0 !important;
9769
+ }
9767
9770
  .lm_editTable_warpper .ant-picker {
9768
9771
  height: 24px !important;
9769
9772
  padding: 2px 8px;
@@ -9844,11 +9847,15 @@ p {
9844
9847
  background-color: var(--background-color-hover);
9845
9848
  }
9846
9849
  .lm_filter_wrapper .lm_filter_container .lm_filter .lm_filter_search {
9850
+ width: 140px;
9847
9851
  max-width: 140px;
9848
9852
  }
9849
9853
  .lm_filter_wrapper .lm_filter_container .lm_filter .lm_filter_complex {
9850
9854
  display: inline-flex;
9851
9855
  }
9856
+ .lm_filter_wrapper .lm_filter_container .lm_filter.lm_filter_small .lm_filter_custom_line {
9857
+ height: 24px;
9858
+ }
9852
9859
  .lm_filter_basic_item {
9853
9860
  font-size: 12px;
9854
9861
  display: inline-flex;
@@ -11259,6 +11266,9 @@ p {
11259
11266
  height: 48px;
11260
11267
  font-size: 12px;
11261
11268
  }
11269
+ #lm_protable_warp .ant-table-tbody > tr.ant-table-measure-row > td {
11270
+ padding: 0 !important;
11271
+ }
11262
11272
  .row-dragging {
11263
11273
  display: flex;
11264
11274
  align-items: center;
@@ -11611,9 +11621,6 @@ button.ant-table-row-expand-icon::before,
11611
11621
  button.ant-table-row-expand-icon::after {
11612
11622
  color: #bfbfbf;
11613
11623
  }
11614
- .ant-table-tbody > tr.ant-table-measure-row > td {
11615
- padding: 0 !important;
11616
- }
11617
11624
  .react-resizable-handle {
11618
11625
  position: absolute;
11619
11626
  right: -5px;
@@ -1,5 +1,6 @@
1
1
  import type { FormInstance } from 'rc-field-form';
2
2
  import type { FieldProps } from 'rc-field-form/lib/Field';
3
+ import type { Rule } from 'rc-field-form/lib/interface';
3
4
  import * as React from 'react';
4
5
  import useFormItemStatus from '../hooks/useFormItemStatus';
5
6
  import type { FormItemInputProps } from '../FormItemInput';
@@ -9,7 +10,10 @@ export declare type ValidateStatus = typeof ValidateStatuses[number];
9
10
  declare type RenderChildren<Values = any> = (form: FormInstance<Values>) => React.ReactNode;
10
11
  declare type RcFieldProps<Values = any> = Omit<FieldProps<Values>, 'children'>;
11
12
  declare type ChildrenType<Values = any> = RenderChildren<Values> | React.ReactNode;
12
- export interface FormItemProps<Values = any> extends FormItemLabelProps, FormItemInputProps, RcFieldProps<Values> {
13
+ export declare type LmRule = Rule & {
14
+ time?: number;
15
+ };
16
+ export interface FormItemProps<Values = any> extends FormItemLabelProps, FormItemInputProps, Omit<RcFieldProps<Values>, 'rules'> {
13
17
  prefixCls?: string;
14
18
  noStyle?: boolean;
15
19
  style?: React.CSSProperties;
@@ -25,6 +29,8 @@ export interface FormItemProps<Values = any> extends FormItemLabelProps, FormIte
25
29
  tooltip?: LabelTooltipType;
26
30
  /** @deprecated No need anymore */
27
31
  fieldKey?: React.Key | React.Key[];
32
+ /** 变更 */
33
+ rules?: LmRule[];
28
34
  errorPlacement?: string;
29
35
  responsive?: boolean;
30
36
  }
@@ -1,11 +1,12 @@
1
- import _typeof from "@babel/runtime/helpers/esm/typeof";
2
1
  import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
3
2
  import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
3
+ import _typeof from "@babel/runtime/helpers/esm/typeof";
4
+ import _createForOfIteratorHelper from "@babel/runtime/helpers/esm/createForOfIteratorHelper";
4
5
  import { Field, FieldContext, ListContext } from 'rc-field-form';
5
6
  import useState from 'rc-util/lib/hooks/useState';
6
7
  import { supportRef } from 'rc-util/lib/ref';
7
8
  import * as React from 'react';
8
- import { useContext } from 'react';
9
+ import { useContext, useEffect, useRef } from 'react';
9
10
  import useFormItemStatus from '../hooks/useFormItemStatus';
10
11
  import { ConfigContext } from '../../ConfigProvider';
11
12
  import { cloneElement, isValidElement } from '../../_util/reactNode';
@@ -43,6 +44,31 @@ function genEmptyMeta() {
43
44
  };
44
45
  }
45
46
 
47
+ function getRuleTime(rules) {
48
+ if (!rules) {
49
+ return 0;
50
+ }
51
+
52
+ var _iterator = _createForOfIteratorHelper(rules),
53
+ _step;
54
+
55
+ try {
56
+ for (_iterator.s(); !(_step = _iterator.n()).done;) {
57
+ var rule = _step.value;
58
+
59
+ if (rule && _typeof(rule) === 'object' && rule.time) {
60
+ return rule.time;
61
+ }
62
+ }
63
+ } catch (err) {
64
+ _iterator.e(err);
65
+ } finally {
66
+ _iterator.f();
67
+ }
68
+
69
+ return 0;
70
+ }
71
+
46
72
  function InternalFormItem(props) {
47
73
  var name = props.name,
48
74
  noStyle = props.noStyle,
@@ -58,6 +84,17 @@ function InternalFormItem(props) {
58
84
  trigger = _props$trigger === void 0 ? 'onChange' : _props$trigger,
59
85
  validateTrigger = props.validateTrigger,
60
86
  hidden = props.hidden;
87
+ var timerRef = useRef(null);
88
+
89
+ var _useState = useState([]),
90
+ _useState2 = _slicedToArray(_useState, 2),
91
+ mergedErrors = _useState2[0],
92
+ setMergedErrors = _useState2[1];
93
+
94
+ var _useState3 = useState([]),
95
+ _useState4 = _slicedToArray(_useState3, 2),
96
+ mergedWarnings = _useState4[0],
97
+ setMergedWarnings = _useState4[1];
61
98
 
62
99
  var _useContext = useContext(ConfigContext),
63
100
  getPrefixCls = _useContext.getPrefixCls;
@@ -86,12 +123,12 @@ function InternalFormItem(props) {
86
123
  setSubFieldErrors = _useFrameState2[1]; // >>>>> Current field errors
87
124
 
88
125
 
89
- var _useState = useState(function () {
126
+ var _useState5 = useState(function () {
90
127
  return genEmptyMeta();
91
128
  }),
92
- _useState2 = _slicedToArray(_useState, 2),
93
- meta = _useState2[0],
94
- setMeta = _useState2[1];
129
+ _useState6 = _slicedToArray(_useState5, 2),
130
+ meta = _useState6[0],
131
+ setMeta = _useState6[1];
95
132
 
96
133
  var onMetaChange = function onMetaChange(nextMeta) {
97
134
  // This keyInfo is not correct when field is removed
@@ -144,7 +181,7 @@ function InternalFormItem(props) {
144
181
  }; // >>>>> Get merged errors
145
182
 
146
183
 
147
- var _React$useMemo = React.useMemo(function () {
184
+ useEffect(function () {
148
185
  var errorList = _toConsumableArray(meta.errors);
149
186
 
150
187
  var warningList = _toConsumableArray(meta.warnings);
@@ -153,12 +190,18 @@ function InternalFormItem(props) {
153
190
  errorList.push.apply(errorList, _toConsumableArray(subFieldError.errors || []));
154
191
  warningList.push.apply(warningList, _toConsumableArray(subFieldError.warnings || []));
155
192
  });
156
- return [errorList, warningList];
157
- }, [subFieldErrors, meta.errors, meta.warnings]),
158
- _React$useMemo2 = _slicedToArray(_React$useMemo, 2),
159
- mergedErrors = _React$useMemo2[0],
160
- mergedWarnings = _React$useMemo2[1]; // ===================== Children Ref =====================
161
-
193
+ setMergedErrors(errorList);
194
+ setMergedWarnings(warningList);
195
+ var time = getRuleTime(rules);
196
+
197
+ if (time) {
198
+ clearTimeout(timerRef.current);
199
+ timerRef.current = setTimeout(function () {
200
+ setMergedErrors([]);
201
+ setMergedWarnings([]);
202
+ }, time);
203
+ }
204
+ }, [subFieldErrors, meta.errors, meta.warnings]); // ===================== Children Ref =====================
162
205
 
163
206
  var getItemRef = useItemRef(); // ======================== Render ========================
164
207
 
@@ -735,13 +735,15 @@ var EditTable = /*#__PURE__*/forwardRef(function (props, ref) {
735
735
  };
736
736
 
737
737
  var onColSortEnd = function onColSortEnd(active, over) {
738
+ var _a;
739
+
738
740
  var oldIndex = columns.findIndex(function (item) {
739
741
  return item.dataIndex === active;
740
742
  });
741
743
  var newIndex = columns.findIndex(function (item) {
742
744
  return item.dataIndex === over;
743
745
  });
744
- filterChange === null || filterChange === void 0 ? void 0 : filterChange(arrayMove(columns, oldIndex, newIndex).map(function (item, index) {
746
+ filterChange === null || filterChange === void 0 ? void 0 : filterChange((_a = arrayMove(columns, oldIndex, newIndex)) === null || _a === void 0 ? void 0 : _a.map(function (item, index) {
745
747
  return Object.assign(Object.assign({}, item), {
746
748
  order: index
747
749
  });
@@ -775,7 +777,7 @@ var EditTable = /*#__PURE__*/forwardRef(function (props, ref) {
775
777
  dataSourceRef.current = dataSource;
776
778
 
777
779
  if (sortOpen) {
778
- var dataSourceKeys = dataSource.map(function (item) {
780
+ var dataSourceKeys = dataSource === null || dataSource === void 0 ? void 0 : dataSource.map(function (item) {
779
781
  return item[_rowKey];
780
782
  }).join(',');
781
783
  var setCallBackFalgKeys = ((_a = sortDataSorceRef.current) === null || _a === void 0 ? void 0 : _a.map(function (item) {
@@ -819,12 +821,12 @@ var EditTable = /*#__PURE__*/forwardRef(function (props, ref) {
819
821
 
820
822
  if ((preKeys === null || preKeys === void 0 ? void 0 : preKeys.length) > 1) {
821
823
  var deeps = function deeps(children) {
822
- children.forEach(function (item) {
824
+ children === null || children === void 0 ? void 0 : children.forEach(function (item) {
823
825
  var _a;
824
826
 
825
827
  if (preKeys.includes(item[_rowKey])) {
826
828
  if (item[_rowKey] === row[_rowKey]) {
827
- children.forEach(function (c) {
829
+ children === null || children === void 0 ? void 0 : children.forEach(function (c) {
828
830
  c[key] = value;
829
831
  });
830
832
  (_a = Object.keys(item)) === null || _a === void 0 ? void 0 : _a.forEach(function (v) {
@@ -839,7 +841,7 @@ var EditTable = /*#__PURE__*/forwardRef(function (props, ref) {
839
841
 
840
842
  deeps(draft);
841
843
  } else {
842
- draft.forEach(function (item, index) {
844
+ draft === null || draft === void 0 ? void 0 : draft.forEach(function (item, index) {
843
845
  if (row[_rowKey] === item[_rowKey]) {
844
846
  draft[index] = row;
845
847
  } else {
@@ -850,7 +852,7 @@ var EditTable = /*#__PURE__*/forwardRef(function (props, ref) {
850
852
  } else {
851
853
  if ((preKeys === null || preKeys === void 0 ? void 0 : preKeys.length) > 1) {
852
854
  var _deeps = function _deeps(children) {
853
- children.forEach(function (item) {
855
+ children === null || children === void 0 ? void 0 : children.forEach(function (item) {
854
856
  var _a;
855
857
 
856
858
  if (preKeys.includes(item[_rowKey])) {
@@ -887,7 +889,7 @@ var EditTable = /*#__PURE__*/forwardRef(function (props, ref) {
887
889
 
888
890
  var reWriteOriginSource = function reWriteOriginSource(rowKey, rowValue, dataIndex, nextValue) {
889
891
  setDataSource(function (prevDataSource) {
890
- return prevDataSource.map(function (item) {
892
+ return prevDataSource === null || prevDataSource === void 0 ? void 0 : prevDataSource.map(function (item) {
891
893
  if (get(item, rowKey) === rowValue) {
892
894
  set(item, dataIndex, nextValue);
893
895
  }
@@ -906,10 +908,10 @@ var EditTable = /*#__PURE__*/forwardRef(function (props, ref) {
906
908
  if (preKeys.length > 1) {
907
909
  /** 说明删除的是children中的数据 */
908
910
  var filter = function filter(data, key) {
909
- var newData = data.filter(function (x) {
911
+ var newData = data === null || data === void 0 ? void 0 : data.filter(function (x) {
910
912
  return x[_rowKey] !== key;
911
913
  });
912
- newData.forEach(function (x) {
914
+ newData === null || newData === void 0 ? void 0 : newData.forEach(function (x) {
913
915
  if (x.children) {
914
916
  var c = filter(x.children, key);
915
917
  x.children = c;
@@ -957,13 +959,12 @@ var EditTable = /*#__PURE__*/forwardRef(function (props, ref) {
957
959
  var handleTableRowAdd = function handleTableRowAdd(record) {
958
960
  var _a, _b;
959
961
 
960
- console.log(record, '-rrrrr');
961
962
  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;
962
963
  var res = produce(dataSourceRef.current, function (draft) {
963
964
  if (preKeys.length > 1) {
964
965
  var deeps = function deeps(children) {
965
- children.forEach(function (item, index) {
966
- if (preKeys.includes(item[_rowKey])) {
966
+ children === null || children === void 0 ? void 0 : children.forEach(function (item, index) {
967
+ if (preKeys === null || preKeys === void 0 ? void 0 : preKeys.includes(item[_rowKey])) {
967
968
  if (item[_rowKey] === record[_rowKey]) {
968
969
  children.splice(index + 1, 0, _defineProperty({}, _rowKey, "".concat(Date.now())));
969
970
  } else if (item.children) {
@@ -994,7 +995,7 @@ var EditTable = /*#__PURE__*/forwardRef(function (props, ref) {
994
995
 
995
996
  var handleCopy = function handleCopy(key, value) {
996
997
  var res = produce(dataSourceRef.current, function (draft) {
997
- draft.forEach(function (item) {
998
+ draft === null || draft === void 0 ? void 0 : draft.forEach(function (item) {
998
999
  return item[key] = value;
999
1000
  });
1000
1001
  });
@@ -1016,7 +1017,7 @@ var EditTable = /*#__PURE__*/forwardRef(function (props, ref) {
1016
1017
  });
1017
1018
 
1018
1019
  if (hasOnlyOptionsDatas.length) {
1019
- return hasOnlyOptionsDatas.map(function (item) {
1020
+ return hasOnlyOptionsDatas === null || hasOnlyOptionsDatas === void 0 ? void 0 : hasOnlyOptionsDatas.map(function (item) {
1020
1021
  return item.dataIndex;
1021
1022
  });
1022
1023
  }
@@ -1033,10 +1034,10 @@ var EditTable = /*#__PURE__*/forwardRef(function (props, ref) {
1033
1034
 
1034
1035
  if (optionOnly && options) {
1035
1036
  var dataIndex = item.dataIndex;
1036
- var dataIndexData = dataSource.map(function (d) {
1037
+ var dataIndexData = dataSource === null || dataSource === void 0 ? void 0 : dataSource.map(function (d) {
1037
1038
  return d[dataIndex];
1038
1039
  });
1039
- var newOptions = options.map(function (o) {
1040
+ var newOptions = options === null || options === void 0 ? void 0 : options.map(function (o) {
1040
1041
  return Object.assign(Object.assign({}, o), {
1041
1042
  disabled: !!dataIndexData.includes(o === null || o === void 0 ? void 0 : o.value)
1042
1043
  });
@@ -1092,7 +1093,7 @@ var EditTable = /*#__PURE__*/forwardRef(function (props, ref) {
1092
1093
  var leftColumns = [];
1093
1094
  var mainColumns = [];
1094
1095
  var rightColumns = [];
1095
- localColumns.forEach(function (item) {
1096
+ localColumns === null || localColumns === void 0 ? void 0 : localColumns.forEach(function (item) {
1096
1097
  if ((item === null || item === void 0 ? void 0 : item.fixed) === 'left') {
1097
1098
  leftColumns.push(item);
1098
1099
  } else if ((item === null || item === void 0 ? void 0 : item.fixed) === 'right') {
@@ -1105,7 +1106,7 @@ var EditTable = /*#__PURE__*/forwardRef(function (props, ref) {
1105
1106
  /** 为了支持colums中的分组之后,进行递归处理 */
1106
1107
 
1107
1108
  var mapColumns = function mapColumns(col, index) {
1108
- var _a;
1109
+ var _a, _b;
1109
1110
 
1110
1111
  if (!col.editable && !((_a = col.children) === null || _a === void 0 ? void 0 : _a.length)) {
1111
1112
  return col;
@@ -1154,7 +1155,7 @@ var EditTable = /*#__PURE__*/forwardRef(function (props, ref) {
1154
1155
  });
1155
1156
 
1156
1157
  if (col === null || col === void 0 ? void 0 : col.children) {
1157
- newCol.children = col.children.map(mapColumns);
1158
+ newCol.children = (_b = col.children) === null || _b === void 0 ? void 0 : _b.map(mapColumns);
1158
1159
  }
1159
1160
 
1160
1161
  return newCol;
@@ -1179,9 +1180,11 @@ var EditTable = /*#__PURE__*/forwardRef(function (props, ref) {
1179
1180
  }, /*#__PURE__*/React.createElement("tbody", Object.assign({}, props))));
1180
1181
  }, [sortEditTable]);
1181
1182
  var colDraggableContainer = useCallback(function (_a) {
1183
+ var _b;
1184
+
1182
1185
  var props = __rest(_a, []);
1183
1186
 
1184
- return /*#__PURE__*/React.createElement("tr", null, React.Children.map(props.children, function (child) {
1187
+ return /*#__PURE__*/React.createElement("tr", null, (_b = React.Children) === null || _b === void 0 ? void 0 : _b.map(props.children, function (child) {
1185
1188
  var _a, _b;
1186
1189
 
1187
1190
  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) {
@@ -1322,7 +1325,7 @@ var EditTable = /*#__PURE__*/forwardRef(function (props, ref) {
1322
1325
  fixed: true,
1323
1326
  type: 'checkbox',
1324
1327
  columnWidth: 36,
1325
- selectedRowKeys: localRowSelectList.map(function (v) {
1328
+ selectedRowKeys: localRowSelectList === null || localRowSelectList === void 0 ? void 0 : localRowSelectList.map(function (v) {
1326
1329
  return v[_rowKey];
1327
1330
  }),
1328
1331
  onChange: function onChange(selectedRowKeys, selectedRows) {
@@ -576,6 +576,9 @@ p {
576
576
  .lm_editTable_warpper .icon_drag:hover {
577
577
  color: var(--text-color);
578
578
  }
579
+ .lm_editTable_warpper .ant-table .ant-table-tbody > .ant-table-measure-row > td {
580
+ padding: 0 !important;
581
+ }
579
582
  .lm_editTable_warpper .ant-picker {
580
583
  height: 24px !important;
581
584
  padding: 2px 8px;
@@ -65,6 +65,9 @@
65
65
  .lm_editTable_warpper .icon_drag:hover {
66
66
  color: var(--text-color);
67
67
  }
68
+ .lm_editTable_warpper .ant-table .ant-table-tbody > .ant-table-measure-row > td {
69
+ padding: 0 !important;
70
+ }
68
71
  .lm_editTable_warpper .ant-picker {
69
72
  height: 24px !important;
70
73
  padding: 2px 8px;
@@ -9,13 +9,13 @@ export function deepDataSourcePreKeys(dataSource, rowKey) {
9
9
  var deepDataSource = [];
10
10
 
11
11
  var eachChildren = function eachChildren(children, preKeys) {
12
- children.forEach(function (item) {
12
+ children === null || children === void 0 ? void 0 : children.forEach(function (item) {
13
13
  deepDataSource.push(Object.assign(Object.assign({}, item), {
14
- preKeys: [].concat(_toConsumableArray(preKeys), [item[rowKey]])
14
+ preKeys: [].concat(_toConsumableArray(preKeys), [item === null || item === void 0 ? void 0 : item[rowKey]])
15
15
  }));
16
16
 
17
- if (item.children) {
18
- eachChildren(item.children, [].concat(_toConsumableArray(preKeys), [item[rowKey]])); // deepDataSource.push({ ...item, preKeys: [...preKeys, item[rowKey]] })
17
+ if (item === null || item === void 0 ? void 0 : item.children) {
18
+ eachChildren(item === null || item === void 0 ? void 0 : item.children, [].concat(_toConsumableArray(preKeys), [item === null || item === void 0 ? void 0 : item[rowKey]])); // deepDataSource.push({ ...item, preKeys: [...preKeys, item[rowKey]] })
19
19
  }
20
20
  });
21
21
  };
@@ -14,7 +14,8 @@ var _linkmoreDesign = require("linkmore-design");
14
14
  var LmFilterClear = /*#__PURE__*/_react.default.memo(function (_ref) {
15
15
  var instance = _ref.instance;
16
16
  var onClearChange = instance.onClearChange,
17
- getHasFilter = instance.getHasFilter;
17
+ getHasFilter = instance.getHasFilter,
18
+ size = instance.size;
18
19
  if (!getHasFilter()) return null;
19
20
 
20
21
  var handleClear = function handleClear() {
@@ -25,6 +26,7 @@ var LmFilterClear = /*#__PURE__*/_react.default.memo(function (_ref) {
25
26
  className: "lm_filter_clear"
26
27
  }, /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Button, {
27
28
  type: "link",
29
+ size: size,
28
30
  onClick: handleClear
29
31
  }, "\u4E00\u952E\u6E05\u7A7A"));
30
32
  });
@@ -24,7 +24,8 @@ var _utils = require("../utils");
24
24
  var LmFilterComplex = function LmFilterComplex(_ref) {
25
25
  var instance = _ref.instance;
26
26
  var state = instance.state,
27
- dispatch = instance.dispatch;
27
+ dispatch = instance.dispatch,
28
+ size = instance.size;
28
29
  var expand = (0, _react.useMemo)(function () {
29
30
  return state.complexDrawer.visible;
30
31
  }, [state.complexDrawer.visible]);
@@ -44,7 +45,7 @@ var LmFilterComplex = function LmFilterComplex(_ref) {
44
45
  return /*#__PURE__*/_react.default.createElement("div", {
45
46
  className: "lm_filter_complex"
46
47
  }, /*#__PURE__*/_react.default.createElement("div", {
47
- className: (0, _classnames.default)('lm_filter_basic_item lm_filter_complex_item', {
48
+ className: (0, _classnames.default)('lm_filter_basic_item lm_filter_complex_item', size, {
48
49
  expand: expand,
49
50
  active: active
50
51
  }),
@@ -98,7 +98,8 @@ var getPlacehodler = function getPlacehodler(props) {
98
98
  }; // 根据不同的类型展示文本内容
99
99
 
100
100
 
101
- var getLabel = function getLabel(filterValue, item) {
101
+ var getLabel = function getLabel(resetInstance, item) {
102
+ var filterValue = resetInstance.filterValue;
102
103
  var type = item.type,
103
104
  data = item.data; // 不存在筛选时
104
105
 
@@ -151,7 +152,7 @@ var getLabel = function getLabel(filterValue, item) {
151
152
 
152
153
 
153
154
  var _labels = data === null || data === void 0 ? void 0 : (_data$filter = data.filter(function (v) {
154
- return filterValue.includes(v.value);
155
+ return (0, _utils.toStringIsEqual)(v.value, filterValue, 'includes');
155
156
  })) === null || _data$filter === void 0 ? void 0 : _data$filter.map(function (v) {
156
157
  return v.label;
157
158
  });
@@ -180,7 +181,7 @@ var getLabel = function getLabel(filterValue, item) {
180
181
 
181
182
 
182
183
  var label = (data === null || data === void 0 ? void 0 : (_data$find = data.find(function (v) {
183
- return (v === null || v === void 0 ? void 0 : v.value) === filterValue;
184
+ return (0, _utils.toStringIsEqual)(v === null || v === void 0 ? void 0 : v.value, filterValue);
184
185
  })) === null || _data$find === void 0 ? void 0 : _data$find.label) || filterValue;
185
186
  return label;
186
187
  } catch (error) {
@@ -203,7 +204,8 @@ var DropdownFilter = /*#__PURE__*/_react.default.memo(function (_ref2) {
203
204
  visible = _useState2[0],
204
205
  setVisible = _useState2[1];
205
206
 
206
- var filterValue = instance.filterValue; // 触发查询时关闭下拉框
207
+ var filterValue = instance.filterValue,
208
+ size = instance.size; // 触发查询时关闭下拉框
207
209
 
208
210
  var setFilterValue = function setFilterValue(obj) {
209
211
  instance.setFilterValue(obj);
@@ -244,7 +246,7 @@ var DropdownFilter = /*#__PURE__*/_react.default.memo(function (_ref2) {
244
246
  ,
245
247
  destroyPopupOnHide: true
246
248
  }, /*#__PURE__*/_react.default.createElement("div", {
247
- className: (0, _classnames.default)('lm_filter_basic_item', {
249
+ className: (0, _classnames.default)('lm_filter_basic_item', size, {
248
250
  expand: visible,
249
251
  active: active
250
252
  })
@@ -252,7 +254,7 @@ var DropdownFilter = /*#__PURE__*/_react.default.memo(function (_ref2) {
252
254
  className: "filter_item_label"
253
255
  }, item === null || item === void 0 ? void 0 : item.title, ":"), /*#__PURE__*/_react.default.createElement("div", {
254
256
  className: "filter_item_value"
255
- }, getLabel(filterValue, item)), /*#__PURE__*/_react.default.createElement("div", {
257
+ }, getLabel(resetInstance, item)), /*#__PURE__*/_react.default.createElement("div", {
256
258
  className: "filter_item_icon addon_after"
257
259
  }, item.type !== 'date' || active ? /*#__PURE__*/_react.default.createElement(_linkmoreDesign.IconFont, {
258
260
  type: active ? 'lmweb-close-circle-fill' : 'lmweb-down',
@@ -53,11 +53,15 @@
53
53
  background-color: var(--background-color-hover);
54
54
  }
55
55
  .lm_filter_wrapper .lm_filter_container .lm_filter .lm_filter_search {
56
+ width: 140px;
56
57
  max-width: 140px;
57
58
  }
58
59
  .lm_filter_wrapper .lm_filter_container .lm_filter .lm_filter_complex {
59
60
  display: inline-flex;
60
61
  }
62
+ .lm_filter_wrapper .lm_filter_container .lm_filter.lm_filter_small .lm_filter_custom_line {
63
+ height: 24px;
64
+ }
61
65
  .lm_filter_basic_item {
62
66
  font-size: 12px;
63
67
  display: inline-flex;
@@ -53,11 +53,15 @@
53
53
  background-color: var(--background-color-hover);
54
54
  }
55
55
  .lm_filter_wrapper .lm_filter_container .lm_filter .lm_filter_search {
56
+ width: 140px;
56
57
  max-width: 140px;
57
58
  }
58
59
  .lm_filter_wrapper .lm_filter_container .lm_filter .lm_filter_complex {
59
60
  display: inline-flex;
60
61
  }
62
+ .lm_filter_wrapper .lm_filter_container .lm_filter.lm_filter_small .lm_filter_custom_line {
63
+ height: 24px;
64
+ }
61
65
  .lm_filter_basic_item {
62
66
  font-size: 12px;
63
67
  display: inline-flex;
@@ -11,6 +11,7 @@ exports.getFlatItem = getFlatItem;
11
11
  exports.getIsHas = getIsHas;
12
12
  exports.getRanges = getRanges;
13
13
  exports.getValueForType = getValueForType;
14
+ exports.toStringIsEqual = toStringIsEqual;
14
15
  exports.uniqueFunc = uniqueFunc;
15
16
 
16
17
  var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/toConsumableArray"));
@@ -33,6 +34,23 @@ function getIsHas(val) {
33
34
  }
34
35
 
35
36
  return flag;
37
+ }
38
+ /*
39
+ * 数据(布尔值、数值)转字符串后对比是否相等 str, strs, type
40
+ * @params {Array | String} strs
41
+ * @params {String} type 比对类型
42
+ * @type includes 是否包含在数组内
43
+ */
44
+
45
+
46
+ function toStringIsEqual(str, strs, type) {
47
+ if (type === 'includes') {
48
+ return strs === null || strs === void 0 ? void 0 : strs.some(function (v) {
49
+ return toStringIsEqual(str, v);
50
+ });
51
+ }
52
+
53
+ return String(str) === String(strs);
36
54
  } // 根据类型返回对应的值
37
55
 
38
56
 
@@ -7,8 +7,12 @@ Object.defineProperty(exports, "__esModule", {
7
7
  });
8
8
  exports.default = void 0;
9
9
 
10
+ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/defineProperty"));
11
+
10
12
  var _react = _interopRequireDefault(require("react"));
11
13
 
14
+ var _classnames = _interopRequireDefault(require("classnames"));
15
+
12
16
  var _baseFilter = _interopRequireDefault(require("../baseFilter"));
13
17
 
14
18
  var _customFilter = _interopRequireDefault(require("../customFilter"));
@@ -22,10 +26,10 @@ var LmFilter = /*#__PURE__*/_react.default.memo(function (_ref) {
22
26
  var instance = _ref.instance;
23
27
  var enableBaisc = instance.enableBaisc,
24
28
  enableComplex = instance.enableComplex,
25
- enableCustom = instance.enableCustom,
29
+ size = instance.size,
26
30
  enableClear = instance.enableClear;
27
31
  return /*#__PURE__*/_react.default.createElement("div", {
28
- className: "lm_filter"
32
+ className: (0, _classnames.default)('lm_filter', (0, _defineProperty2.default)({}, "lm_filter_".concat(size), size))
29
33
  }, /*#__PURE__*/_react.default.createElement(_customFilter.default, {
30
34
  instance: instance
31
35
  }), enableBaisc && /*#__PURE__*/_react.default.createElement(_baseFilter.default, {