linkmore-design 1.0.56 → 1.0.59

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 (181) hide show
  1. package/dist/Button/index.d.ts +4 -0
  2. package/dist/CardTable/LmCardTable.d.ts +1 -0
  3. package/dist/CustomTableOption/cardSort.d.ts +4 -0
  4. package/dist/CustomTableOption/index.d.ts +1 -0
  5. package/dist/DatePicker/PickerButton.d.ts +2 -0
  6. package/dist/DatePicker/PickerTag.d.ts +2 -0
  7. package/dist/DatePicker/demos/basic.d.ts +2 -0
  8. package/dist/DatePicker/generatePicker/generateRangePicker.d.ts +4 -0
  9. package/dist/DatePicker/generatePicker/generateSinglePicker.d.ts +14 -0
  10. package/dist/DatePicker/generatePicker/index.d.ts +106 -0
  11. package/dist/DatePicker/generatePicker/interface.d.ts +12 -0
  12. package/dist/DatePicker/index.d.ts +17 -0
  13. package/dist/DatePicker/style/index.d.ts +1 -0
  14. package/dist/DatePicker/util.d.ts +14 -0
  15. package/dist/Empty/demos/custom.d.ts +2 -0
  16. package/dist/Empty/empty.d.ts +2 -0
  17. package/dist/Empty/index.d.ts +18 -3
  18. package/dist/Empty/simple.d.ts +2 -0
  19. package/dist/Form/container.d.ts +8 -0
  20. package/dist/Form/demos/responsive.d.ts +2 -0
  21. package/dist/Form/index.d.ts +3 -0
  22. package/dist/LmEditTable/demos/basic copy.d.ts +2 -0
  23. package/dist/LmFilter/customFilter/index.d.ts +3 -1
  24. package/dist/LmFilter/filterFns/index.d.ts +4 -1
  25. package/dist/LmFilter/utils.d.ts +1 -1
  26. package/dist/_util/motion.d.ts +8 -0
  27. package/dist/_util/statusUtils.d.ts +6 -0
  28. package/dist/_util/type.d.ts +9 -0
  29. package/dist/_util/warning.d.ts +6 -0
  30. package/dist/index.d.ts +3 -0
  31. package/dist/index.umd.js +10675 -271
  32. package/dist/index.umd.min.js +6 -6
  33. package/es/Button/index.d.ts +4 -0
  34. package/es/Button/index.js +1 -1
  35. package/es/CardTable/LmCardTable.js +4 -1
  36. package/es/CardTable/card/PictureTextRow.js +8 -3
  37. package/es/CardTable/style/index.css +8 -1
  38. package/es/CustomTableOption/cardSort.d.ts +4 -0
  39. package/es/CustomTableOption/cardSort.js +219 -0
  40. package/es/CustomTableOption/columnsSort.js +2 -4
  41. package/es/CustomTableOption/filterSort.js +0 -3
  42. package/es/CustomTableOption/index.d.ts +1 -0
  43. package/es/CustomTableOption/index.js +37 -13
  44. package/es/CustomTableOption/style/index.css +3 -0
  45. package/es/DatePicker/PickerButton.d.ts +2 -0
  46. package/es/DatePicker/PickerButton.js +8 -0
  47. package/es/DatePicker/PickerTag.d.ts +2 -0
  48. package/es/DatePicker/PickerTag.js +7 -0
  49. package/es/DatePicker/generatePicker/generateRangePicker.d.ts +4 -0
  50. package/es/DatePicker/generatePicker/generateRangePicker.js +142 -0
  51. package/es/DatePicker/generatePicker/generateSinglePicker.d.ts +14 -0
  52. package/es/DatePicker/generatePicker/generateSinglePicker.js +170 -0
  53. package/es/DatePicker/generatePicker/index.d.ts +106 -0
  54. package/es/DatePicker/generatePicker/index.js +84 -0
  55. package/es/DatePicker/generatePicker/interface.d.ts +12 -0
  56. package/es/DatePicker/generatePicker/interface.js +1 -0
  57. package/es/DatePicker/index.d.ts +17 -0
  58. package/es/DatePicker/index.js +7 -0
  59. package/es/DatePicker/style/index.css +505 -0
  60. package/es/DatePicker/style/index.d.ts +1 -0
  61. package/es/DatePicker/style/index.js +1 -0
  62. package/es/DatePicker/util.d.ts +14 -0
  63. package/es/DatePicker/util.js +111 -0
  64. package/es/Empty/empty.d.ts +2 -0
  65. package/es/Empty/empty.js +55 -0
  66. package/es/Empty/index.d.ts +18 -3
  67. package/es/Empty/index.js +100 -1
  68. package/es/Empty/simple.d.ts +2 -0
  69. package/es/Empty/simple.js +36 -0
  70. package/es/Empty/style/index.css +44 -0
  71. package/es/Form/container.d.ts +8 -0
  72. package/es/Form/container.js +97 -0
  73. package/es/Form/index.d.ts +3 -0
  74. package/es/Form/index.js +13 -1
  75. package/es/Form/style/index.css +35 -0
  76. package/es/IconFont/index.js +1 -1
  77. package/es/LmEditTable/DragHandle.js +1 -1
  78. package/es/LmEditTable/EditTable.js +27 -35
  79. package/es/LmFilter/Controls/index.js +32 -2
  80. package/es/LmFilter/baseFilter/index.js +2 -1
  81. package/es/LmFilter/complexFilter/drawer.js +33 -32
  82. package/es/LmFilter/components/CascaderFilter.js +35 -35
  83. package/es/LmFilter/components/CheckboxFilter.js +13 -21
  84. package/es/LmFilter/components/DateFilter.js +53 -29
  85. package/es/LmFilter/components/DropdownFIlter.js +51 -22
  86. package/es/LmFilter/components/SelectFilter.js +2 -3
  87. package/es/LmFilter/components/index.js +5 -61
  88. package/es/LmFilter/customFilter/index.js +3 -2
  89. package/es/LmFilter/filterFns/index.js +65 -25
  90. package/es/LmFilter/style/style.css +2 -1
  91. package/es/LmFilter/utils.js +63 -14
  92. package/es/LmFilter/wrapper/Filter.js +6 -3
  93. package/es/LmFilter/wrapper/FilterRoot.js +29 -22
  94. package/es/LmTable/Table.js +15 -8
  95. package/es/QuickMenu/index.js +5 -3
  96. package/es/_util/motion.d.ts +8 -0
  97. package/es/_util/motion.js +60 -0
  98. package/es/_util/statusUtils.d.ts +6 -0
  99. package/es/_util/statusUtils.js +12 -0
  100. package/es/_util/type.d.ts +9 -0
  101. package/es/_util/type.js +15 -0
  102. package/es/_util/warning.d.ts +6 -0
  103. package/es/_util/warning.js +17 -0
  104. package/es/index.d.ts +3 -0
  105. package/es/index.js +2 -1
  106. package/es/message/index.d.ts +5 -5
  107. package/lib/Button/index.d.ts +4 -0
  108. package/lib/Button/index.js +1 -1
  109. package/lib/CardTable/LmCardTable.js +4 -1
  110. package/lib/CardTable/card/PictureTextRow.js +8 -3
  111. package/lib/CardTable/style/index.css +8 -1
  112. package/lib/CustomTableOption/cardSort.d.ts +4 -0
  113. package/lib/CustomTableOption/cardSort.js +239 -0
  114. package/lib/CustomTableOption/columnsSort.js +2 -4
  115. package/lib/CustomTableOption/filterSort.js +0 -3
  116. package/lib/CustomTableOption/index.d.ts +1 -0
  117. package/lib/CustomTableOption/index.js +38 -13
  118. package/lib/CustomTableOption/style/index.css +3 -0
  119. package/lib/DatePicker/PickerButton.d.ts +2 -0
  120. package/lib/DatePicker/PickerButton.js +19 -0
  121. package/lib/DatePicker/PickerTag.d.ts +2 -0
  122. package/lib/DatePicker/PickerTag.js +18 -0
  123. package/lib/DatePicker/generatePicker/generateRangePicker.d.ts +4 -0
  124. package/lib/DatePicker/generatePicker/generateRangePicker.js +168 -0
  125. package/lib/DatePicker/generatePicker/generateSinglePicker.d.ts +14 -0
  126. package/lib/DatePicker/generatePicker/generateSinglePicker.js +196 -0
  127. package/lib/DatePicker/generatePicker/index.d.ts +106 -0
  128. package/lib/DatePicker/generatePicker/index.js +102 -0
  129. package/lib/DatePicker/generatePicker/interface.d.ts +12 -0
  130. package/lib/DatePicker/generatePicker/interface.js +5 -0
  131. package/lib/DatePicker/index.d.ts +17 -0
  132. package/lib/DatePicker/index.js +21 -0
  133. package/lib/DatePicker/style/index.css +505 -0
  134. package/lib/DatePicker/style/index.d.ts +1 -0
  135. package/lib/DatePicker/style/index.js +3 -0
  136. package/lib/DatePicker/util.d.ts +14 -0
  137. package/lib/DatePicker/util.js +122 -0
  138. package/lib/Empty/empty.d.ts +2 -0
  139. package/lib/Empty/empty.js +66 -0
  140. package/lib/Empty/index.d.ts +18 -3
  141. package/lib/Empty/index.js +107 -1
  142. package/lib/Empty/simple.d.ts +2 -0
  143. package/lib/Empty/simple.js +47 -0
  144. package/lib/Empty/style/index.css +44 -0
  145. package/lib/Form/container.d.ts +8 -0
  146. package/lib/Form/container.js +112 -0
  147. package/lib/Form/index.d.ts +3 -0
  148. package/lib/Form/index.js +14 -1
  149. package/lib/Form/style/index.css +35 -0
  150. package/lib/IconFont/index.js +1 -1
  151. package/lib/LmEditTable/DragHandle.js +1 -1
  152. package/lib/LmEditTable/EditTable.js +26 -36
  153. package/lib/LmFilter/Controls/index.js +32 -2
  154. package/lib/LmFilter/baseFilter/index.js +2 -1
  155. package/lib/LmFilter/complexFilter/drawer.js +33 -32
  156. package/lib/LmFilter/components/CascaderFilter.js +35 -35
  157. package/lib/LmFilter/components/CheckboxFilter.js +13 -21
  158. package/lib/LmFilter/components/DateFilter.js +53 -29
  159. package/lib/LmFilter/components/DropdownFIlter.js +51 -22
  160. package/lib/LmFilter/components/SelectFilter.js +2 -3
  161. package/lib/LmFilter/components/index.js +5 -61
  162. package/lib/LmFilter/customFilter/index.js +3 -2
  163. package/lib/LmFilter/filterFns/index.js +65 -25
  164. package/lib/LmFilter/style/style.css +2 -1
  165. package/lib/LmFilter/utils.js +63 -14
  166. package/lib/LmFilter/wrapper/Filter.js +6 -3
  167. package/lib/LmFilter/wrapper/FilterRoot.js +29 -22
  168. package/lib/LmTable/Table.js +15 -8
  169. package/lib/QuickMenu/index.js +4 -2
  170. package/lib/_util/motion.d.ts +8 -0
  171. package/lib/_util/motion.js +71 -0
  172. package/lib/_util/statusUtils.d.ts +6 -0
  173. package/lib/_util/statusUtils.js +29 -0
  174. package/lib/_util/type.d.ts +9 -0
  175. package/lib/_util/type.js +27 -0
  176. package/lib/_util/warning.d.ts +6 -0
  177. package/lib/_util/warning.js +35 -0
  178. package/lib/index.d.ts +3 -0
  179. package/lib/index.js +9 -1
  180. package/lib/message/index.d.ts +5 -5
  181. package/package.json +1 -1
@@ -506,6 +506,9 @@ html {
506
506
  .lm_form .ant-form-item {
507
507
  margin-bottom: 16px;
508
508
  }
509
+ .lm_form .ant-form-item .ant-form-item-explain {
510
+ line-height: 24px;
511
+ }
509
512
  .lm_form .ant-form-item-label {
510
513
  display: flex !important;
511
514
  align-items: center;
@@ -529,3 +532,35 @@ html {
529
532
  .lm_form .ant-form-item-control {
530
533
  width: 240px;
531
534
  }
535
+ .lm_container_wrapper {
536
+ overflow: auto;
537
+ }
538
+ .lm_container_wrapper .lm_container.responsive {
539
+ min-width: 990px;
540
+ }
541
+ .lm_container_wrapper .lm_container.responsive .lm_form {
542
+ display: flex;
543
+ flex-direction: row;
544
+ flex-wrap: wrap;
545
+ }
546
+ .lm_container_wrapper .lm_container.responsive .lm_form .ant-form-item {
547
+ margin-right: 24px;
548
+ }
549
+ .lm_container_wrapper .lm_container.responsive.lm_col_3 .ant-form-item {
550
+ width: calc(33.3333% - 16px);
551
+ }
552
+ .lm_container_wrapper .lm_container.responsive.lm_col_3 .ant-form-item:nth-of-type(3n) {
553
+ margin-right: 0;
554
+ }
555
+ .lm_container_wrapper .lm_container.responsive.lm_col_4 .ant-form-item {
556
+ width: calc(25% - 18px);
557
+ }
558
+ .lm_container_wrapper .lm_container.responsive.lm_col_4 .ant-form-item:nth-of-type(4n) {
559
+ margin-right: 0;
560
+ }
561
+ .lm_container_wrapper .lm_container.responsive.lm_col_5 .ant-form-item {
562
+ width: calc(20% - 96px / 5);
563
+ }
564
+ .lm_container_wrapper .lm_container.responsive.lm_col_5 .ant-form-item:nth-of-type(5n) {
565
+ margin-right: 0;
566
+ }
@@ -8,7 +8,7 @@ exports.default = void 0;
8
8
  var _icons = require("@ant-design/icons");
9
9
 
10
10
  var IconFont = (0, _icons.createFromIconfontCN)({
11
- scriptUrl: '//at.alicdn.com/t/c/font_2966019_7jeb9gjjk63.js' // 在 iconfont.cn 上生成
11
+ scriptUrl: '//at.alicdn.com/t/c/font_2966019_sw56tprypkb.js' // 在 iconfont.cn 上生成
12
12
  // scriptUrl: require('./font/iconfont.js'),
13
13
 
14
14
  });
@@ -11,7 +11,7 @@ export var Dragger = function Dragger(_ref) {
11
11
  isDragging = _useSortable.isDragging;
12
12
 
13
13
  return /*#__PURE__*/React.createElement(IconFont, Object.assign({
14
- type: "lmweb-icon-m-receipt"
14
+ type: "lmweb-icon-m-receipt1"
15
15
  }, listeners, {
16
16
  style: {
17
17
  touchAction: 'none'
@@ -1,5 +1,3 @@
1
- import "antd/es/date-picker/style";
2
- import _DatePicker from "antd/es/date-picker";
3
1
  import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
4
2
  import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
5
3
  import "antd/es/form/style";
@@ -55,9 +53,9 @@ var __rest = this && this.__rest || function (s, e) {
55
53
 
56
54
 
57
55
  import { PlusCircleOutlined } from '@ant-design/icons';
58
- import dayjs from 'dayjs';
56
+ import moment from 'moment';
59
57
  import { arrayMove } from '@dnd-kit/sortable';
60
- import { Button, Checkbox, IconFont, Input, InputNumber, Radio, Select, Table, Switch } from 'linkmore-design';
58
+ import { Button, Checkbox, IconFont, Input, InputNumber, Radio, Select, Table, Switch, DatePicker } from 'linkmore-design';
61
59
  import { get, set } from 'lodash';
62
60
  import React, { forwardRef, useContext, useEffect, useImperativeHandle, useMemo, useRef, useState, memo, useCallback } from 'react';
63
61
  import { produce } from 'immer';
@@ -199,7 +197,7 @@ var Opetate = function Opetate(_ref) {
199
197
  type: "link",
200
198
  size: "small",
201
199
  icon: /*#__PURE__*/React.createElement(IconFont, {
202
- type: "lmweb-plus-circle",
200
+ type: "lmweb-plus-circle-fill",
203
201
  style: {
204
202
  fontSize: 16
205
203
  }
@@ -252,8 +250,8 @@ var EditableCell = function EditableCell(props) {
252
250
  clearProps = __rest(restProps, ["onMouseEnter", "onMouseLeave"]);
253
251
 
254
252
  var _col$componentProps = col.componentProps,
255
- componentProps = _col$componentProps === void 0 ? {} : _col$componentProps;
256
- var checkCellRef = useRef(null); // const focusCapturedRef = useRef(false);
253
+ componentProps = _col$componentProps === void 0 ? {} : _col$componentProps; // const checkCellRef = useRef(null)
254
+ // const focusCapturedRef = useRef(false);
257
255
  // const curValue = useMemo(() => {
258
256
  // return record?.dataIndex
259
257
  // }, [record])
@@ -319,7 +317,7 @@ var EditableCell = function EditableCell(props) {
319
317
  return /*#__PURE__*/React.createElement(Input, Object.assign({
320
318
  onPressEnter: handleFormItemChange,
321
319
  onBlur: handleFormItemChange,
322
- ref: checkCellRef,
320
+ // ref={checkCellRef}
323
321
  placeholder: "\u8BF7\u8F93\u5165"
324
322
  }, componentProps, {
325
323
  addonBefore: componentProps.addonBefore ? /*#__PURE__*/React.createElement(_Form.Item, {
@@ -338,8 +336,7 @@ var EditableCell = function EditableCell(props) {
338
336
 
339
337
  case 'inputRange':
340
338
  return /*#__PURE__*/React.createElement(InputRange, Object.assign({
341
- onChange: handleFormItemChange,
342
- ref: checkCellRef
339
+ onChange: handleFormItemChange
343
340
  }, componentProps));
344
341
 
345
342
  case 'number':
@@ -349,15 +346,13 @@ var EditableCell = function EditableCell(props) {
349
346
  style: {
350
347
  width: (editEnum === null || editEnum === void 0 ? void 0 : editEnum.width) || '100%'
351
348
  },
352
- placeholder: "\u8BF7\u8F93\u5165",
353
- ref: checkCellRef
349
+ placeholder: "\u8BF7\u8F93\u5165"
354
350
  }, componentProps));
355
351
 
356
352
  case 'date':
357
353
  // @ts-ignore
358
- return /*#__PURE__*/React.createElement(_DatePicker, Object.assign({
359
- onChange: handleFormItemChange,
360
- ref: checkCellRef
354
+ return /*#__PURE__*/React.createElement(DatePicker, Object.assign({
355
+ onChange: handleFormItemChange
361
356
  }, componentProps));
362
357
 
363
358
  case 'select':
@@ -365,7 +360,7 @@ var EditableCell = function EditableCell(props) {
365
360
  showSearch: true,
366
361
  allowClear: true,
367
362
  placeholder: "\u8BF7\u9009\u62E9",
368
- ref: checkCellRef,
363
+ // ref={checkCellRef}
369
364
  filterOption: function filterOption(input, option) {
370
365
  var _a, _b;
371
366
 
@@ -381,7 +376,7 @@ var EditableCell = function EditableCell(props) {
381
376
  showSearch: true,
382
377
  allowClear: true,
383
378
  placeholder: "\u8BF7\u9009\u62E9",
384
- ref: checkCellRef,
379
+ // ref={checkCellRef}
385
380
  filterOption: function filterOption(input, option) {
386
381
  var _a;
387
382
 
@@ -393,20 +388,13 @@ var EditableCell = function EditableCell(props) {
393
388
 
394
389
  case 'checkbox':
395
390
  return /*#__PURE__*/React.createElement(Checkbox.Group, Object.assign({
396
- onChange: handleFormItemChange,
397
- ref: checkCellRef
391
+ onChange: handleFormItemChange
398
392
  }, componentProps));
399
393
 
400
394
  case 'radio':
401
395
  return /*#__PURE__*/React.createElement(Radio.Group, Object.assign({
402
- onChange: handleFormItemChange,
403
- ref: checkCellRef
404
- }, componentProps), editEnum === null || editEnum === void 0 ? void 0 : editEnum.map(function (v) {
405
- return /*#__PURE__*/React.createElement(Radio, {
406
- key: v.value,
407
- value: v.value
408
- }, v.label);
409
- }));
396
+ onChange: handleFormItemChange
397
+ }, componentProps));
410
398
 
411
399
  case 'switch':
412
400
  return /*#__PURE__*/React.createElement(Switch, {
@@ -416,7 +404,7 @@ var EditableCell = function EditableCell(props) {
416
404
  case 'upload':
417
405
  return /*#__PURE__*/React.createElement(UploadSingle, {
418
406
  editEnum: componentProps,
419
- ref: checkCellRef,
407
+ // ref={checkCellRef}
420
408
  onChange: handleFormItemChange
421
409
  });
422
410
 
@@ -425,7 +413,7 @@ var EditableCell = function EditableCell(props) {
425
413
  return /*#__PURE__*/React.createElement(Opetate, Object.assign({
426
414
  record: record,
427
415
  rowKey: rowKey,
428
- ref: checkCellRef,
416
+ // ref={checkCellRef}
429
417
  handleAdd: handleTableRowAdd,
430
418
  handleDelete: handleTableRowDelete,
431
419
  getLength: getLength
@@ -442,8 +430,7 @@ var EditableCell = function EditableCell(props) {
442
430
  default:
443
431
  return /*#__PURE__*/React.createElement(Input, Object.assign({
444
432
  onPressEnter: handleFormItemChange,
445
- onBlur: handleFormItemChange,
446
- ref: checkCellRef
433
+ onBlur: handleFormItemChange
447
434
  }, componentProps));
448
435
  }
449
436
  };
@@ -485,7 +472,7 @@ var EditableCell = function EditableCell(props) {
485
472
  dataIndex = col.dataIndex;
486
473
 
487
474
  if (isEdit && editable && record[dataIndex] || isHoverEdit && editable && record[dataIndex]) {
488
- form.setFieldsValue(_defineProperty({}, dataIndex, editable === 'date' ? dayjs(record[dataIndex]) : record[dataIndex]));
475
+ form.setFieldsValue(_defineProperty({}, dataIndex, editable === 'date' ? moment(record[dataIndex]) : record[dataIndex]));
489
476
  }
490
477
  }, [record]); // const isOpenEdit = (isEdit && focusCapturedRef.current) || (isHoverEdit && focusCapturedRef.current);
491
478
  // const classNames = cx({
@@ -574,7 +561,12 @@ var EditTable = /*#__PURE__*/forwardRef(function (props, ref) {
574
561
  var newIndex = cloneArr.findIndex(function (v) {
575
562
  return v[_rowKey] === over;
576
563
  });
577
- onChange === null || onChange === void 0 ? void 0 : onChange(arrayMove(cloneArr, oldIndex, newIndex));
564
+
565
+ if (onChange) {
566
+ onChange === null || onChange === void 0 ? void 0 : onChange(arrayMove(cloneArr, oldIndex, newIndex));
567
+ } else {
568
+ setDataSource(arrayMove(cloneArr, oldIndex, newIndex));
569
+ }
578
570
  }; // 删除
579
571
 
580
572
 
@@ -644,6 +636,7 @@ var EditTable = /*#__PURE__*/forwardRef(function (props, ref) {
644
636
  }
645
637
  });
646
638
  console.time('b');
639
+ console.log(res, 'rrrr');
647
640
 
648
641
  if (onChange) {
649
642
  onChange === null || onChange === void 0 ? void 0 : onChange(res);
@@ -880,13 +873,12 @@ var EditTable = /*#__PURE__*/forwardRef(function (props, ref) {
880
873
  })), isShowAddAction && /*#__PURE__*/React.createElement(Button, {
881
874
  className: "lm_editTable_add_bar",
882
875
  type: "dashed",
883
- block: true,
884
876
  onClick: handleAdd,
885
877
  style: {
886
878
  marginTop: 8
887
879
  }
888
880
  }, /*#__PURE__*/React.createElement(PlusCircleOutlined, {
889
- className: "lm_editTable_add_icon"
881
+ className: "lmweb-plus"
890
882
  }), "\u65B0\u589E"));
891
883
  });
892
884
  export default /*#__PURE__*/memo(EditTable);
@@ -2,6 +2,8 @@
2
2
 
3
3
  var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
4
4
 
5
+ var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
6
+
5
7
  Object.defineProperty(exports, "__esModule", {
6
8
  value: true
7
9
  });
@@ -13,12 +15,18 @@ var _input = _interopRequireDefault(require("antd/es/input"));
13
15
 
14
16
  var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/extends"));
15
17
 
18
+ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/slicedToArray"));
19
+
16
20
  var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/objectWithoutProperties"));
17
21
 
18
- var _react = _interopRequireDefault(require("react"));
22
+ var _react = _interopRequireWildcard(require("react"));
19
23
 
20
24
  var _CheckboxTags = _interopRequireDefault(require("./CheckboxTags"));
21
25
 
26
+ var _CascaderFilter = _interopRequireDefault(require("../components/CascaderFilter"));
27
+
28
+ var _DateFilter = _interopRequireDefault(require("../components/DateFilter"));
29
+
22
30
  var _excluded = ["item", "options"];
23
31
 
24
32
  var Controls = function Controls(props) {
@@ -27,6 +35,19 @@ var Controls = function Controls(props) {
27
35
  options = props.options,
28
36
  resetProps = (0, _objectWithoutProperties2.default)(props, _excluded);
29
37
  var type = item.type;
38
+
39
+ var _useState = (0, _react.useState)(false),
40
+ _useState2 = (0, _slicedToArray2.default)(_useState, 2),
41
+ visible = _useState2[0],
42
+ setVisible = _useState2[1];
43
+
44
+ var instance = {
45
+ filterValue: resetProps.value,
46
+ setFilterValue: resetProps.onChange,
47
+ visible: visible,
48
+ setVisible: setVisible,
49
+ children: null
50
+ };
30
51
  var obj = {
31
52
  'select': /*#__PURE__*/_react.default.createElement(_CheckboxTags.default, (0, _extends2.default)({
32
53
  options: options
@@ -34,7 +55,16 @@ var Controls = function Controls(props) {
34
55
  'checkbox': /*#__PURE__*/_react.default.createElement(_CheckboxTags.default, (0, _extends2.default)({
35
56
  options: options
36
57
  }, resetProps)),
37
- // 'cascader': <CascaderFilter options={options} {...resetProps} />,
58
+ 'cascader': /*#__PURE__*/_react.default.createElement(_CascaderFilter.default, {
59
+ instance: instance,
60
+ item: item,
61
+ options: options
62
+ }),
63
+ 'date': /*#__PURE__*/_react.default.createElement(_DateFilter.default, {
64
+ instance: instance,
65
+ item: item,
66
+ options: options
67
+ }),
38
68
  'input': /*#__PURE__*/_react.default.createElement(_input.default, (0, _extends2.default)({
39
69
  placeholder: "\u8BF7\u8F93\u5165"
40
70
  }, resetProps)) // 'nested': <Nested options={options} {...resetProps} />,
@@ -22,7 +22,8 @@ var LmFilterBase = /*#__PURE__*/_react.default.memo(function (_ref) {
22
22
  }, /*#__PURE__*/_react.default.createElement(_fuzzySearch.default, {
23
23
  instance: instance
24
24
  }), dataSource.map(function (v, index) {
25
- return /*#__PURE__*/_react.default.createElement(_components.default, {
25
+ var isHidden = !v.show && typeof v.show === 'boolean';
26
+ return isHidden ? null : /*#__PURE__*/_react.default.createElement(_components.default, {
26
27
  key: (v === null || v === void 0 ? void 0 : v.field) || index,
27
28
  instance: instance,
28
29
  item: v
@@ -49,31 +49,8 @@ var ListItemChecked = function ListItemChecked(_ref) {
49
49
  }, [field, valueObj.originField, dataSource]); // 选中值的处理
50
50
 
51
51
  var resetValue = (0, _react.useMemo)(function () {
52
- if (getItem.type === 'cascader') {
53
- var _valueObj$value;
54
-
55
- return (_valueObj$value = valueObj.value) === null || _valueObj$value === void 0 ? void 0 : _valueObj$value.map(function (v) {
56
- return v[v.length - 1];
57
- });
58
- }
59
-
60
52
  return valueObj.value;
61
- }, [getItem, valueObj.value]); // 遍历树结构
62
-
63
- var deepChildren = function deepChildren(arr, preArr) {
64
- arr.forEach(function (item) {
65
- var _item$children;
66
-
67
- if (resetValue.includes(item.value)) {
68
- preArr.push(item);
69
- }
70
-
71
- if ((_item$children = item.children) === null || _item$children === void 0 ? void 0 : _item$children.length) {
72
- deepChildren(item.children, preArr);
73
- }
74
- });
75
- }; // 选中的数据
76
-
53
+ }, [valueObj.value]); // 选中的数据
77
54
 
78
55
  var checkedValues = (0, _react.useMemo)(function () {
79
56
  var checkedValue = valueObj.value;
@@ -81,14 +58,21 @@ var ListItemChecked = function ListItemChecked(_ref) {
81
58
  if (Array.isArray(checkedValue)) {
82
59
  var _getItem$data;
83
60
 
61
+ if (['date'].includes(getItem.type)) {
62
+ return [{
63
+ value: resetValue,
64
+ label: "".concat(resetValue[0], " ~ ").concat(resetValue[1])
65
+ }];
66
+ }
67
+
84
68
  if (getItem.type === 'nested') {
85
69
  return checkedValue;
86
70
  }
87
71
 
88
72
  if (getItem.type === 'cascader') {
89
- var arr = [];
90
- deepChildren(getItem.data, arr);
91
- return arr;
73
+ var _getItem$props;
74
+
75
+ return (0, _utils.getFlatItem)((getItem === null || getItem === void 0 ? void 0 : (_getItem$props = getItem.props) === null || _getItem$props === void 0 ? void 0 : _getItem$props.multiple) ? checkedValue : [checkedValue], getItem.data, 'parent');
92
76
  }
93
77
 
94
78
  return (_getItem$data = getItem.data) === null || _getItem$data === void 0 ? void 0 : _getItem$data.filter(function (v) {
@@ -96,7 +80,7 @@ var ListItemChecked = function ListItemChecked(_ref) {
96
80
  });
97
81
  }
98
82
 
99
- if (getItem.type === 'input') {
83
+ if (['input', 'date'].includes(getItem.type)) {
100
84
  return resetValue ? [{
101
85
  value: resetValue,
102
86
  label: resetValue
@@ -137,10 +121,24 @@ var ListItemChecked = function ListItemChecked(_ref) {
137
121
 
138
122
  var onTagClose = function onTagClose(val) {
139
123
  var originData = (0, _objectSpread3.default)({}, complexDrawer.data);
140
- var filterValues = (0, _objectSpread3.default)((0, _objectSpread3.default)({}, originData), {}, (0, _defineProperty2.default)({}, field, (0, _objectSpread3.default)((0, _objectSpread3.default)({}, originData[field]), {}, {
141
- value: originData[field].value.filter(function (v) {
124
+ var nValue = '';
125
+
126
+ if (['select', 'checkbox'].includes(getItem.type)) {
127
+ nValue = originData[field].value.filter(function (v) {
142
128
  return !v.includes(val);
143
- })
129
+ });
130
+ }
131
+
132
+ if (['input'].includes(getItem.type)) {
133
+ nValue = '';
134
+ }
135
+
136
+ if (['cascader'].includes(getItem.type)) {
137
+ nValue = [];
138
+ }
139
+
140
+ var filterValues = (0, _objectSpread3.default)((0, _objectSpread3.default)({}, originData), {}, (0, _defineProperty2.default)({}, field, (0, _objectSpread3.default)((0, _objectSpread3.default)({}, originData[field]), {}, {
141
+ value: nValue
144
142
  })));
145
143
  dispatch({
146
144
  type: 'changeComplexDrawer',
@@ -304,7 +302,10 @@ var ComplexDrawer = function ComplexDrawer(_ref5) {
304
302
  complexFilter: complexDrawer.data
305
303
  });
306
304
  onClose();
307
- onChange === null || onChange === void 0 ? void 0 : onChange(null, complexDrawer.data);
305
+ onChange === null || onChange === void 0 ? void 0 : onChange({
306
+ complexFilter: complexDrawer.data,
307
+ type: 'complex'
308
+ });
308
309
  }; // 初始化筛选
309
310
 
310
311
 
@@ -13,6 +13,8 @@ require("antd/es/cascader/style");
13
13
 
14
14
  var _cascader = _interopRequireDefault(require("antd/es/cascader"));
15
15
 
16
+ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/extends"));
17
+
16
18
  var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/slicedToArray"));
17
19
 
18
20
  var _react = _interopRequireWildcard(require("react"));
@@ -21,14 +23,15 @@ var _linkmoreDesign = require("linkmore-design");
21
23
 
22
24
  var _InputSearchClose = _interopRequireDefault(require("./InputSearchClose"));
23
25
 
26
+ var _hooks = require("../hooks");
27
+
24
28
  // 重置级联弹框
25
29
  var DropdownRender = function DropdownRender(_ref) {
26
30
  var dom = _ref.dom,
27
31
  instance = _ref.instance,
28
32
  item = _ref.item,
29
33
  setOptions = _ref.setOptions,
30
- checkedValues = _ref.checkedValues,
31
- setCheckedValues = _ref.setCheckedValues;
34
+ checkedValues = _ref.checkedValues;
32
35
  var _instance$filterValue = instance.filterValue,
33
36
  filterValue = _instance$filterValue === void 0 ? [] : _instance$filterValue,
34
37
  setFilterValue = instance.setFilterValue,
@@ -37,6 +40,12 @@ var DropdownRender = function DropdownRender(_ref) {
37
40
  var _item$data = item.data,
38
41
  filters = _item$data === void 0 ? [] : _item$data;
39
42
  var inputRef = (0, _react.useRef)(null);
43
+ var delayedFn = (0, _hooks.useDelayedFn)();
44
+ var isShowFoot = (0, _react.useMemo)(function () {
45
+ var _item$props;
46
+
47
+ return item === null || item === void 0 ? void 0 : (_item$props = item.props) === null || _item$props === void 0 ? void 0 : _item$props.multiple;
48
+ }, [item]);
40
49
 
41
50
  var handleFilter = function handleFilter(val) {
42
51
  var serachValues = filters.filter(function (v) {
@@ -48,28 +57,23 @@ var DropdownRender = function DropdownRender(_ref) {
48
57
 
49
58
  var handleSure = function handleSure() {
50
59
  setFilterValue(checkedValues);
51
- setVisible(false);
60
+ setVisible === null || setVisible === void 0 ? void 0 : setVisible(false);
52
61
  }; // 取消
53
62
 
54
63
 
55
64
  var handleReset = function handleReset() {
56
- setVisible === null || setVisible === void 0 ? void 0 : setVisible(false);
65
+ return setVisible === null || setVisible === void 0 ? void 0 : setVisible(false);
57
66
  };
58
67
 
59
68
  (0, _react.useEffect)(function () {
60
69
  if (visible) {
61
- var _inputRef$current2, _inputRef$current2$se;
62
-
63
- setTimeout(function () {
64
- var _inputRef$current;
70
+ delayedFn(function () {
71
+ var _inputRef$current, _inputRef$current$foc;
65
72
 
66
- (_inputRef$current = inputRef.current) === null || _inputRef$current === void 0 ? void 0 : _inputRef$current.focus({
73
+ return (_inputRef$current = inputRef.current) === null || _inputRef$current === void 0 ? void 0 : (_inputRef$current$foc = _inputRef$current.focus) === null || _inputRef$current$foc === void 0 ? void 0 : _inputRef$current$foc.call(_inputRef$current, {
67
74
  cursor: 'all'
68
75
  });
69
- }, 200);
70
- setCheckedValues(filterValue);
71
- (_inputRef$current2 = inputRef.current) === null || _inputRef$current2 === void 0 ? void 0 : (_inputRef$current2$se = _inputRef$current2.setValue) === null || _inputRef$current2$se === void 0 ? void 0 : _inputRef$current2$se.call(_inputRef$current2, '');
72
- handleFilter('');
76
+ });
73
77
  }
74
78
  }, [visible]);
75
79
  return /*#__PURE__*/_react.default.createElement("div", {
@@ -80,7 +84,7 @@ var DropdownRender = function DropdownRender(_ref) {
80
84
  ref: inputRef,
81
85
  onSearch: handleFilter,
82
86
  onChange: handleFilter
83
- })), dom, /*#__PURE__*/_react.default.createElement("div", {
87
+ })), dom, isShowFoot && /*#__PURE__*/_react.default.createElement("div", {
84
88
  className: "filter_footer"
85
89
  }, /*#__PURE__*/_react.default.createElement("div", {
86
90
  className: "footer_clear",
@@ -99,7 +103,9 @@ var CascaderFilter = function CascaderFilter(_ref2) {
99
103
  filterValue = _instance$filterValue2 === void 0 ? [] : _instance$filterValue2,
100
104
  setFilterValue = instance.setFilterValue,
101
105
  visible = instance.visible,
102
- setVisible = instance.setVisible;
106
+ setVisible = instance.setVisible,
107
+ _instance$children = instance.children,
108
+ children = _instance$children === void 0 ? /*#__PURE__*/_react.default.createElement("div", null) : _instance$children;
103
109
  var _itemProps$data = itemProps.data,
104
110
  filters = _itemProps$data === void 0 ? [] : _itemProps$data;
105
111
 
@@ -113,35 +119,29 @@ var CascaderFilter = function CascaderFilter(_ref2) {
113
119
  checkedValues = _useState4[0],
114
120
  setCheckedValues = _useState4[1];
115
121
 
116
- var checkedKeys = (0, _react.useMemo)(function () {
117
- return checkedValues.map(function (v) {
118
- return v.value;
119
- });
120
- }, [checkedValues]);
121
122
  var defaultValue = (0, _react.useMemo)(function () {
122
- var flatKeys = function flatKeys(arr) {
123
- return arr.map(function (v) {
124
- return v.value;
125
- });
126
- };
127
-
128
- var nKey = filterValue.map(function (v) {
129
- return Array.isArray(v) ? flatKeys(v) : v.value;
130
- });
131
- return nKey;
123
+ return filterValue;
132
124
  }, [filterValue]);
133
125
 
134
126
  var onChange = function onChange(item, selectedOptions) {
135
- console.log('item', item, '===', selectedOptions);
136
- setCheckedValues(selectedOptions);
127
+ var _itemProps$props;
128
+
129
+ console.log('item', item);
130
+ setCheckedValues(item);
131
+
132
+ if (!(itemProps === null || itemProps === void 0 ? void 0 : (_itemProps$props = itemProps.props) === null || _itemProps$props === void 0 ? void 0 : _itemProps$props.multiple)) {
133
+ setFilterValue(item);
134
+ }
137
135
  };
138
136
 
139
- return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_cascader.default, {
140
- multiple: true,
137
+ return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_cascader.default, (0, _extends2.default)({}, itemProps.props, {
141
138
  options: options,
142
139
  onChange: onChange,
143
140
  defaultValue: defaultValue,
144
141
  open: visible,
142
+ onDropdownVisibleChange: function onDropdownVisibleChange(vis) {
143
+ return setVisible(vis);
144
+ },
145
145
  dropdownRender: function dropdownRender(dom) {
146
146
  return /*#__PURE__*/_react.default.createElement(DropdownRender, {
147
147
  dom: dom,
@@ -152,7 +152,7 @@ var CascaderFilter = function CascaderFilter(_ref2) {
152
152
  setOptions: setOptions
153
153
  });
154
154
  }
155
- }, /*#__PURE__*/_react.default.createElement("div", null)));
155
+ }), children));
156
156
  };
157
157
 
158
158
  var _default = CascaderFilter;
@@ -44,20 +44,16 @@ var CheckboxFilter = function CheckboxFilter(_ref) {
44
44
  setVisible = instance.setVisible;
45
45
  var _itemProps$data = itemProps.data,
46
46
  filters = _itemProps$data === void 0 ? [] : _itemProps$data;
47
- var inputRef = (0, _react.useRef)(); // 选中的数据项: [{}, {}, ...];
47
+ var inputRef = (0, _react.useRef)(); // 选中的数据项: [key, key, ...];
48
48
 
49
49
  var _useState = (0, _react.useState)(filterValue),
50
50
  _useState2 = (0, _slicedToArray2.default)(_useState, 2),
51
51
  checkedValues = _useState2[0],
52
52
  setCheckedValues = _useState2[1]; // 选中的数据的键
53
+ // const checkedKeys = useMemo(() => checkedValues.map(v => v), [checkedValues]);
54
+ // 搜索后的筛选项
53
55
 
54
56
 
55
- var checkedKeys = (0, _react.useMemo)(function () {
56
- return checkedValues.map(function (v) {
57
- return v.value;
58
- });
59
- }, [checkedValues]); // 搜索后的筛选项
60
-
61
57
  var _useState3 = (0, _react.useState)(filters),
62
58
  _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
63
59
  options = _useState4[0],
@@ -74,7 +70,7 @@ var CheckboxFilter = function CheckboxFilter(_ref) {
74
70
  return isAll && options.every(function (_ref2) {
75
71
  var value = _ref2.value;
76
72
  return checkedValues.some(function (v) {
77
- return v.value === value;
73
+ return v === value;
78
74
  });
79
75
  });
80
76
  }, [checkedValues, options]); // 是否半选: 存在选中的数据 && 未全选
@@ -94,20 +90,17 @@ var CheckboxFilter = function CheckboxFilter(_ref) {
94
90
 
95
91
  var onChange = function onChange(e, item) {
96
92
  e.preventDefault();
97
- var nValue = checkedValues.some(function (_ref3) {
98
- var value = _ref3.value;
93
+ var nValue = checkedValues.some(function (value) {
99
94
  return value === item.value;
100
- }) ? checkedValues.filter(function (_ref4) {
101
- var value = _ref4.value;
95
+ }) ? checkedValues.filter(function (value) {
102
96
  return value !== item.value;
103
- }) : (0, _utils.uniqueFunc)([].concat((0, _toConsumableArray2.default)(checkedValues), [item]), 'value');
97
+ }) : (0, _utils.uniqueFunc)([].concat((0, _toConsumableArray2.default)(checkedValues), [item.value]), 'value');
104
98
  setCheckedValues(nValue);
105
99
  }; // 全选事件
106
100
 
107
101
 
108
102
  var onCheckAllChange = function onCheckAllChange() {
109
- var nValue = checkAll ? checkedValues.filter(function (_ref5) {
110
- var value = _ref5.value;
103
+ var nValue = checkAll ? checkedValues.filter(function (value) {
111
104
  return !options.some(function (v) {
112
105
  return v.value === value;
113
106
  });
@@ -159,18 +152,17 @@ var CheckboxFilter = function CheckboxFilter(_ref) {
159
152
  }, "\u5168\u90E8"), /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement("span", {
160
153
  className: "filter_tip"
161
154
  }, "\u5DF2\u9009: ", checkedValues.length)))), /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Checkbox.Group, {
162
- value: checkedKeys,
155
+ value: checkedValues,
163
156
  className: "filter_body"
164
157
  }, /*#__PURE__*/_react.default.createElement(_linkmoreDesign.VirtualList, {
165
158
  options: options,
166
159
  className: "filter_list"
167
- }, function (_ref6) {
168
- var item = _ref6.item,
169
- resetProps = (0, _objectWithoutProperties2.default)(_ref6, _excluded);
160
+ }, function (_ref3) {
161
+ var item = _ref3.item,
162
+ resetProps = (0, _objectWithoutProperties2.default)(_ref3, _excluded);
170
163
  return /*#__PURE__*/_react.default.createElement("div", (0, _extends2.default)({}, resetProps, {
171
164
  className: (0, _classnames.default)('filter_item', {
172
- checked: checkedValues.some(function (_ref7) {
173
- var value = _ref7.value;
165
+ checked: checkedValues.some(function (value) {
174
166
  return value === item.value;
175
167
  })
176
168
  }),