@zat-design/sisyphus-react 3.13.7 → 3.13.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.
- package/es/ProAction/components/CheckModalContent/index.css +22 -0
- package/es/ProAction/components/CheckModalContent/index.d.ts +8 -0
- package/es/ProAction/components/CheckModalContent/index.js +38 -0
- package/es/ProAction/components/CheckModalContent/index.less +28 -0
- package/es/ProAction/index.js +39 -41
- package/es/ProAction/index.less +5 -6
- package/es/ProAction/propsType.d.ts +8 -6
- package/es/ProDownload/index.js +4 -3
- package/es/ProDownload/utils.js +5 -4
- package/es/ProDrawerForm/components/ProDrawer/index.js +2 -2
- package/es/ProDrawerForm/components/ProModal/index.js +2 -2
- package/es/ProEditLabel/components/RenderProForm.js +3 -3
- package/es/ProEditLabel/index.js +2 -2
- package/es/ProEditTable/components/ActionButton/index.js +9 -8
- package/es/ProEditTable/components/RenderField/ListChangedWrapper.js +6 -6
- package/es/ProEditTable/components/RenderField/index.js +20 -16
- package/es/ProEditTable/index.js +10 -7
- package/es/ProEditTable/utils/config.js +3 -3
- package/es/ProEditTable/utils/diffOriginal.js +6 -4
- package/es/ProEditTable/utils/getDefaultProps.js +8 -7
- package/es/ProEditTable/utils/index.js +21 -18
- package/es/ProEditTable/utils/tools.js +32 -24
- package/es/ProEditTable/utils/useEditTableError.js +2 -2
- package/es/ProEnum/index.js +16 -11
- package/es/ProEnum/utils/eventCenter.js +2 -2
- package/es/ProEnum/utils/getEnumLabel.js +5 -4
- package/es/ProEnum/utils/index.js +3 -2
- package/es/ProForm/components/base/DatePicker/index.js +11 -8
- package/es/ProForm/components/base/Input/index.js +3 -3
- package/es/ProForm/components/base/InputNumber/index.js +6 -4
- package/es/ProForm/components/base/RangePicker/index.js +12 -8
- package/es/ProForm/components/base/Select/index.js +2 -2
- package/es/ProForm/components/base/Switch/index.js +3 -2
- package/es/ProForm/components/base/SwitchCheckbox/index.js +3 -2
- package/es/ProForm/components/base/TextArea/index.js +2 -2
- package/es/ProForm/components/combination/Container/index.js +2 -2
- package/es/ProForm/components/combination/FormList/components/ActionButton.js +7 -6
- package/es/ProForm/components/combination/FormList/components/BlockFields.js +2 -2
- package/es/ProForm/components/combination/FormList/components/BlockTitle.js +2 -2
- package/es/ProForm/components/combination/FormList/components/ToolbarButton.js +5 -4
- package/es/ProForm/components/combination/FormList/index.js +2 -2
- package/es/ProForm/components/combination/FormList/utils.js +2 -2
- package/es/ProForm/components/combination/Group/hooks/index.js +4 -3
- package/es/ProForm/components/combination/Group/index.js +2 -2
- package/es/ProForm/components/combination/Group/utils.js +6 -6
- package/es/ProForm/components/combination/ProCascader/index.js +6 -4
- package/es/ProForm/components/combination/ProCascader/utils/index.js +2 -2
- package/es/ProForm/components/combination/ProModalSelect/hooks/useRequestList.js +3 -3
- package/es/ProForm/components/combination/ProModalSelect/index.js +13 -10
- package/es/ProForm/components/combination/ProNumberRange/index.js +2 -2
- package/es/ProForm/components/combination/ProRangeLimit/index.js +8 -5
- package/es/ProForm/components/combination/ProTimeLimit/index.js +10 -7
- package/es/ProForm/components/old/EnumSelect/hooks/useRequestList.js +3 -3
- package/es/ProForm/components/old/EnumSelect/index.js +3 -3
- package/es/ProForm/components/render/ChangedWrapper.js +3 -3
- package/es/ProForm/components/render/ConfirmWrapper.js +4 -3
- package/es/ProForm/components/render/Render.js +17 -13
- package/es/ProForm/components/render/RenderFields.js +9 -6
- package/es/ProForm/index.js +6 -4
- package/es/ProForm/utils/_useChanged.js +3 -3
- package/es/ProForm/utils/_useListChanged.js +6 -6
- package/es/ProForm/utils/diffOriginal.js +6 -4
- package/es/ProForm/utils/getDefaultProps.js +7 -6
- package/es/ProForm/utils/index.js +20 -15
- package/es/ProForm/utils/rulesCreator.js +4 -3
- package/es/ProForm/utils/transformNames.js +2 -2
- package/es/ProForm/utils/transformValue.js +3 -3
- package/es/ProForm/utils/useDeepCompareMemo.js +2 -2
- package/es/ProForm/utils/useRules.js +4 -3
- package/es/ProForm/utils/useShouldUpdate.js +23 -21
- package/es/ProForm/utils/useWatch.js +2 -2
- package/es/ProForm/utils/valueType.js +2 -2
- package/es/ProIcon/index.js +2 -2
- package/es/ProLayout/components/Layout/Menu/OpenMenu/index.js +2 -2
- package/es/ProLayout/components/ProCollapse/index.js +2 -2
- package/es/ProLayout/components/ProHeader/index.js +12 -9
- package/es/ProLayout/utils/index.js +3 -2
- package/es/ProSelect/index.js +11 -7
- package/es/ProSelect/utils/index.js +5 -3
- package/es/ProStep/components/Item/index.js +2 -2
- package/es/ProStep/components/Listener/index.js +2 -2
- package/es/ProStep/components/Step/index.js +2 -2
- package/es/ProStep/index.js +2 -2
- package/es/ProStep/utils/index.js +4 -3
- package/es/ProStepTab/index.js +3 -3
- package/es/ProTable/components/FormatColumn/index.js +16 -12
- package/es/ProTable/components/RcTable/components/DraggableTable/components/DndWrapper/index.js +3 -3
- package/es/ProTable/components/RenderColumn/index.js +2 -2
- package/es/ProTable/components/RenderSummary/index.js +3 -3
- package/es/ProTable/hooks/useAntdTable.js +15 -10
- package/es/ProTable/index.js +12 -7
- package/es/ProTable/utils/index.js +5 -4
- package/es/ProTabs/index.js +2 -2
- package/es/ProThemeTools/index.js +2 -2
- package/es/ProTree/components/ProTree.js +5 -4
- package/es/ProTree/components/ProTreeSelect/index.js +6 -5
- package/es/ProTreeModal/index.js +5 -4
- package/es/ProUpload/components/ImageRender.js +2 -2
- package/es/ProUpload/index.js +5 -4
- package/es/old/ProEditableTable/index.js +7 -7
- package/es/old/ProEditableTable/utils.js +2 -2
- package/lib/ProAction/components/CheckModalContent/index.css +22 -0
- package/lib/ProAction/components/CheckModalContent/index.d.ts +8 -0
- package/lib/ProAction/components/CheckModalContent/index.js +45 -0
- package/lib/ProAction/components/CheckModalContent/index.less +28 -0
- package/lib/ProAction/index.js +45 -44
- package/lib/ProAction/index.less +5 -6
- package/lib/ProAction/propsType.d.ts +8 -6
- package/lib/ProConfigProvider/index.js +3 -2
- package/lib/ProDownload/index.js +7 -6
- package/lib/ProDownload/utils.js +9 -7
- package/lib/ProDrawerForm/components/ProDrawer/index.js +12 -7
- package/lib/ProDrawerForm/components/ProModal/index.js +12 -7
- package/lib/ProEditLabel/components/RenderProForm.js +6 -5
- package/lib/ProEditLabel/index.js +15 -8
- package/lib/ProEditTable/components/ActionButton/index.js +15 -11
- package/lib/ProEditTable/components/RcTable/BaseTable.js +6 -3
- package/lib/ProEditTable/components/RcTable/DraggableTable.js +3 -2
- package/lib/ProEditTable/components/RenderField/ListChangedWrapper.js +14 -11
- package/lib/ProEditTable/components/RenderField/index.js +25 -20
- package/lib/ProEditTable/components/RenderToolbar/index.js +3 -2
- package/lib/ProEditTable/components/Summary/index.js +8 -5
- package/lib/ProEditTable/components/Validator/index.js +7 -3
- package/lib/ProEditTable/index.js +20 -12
- package/lib/ProEditTable/utils/config.js +8 -7
- package/lib/ProEditTable/utils/diffOriginal.js +7 -4
- package/lib/ProEditTable/utils/getDefaultProps.js +8 -7
- package/lib/ProEditTable/utils/index.js +27 -21
- package/lib/ProEditTable/utils/tools.js +32 -24
- package/lib/ProEditTable/utils/useEditTableError.js +2 -2
- package/lib/ProEnum/index.js +31 -19
- package/lib/ProEnum/utils/eventCenter.js +2 -2
- package/lib/ProEnum/utils/getEnumLabel.js +5 -4
- package/lib/ProEnum/utils/index.js +3 -2
- package/lib/ProForm/components/Container.js +3 -2
- package/lib/ProForm/components/FormFooter/index.js +7 -4
- package/lib/ProForm/components/base/Checkbox/index.js +4 -3
- package/lib/ProForm/components/base/DatePicker/index.js +14 -10
- package/lib/ProForm/components/base/Input/index.js +6 -5
- package/lib/ProForm/components/base/InputNumber/index.js +12 -7
- package/lib/ProForm/components/base/Radio/index.js +4 -3
- package/lib/ProForm/components/base/RangePicker/index.js +15 -10
- package/lib/ProForm/components/base/Select/index.js +5 -4
- package/lib/ProForm/components/base/Switch/index.js +6 -4
- package/lib/ProForm/components/base/SwitchCheckbox/index.js +6 -4
- package/lib/ProForm/components/base/TextArea/index.js +5 -4
- package/lib/ProForm/components/base/TimePicker/index.js +3 -2
- package/lib/ProForm/components/combination/Container/index.js +2 -2
- package/lib/ProForm/components/combination/FormList/components/ActionButton.js +16 -10
- package/lib/ProForm/components/combination/FormList/components/BlockFields.js +8 -5
- package/lib/ProForm/components/combination/FormList/components/BlockTitle.js +2 -2
- package/lib/ProForm/components/combination/FormList/components/LineFields.js +3 -2
- package/lib/ProForm/components/combination/FormList/components/ToolbarButton.js +10 -6
- package/lib/ProForm/components/combination/FormList/index.js +5 -4
- package/lib/ProForm/components/combination/FormList/utils.js +2 -2
- package/lib/ProForm/components/combination/Group/hooks/index.js +4 -3
- package/lib/ProForm/components/combination/Group/index.js +6 -5
- package/lib/ProForm/components/combination/Group/utils.js +10 -9
- package/lib/ProForm/components/combination/ProCascader/index.js +14 -7
- package/lib/ProForm/components/combination/ProCascader/utils/index.js +2 -2
- package/lib/ProForm/components/combination/ProCombination/index.js +9 -4
- package/lib/ProForm/components/combination/ProModalSelect/hooks/useRequestList.js +3 -3
- package/lib/ProForm/components/combination/ProModalSelect/index.js +35 -19
- package/lib/ProForm/components/combination/ProNumberRange/index.js +17 -10
- package/lib/ProForm/components/combination/ProRangeLimit/index.js +17 -9
- package/lib/ProForm/components/combination/ProTimeLimit/index.js +19 -11
- package/lib/ProForm/components/old/EnumSelect/hooks/useRequestList.js +3 -3
- package/lib/ProForm/components/old/EnumSelect/index.js +15 -8
- package/lib/ProForm/components/old/InputRange/index.js +8 -5
- package/lib/ProForm/components/old/InputWithSuffix/index.js +4 -3
- package/lib/ProForm/components/old/ProAddress/index.js +18 -11
- package/lib/ProForm/components/old/ProCertNo/index.js +12 -7
- package/lib/ProForm/components/old/ProCertValidity/index.js +11 -6
- package/lib/ProForm/components/old/ProRangeBox/index.js +21 -12
- package/lib/ProForm/components/render/ChangedWrapper.js +11 -8
- package/lib/ProForm/components/render/ConfirmWrapper.js +8 -6
- package/lib/ProForm/components/render/Render.js +34 -23
- package/lib/ProForm/components/render/RenderFields.js +9 -6
- package/lib/ProForm/index.js +21 -12
- package/lib/ProForm/utils/_useChanged.js +7 -5
- package/lib/ProForm/utils/_useListChanged.js +10 -8
- package/lib/ProForm/utils/diffOriginal.js +7 -4
- package/lib/ProForm/utils/getDefaultProps.js +8 -6
- package/lib/ProForm/utils/index.js +20 -15
- package/lib/ProForm/utils/rulesCreator.js +4 -3
- package/lib/ProForm/utils/transformNames.js +3 -2
- package/lib/ProForm/utils/transformValue.js +3 -3
- package/lib/ProForm/utils/useDeepCompareMemo.js +3 -2
- package/lib/ProForm/utils/useForm.js +3 -2
- package/lib/ProForm/utils/useRules.js +4 -3
- package/lib/ProForm/utils/useShouldUpdate.js +23 -21
- package/lib/ProForm/utils/useWatch.js +2 -2
- package/lib/ProForm/utils/valueType.js +2 -2
- package/lib/ProIcon/index.js +13 -8
- package/lib/ProLayout/components/Layout/Menu/FoldMenu/index.js +6 -3
- package/lib/ProLayout/components/Layout/Menu/OpenMenu/index.js +5 -4
- package/lib/ProLayout/components/ProCollapse/index.js +13 -8
- package/lib/ProLayout/components/ProFooter/index.js +3 -2
- package/lib/ProLayout/components/ProHeader/components/Copy/index.js +3 -2
- package/lib/ProLayout/components/ProHeader/components/ProBackBtn/index.js +3 -2
- package/lib/ProLayout/components/ProHeader/index.js +37 -25
- package/lib/ProLayout/index.js +3 -2
- package/lib/ProLayout/utils/index.js +2 -2
- package/lib/ProSelect/components/AdaptiveTooltip.js +3 -2
- package/lib/ProSelect/index.js +25 -14
- package/lib/ProSelect/utils/index.js +4 -4
- package/lib/ProStep/components/Anchor/index.js +3 -2
- package/lib/ProStep/components/Item/index.js +2 -2
- package/lib/ProStep/components/Listener/index.js +2 -2
- package/lib/ProStep/components/Step/index.js +2 -2
- package/lib/ProStep/index.js +2 -2
- package/lib/ProStep/utils/index.js +4 -3
- package/lib/ProStepTab/index.js +3 -3
- package/lib/ProTable/components/FormatColumn/index.js +26 -21
- package/lib/ProTable/components/RcTable/components/BaseTable/index.js +3 -2
- package/lib/ProTable/components/RcTable/components/DraggableTable/components/DndWrapper/index.js +3 -3
- package/lib/ProTable/components/RcTable/components/DraggableTable/index.js +3 -2
- package/lib/ProTable/components/RenderColumn/index.js +17 -12
- package/lib/ProTable/components/RenderSummary/index.js +8 -7
- package/lib/ProTable/components/RenderTableHeader/index.js +5 -3
- package/lib/ProTable/components/RenderTabs/index.js +6 -3
- package/lib/ProTable/components/TooltipTitle/index.js +3 -2
- package/lib/ProTable/hooks/useAntdTable.js +21 -13
- package/lib/ProTable/index.js +12 -7
- package/lib/ProTable/utils/index.js +5 -4
- package/lib/ProTabs/components/Card/index.js +11 -5
- package/lib/ProTabs/index.js +5 -4
- package/lib/ProThemeTools/component/ProTools/index.js +19 -12
- package/lib/ProThemeTools/index.js +12 -9
- package/lib/ProThemeTools/utils/index.js +3 -2
- package/lib/ProTooltip/index.js +5 -4
- package/lib/ProTree/components/AdaptiveTooltip.js +4 -2
- package/lib/ProTree/components/List.js +4 -3
- package/lib/ProTree/components/ProTree.js +17 -9
- package/lib/ProTree/components/ProTreeSelect/index.js +22 -14
- package/lib/ProTree/components/Tree.js +6 -3
- package/lib/ProTreeModal/components/Cascader.js +4 -3
- package/lib/ProTreeModal/components/List.js +14 -9
- package/lib/ProTreeModal/components/SortableItem.js +3 -2
- package/lib/ProTreeModal/components/Tree.js +4 -3
- package/lib/ProTreeModal/components/Trigger.js +11 -6
- package/lib/ProTreeModal/index.js +21 -13
- package/lib/ProUpload/components/ButtonRender.js +6 -3
- package/lib/ProUpload/components/DragRender.js +3 -2
- package/lib/ProUpload/components/FileItem.js +15 -10
- package/lib/ProUpload/components/ImageRender.js +19 -10
- package/lib/ProUpload/index.js +9 -7
- package/lib/ProViewer/index.js +9 -4
- package/lib/old/ProCertValidity/index.js +11 -6
- package/lib/old/ProEditableTable/index.js +36 -23
- package/lib/old/ProEditableTable/utils.js +35 -18
- package/package.json +2 -1
@@ -6,18 +6,34 @@ Object.defineProperty(exports, "__esModule", {
|
|
6
6
|
value: true
|
7
7
|
});
|
8
8
|
exports.default = void 0;
|
9
|
+
require("antd/es/tooltip/style");
|
10
|
+
var _tooltip = _interopRequireDefault(require("antd/es/tooltip"));
|
11
|
+
require("antd/es/button/style");
|
12
|
+
var _button = _interopRequireDefault(require("antd/es/button"));
|
13
|
+
require("antd/es/input/style");
|
14
|
+
var _input = _interopRequireDefault(require("antd/es/input"));
|
15
|
+
require("antd/es/spin/style");
|
16
|
+
var _spin = _interopRequireDefault(require("antd/es/spin"));
|
17
|
+
require("antd/es/space/style");
|
18
|
+
var _space = _interopRequireDefault(require("antd/es/space"));
|
9
19
|
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
10
20
|
var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
|
21
|
+
require("antd/es/message/style");
|
22
|
+
var _message2 = _interopRequireDefault(require("antd/es/message"));
|
11
23
|
var _regeneratorRuntime2 = _interopRequireDefault(require("@babel/runtime/helpers/regeneratorRuntime"));
|
12
24
|
var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
|
13
25
|
var _objectSpread5 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
|
14
26
|
var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
|
27
|
+
require("antd/es/form/style");
|
28
|
+
var _form = _interopRequireDefault(require("antd/es/form"));
|
15
29
|
var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
|
30
|
+
var _isFunction2 = _interopRequireDefault(require("lodash/isFunction"));
|
31
|
+
var _isEqual2 = _interopRequireDefault(require("lodash/isEqual"));
|
32
|
+
var _isArray2 = _interopRequireDefault(require("lodash/isArray"));
|
33
|
+
var _debounce2 = _interopRequireDefault(require("lodash/debounce"));
|
16
34
|
var _jsxRuntime = require("react/jsx-runtime");
|
17
35
|
var _icons = require("@ant-design/icons");
|
18
36
|
var _ahooks = require("ahooks");
|
19
|
-
var _antd = require("antd");
|
20
|
-
var _lodash = require("lodash");
|
21
37
|
var _classnames = _interopRequireDefault(require("classnames"));
|
22
38
|
var _reactSvg = require("react-svg");
|
23
39
|
var _react = _interopRequireWildcard(require("react"));
|
@@ -57,7 +73,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
|
|
57
73
|
defaultOne = props.defaultOne,
|
58
74
|
otherProps = props.otherProps,
|
59
75
|
restProps = (0, _objectWithoutProperties2.default)(props, _excluded);
|
60
|
-
var contentForm =
|
76
|
+
var contentForm = _form.default.useFormInstance();
|
61
77
|
if (!configOption || Object.prototype.toString.call(configOption) !== '[object Object]') {
|
62
78
|
throw new Error('error: 请检查枚举选择弹框的配置项【configOption】');
|
63
79
|
}
|
@@ -129,7 +145,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
|
|
129
145
|
_selectedRows = _useSetState2$.selectedRows,
|
130
146
|
_selectedRowKeys = _useSetState2$.selectedRowKeys,
|
131
147
|
setState = _useSetState2[1];
|
132
|
-
var _Form$useForm =
|
148
|
+
var _Form$useForm = _form.default.useForm(searchForm),
|
133
149
|
_Form$useForm2 = (0, _slicedToArray2.default)(_Form$useForm, 1),
|
134
150
|
form = _Form$useForm2[0];
|
135
151
|
var selectedRows = (rowSelection === null || rowSelection === void 0 ? void 0 : rowSelection.selectedRows) || _selectedRows;
|
@@ -201,7 +217,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
|
|
201
217
|
label: data[labelKey]
|
202
218
|
}));
|
203
219
|
}
|
204
|
-
return (0,
|
220
|
+
return (0, _isArray2.default)(data) ? data === null || data === void 0 ? void 0 : (_data$map = data.map(function (item) {
|
205
221
|
return handleFormat((0, _objectSpread5.default)((0, _objectSpread5.default)({}, item), {}, {
|
206
222
|
value: item[valueKey],
|
207
223
|
label: item[labelKey]
|
@@ -342,7 +358,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
|
|
342
358
|
_context2.next = 4;
|
343
359
|
break;
|
344
360
|
}
|
345
|
-
|
361
|
+
_message2.default.error(_locale.default.ProModalSelect.checkMsg);
|
346
362
|
return _context2.abrupt("return", false);
|
347
363
|
case 4:
|
348
364
|
nextSelectedRows = selectedRows;
|
@@ -378,7 +394,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
|
|
378
394
|
// 更新内部展示值
|
379
395
|
setState({
|
380
396
|
_value: record,
|
381
|
-
options: (0,
|
397
|
+
options: (0, _isArray2.default)(record) ? record : [record]
|
382
398
|
});
|
383
399
|
handleClose();
|
384
400
|
}
|
@@ -633,7 +649,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
|
|
633
649
|
nextState.selectedRowKeys = [getRowKey(value)];
|
634
650
|
nextState.selectedRows = [value];
|
635
651
|
}
|
636
|
-
if ((0,
|
652
|
+
if ((0, _isArray2.default)(value)) {
|
637
653
|
nextState.selectedRowKeys = value.map(function (item) {
|
638
654
|
return getRowKey(item);
|
639
655
|
});
|
@@ -660,7 +676,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
|
|
660
676
|
}
|
661
677
|
}, [JSON.stringify(value), visible, isInit]);
|
662
678
|
(0, _ahooks.useDebounceEffect)(function () {
|
663
|
-
if (value && !visible && readOnly && (!(0,
|
679
|
+
if (value && !visible && readOnly && (!(0, _isEqual2.default)(value, preValue.current) || (options === null || options === void 0 ? void 0 : options.length) === 0)) {
|
664
680
|
var _options$some;
|
665
681
|
preValue.current = value;
|
666
682
|
var _data3 = labelInValue ? value[valueKey] : value;
|
@@ -694,7 +710,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
|
|
694
710
|
} : queryBean;
|
695
711
|
var nextParams = transformParams ? transformParams(params) : params;
|
696
712
|
// 减少请求条件一致时,且请求过时,focus的重复请求
|
697
|
-
if (!(0,
|
713
|
+
if (!(0, _isEqual2.default)(queryBean, defaultParamsRef.current) || !(options === null || options === void 0 ? void 0 : options.length)) {
|
698
714
|
run(nextParams); // 触发 run 请求
|
699
715
|
defaultParamsRef.current = queryBean; // 更新缓存
|
700
716
|
}
|
@@ -703,7 +719,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
|
|
703
719
|
});
|
704
720
|
}
|
705
721
|
};
|
706
|
-
var handleSelectSearch = (0,
|
722
|
+
var handleSelectSearch = (0, _debounce2.default)(function (val) {
|
707
723
|
if (useRequest) {
|
708
724
|
var queryBean = (0, _objectSpread5.default)((0, _objectSpread5.default)({}, defaultParams), {}, (0, _defineProperty2.default)({}, searchKey !== null && searchKey !== void 0 ? searchKey : labelKey, val));
|
709
725
|
var params = withPagination ? {
|
@@ -728,14 +744,14 @@ var ProModalSelect = function ProModalSelect(props, ref) {
|
|
728
744
|
}
|
729
745
|
}
|
730
746
|
if (!readOnly) {
|
731
|
-
if (labelInValue && _value && !(0,
|
747
|
+
if (labelInValue && _value && !(0, _isEqual2.default)(value, _value)) {
|
732
748
|
setState({
|
733
749
|
_value: value,
|
734
750
|
selectedRowKeys: [],
|
735
751
|
selectedRows: []
|
736
752
|
});
|
737
753
|
}
|
738
|
-
if (!labelInValue && !(0,
|
754
|
+
if (!labelInValue && !(0, _isEqual2.default)(value, _value === null || _value === void 0 ? void 0 : _value[valueKey])) {
|
739
755
|
setState({
|
740
756
|
_value: value,
|
741
757
|
selectedRowKeys: [],
|
@@ -745,7 +761,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
|
|
745
761
|
}
|
746
762
|
}, [value, _value]);
|
747
763
|
// 加个中间状态Input
|
748
|
-
var initRender = (0, _jsxRuntime.jsxs)(
|
764
|
+
var initRender = (0, _jsxRuntime.jsxs)(_space.default.Compact, {
|
749
765
|
style: {
|
750
766
|
width: '100%'
|
751
767
|
},
|
@@ -761,7 +777,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
|
|
761
777
|
optionRender: optionRender,
|
762
778
|
scrollFollowParent: false,
|
763
779
|
mode: isMultiple ? 'multiple' : undefined,
|
764
|
-
notFoundContent: selectLoading ? (0, _jsxRuntime.jsx)(
|
780
|
+
notFoundContent: selectLoading ? (0, _jsxRuntime.jsx)(_spin.default, {
|
765
781
|
size: "small"
|
766
782
|
}) : null,
|
767
783
|
onFocus: handleSelectFocus,
|
@@ -769,13 +785,13 @@ var ProModalSelect = function ProModalSelect(props, ref) {
|
|
769
785
|
style: {
|
770
786
|
width: isView || disabled ? '100%' : 'calc(100% - 30px)'
|
771
787
|
}
|
772
|
-
}, restProps)) : (0, _jsxRuntime.jsx)(
|
788
|
+
}, restProps)) : (0, _jsxRuntime.jsx)(_input.default, (0, _objectSpread5.default)({
|
773
789
|
value: viewText,
|
774
790
|
onChange: handleChangeValue,
|
775
791
|
disabled: disabled,
|
776
792
|
autoComplete: "off",
|
777
793
|
allowClear: true
|
778
|
-
}, restProps)), isView || disabled ? null : (0, _jsxRuntime.jsx)(
|
794
|
+
}, restProps)), isView || disabled ? null : (0, _jsxRuntime.jsx)(_button.default, {
|
779
795
|
icon: (0, _jsxRuntime.jsx)(_reactSvg.ReactSVG, {
|
780
796
|
className: "viewSvg",
|
781
797
|
src: _view.default,
|
@@ -836,7 +852,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
|
|
836
852
|
if (!((_formColumns$2 = formColumns[0]) === null || _formColumns$2 === void 0 ? void 0 : _formColumns$2.fieldProps)) {
|
837
853
|
formColumns[0].fieldProps = {};
|
838
854
|
}
|
839
|
-
if (!(0,
|
855
|
+
if (!(0, _isFunction2.default)(formColumns[0].fieldProps) && !(formColumns === null || formColumns === void 0 ? void 0 : (_formColumns$3 = formColumns[0]) === null || _formColumns$3 === void 0 ? void 0 : (_formColumns$3$fieldP = _formColumns$3.fieldProps) === null || _formColumns$3$fieldP === void 0 ? void 0 : _formColumns$3$fieldP.suffix)) {
|
840
856
|
formColumns[0].fieldProps.suffix = (0, _jsxRuntime.jsx)(_icons.SearchOutlined, {
|
841
857
|
onClick: handleSearch
|
842
858
|
});
|
@@ -862,7 +878,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
|
|
862
878
|
className: _className,
|
863
879
|
style: style,
|
864
880
|
ref: fieldRef,
|
865
|
-
children: isTooltip && viewText ? (0, _jsxRuntime.jsx)(
|
881
|
+
children: isTooltip && viewText ? (0, _jsxRuntime.jsx)(_tooltip.default, {
|
866
882
|
placement: "topLeft",
|
867
883
|
open: open,
|
868
884
|
title: viewText,
|
@@ -5,13 +5,20 @@ Object.defineProperty(exports, "__esModule", {
|
|
5
5
|
value: true
|
6
6
|
});
|
7
7
|
exports.default = void 0;
|
8
|
+
require("antd/es/input/style");
|
9
|
+
var _input = _interopRequireDefault(require("antd/es/input"));
|
10
|
+
require("antd/es/button/style");
|
11
|
+
var _button = _interopRequireDefault(require("antd/es/button"));
|
8
12
|
var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
|
13
|
+
require("antd/es/input-number/style");
|
14
|
+
var _inputNumber = _interopRequireDefault(require("antd/es/input-number"));
|
15
|
+
require("antd/es/space/style");
|
16
|
+
var _space = _interopRequireDefault(require("antd/es/space"));
|
9
17
|
var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
|
10
18
|
var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
|
19
|
+
var _isEmpty2 = _interopRequireDefault(require("lodash/isEmpty"));
|
11
20
|
var _jsxRuntime = require("react/jsx-runtime");
|
12
21
|
var _ahooks = require("ahooks");
|
13
|
-
var _antd = require("antd");
|
14
|
-
var _lodash = require("lodash");
|
15
22
|
var _classnames = _interopRequireDefault(require("classnames"));
|
16
23
|
var _utils = require("@zat-design/utils");
|
17
24
|
var _Container = _interopRequireDefault(require("../../Container"));
|
@@ -95,7 +102,7 @@ var ProNumberRange = function ProNumberRange(props) {
|
|
95
102
|
});
|
96
103
|
// 查看模式
|
97
104
|
if (isView || props.isView) {
|
98
|
-
if ((0,
|
105
|
+
if ((0, _isEmpty2.default)(value) || (value === null || value === void 0 ? void 0 : value.every(function (item) {
|
99
106
|
return typeof item !== 'number';
|
100
107
|
}))) {
|
101
108
|
return viewEmpty;
|
@@ -179,10 +186,10 @@ var ProNumberRange = function ProNumberRange(props) {
|
|
179
186
|
}
|
180
187
|
return result;
|
181
188
|
};
|
182
|
-
return (0, _jsxRuntime.jsx)(
|
189
|
+
return (0, _jsxRuntime.jsx)(_space.default, {
|
183
190
|
className: cls,
|
184
|
-
children: (0, _jsxRuntime.jsxs)(
|
185
|
-
children: [(0, _jsxRuntime.jsx)(
|
191
|
+
children: (0, _jsxRuntime.jsxs)(_space.default.Compact, {
|
192
|
+
children: [(0, _jsxRuntime.jsx)(_inputNumber.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({
|
186
193
|
id: id,
|
187
194
|
className: "range-left",
|
188
195
|
value: (value === null || value === void 0 ? void 0 : value[0]) || range[0],
|
@@ -195,18 +202,18 @@ var ProNumberRange = function ProNumberRange(props) {
|
|
195
202
|
}, valueProps), {}, {
|
196
203
|
min: min !== null && min !== void 0 ? min : (_valueProps = valueProps) === null || _valueProps === void 0 ? void 0 : _valueProps.min,
|
197
204
|
max: (_ref2 = (_ref3 = (_value$ = value === null || value === void 0 ? void 0 : value[1]) !== null && _value$ !== void 0 ? _value$ : range[1]) !== null && _ref3 !== void 0 ? _ref3 : max) !== null && _ref2 !== void 0 ? _ref2 : (_valueProps2 = valueProps) === null || _valueProps2 === void 0 ? void 0 : _valueProps2.max
|
198
|
-
}, childProps === null || childProps === void 0 ? void 0 : childProps[0])), addonBefore ? (0, _jsxRuntime.jsx)(
|
205
|
+
}, childProps === null || childProps === void 0 ? void 0 : childProps[0])), addonBefore ? (0, _jsxRuntime.jsx)(_button.default, {
|
199
206
|
disabled: true,
|
200
207
|
className: "range-addon-before",
|
201
208
|
children: addonBefore
|
202
|
-
}) : null, (0, _jsxRuntime.jsx)(
|
209
|
+
}) : null, (0, _jsxRuntime.jsx)(_input.default, {
|
203
210
|
className: (0, _classnames.default)({
|
204
211
|
'range-split': true,
|
205
212
|
'range-split-disabled': !!disabled
|
206
213
|
}),
|
207
214
|
placeholder: "~",
|
208
215
|
disabled: true
|
209
|
-
}), (0, _jsxRuntime.jsx)(
|
216
|
+
}), (0, _jsxRuntime.jsx)(_inputNumber.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({
|
210
217
|
className: "range-right",
|
211
218
|
value: (value === null || value === void 0 ? void 0 : value[1]) || range[1],
|
212
219
|
placeholder: "".concat(_locale.default.ProForm.inputPlaceholder),
|
@@ -218,7 +225,7 @@ var ProNumberRange = function ProNumberRange(props) {
|
|
218
225
|
}, valueProps), {}, {
|
219
226
|
min: (_ref4 = (_ref5 = (_value$2 = value === null || value === void 0 ? void 0 : value[0]) !== null && _value$2 !== void 0 ? _value$2 : range[0]) !== null && _ref5 !== void 0 ? _ref5 : min) !== null && _ref4 !== void 0 ? _ref4 : (_valueProps3 = valueProps) === null || _valueProps3 === void 0 ? void 0 : _valueProps3.min,
|
220
227
|
max: max !== null && max !== void 0 ? max : (_valueProps4 = valueProps) === null || _valueProps4 === void 0 ? void 0 : _valueProps4.max
|
221
|
-
}, childProps === null || childProps === void 0 ? void 0 : childProps[1])), addonAfter ? (0, _jsxRuntime.jsx)(
|
228
|
+
}, childProps === null || childProps === void 0 ? void 0 : childProps[1])), addonAfter ? (0, _jsxRuntime.jsx)(_button.default, {
|
222
229
|
disabled: true,
|
223
230
|
className: "range-addon-after",
|
224
231
|
children: addonAfter
|
@@ -5,14 +5,22 @@ Object.defineProperty(exports, "__esModule", {
|
|
5
5
|
value: true
|
6
6
|
});
|
7
7
|
exports.default = void 0;
|
8
|
+
require("antd/es/checkbox/style");
|
9
|
+
var _checkbox = _interopRequireDefault(require("antd/es/checkbox"));
|
10
|
+
require("antd/es/input/style");
|
11
|
+
var _input = _interopRequireDefault(require("antd/es/input"));
|
8
12
|
var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
|
9
13
|
var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
|
10
14
|
var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
|
15
|
+
require("antd/es/date-picker/style");
|
16
|
+
var _datePicker = _interopRequireDefault(require("antd/es/date-picker"));
|
11
17
|
var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
|
18
|
+
var _isObject2 = _interopRequireDefault(require("lodash/isObject"));
|
19
|
+
var _uniq2 = _interopRequireDefault(require("lodash/uniq"));
|
20
|
+
var _isFunction2 = _interopRequireDefault(require("lodash/isFunction"));
|
21
|
+
var _omit2 = _interopRequireDefault(require("lodash/omit"));
|
12
22
|
var _jsxRuntime = require("react/jsx-runtime");
|
13
23
|
var _react = require("react");
|
14
|
-
var _antd = require("antd");
|
15
|
-
var _lodash = require("lodash");
|
16
24
|
var _classnames = _interopRequireDefault(require("classnames"));
|
17
25
|
var _moment = _interopRequireDefault(require("moment"));
|
18
26
|
var _ProConfigProvider = require("../../../../ProConfigProvider");
|
@@ -47,7 +55,7 @@ var useControlled = function useControlled(props) {
|
|
47
55
|
// @ts-ignore
|
48
56
|
return [value, setValue];
|
49
57
|
};
|
50
|
-
var RangePicker =
|
58
|
+
var RangePicker = _datePicker.default.RangePicker;
|
51
59
|
var ProRangeLimit = function ProRangeLimit(props) {
|
52
60
|
var disabled = props.disabled,
|
53
61
|
_props$foreverText = props.foreverText,
|
@@ -97,10 +105,10 @@ var ProRangeLimit = function ProRangeLimit(props) {
|
|
97
105
|
}
|
98
106
|
var _viewFormat = Array.isArray(format) ? format[0] : format;
|
99
107
|
var tempFormat = Array.isArray(format) ? format : [format];
|
100
|
-
if ((0,
|
108
|
+
if ((0, _isFunction2.default)(format)) {
|
101
109
|
tempFormat = [];
|
102
110
|
}
|
103
|
-
var _format = (0,
|
111
|
+
var _format = (0, _uniq2.default)([].concat((0, _toConsumableArray2.default)(tempFormat), ['YYYY-MM-DD', 'YYYYMMDD', 'YYYY/MM/DD', 'YYYY_MM_DD', 'YYYY.MM.DD'])).filter(function (formatKey) {
|
104
112
|
return !!formatKey;
|
105
113
|
});
|
106
114
|
var _defaultShowTime = {
|
@@ -164,23 +172,23 @@ var ProRangeLimit = function ProRangeLimit(props) {
|
|
164
172
|
if (_rest.showTime === true) {
|
165
173
|
_rest.showTime = (0, _objectSpread2.default)({}, _defaultShowTime);
|
166
174
|
}
|
167
|
-
if ((0,
|
175
|
+
if ((0, _isObject2.default)(_rest.showTime)) {
|
168
176
|
_rest.showTime = Object.assign(_defaultShowTime, _rest.showTime);
|
169
177
|
}
|
170
|
-
return (0, _jsxRuntime.jsxs)(
|
178
|
+
return (0, _jsxRuntime.jsxs)(_input.default.Group, {
|
171
179
|
compact: true,
|
172
180
|
className: "pro-range-limit",
|
173
181
|
children: [(0, _jsxRuntime.jsx)(RangePicker, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({
|
174
182
|
allowClear: true,
|
175
183
|
disabled: [_disabled === null || _disabled === void 0 ? void 0 : _disabled[0], (_disabled === null || _disabled === void 0 ? void 0 : _disabled[1]) || _isForever],
|
176
184
|
defaultPickerValue: defaultPickerValue
|
177
|
-
}, initialConfig), (0,
|
185
|
+
}, initialConfig), (0, _omit2.default)(_rest, ['placeholder', 'separator'])), {}, {
|
178
186
|
format: _format,
|
179
187
|
value: value,
|
180
188
|
onChange: handleRangeChange
|
181
189
|
})), limit && (0, _jsxRuntime.jsx)("div", {
|
182
190
|
className: className,
|
183
|
-
children: (0, _jsxRuntime.jsx)(
|
191
|
+
children: (0, _jsxRuntime.jsx)(_checkbox.default, {
|
184
192
|
checked: _isForever,
|
185
193
|
disabled: _disabled === null || _disabled === void 0 ? void 0 : _disabled[1],
|
186
194
|
onChange: handleForeverChange,
|
@@ -5,14 +5,22 @@ Object.defineProperty(exports, "__esModule", {
|
|
5
5
|
value: true
|
6
6
|
});
|
7
7
|
exports.default = exports.ProTimeLimit = void 0;
|
8
|
+
require("antd/es/checkbox/style");
|
9
|
+
var _checkbox = _interopRequireDefault(require("antd/es/checkbox"));
|
10
|
+
require("antd/es/date-picker/style");
|
11
|
+
var _datePicker = _interopRequireDefault(require("antd/es/date-picker"));
|
12
|
+
require("antd/es/input/style");
|
13
|
+
var _input = _interopRequireDefault(require("antd/es/input"));
|
8
14
|
var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
|
9
15
|
var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
|
10
16
|
var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
|
11
17
|
var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
|
18
|
+
var _isFunction2 = _interopRequireDefault(require("lodash/isFunction"));
|
19
|
+
var _uniq2 = _interopRequireDefault(require("lodash/uniq"));
|
20
|
+
var _isObject2 = _interopRequireDefault(require("lodash/isObject"));
|
21
|
+
var _omit2 = _interopRequireDefault(require("lodash/omit"));
|
12
22
|
var _jsxRuntime = require("react/jsx-runtime");
|
13
|
-
var _antd = require("antd");
|
14
23
|
var _classnames = _interopRequireDefault(require("classnames"));
|
15
|
-
var _lodash = require("lodash");
|
16
24
|
var _moment = _interopRequireDefault(require("moment"));
|
17
25
|
var _react = require("react");
|
18
26
|
var _ProConfigProvider = require("../../../../ProConfigProvider");
|
@@ -46,10 +54,10 @@ var ProTimeLimit = exports.ProTimeLimit = function ProTimeLimit(props) {
|
|
46
54
|
var _foreverDate = foreverDate || (initialConfig === null || initialConfig === void 0 ? void 0 : initialConfig.foreverDate);
|
47
55
|
var _viewFormat = Array.isArray(format) ? format[0] : format;
|
48
56
|
var tempFormat = Array.isArray(format) ? format : [format];
|
49
|
-
if ((0,
|
57
|
+
if ((0, _isFunction2.default)(format)) {
|
50
58
|
tempFormat = [];
|
51
59
|
}
|
52
|
-
var _format = (0,
|
60
|
+
var _format = (0, _uniq2.default)([].concat((0, _toConsumableArray2.default)(tempFormat), ['YYYY-MM-DD', 'YYYYMMDD', 'YYYY/MM/DD', 'YYYY_MM_DD', 'YYYY.MM.DD'])).filter(function (formatKey) {
|
53
61
|
return !!formatKey;
|
54
62
|
});
|
55
63
|
// dateTime模式下默认开启time选择
|
@@ -82,7 +90,7 @@ var ProTimeLimit = exports.ProTimeLimit = function ProTimeLimit(props) {
|
|
82
90
|
value = _useControlled2[0],
|
83
91
|
onChange = _useControlled2[1];
|
84
92
|
var isForever = (0, _react.useMemo)(function () {
|
85
|
-
if ((0,
|
93
|
+
if ((0, _isObject2.default)(value)) {
|
86
94
|
return foreverMoment.format(format) === value.format(format);
|
87
95
|
}
|
88
96
|
return false;
|
@@ -102,7 +110,7 @@ var ProTimeLimit = exports.ProTimeLimit = function ProTimeLimit(props) {
|
|
102
110
|
children: foreverText
|
103
111
|
});
|
104
112
|
}
|
105
|
-
if ((0,
|
113
|
+
if ((0, _isObject2.default)(value)) {
|
106
114
|
return (0, _jsxRuntime.jsx)(_Container.default, {
|
107
115
|
viewEmpty: viewEmpty,
|
108
116
|
children: value.format(_viewFormat)
|
@@ -116,7 +124,7 @@ var ProTimeLimit = exports.ProTimeLimit = function ProTimeLimit(props) {
|
|
116
124
|
if (_rest.showTime === true) {
|
117
125
|
_rest.showTime = (0, _objectSpread2.default)({}, _defaultShowTime);
|
118
126
|
}
|
119
|
-
if ((0,
|
127
|
+
if ((0, _isObject2.default)(_rest.showTime)) {
|
120
128
|
_rest.showTime = Object.assign(_defaultShowTime, _rest.showTime);
|
121
129
|
}
|
122
130
|
var className = (0, _classnames.default)({
|
@@ -124,18 +132,18 @@ var ProTimeLimit = exports.ProTimeLimit = function ProTimeLimit(props) {
|
|
124
132
|
'ant-input-disabled': disabled,
|
125
133
|
'forever-checkbox': true
|
126
134
|
});
|
127
|
-
return (0, _jsxRuntime.jsxs)(
|
135
|
+
return (0, _jsxRuntime.jsxs)(_input.default.Group, {
|
128
136
|
compact: true,
|
129
137
|
className: "pro-time-limit",
|
130
|
-
children: [(0, _jsxRuntime.jsx)(
|
138
|
+
children: [(0, _jsxRuntime.jsx)(_datePicker.default, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({
|
131
139
|
disabled: disabled || isForever
|
132
|
-
}, initialConfig), (0,
|
140
|
+
}, initialConfig), (0, _omit2.default)(_rest, ['placeholder'])), {}, {
|
133
141
|
format: _format,
|
134
142
|
value: value,
|
135
143
|
onChange: onChange
|
136
144
|
})), limit && (0, _jsxRuntime.jsx)("div", {
|
137
145
|
className: className,
|
138
|
-
children: (0, _jsxRuntime.jsx)(
|
146
|
+
children: (0, _jsxRuntime.jsx)(_checkbox.default, {
|
139
147
|
checked: isForever,
|
140
148
|
disabled: disabled,
|
141
149
|
onChange: foreverChange,
|
@@ -8,8 +8,8 @@ exports.default = useRequestList;
|
|
8
8
|
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
9
9
|
var _objectSpread3 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
|
10
10
|
var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
|
11
|
+
var _isEqual2 = _interopRequireDefault(require("lodash/isEqual"));
|
11
12
|
var _ahooks = require("ahooks");
|
12
|
-
var _lodash = require("lodash");
|
13
13
|
var _react = require("react");
|
14
14
|
var defaultTransform = function defaultTransform(data) {
|
15
15
|
return data === null || data === void 0 ? void 0 : data.list;
|
@@ -64,7 +64,7 @@ function useRequestList(service, options, useRequestOptions) {
|
|
64
64
|
var prevParams = (0, _ahooks.usePrevious)(params);
|
65
65
|
var prevSearchValues = (0, _ahooks.usePrevious)(searchValues);
|
66
66
|
(0, _react.useEffect)(function () {
|
67
|
-
if (prevParams && !(0,
|
67
|
+
if (prevParams && !(0, _isEqual2.default)(prevParams, params)) {
|
68
68
|
// @ts-ignore
|
69
69
|
run(params);
|
70
70
|
}
|
@@ -77,7 +77,7 @@ function useRequestList(service, options, useRequestOptions) {
|
|
77
77
|
});
|
78
78
|
}, [onPageChange]);
|
79
79
|
var onSearch = (0, _react.useCallback)(function (values) {
|
80
|
-
if (!(0,
|
80
|
+
if (!(0, _isEqual2.default)(prevSearchValues, values)) {
|
81
81
|
setSearchValues(function (p) {
|
82
82
|
return (0, _objectSpread3.default)((0, _objectSpread3.default)((0, _objectSpread3.default)({}, p), values), {}, {
|
83
83
|
timestamp: Date.now()
|
@@ -5,14 +5,21 @@ Object.defineProperty(exports, "__esModule", {
|
|
5
5
|
value: true
|
6
6
|
});
|
7
7
|
exports.default = void 0;
|
8
|
+
require("antd/es/table/style");
|
9
|
+
var _table = _interopRequireDefault(require("antd/es/table"));
|
10
|
+
require("antd/es/modal/style");
|
11
|
+
var _modal = _interopRequireDefault(require("antd/es/modal"));
|
12
|
+
require("antd/es/message/style");
|
13
|
+
var _message2 = _interopRequireDefault(require("antd/es/message"));
|
8
14
|
var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
|
15
|
+
require("antd/es/form/style");
|
16
|
+
var _form = _interopRequireDefault(require("antd/es/form"));
|
9
17
|
var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
|
10
18
|
var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
|
19
|
+
var _cloneDeep2 = _interopRequireDefault(require("lodash/cloneDeep"));
|
11
20
|
var _jsxRuntime = require("react/jsx-runtime");
|
12
21
|
var _icons = require("@ant-design/icons");
|
13
22
|
var _ahooks = require("ahooks");
|
14
|
-
var _antd = require("antd");
|
15
|
-
var _lodash = require("lodash");
|
16
23
|
var _react = require("react");
|
17
24
|
var _reactSvg = require("react-svg");
|
18
25
|
var _ProForm = _interopRequireDefault(require("../../../../ProForm"));
|
@@ -76,7 +83,7 @@ var EnumSelect = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
|
|
76
83
|
_useSetState2 = (0, _slicedToArray2.default)(_useSetState, 2),
|
77
84
|
state = _useSetState2[0],
|
78
85
|
setState = _useSetState2[1];
|
79
|
-
var _Form$useForm =
|
86
|
+
var _Form$useForm = _form.default.useForm(),
|
80
87
|
_Form$useForm2 = (0, _slicedToArray2.default)(_Form$useForm, 1),
|
81
88
|
form = _Form$useForm2[0];
|
82
89
|
var _useRequestList = (0, _useRequestList2.default)(fetchOptions, {
|
@@ -121,7 +128,7 @@ var EnumSelect = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
|
|
121
128
|
};
|
122
129
|
var handleFinish = function handleFinish() {
|
123
130
|
if (!state.selectedRows.length) {
|
124
|
-
|
131
|
+
_message2.default.error('请先勾选');
|
125
132
|
return false;
|
126
133
|
}
|
127
134
|
var formatterValueArr = state.selectedRows.map(function (row) {
|
@@ -137,8 +144,8 @@ var EnumSelect = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
|
|
137
144
|
// 点击行进行勾选
|
138
145
|
var handleClickRow = function handleClickRow(record) {
|
139
146
|
var selectedValue = record[rowKey];
|
140
|
-
var tempSelectedRows = (0,
|
141
|
-
var tempSelectedRowKeys = (0,
|
147
|
+
var tempSelectedRows = (0, _cloneDeep2.default)(state.selectedRows);
|
148
|
+
var tempSelectedRowKeys = (0, _cloneDeep2.default)(state.selectedRowKeys);
|
142
149
|
if (isMultiple) {
|
143
150
|
var rowIndex = tempSelectedRows.findIndex(function (item) {
|
144
151
|
return item[rowKey] === selectedValue;
|
@@ -234,7 +241,7 @@ var EnumSelect = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
|
|
234
241
|
onChange: handleChangeValue,
|
235
242
|
disabled: disabled,
|
236
243
|
suffix: forceSuffixRender()
|
237
|
-
}, restInputProps)), state.onOff && (0, _jsxRuntime.jsxs)(
|
244
|
+
}, restInputProps)), state.onOff && (0, _jsxRuntime.jsxs)(_modal.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({
|
238
245
|
className: "pro-enum-select-modal",
|
239
246
|
title: title,
|
240
247
|
width: "50%",
|
@@ -248,7 +255,7 @@ var EnumSelect = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
|
|
248
255
|
columns: conditionColumns,
|
249
256
|
onFinish: handleSearch,
|
250
257
|
footer: (conditionColumns === null || conditionColumns === void 0 ? void 0 : conditionColumns.length) > 1
|
251
|
-
}), (0, _jsxRuntime.jsx)(
|
258
|
+
}), (0, _jsxRuntime.jsx)(_table.default, (0, _objectSpread2.default)({
|
252
259
|
onRow: function onRow(record) {
|
253
260
|
return {
|
254
261
|
onClick: function onClick() {
|
@@ -5,11 +5,14 @@ Object.defineProperty(exports, "__esModule", {
|
|
5
5
|
value: true
|
6
6
|
});
|
7
7
|
exports.default = void 0;
|
8
|
+
require("antd/es/input-number/style");
|
9
|
+
var _inputNumber = _interopRequireDefault(require("antd/es/input-number"));
|
10
|
+
require("antd/es/input/style");
|
11
|
+
var _input = _interopRequireDefault(require("antd/es/input"));
|
8
12
|
var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
|
9
13
|
var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
|
10
14
|
var _jsxRuntime = require("react/jsx-runtime");
|
11
15
|
var _ahooks = require("ahooks");
|
12
|
-
var _antd = require("antd");
|
13
16
|
var _classnames = _interopRequireDefault(require("classnames"));
|
14
17
|
/* eslint-disable @typescript-eslint/no-shadow */
|
15
18
|
/* eslint-disable no-param-reassign */
|
@@ -56,10 +59,10 @@ var InputRange = function InputRange(_ref) {
|
|
56
59
|
'site-input-split': true,
|
57
60
|
'site-input-split-disabled': !!disabled
|
58
61
|
});
|
59
|
-
return (0, _jsxRuntime.jsxs)(
|
62
|
+
return (0, _jsxRuntime.jsxs)(_input.default.Group, {
|
60
63
|
compact: true,
|
61
64
|
className: "site-input-group-wrapper",
|
62
|
-
children: [(0, _jsxRuntime.jsx)(
|
65
|
+
children: [(0, _jsxRuntime.jsx)(_inputNumber.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({
|
63
66
|
className: "site-input-left",
|
64
67
|
style: {
|
65
68
|
textAlign: 'center'
|
@@ -75,7 +78,7 @@ var InputRange = function InputRange(_ref) {
|
|
75
78
|
range.min = e;
|
76
79
|
onUpdate();
|
77
80
|
}
|
78
|
-
}, group === null || group === void 0 ? void 0 : group[0]), positiveIntegerpValues)), (0, _jsxRuntime.jsx)(
|
81
|
+
}, group === null || group === void 0 ? void 0 : group[0]), positiveIntegerpValues)), (0, _jsxRuntime.jsx)(_input.default, {
|
79
82
|
className: cls,
|
80
83
|
style: {
|
81
84
|
width: 40,
|
@@ -84,7 +87,7 @@ var InputRange = function InputRange(_ref) {
|
|
84
87
|
},
|
85
88
|
placeholder: "~",
|
86
89
|
disabled: true
|
87
|
-
}), (0, _jsxRuntime.jsx)(
|
90
|
+
}), (0, _jsxRuntime.jsx)(_inputNumber.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({
|
88
91
|
className: "site-input-right",
|
89
92
|
style: {
|
90
93
|
textAlign: 'center'
|
@@ -6,9 +6,10 @@ Object.defineProperty(exports, "__esModule", {
|
|
6
6
|
});
|
7
7
|
exports.default = void 0;
|
8
8
|
var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
|
9
|
+
require("antd/es/input/style");
|
10
|
+
var _input = _interopRequireDefault(require("antd/es/input"));
|
9
11
|
var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
|
10
12
|
var _jsxRuntime = require("react/jsx-runtime");
|
11
|
-
var _antd = require("antd");
|
12
13
|
var _excluded = ["value", "onChange", "suffix", "formItemProps", "groupStyle", "InputStyle", "suffixWidth"];
|
13
14
|
var InputWithSuffix = function InputWithSuffix(props) {
|
14
15
|
var value = props.value,
|
@@ -23,12 +24,12 @@ var InputWithSuffix = function InputWithSuffix(props) {
|
|
23
24
|
suffixWidth = _props$suffixWidth === void 0 ? false : _props$suffixWidth,
|
24
25
|
restProps = (0, _objectWithoutProperties2.default)(props, _excluded);
|
25
26
|
var localSuffixWidht = suffixWidth || '36px';
|
26
|
-
return (0, _jsxRuntime.jsxs)(
|
27
|
+
return (0, _jsxRuntime.jsxs)(_input.default.Group, {
|
27
28
|
compact: true,
|
28
29
|
style: {
|
29
30
|
display: 'flex'
|
30
31
|
},
|
31
|
-
children: [(0, _jsxRuntime.jsx)(
|
32
|
+
children: [(0, _jsxRuntime.jsx)(_input.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({
|
32
33
|
value: value,
|
33
34
|
style: {
|
34
35
|
flex: '1'
|