linkmore-design 1.0.13 → 1.0.16

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 (51) hide show
  1. package/dist/index.umd.js +1857 -744
  2. package/dist/index.umd.min.js +6 -6
  3. package/es/Button/index.js +3 -1
  4. package/es/Button/style/style.css +4 -1
  5. package/es/CkFilter/baseFilter/filterMenu.js +11 -0
  6. package/es/CkFilter/complexFilter/drawer.js +42 -2
  7. package/es/CkFilter/components/CascaderFilter.js +132 -0
  8. package/es/CkFilter/components/CheckboxTags.js +53 -0
  9. package/es/CkFilter/components/Controls.js +43 -0
  10. package/es/CkFilter/components/CustomModal.js +230 -0
  11. package/es/CkFilter/components/filterTypes.js +154 -1
  12. package/es/CkFilter/components/modal.js +36 -67
  13. package/es/CkFilter/components/modalBack.js +261 -0
  14. package/es/CkFilter/context.js +1 -1
  15. package/es/CkFilter/customFilter/drawer.js +4 -1
  16. package/es/CkFilter/filter.js +3 -3
  17. package/es/CkFilter/style/style.css +68 -26
  18. package/es/Dropdown/index.d.ts +1 -0
  19. package/es/Dropdown/index.js +78 -7
  20. package/es/PopTable/style/style.css +1 -4
  21. package/es/ProTable/Table.js +24 -12
  22. package/es/ProTable/autosize.js +170 -0
  23. package/es/ProTable/detectElementResize.js +225 -0
  24. package/es/ProTable/style/style.css +7 -0
  25. package/es/Radio/style/style.css +7 -0
  26. package/es/TabBar/style/style.css +0 -1
  27. package/lib/Button/index.js +3 -1
  28. package/lib/Button/style/style.css +4 -1
  29. package/lib/CkFilter/baseFilter/filterMenu.js +11 -0
  30. package/lib/CkFilter/complexFilter/drawer.js +42 -2
  31. package/lib/CkFilter/components/CascaderFilter.js +132 -0
  32. package/lib/CkFilter/components/CheckboxTags.js +53 -0
  33. package/lib/CkFilter/components/Controls.js +43 -0
  34. package/lib/CkFilter/components/CustomModal.js +230 -0
  35. package/lib/CkFilter/components/filterTypes.js +154 -1
  36. package/lib/CkFilter/components/modal.js +36 -67
  37. package/lib/CkFilter/components/modalBack.js +261 -0
  38. package/lib/CkFilter/context.js +1 -1
  39. package/lib/CkFilter/customFilter/drawer.js +4 -1
  40. package/lib/CkFilter/filter.js +3 -3
  41. package/lib/CkFilter/style/style.css +68 -26
  42. package/lib/Dropdown/index.d.ts +1 -0
  43. package/lib/Dropdown/index.js +81 -7
  44. package/lib/PopTable/style/style.css +1 -4
  45. package/lib/ProTable/Table.js +24 -12
  46. package/lib/ProTable/autosize.js +170 -0
  47. package/lib/ProTable/detectElementResize.js +225 -0
  48. package/lib/ProTable/style/style.css +7 -0
  49. package/lib/Radio/style/style.css +7 -0
  50. package/lib/TabBar/style/style.css +0 -1
  51. package/package.json +1 -1
@@ -0,0 +1,230 @@
1
+ "use strict";
2
+
3
+ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
4
+
5
+ var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
6
+
7
+ Object.defineProperty(exports, "__esModule", {
8
+ value: true
9
+ });
10
+ exports.default = void 0;
11
+
12
+ var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
13
+
14
+ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
15
+
16
+ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
17
+
18
+ var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
19
+
20
+ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
21
+
22
+ var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
23
+
24
+ require("antd/es/form/style");
25
+
26
+ var _form = _interopRequireDefault(require("antd/es/form"));
27
+
28
+ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
29
+
30
+ var _linkmoreDesign = require("linkmore-design");
31
+
32
+ var _react = _interopRequireWildcard(require("react"));
33
+
34
+ var _context2 = require("../context");
35
+
36
+ var _utils = require("../utils");
37
+
38
+ var _Controls = _interopRequireDefault(require("./Controls"));
39
+
40
+ var _excluded = ["field"];
41
+
42
+ // const { EditModal } = Modal
43
+ // 第二层抽屉,弹出数据选择
44
+ var ModalItem = function ModalItem() {
45
+ var _useStore = (0, _context2.useStore)(),
46
+ state = _useStore.state,
47
+ dispatch = _useStore.dispatch;
48
+
49
+ var customModal = state.customModal,
50
+ customDrawer = state.customDrawer,
51
+ complexDrawer = state.complexDrawer,
52
+ instance = state.instance;
53
+
54
+ var _Form$useForm = _form.default.useForm(),
55
+ _Form$useForm2 = (0, _slicedToArray2.default)(_Form$useForm, 1),
56
+ form = _Form$useForm2[0]; // 是否编辑
57
+
58
+
59
+ var isEdit = (0, _react.useMemo)(function () {
60
+ var type = customModal.type,
61
+ data = customModal.data;
62
+ return type === 'complex' || (0, _utils.getIsHas)(data);
63
+ }, [customModal]);
64
+
65
+ var onClose = function onClose() {
66
+ dispatch({
67
+ type: 'changeModal',
68
+ customModal: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, customModal), {}, {
69
+ visible: false
70
+ })
71
+ });
72
+ form.resetFields();
73
+ };
74
+
75
+ var onSave = /*#__PURE__*/function () {
76
+ var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
77
+ var _yield$form$validateF, field, values, filterValues;
78
+
79
+ return _regenerator.default.wrap(function _callee$(_context) {
80
+ while (1) {
81
+ switch (_context.prev = _context.next) {
82
+ case 0:
83
+ _context.prev = 0;
84
+ _context.next = 3;
85
+ return form.validateFields();
86
+
87
+ case 3:
88
+ _yield$form$validateF = _context.sent;
89
+ field = _yield$form$validateF.field;
90
+ values = (0, _objectWithoutProperties2.default)(_yield$form$validateF, _excluded);
91
+ filterValues = customModal.type === 'complex' ? (0, _objectSpread2.default)({}, complexDrawer.data) : (0, _objectSpread2.default)({}, customDrawer.data.filterValues); // 判断是新增还是编辑
92
+
93
+ if (isEdit) {
94
+ Object.assign(filterValues, (0, _defineProperty2.default)({}, customModal.data.field, values));
95
+ } else {
96
+ Object.assign(filterValues, (0, _defineProperty2.default)({}, field, values));
97
+ }
98
+
99
+ if (customModal.type === 'complex') {
100
+ dispatch({
101
+ type: 'changeComplexDrawer',
102
+ complexDrawer: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, complexDrawer), {}, {
103
+ data: filterValues
104
+ })
105
+ });
106
+ } else {
107
+ dispatch({
108
+ type: 'changeDrawer',
109
+ customDrawer: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, customDrawer), {}, {
110
+ data: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, customDrawer.data), {}, {
111
+ filterValues: filterValues
112
+ })
113
+ })
114
+ });
115
+ }
116
+
117
+ onClose();
118
+ _context.next = 15;
119
+ break;
120
+
121
+ case 12:
122
+ _context.prev = 12;
123
+ _context.t0 = _context["catch"](0);
124
+ console.log('校验错误!', _context.t0);
125
+
126
+ case 15:
127
+ case "end":
128
+ return _context.stop();
129
+ }
130
+ }
131
+ }, _callee, null, [[0, 12]]);
132
+ }));
133
+
134
+ return function onSave() {
135
+ return _ref.apply(this, arguments);
136
+ };
137
+ }();
138
+
139
+ var onValuesChange = function onValuesChange(values) {
140
+ if (values.field) {
141
+ form.setFieldsValue({
142
+ value: []
143
+ });
144
+ }
145
+ }; // 动态展示选择框
146
+
147
+
148
+ var DynamicSelect = (0, _react.useCallback)(function (_ref2) {
149
+ var _instance$fullData, _instance$fullData$fi;
150
+
151
+ var getFieldValue = _ref2.getFieldValue;
152
+ var field = getFieldValue('field');
153
+ var options = ((_instance$fullData = instance.fullData) === null || _instance$fullData === void 0 ? void 0 : (_instance$fullData$fi = _instance$fullData.find(function (v) {
154
+ return v.field === field;
155
+ })) === null || _instance$fullData$fi === void 0 ? void 0 : _instance$fullData$fi.data) || [];
156
+
157
+ if (field) {
158
+ return /*#__PURE__*/_react.default.createElement(_form.default.Item, {
159
+ name: "value",
160
+ label: "\u9009\u62E9\u5B57\u6BB5\u503C"
161
+ }, /*#__PURE__*/_react.default.createElement(_Controls.default, (0, _extends2.default)({
162
+ visible: customModal.visible
163
+ }, customModal.data, {
164
+ options: options
165
+ })));
166
+ }
167
+
168
+ return false;
169
+ }, [instance.fullData, customModal.data.type]);
170
+ var config = {
171
+ title: isEdit ? customModal.data.title : '新增查询项',
172
+ visible: customModal.type === 'custom' && customModal.visible,
173
+ onClose: onClose,
174
+ className: 'lm_det_drawer',
175
+ extra: /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Space, {
176
+ size: 8
177
+ }, /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Button, {
178
+ key: "cancel",
179
+ onClick: onClose,
180
+ size: "small"
181
+ }, "\u53D6\u6D88"), /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Button, {
182
+ type: "primary",
183
+ key: "back",
184
+ onClick: onSave,
185
+ size: "small"
186
+ }, "\u786E\u5B9A"))
187
+ }; // 初始化重置数据
188
+
189
+ (0, _react.useEffect)(function () {
190
+ if (customModal.visible) {
191
+ form.setFieldsValue(customModal.data);
192
+ }
193
+ }, [form, customModal]);
194
+ return /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Drawer, config, /*#__PURE__*/_react.default.createElement("div", {
195
+ className: "custom_modal"
196
+ }, /*#__PURE__*/_react.default.createElement(_form.default, {
197
+ form: form,
198
+ initialValues: {
199
+ mode: 'or'
200
+ },
201
+ onValuesChange: onValuesChange,
202
+ layout: "vertical",
203
+ size: "default"
204
+ }, /*#__PURE__*/_react.default.createElement(_form.default.Item, {
205
+ name: "mode",
206
+ label: "\u67E5\u8BE2\u65B9\u5F0F"
207
+ }, /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Radio.Group, null, /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Radio, {
208
+ value: "and"
209
+ }, "\u4E14,\u67E5\u8BE2\u540C\u65F6\u6EE1\u8DB3\u6B64\u9009\u9879\u6761\u4EF6"), /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Radio, {
210
+ value: "or"
211
+ }, "\u6216,\u67E5\u8BE2\u5305\u542B\u6B64\u9009\u9879\u6761\u4EF6"))), !isEdit && /*#__PURE__*/_react.default.createElement(_form.default.Item, {
212
+ name: "field",
213
+ label: "\u9009\u62E9\u5B57\u6BB5"
214
+ }, /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Select, {
215
+ open: true
216
+ }, state.instance.fullData.map(function (v) {
217
+ return /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Select.Option, {
218
+ key: v.field,
219
+ value: v.field
220
+ }, v.title);
221
+ }))), /*#__PURE__*/_react.default.createElement(_form.default.Item, {
222
+ noStyle: true,
223
+ shouldUpdate: function shouldUpdate(prevValues, currentValues) {
224
+ return prevValues.field !== currentValues.field;
225
+ }
226
+ }, DynamicSelect))));
227
+ };
228
+
229
+ var _default = ModalItem;
230
+ exports.default = _default;
@@ -9,6 +9,10 @@ Object.defineProperty(exports, "__esModule", {
9
9
  });
10
10
  exports.default = void 0;
11
11
 
12
+ require("antd/es/cascader/style");
13
+
14
+ var _cascader = _interopRequireDefault(require("antd/es/cascader"));
15
+
12
16
  require("antd/es/date-picker/style");
13
17
 
14
18
  var _datePicker = _interopRequireDefault(require("antd/es/date-picker"));
@@ -408,6 +412,7 @@ var CheckboxFilter = function CheckboxFilter(_ref8) {
408
412
  onClick: handleReset
409
413
  }, "\u6E05\u7A7A"), /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Button, {
410
414
  type: "primary",
415
+ disabled: !checkedValues.length,
411
416
  size: "small",
412
417
  onClick: handleSure
413
418
  }, "\u786E\u5B9A")));
@@ -601,12 +606,157 @@ var DatePickerFilter = function DatePickerFilter(_ref14) {
601
606
  bordered: false,
602
607
  size: "small"
603
608
  }));
609
+ }; // 级联选择器
610
+
611
+
612
+ var CascaderFilter = function CascaderFilter(props) {
613
+ var title = props.title,
614
+ filters = props.filters,
615
+ getFilterValue = props.getFilterValue,
616
+ setFilterValue = props.setFilterValue,
617
+ _props$itemProps = props.itemProps,
618
+ itemProps = _props$itemProps === void 0 ? {} : _props$itemProps,
619
+ isFiltering = props.isFiltering;
620
+
621
+ var _useState9 = (0, _react.useState)(false),
622
+ _useState10 = (0, _slicedToArray2.default)(_useState9, 2),
623
+ visible = _useState10[0],
624
+ setVisible = _useState10[1];
625
+
626
+ var _useState11 = (0, _react.useState)(filters),
627
+ _useState12 = (0, _slicedToArray2.default)(_useState11, 2),
628
+ options = _useState12[0],
629
+ setOptions = _useState12[1];
630
+
631
+ var _useState13 = (0, _react.useState)('全部'),
632
+ _useState14 = (0, _slicedToArray2.default)(_useState13, 2),
633
+ text = _useState14[0],
634
+ setText = _useState14[1];
635
+
636
+ var _useState15 = (0, _react.useState)(getFilterValue || itemProps.multiple ? [] : ''),
637
+ _useState16 = (0, _slicedToArray2.default)(_useState15, 2),
638
+ checkedValues = _useState16[0],
639
+ setCheckedValues = _useState16[1];
640
+
641
+ var isSearch = (0, _react.useMemo)(function () {
642
+ return filters.length > 8;
643
+ }, [filters.length]);
644
+
645
+ var handleFilter = function handleFilter(val) {
646
+ setOptions(filters.filter(function (v) {
647
+ return v.label.indexOf(val) > -1;
648
+ }));
649
+ };
650
+
651
+ var dropdownRender = function dropdownRender(menus) {
652
+ var inputRef = (0, _react.useRef)(null); // 确定
653
+
654
+ var handleSure = function handleSure() {
655
+ setFilterValue(checkedValues);
656
+ }; // 清空
657
+
658
+
659
+ var handleReset = function handleReset() {
660
+ inputRef.current.input.value = '';
661
+ setFilterValue(undefined);
662
+ };
663
+
664
+ return /*#__PURE__*/_react.default.createElement("div", {
665
+ className: "filter_cascader_container filter_dropdown"
666
+ }, /*#__PURE__*/_react.default.createElement("div", {
667
+ className: "filter_header"
668
+ }, /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Input.Search, {
669
+ ref: inputRef,
670
+ allowClear: true,
671
+ size: "small",
672
+ placeholder: "\u8BF7\u8F93\u5165",
673
+ onSearch: handleFilter,
674
+ onChange: (0, _lodash.debounce)(function (e) {
675
+ return handleFilter(e.target.value);
676
+ }, 500)
677
+ })), menus, isSearch && /*#__PURE__*/_react.default.createElement("div", {
678
+ className: "filter_footer"
679
+ }, /*#__PURE__*/_react.default.createElement("div", {
680
+ className: "footer_clear",
681
+ onClick: handleReset
682
+ }, "\u6E05\u7A7A"), /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Button, {
683
+ type: "primary",
684
+ size: "small",
685
+ onClick: handleSure
686
+ }, "\u786E\u5B9A")));
687
+ };
688
+
689
+ var onChange = function onChange(item, selectedOptions) {
690
+ if (!item.length) {
691
+ setText('全部');
692
+ setCheckedValues(itemProps.multiple ? [] : '');
693
+ setFilterValue(undefined);
694
+ return;
695
+ }
696
+
697
+ if (itemProps.multiple) {
698
+ var arr = [];
699
+ selectedOptions.map(function (vals) {
700
+ return vals.length > 1 ? arr.push(vals.map(function (v) {
701
+ return v.label;
702
+ }).join('/')) : vals[0].children.map(function (v) {
703
+ return arr.push("".concat(vals[0].label, "/").concat(v.label));
704
+ });
705
+ });
706
+ var showLabel = arr.length < 3 ? arr.join('、') : "".concat(arr[0], "\u3001+").concat(arr.length);
707
+ setText(showLabel);
708
+ setFilterValue(item.map(function (v) {
709
+ return v[v.length - 1];
710
+ }));
711
+ setCheckedValues(item);
712
+ } else {
713
+ setText(selectedOptions.map(function (v) {
714
+ return v.label;
715
+ }).join('/'));
716
+ setFilterValue(item);
717
+ setCheckedValues(item);
718
+ }
719
+ };
720
+
721
+ var handleClear = function handleClear(e) {
722
+ if (isFiltering) {
723
+ e.stopPropagation();
724
+ setText('全部');
725
+ setCheckedValues(itemProps.multiple ? [] : '');
726
+ setFilterValue(undefined);
727
+ }
728
+ };
729
+
730
+ return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_cascader.default, (0, _extends2.default)({}, itemProps, {
731
+ options: options,
732
+ value: checkedValues,
733
+ onChange: onChange,
734
+ showCheckedStrategy: "Cascader.SHOW_CHILD",
735
+ dropdownRender: dropdownRender,
736
+ onDropdownVisibleChange: function onDropdownVisibleChange(v) {
737
+ return setVisible(v);
738
+ }
739
+ }), /*#__PURE__*/_react.default.createElement("div", {
740
+ className: (0, _classnames.default)('filter_item', {
741
+ isfiltering: isFiltering,
742
+ active: !isFiltering && visible
743
+ })
744
+ }, /*#__PURE__*/_react.default.createElement("div", {
745
+ className: "filter_item_label"
746
+ }, title, ":"), /*#__PURE__*/_react.default.createElement("div", {
747
+ className: "filter_item_value"
748
+ }, /*#__PURE__*/_react.default.createElement("div", {
749
+ className: "checked"
750
+ }, text), /*#__PURE__*/_react.default.createElement(_IconFont.default, {
751
+ type: isFiltering ? 'lmweb-close-circle-fill' : 'lmweb-down',
752
+ className: "addonAfter",
753
+ onClick: handleClear
754
+ })))));
604
755
  };
605
756
 
606
757
  var FilterComp = function FilterComp(props) {
607
758
  var type = props.type,
608
759
  resetProps = (0, _objectWithoutProperties2.default)(props, _excluded6);
609
- console.log(props, '--props');
610
760
 
611
761
  switch (type) {
612
762
  case 'input':
@@ -630,6 +780,9 @@ var FilterComp = function FilterComp(props) {
630
780
  case 'nested':
631
781
  return /*#__PURE__*/_react.default.createElement(NestedFilter, resetProps);
632
782
 
783
+ case 'cascader':
784
+ return /*#__PURE__*/_react.default.createElement(CascaderFilter, resetProps);
785
+
633
786
  default:
634
787
  return /*#__PURE__*/_react.default.createElement(CheckboxFilter, resetProps);
635
788
  }
@@ -11,6 +11,8 @@ exports.default = void 0;
11
11
 
12
12
  var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
13
13
 
14
+ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
15
+
14
16
  var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
15
17
 
16
18
  var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
@@ -25,10 +27,6 @@ var _form = _interopRequireDefault(require("antd/es/form"));
25
27
 
26
28
  var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
27
29
 
28
- var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
29
-
30
- var _classnames = _interopRequireDefault(require("classnames"));
31
-
32
30
  var _linkmoreDesign = require("linkmore-design");
33
31
 
34
32
  var _react = _interopRequireWildcard(require("react"));
@@ -37,40 +35,12 @@ var _context2 = require("../context");
37
35
 
38
36
  var _utils = require("../utils");
39
37
 
38
+ var _Controls = _interopRequireDefault(require("./Controls"));
39
+
40
40
  var _excluded = ["field"];
41
41
 
42
42
  // const { EditModal } = Modal
43
- var ButtonTags = function ButtonTags(_ref) {
44
- var value = _ref.value,
45
- onChange = _ref.onChange,
46
- options = _ref.options;
47
-
48
- var handleClick = function handleClick(item) {
49
- var oriValue = value || [];
50
- var has = oriValue === null || oriValue === void 0 ? void 0 : oriValue.includes(item.value);
51
- var nValue = has ? oriValue.filter(function (v) {
52
- return v !== item.value;
53
- }) : [].concat((0, _toConsumableArray2.default)(oriValue), [item.value]);
54
- onChange === null || onChange === void 0 ? void 0 : onChange(nValue);
55
- };
56
-
57
- return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Space, {
58
- size: 8,
59
- wrap: true,
60
- className: "auto_height"
61
- }, options === null || options === void 0 ? void 0 : options.map(function (v) {
62
- return /*#__PURE__*/_react.default.createElement("div", {
63
- key: v.value,
64
- className: (0, _classnames.default)('checkbox_tag', {
65
- active: value === null || value === void 0 ? void 0 : value.includes(v.value)
66
- }),
67
- onClick: function onClick() {
68
- return handleClick(v);
69
- }
70
- }, v.label);
71
- })));
72
- };
73
-
43
+ // 第二层抽屉,弹出数据选择
74
44
  var ModalItem = function ModalItem() {
75
45
  var _useStore = (0, _context2.useStore)(),
76
46
  state = _useStore.state,
@@ -103,7 +73,7 @@ var ModalItem = function ModalItem() {
103
73
  };
104
74
 
105
75
  var onSave = /*#__PURE__*/function () {
106
- var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
76
+ var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
107
77
  var _yield$form$validateF, field, values, filterValues;
108
78
 
109
79
  return _regenerator.default.wrap(function _callee$(_context) {
@@ -162,7 +132,7 @@ var ModalItem = function ModalItem() {
162
132
  }));
163
133
 
164
134
  return function onSave() {
165
- return _ref2.apply(this, arguments);
135
+ return _ref.apply(this, arguments);
166
136
  };
167
137
  }();
168
138
 
@@ -175,12 +145,12 @@ var ModalItem = function ModalItem() {
175
145
  }; // 动态展示选择框
176
146
 
177
147
 
178
- var DynamicSelect = (0, _react.useCallback)(function (_ref3) {
179
- var _instance$fullData$fi;
148
+ var DynamicSelect = (0, _react.useCallback)(function (_ref2) {
149
+ var _instance$fullData, _instance$fullData$fi;
180
150
 
181
- var getFieldValue = _ref3.getFieldValue;
151
+ var getFieldValue = _ref2.getFieldValue;
182
152
  var field = getFieldValue('field');
183
- var options = ((_instance$fullData$fi = instance.fullData.find(function (v) {
153
+ var options = ((_instance$fullData = instance.fullData) === null || _instance$fullData === void 0 ? void 0 : (_instance$fullData$fi = _instance$fullData.find(function (v) {
184
154
  return v.field === field;
185
155
  })) === null || _instance$fullData$fi === void 0 ? void 0 : _instance$fullData$fi.data) || [];
186
156
 
@@ -188,31 +158,32 @@ var ModalItem = function ModalItem() {
188
158
  return /*#__PURE__*/_react.default.createElement(_form.default.Item, {
189
159
  name: "value",
190
160
  label: "\u9009\u62E9\u5B57\u6BB5\u503C"
191
- }, /*#__PURE__*/_react.default.createElement(ButtonTags, {
161
+ }, /*#__PURE__*/_react.default.createElement(_Controls.default, (0, _extends2.default)({
162
+ visible: customModal.visible
163
+ }, customModal.data, {
192
164
  options: options
193
- }));
165
+ })));
194
166
  }
195
167
 
196
168
  return false;
197
- }, [instance.fullData]);
169
+ }, [instance.fullData, customModal.data.type]);
198
170
  var config = {
199
- title: isEdit ? '编辑' : '新增查询项',
200
- visible: customModal.visible,
201
- onCancel: onClose,
202
- bodyStyle: {
203
- padding: 24
204
- },
205
- // zIndex: 2001,
206
- footer: [/*#__PURE__*/_react.default.createElement(_linkmoreDesign.Button, {
171
+ title: isEdit ? customModal.data.title : '新增查询项',
172
+ visible: customModal.type === 'complex' && customModal.visible,
173
+ onClose: onClose,
174
+ className: 'lm_det_drawer',
175
+ extra: /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Space, {
176
+ size: 8
177
+ }, /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Button, {
207
178
  key: "cancel",
208
179
  onClick: onClose,
209
- size: "middle"
180
+ size: "small"
210
181
  }, "\u53D6\u6D88"), /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Button, {
211
182
  type: "primary",
212
183
  key: "back",
213
184
  onClick: onSave,
214
- size: "middle"
215
- }, "\u786E\u5B9A")]
185
+ size: "small"
186
+ }, "\u786E\u5B9A"))
216
187
  }; // 初始化重置数据
217
188
 
218
189
  (0, _react.useEffect)(function () {
@@ -220,7 +191,7 @@ var ModalItem = function ModalItem() {
220
191
  form.setFieldsValue(customModal.data);
221
192
  }
222
193
  }, [form, customModal]);
223
- return /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Modal, config, /*#__PURE__*/_react.default.createElement("div", {
194
+ return /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Drawer, config, /*#__PURE__*/_react.default.createElement("div", {
224
195
  className: "custom_modal"
225
196
  }, /*#__PURE__*/_react.default.createElement(_form.default, {
226
197
  form: form,
@@ -230,7 +201,14 @@ var ModalItem = function ModalItem() {
230
201
  onValuesChange: onValuesChange,
231
202
  layout: "vertical",
232
203
  size: "default"
233
- }, !isEdit && /*#__PURE__*/_react.default.createElement(_form.default.Item, {
204
+ }, /*#__PURE__*/_react.default.createElement(_form.default.Item, {
205
+ name: "mode",
206
+ label: "\u67E5\u8BE2\u65B9\u5F0F"
207
+ }, /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Radio.Group, null, /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Radio, {
208
+ value: "and"
209
+ }, "\u4E14,\u67E5\u8BE2\u540C\u65F6\u6EE1\u8DB3\u6B64\u9009\u9879\u6761\u4EF6"), /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Radio, {
210
+ value: "or"
211
+ }, "\u6216,\u67E5\u8BE2\u5305\u542B\u6B64\u9009\u9879\u6761\u4EF6"))), !isEdit && /*#__PURE__*/_react.default.createElement(_form.default.Item, {
234
212
  name: "field",
235
213
  label: "\u9009\u62E9\u5B57\u6BB5"
236
214
  }, /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Select, {
@@ -245,16 +223,7 @@ var ModalItem = function ModalItem() {
245
223
  shouldUpdate: function shouldUpdate(prevValues, currentValues) {
246
224
  return prevValues.field !== currentValues.field;
247
225
  }
248
- }, DynamicSelect), /*#__PURE__*/_react.default.createElement(_form.default.Item, {
249
- name: "mode",
250
- label: "\u67E5\u8BE2\u65B9\u5F0F"
251
- }, /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Radio.Group, {
252
- direction: "column"
253
- }, /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Radio, {
254
- value: "and"
255
- }, "\u4E14,\u67E5\u8BE2\u540C\u65F6\u6EE1\u8DB3\u6B64\u9009\u9879\u6761\u4EF6"), /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Radio, {
256
- value: "or"
257
- }, "\u6216,\u67E5\u8BE2\u5305\u542B\u6B64\u9009\u9879\u6761\u4EF6"))))));
226
+ }, DynamicSelect))));
258
227
  };
259
228
 
260
229
  var _default = ModalItem;