@zat-design/sisyphus-react 3.13.8 → 3.13.10-deta.1
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/index.js +2 -2
- 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/index.js +8 -5
- 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 +4 -3
@@ -5,15 +5,19 @@ Object.defineProperty(exports, "__esModule", {
|
|
5
5
|
value: true
|
6
6
|
});
|
7
7
|
exports.default = void 0;
|
8
|
+
require("antd/es/button/style");
|
9
|
+
var _button = _interopRequireDefault(require("antd/es/button"));
|
8
10
|
var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
|
11
|
+
require("antd/es/space/style");
|
12
|
+
var _space = _interopRequireDefault(require("antd/es/space"));
|
9
13
|
var _regeneratorRuntime2 = _interopRequireDefault(require("@babel/runtime/helpers/regeneratorRuntime"));
|
10
14
|
var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
|
11
15
|
var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
|
12
16
|
var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
|
17
|
+
var _omit2 = _interopRequireDefault(require("lodash/omit"));
|
18
|
+
var _isFunction2 = _interopRequireDefault(require("lodash/isFunction"));
|
13
19
|
var _jsxRuntime = require("react/jsx-runtime");
|
14
|
-
var _antd = require("antd");
|
15
20
|
var _icons = require("@ant-design/icons");
|
16
|
-
var _lodash = require("lodash");
|
17
21
|
var _react = require("react");
|
18
22
|
var _locale = _interopRequireDefault(require("../../../../../locale"));
|
19
23
|
var _excluded = ["label", "onClick", "onHandle", "type"],
|
@@ -107,12 +111,12 @@ var ToolbarButton = function ToolbarButton(props) {
|
|
107
111
|
namePath: namePath
|
108
112
|
});
|
109
113
|
};
|
110
|
-
return (0, _jsxRuntime.jsx)(
|
114
|
+
return (0, _jsxRuntime.jsx)(_space.default, {
|
111
115
|
align: "start",
|
112
116
|
className: "pro-form-list-toolbar",
|
113
117
|
children: toolbarProps === null || toolbarProps === void 0 ? void 0 : toolbarProps.map(function (item, index) {
|
114
118
|
if (item.show === false) return (0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {});
|
115
|
-
if ((0,
|
119
|
+
if ((0, _isFunction2.default)(item.show) && !item.show(form.getFieldValue(namePath), {
|
116
120
|
namePath: namePath,
|
117
121
|
form: form
|
118
122
|
})) {
|
@@ -134,7 +138,7 @@ var ToolbarButton = function ToolbarButton(props) {
|
|
134
138
|
if (max && max <= fields.length && type === 'add') {
|
135
139
|
return false;
|
136
140
|
}
|
137
|
-
return (0, _jsxRuntime.jsx)(
|
141
|
+
return (0, _jsxRuntime.jsx)(_button.default, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, actions[type]), (0, _omit2.default)(rest, filterKeys)), {}, {
|
138
142
|
type: "link",
|
139
143
|
onClick: function onClick() {
|
140
144
|
return handleClick(internalOnClick, _onClick, item);
|
@@ -142,7 +146,7 @@ var ToolbarButton = function ToolbarButton(props) {
|
|
142
146
|
children: label || defaultLabel
|
143
147
|
}), "".concat(type).concat(index));
|
144
148
|
}
|
145
|
-
return (0, _jsxRuntime.jsx)(
|
149
|
+
return (0, _jsxRuntime.jsx)(_button.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _omit2.default)(rest, filterKeys)), {}, {
|
146
150
|
type: "link",
|
147
151
|
onClick: function onClick() {
|
148
152
|
return customClick(_onClick2, item);
|
@@ -5,13 +5,14 @@ Object.defineProperty(exports, "__esModule", {
|
|
5
5
|
value: true
|
6
6
|
});
|
7
7
|
exports.default = void 0;
|
8
|
+
require("antd/es/form/style");
|
9
|
+
var _form = _interopRequireDefault(require("antd/es/form"));
|
8
10
|
var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
|
9
11
|
var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
|
12
|
+
var _get2 = _interopRequireDefault(require("lodash/get"));
|
10
13
|
var _jsxRuntime = require("react/jsx-runtime");
|
11
14
|
var _react = require("react");
|
12
|
-
var _antd = require("antd");
|
13
15
|
var _core = require("@dnd-kit/core");
|
14
|
-
var _lodash = require("lodash");
|
15
16
|
var _sortable = require("@dnd-kit/sortable");
|
16
17
|
var _utils = require("../../../utils");
|
17
18
|
var _utils2 = require("./utils");
|
@@ -47,7 +48,7 @@ var FormList = function FormList(props, ref) {
|
|
47
48
|
isDiffAll = _useProConfig.isDiffAll;
|
48
49
|
var errors = meta.errors;
|
49
50
|
var _namePath = (0, _utils.toArray)(name);
|
50
|
-
var orgValues = (0,
|
51
|
+
var orgValues = (0, _get2.default)(diffConfig === null || diffConfig === void 0 ? void 0 : diffConfig.originalValues, name);
|
51
52
|
var _diffConfig = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, diffConfig), {}, {
|
52
53
|
originalValues: (diffConfig === null || diffConfig === void 0 ? void 0 : diffConfig.originalValues) && isDiffAll ? orgValues || [] : orgValues
|
53
54
|
});
|
@@ -131,7 +132,7 @@ var FormList = function FormList(props, ref) {
|
|
131
132
|
form: form,
|
132
133
|
diffConfig: _diffConfig
|
133
134
|
}), field.key);
|
134
|
-
}), (0, _jsxRuntime.jsx)(
|
135
|
+
}), (0, _jsxRuntime.jsx)(_form.default.ErrorList, {
|
135
136
|
errors: errors
|
136
137
|
}), toolbarProps !== false && (0, _jsxRuntime.jsx)(_ToolbarButton.default, {
|
137
138
|
disabled: disabled,
|
@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
|
|
5
5
|
value: true
|
6
6
|
});
|
7
7
|
exports.namesPathTransform = exports.memoWith = void 0;
|
8
|
-
var
|
8
|
+
var _isEqualWith2 = _interopRequireDefault(require("lodash/isEqualWith"));
|
9
9
|
var _react = _interopRequireDefault(require("react"));
|
10
10
|
/**
|
11
11
|
* namesPath生产 [['list', 0, 'min'], ['list', 0, 'max']] => list_0_min-list_0_max
|
@@ -29,7 +29,7 @@ var namesPathTransform = exports.namesPathTransform = function namesPathTransfor
|
|
29
29
|
};
|
30
30
|
// 比较memo
|
31
31
|
var memoWith = exports.memoWith = function memoWith(pre, next) {
|
32
|
-
return (0,
|
32
|
+
return (0, _isEqualWith2.default)(pre, next, function (objValue, othValue) {
|
33
33
|
if (/*#__PURE__*/_react.default.isValidElement(objValue) && /*#__PURE__*/_react.default.isValidElement(othValue)) {
|
34
34
|
return true;
|
35
35
|
}
|
@@ -7,8 +7,9 @@ Object.defineProperty(exports, "__esModule", {
|
|
7
7
|
exports.useTransformColumns = void 0;
|
8
8
|
var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
|
9
9
|
var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
|
10
|
+
var _isEqual2 = _interopRequireDefault(require("lodash/isEqual"));
|
11
|
+
var _cloneDeep2 = _interopRequireDefault(require("lodash/cloneDeep"));
|
10
12
|
var _react = require("react");
|
11
|
-
var _lodash = require("lodash");
|
12
13
|
var _useDeepCompareMemo = require("../../../../utils/useDeepCompareMemo");
|
13
14
|
var _tools = require("../../../../../ProEditTable/utils/tools");
|
14
15
|
var _utils = require("../utils");
|
@@ -111,7 +112,7 @@ var useTransformColumns = exports.useTransformColumns = function useTransformCol
|
|
111
112
|
}
|
112
113
|
internalChange === null || internalChange === void 0 ? void 0 : internalChange(newValue, args[1], index);
|
113
114
|
var values = form.getFieldValue(namePath);
|
114
|
-
var originRow = (namePath === null || namePath === void 0 ? void 0 : namePath.length) ? (0,
|
115
|
+
var originRow = (namePath === null || namePath === void 0 ? void 0 : namePath.length) ? (0, _cloneDeep2.default)(values) : undefined;
|
115
116
|
onChange === null || onChange === void 0 ? void 0 : onChange.apply(void 0, args);
|
116
117
|
onFieldChange === null || onFieldChange === void 0 ? void 0 : onFieldChange(newValue, values, {
|
117
118
|
index: outerIndex,
|
@@ -120,7 +121,7 @@ var useTransformColumns = exports.useTransformColumns = function useTransformCol
|
|
120
121
|
option: args === null || args === void 0 ? void 0 : args[1]
|
121
122
|
});
|
122
123
|
// 如果是在可编辑表格或formList内部, 储存当前行的值, 并在变更后更新到表单里
|
123
|
-
if ((namePath === null || namePath === void 0 ? void 0 : namePath.length) && !(0,
|
124
|
+
if ((namePath === null || namePath === void 0 ? void 0 : namePath.length) && !(0, _isEqual2.default)(originRow, values)) {
|
124
125
|
var _Object$keys, _Object$keys$map;
|
125
126
|
form.setFieldValue(namePath, values);
|
126
127
|
var diff = (0, _tools.difference)(originRow, values) || {};
|
@@ -6,12 +6,13 @@ 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/space/style");
|
10
|
+
var _space = _interopRequireDefault(require("antd/es/space"));
|
9
11
|
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
10
12
|
var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
|
13
|
+
var _omit2 = _interopRequireDefault(require("lodash/omit"));
|
11
14
|
var _jsxRuntime = require("react/jsx-runtime");
|
12
|
-
var _antd = require("antd");
|
13
15
|
var _react = _interopRequireDefault(require("react"));
|
14
|
-
var _lodash = require("lodash");
|
15
16
|
var _classnames2 = _interopRequireDefault(require("classnames"));
|
16
17
|
var _utils = require("./utils");
|
17
18
|
var _hooks = require("./hooks");
|
@@ -80,7 +81,7 @@ var Group = function Group(props) {
|
|
80
81
|
return (0, _jsxRuntime.jsx)("div", {
|
81
82
|
className: _className,
|
82
83
|
id: id,
|
83
|
-
children: space.compact || (space === null || space === void 0 ? void 0 : space.separator) ? (0, _jsxRuntime.jsx)(
|
84
|
+
children: space.compact || (space === null || space === void 0 ? void 0 : space.separator) ? (0, _jsxRuntime.jsx)(_space.default.Compact, {
|
84
85
|
children: columns.map(function (column, index) {
|
85
86
|
column.otherProps = otherProps;
|
86
87
|
// 自定义间隔移除对应参数
|
@@ -93,9 +94,9 @@ var Group = function Group(props) {
|
|
93
94
|
isView: isParentView || isView
|
94
95
|
}, column), column.name || index);
|
95
96
|
})
|
96
|
-
}) : (0, _jsxRuntime.jsx)(
|
97
|
+
}) : (0, _jsxRuntime.jsx)(_space.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({
|
97
98
|
align: "start"
|
98
|
-
}, (0,
|
99
|
+
}, (0, _omit2.default)(space, ['separator', 'compact'])), {}, {
|
99
100
|
children: columns.map(function (column, index) {
|
100
101
|
column.otherProps = otherProps;
|
101
102
|
if (column === null || column === void 0 ? void 0 : column.separator) {
|
@@ -8,10 +8,11 @@ exports.defaultGetValueFromEvent = defaultGetValueFromEvent;
|
|
8
8
|
exports.valueFromEventWrapper = exports.transformNamesString = exports.isUpperCase = exports.insertSeparator = exports.getValueTypeTrans = exports.getValueMiddleware = exports.getReactiveProps = void 0;
|
9
9
|
var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
|
10
10
|
var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
|
11
|
+
require("antd/es/button/style");
|
12
|
+
var _button = _interopRequireDefault(require("antd/es/button"));
|
13
|
+
var _isFunction2 = _interopRequireDefault(require("lodash/isFunction"));
|
11
14
|
var _jsxRuntime = require("react/jsx-runtime");
|
12
|
-
var _lodash = require("lodash");
|
13
15
|
var _utils = require("@zat-design/utils");
|
14
|
-
var _antd = require("antd");
|
15
16
|
var _valueType = _interopRequireDefault(require("../../../utils/valueType"));
|
16
17
|
/**
|
17
18
|
* 插入间隔符
|
@@ -44,7 +45,7 @@ var insertSeparator = exports.insertSeparator = function insertSeparator(columns
|
|
44
45
|
if (index === separatorIndex) {
|
45
46
|
result.push({
|
46
47
|
separator: true,
|
47
|
-
component: (0, _jsxRuntime.jsx)(
|
48
|
+
component: (0, _jsxRuntime.jsx)(_button.default, {
|
48
49
|
className: "group-separator",
|
49
50
|
children: space.separator
|
50
51
|
}),
|
@@ -59,7 +60,7 @@ var insertSeparator = exports.insertSeparator = function insertSeparator(columns
|
|
59
60
|
if (index < array.length - 1) {
|
60
61
|
result.push({
|
61
62
|
separator: true,
|
62
|
-
component: (0, _jsxRuntime.jsx)(
|
63
|
+
component: (0, _jsxRuntime.jsx)(_button.default, {
|
63
64
|
className: "group-separator",
|
64
65
|
children: space.separator
|
65
66
|
}),
|
@@ -124,27 +125,27 @@ var getReactiveProps = exports.getReactiveProps = function getReactiveProps(para
|
|
124
125
|
fieldProps = params.fieldProps,
|
125
126
|
desensitization = params.desensitization;
|
126
127
|
var values = namePath ? form.getFieldValue(namePath) : form.getFieldsValue();
|
127
|
-
var _disabled = (0,
|
128
|
+
var _disabled = (0, _isFunction2.default)(disabled) ? disabled(values, {
|
128
129
|
form: form,
|
129
130
|
index: index,
|
130
131
|
namePath: namePath
|
131
132
|
}) : disabled;
|
132
|
-
var _show = (0,
|
133
|
+
var _show = (0, _isFunction2.default)(show) ? show(values, {
|
133
134
|
form: form,
|
134
135
|
index: index,
|
135
136
|
namePath: namePath
|
136
137
|
}) : show;
|
137
|
-
var _component = (0,
|
138
|
+
var _component = (0, _isFunction2.default)(component) ? component(values, {
|
138
139
|
form: form,
|
139
140
|
index: index,
|
140
141
|
namePath: namePath
|
141
142
|
}) : component;
|
142
|
-
var _fieldProps = (0,
|
143
|
+
var _fieldProps = (0, _isFunction2.default)(fieldProps) ? fieldProps(values, {
|
143
144
|
form: form,
|
144
145
|
index: index,
|
145
146
|
namePath: namePath
|
146
147
|
}) : fieldProps;
|
147
|
-
var _desensitization = (0,
|
148
|
+
var _desensitization = (0, _isFunction2.default)(desensitization) ? desensitization(values, {
|
148
149
|
form: form,
|
149
150
|
index: index,
|
150
151
|
namePath: namePath
|
@@ -5,6 +5,10 @@ Object.defineProperty(exports, "__esModule", {
|
|
5
5
|
value: true
|
6
6
|
});
|
7
7
|
exports.default = void 0;
|
8
|
+
require("antd/es/tooltip/style");
|
9
|
+
var _tooltip = _interopRequireDefault(require("antd/es/tooltip"));
|
10
|
+
require("antd/es/cascader/style");
|
11
|
+
var _cascader = _interopRequireDefault(require("antd/es/cascader"));
|
8
12
|
var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
|
9
13
|
var _regeneratorRuntime2 = _interopRequireDefault(require("@babel/runtime/helpers/regeneratorRuntime"));
|
10
14
|
var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
|
@@ -12,10 +16,13 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
|
|
12
16
|
var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
|
13
17
|
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
14
18
|
var _objectSpread3 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
|
19
|
+
require("antd/es/typography/style");
|
20
|
+
var _typography = _interopRequireDefault(require("antd/es/typography"));
|
21
|
+
var _isBoolean2 = _interopRequireDefault(require("lodash/isBoolean"));
|
22
|
+
var _find = _interopRequireDefault(require("lodash/find"));
|
23
|
+
var _omit2 = _interopRequireDefault(require("lodash/omit"));
|
15
24
|
var _jsxRuntime = require("react/jsx-runtime");
|
16
25
|
var _react = require("react");
|
17
|
-
var _antd = require("antd");
|
18
|
-
var _lodash = require("lodash");
|
19
26
|
var _index = require("./utils/index");
|
20
27
|
var _ProConfigProvider = require("../../../../ProConfigProvider");
|
21
28
|
var _Input = _interopRequireDefault(require("../../base/Input"));
|
@@ -24,7 +31,7 @@ var _locale = _interopRequireDefault(require("../../../../locale"));
|
|
24
31
|
var _ = _interopRequireDefault(require("../../.."));
|
25
32
|
var _Container = _interopRequireDefault(require("../../Container"));
|
26
33
|
var _excluded = ["className", "hasDetail", "detailMaxLength", "fieldNames", "value", "disabled", "dataSource", "onChange", "useRequest", "transformResponse", "level", "isView", "enumCode", "code", "tooltip", "separator", "detailPlaceholder", "scrollFollowParent", "desensitization", "otherProps"];
|
27
|
-
var Text =
|
34
|
+
var Text = _typography.default.Text;
|
28
35
|
var defaultFieldNames = {
|
29
36
|
label: 'name',
|
30
37
|
value: 'code',
|
@@ -115,7 +122,7 @@ var ProCascader = function ProCascader(props) {
|
|
115
122
|
return result;
|
116
123
|
}, [isAddressMode, addressCode, realLevel, dataSource, enumDataSource === null || enumDataSource === void 0 ? void 0 : enumDataSource.length]);
|
117
124
|
var lastDisabled = (0, _react.useMemo)(function () {
|
118
|
-
if ((0,
|
125
|
+
if ((0, _isBoolean2.default)(disabled) || disabled === undefined) {
|
119
126
|
return [disabled, disabled];
|
120
127
|
}
|
121
128
|
return disabled;
|
@@ -235,7 +242,7 @@ var ProCascader = function ProCascader(props) {
|
|
235
242
|
}
|
236
243
|
// 尝试在当前层级的选项中查找匹配的 _value
|
237
244
|
var currentValue = _value[0];
|
238
|
-
var foundOption = (0,
|
245
|
+
var foundOption = (0, _find.default)(options, {
|
239
246
|
value: currentValue
|
240
247
|
});
|
241
248
|
if (foundOption) {
|
@@ -272,7 +279,7 @@ var ProCascader = function ProCascader(props) {
|
|
272
279
|
children: viewValue
|
273
280
|
}) : (0, _jsxRuntime.jsxs)("div", {
|
274
281
|
className: "pro-address ".concat(className),
|
275
|
-
children: [(0, _jsxRuntime.jsx)(
|
282
|
+
children: [(0, _jsxRuntime.jsx)(_cascader.default, (0, _objectSpread3.default)({
|
276
283
|
className: hasDetail ? '' : 'no-detail',
|
277
284
|
placeholder: _locale.default === null || _locale.default === void 0 ? void 0 : (_locale$ProAddressBar = _locale.default.ProAddressBar) === null || _locale$ProAddressBar === void 0 ? void 0 : _locale$ProAddressBar.placeholder,
|
278
285
|
value: addressValue,
|
@@ -287,7 +294,7 @@ var ProCascader = function ProCascader(props) {
|
|
287
294
|
getPopupContainer: function getPopupContainer(trigger) {
|
288
295
|
return scrollFollowParent ? trigger.parentElement : document.body;
|
289
296
|
}
|
290
|
-
}, (0,
|
297
|
+
}, (0, _omit2.default)(restProps, ['otherProps', 'scrollFollowParent']))), hasDetail && (tooltip && lastDisabled[1] && detail ? (0, _jsxRuntime.jsx)(_tooltip.default, {
|
291
298
|
title: detail,
|
292
299
|
children: (0, _jsxRuntime.jsx)("span", {
|
293
300
|
className: "pro-address-detail",
|
@@ -7,7 +7,7 @@ Object.defineProperty(exports, "__esModule", {
|
|
7
7
|
exports.transformDataName = void 0;
|
8
8
|
var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
|
9
9
|
var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
|
10
|
-
var
|
10
|
+
var _omit2 = _interopRequireDefault(require("lodash/omit"));
|
11
11
|
var _excluded = ["label", "value", "children"];
|
12
12
|
var transformDataName = exports.transformDataName = function transformDataName(dataSource, fieldNames) {
|
13
13
|
var label = fieldNames.label,
|
@@ -29,7 +29,7 @@ var transformDataName = exports.transformDataName = function transformDataName(d
|
|
29
29
|
if (children && Array.isArray(node[children])) {
|
30
30
|
newNode.children = node[children].map(transformNode);
|
31
31
|
}
|
32
|
-
return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, newNode), (0,
|
32
|
+
return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, newNode), (0, _omit2.default)(node, Object.values(fieldNames)));
|
33
33
|
}
|
34
34
|
var transformData = function transformData(data) {
|
35
35
|
return data.map(transformNode);
|
@@ -6,12 +6,17 @@ Object.defineProperty(exports, "__esModule", {
|
|
6
6
|
value: true
|
7
7
|
});
|
8
8
|
exports.default = exports.childPropsItemProps = exports.ProCombination = void 0;
|
9
|
+
require("antd/es/button/style");
|
10
|
+
var _button = _interopRequireDefault(require("antd/es/button"));
|
11
|
+
require("antd/es/input/style");
|
12
|
+
var _input = _interopRequireDefault(require("antd/es/input"));
|
13
|
+
require("antd/es/space/style");
|
14
|
+
var _space = _interopRequireDefault(require("antd/es/space"));
|
9
15
|
var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
|
10
16
|
var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
|
11
17
|
var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
|
12
18
|
var _jsxRuntime = require("react/jsx-runtime");
|
13
19
|
var _react = require("react");
|
14
|
-
var _antd = require("antd");
|
15
20
|
var _classnames = _interopRequireDefault(require("classnames"));
|
16
21
|
var _Container = _interopRequireDefault(require("../../Container"));
|
17
22
|
var componentMap = _interopRequireWildcard(require("../../index"));
|
@@ -159,7 +164,7 @@ var ProCombination = exports.ProCombination = function ProCombination(props) {
|
|
159
164
|
});
|
160
165
|
return (0, _jsxRuntime.jsx)(_Container.default, {
|
161
166
|
viewEmpty: viewEmpty,
|
162
|
-
children: (0, _jsxRuntime.jsx)(
|
167
|
+
children: (0, _jsxRuntime.jsx)(_space.default, {
|
163
168
|
size: 8,
|
164
169
|
children: !oneValue && !twoValue ? viewEmpty : (0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
|
165
170
|
children: [oneValue, separator, twoValue]
|
@@ -167,7 +172,7 @@ var ProCombination = exports.ProCombination = function ProCombination(props) {
|
|
167
172
|
})
|
168
173
|
});
|
169
174
|
}
|
170
|
-
return (0, _jsxRuntime.jsxs)(
|
175
|
+
return (0, _jsxRuntime.jsxs)(_input.default.Group, {
|
171
176
|
compact: true,
|
172
177
|
className: className,
|
173
178
|
id: id,
|
@@ -182,7 +187,7 @@ var ProCombination = exports.ProCombination = function ProCombination(props) {
|
|
182
187
|
return handleChange(value, rest, 0);
|
183
188
|
},
|
184
189
|
otherProps: beforeOtherProps
|
185
|
-
})), isView ? separator : separator && (0, _jsxRuntime.jsx)(
|
190
|
+
})), isView ? separator : separator && (0, _jsxRuntime.jsx)(_button.default, {
|
186
191
|
disabled: true,
|
187
192
|
children: separator
|
188
193
|
}), (0, _jsxRuntime.jsx)(AfterCom, (0, _objectSpread2.default)((0, _objectSpread2.default)({
|
@@ -11,8 +11,8 @@ var _regeneratorRuntime2 = _interopRequireDefault(require("@babel/runtime/helper
|
|
11
11
|
var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
|
12
12
|
var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
|
13
13
|
var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
|
14
|
+
var _isEqual2 = _interopRequireDefault(require("lodash/isEqual"));
|
14
15
|
var _ahooks = require("ahooks");
|
15
|
-
var _lodash = require("lodash");
|
16
16
|
var _react = require("react");
|
17
17
|
var _locale = _interopRequireWildcard(require("../../../../../locale"));
|
18
18
|
var defaultPage = {
|
@@ -88,7 +88,7 @@ function useRequestList(service, options, useRequestOptions) {
|
|
88
88
|
}),
|
89
89
|
queryList = _useDebounceFn.run;
|
90
90
|
(0, _react.useEffect)(function () {
|
91
|
-
if (prevParams && !(0,
|
91
|
+
if (prevParams && !(0, _isEqual2.default)(prevParams, params)) {
|
92
92
|
queryList();
|
93
93
|
}
|
94
94
|
}, [params, prevParams, queryList]);
|
@@ -100,7 +100,7 @@ function useRequestList(service, options, useRequestOptions) {
|
|
100
100
|
});
|
101
101
|
}, [onPageChange]);
|
102
102
|
var onSearch = (0, _react.useCallback)(function (values) {
|
103
|
-
if (!(0,
|
103
|
+
if (!(0, _isEqual2.default)(searchValues, values)) {
|
104
104
|
onChange(defaultPage.pageNum, defaultPage.pageSize);
|
105
105
|
setSearchValues(values);
|
106
106
|
}
|
@@ -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,
|