@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
package/lib/ProForm/index.js
CHANGED
@@ -6,17 +6,26 @@ Object.defineProperty(exports, "__esModule", {
|
|
6
6
|
value: true
|
7
7
|
});
|
8
8
|
exports.default = exports.ProFormProvider = void 0;
|
9
|
+
require("antd/es/row/style");
|
10
|
+
var _row = _interopRequireDefault(require("antd/es/row"));
|
11
|
+
require("antd/es/form/style");
|
12
|
+
var _form = _interopRequireDefault(require("antd/es/form"));
|
9
13
|
var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
|
14
|
+
require("antd/es/col/style");
|
15
|
+
var _col = _interopRequireDefault(require("antd/es/col"));
|
10
16
|
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
11
17
|
var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
|
18
|
+
require("antd/es/space/style");
|
19
|
+
var _space = _interopRequireDefault(require("antd/es/space"));
|
12
20
|
var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
|
13
21
|
var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
|
22
|
+
var _omit2 = _interopRequireDefault(require("lodash/omit"));
|
23
|
+
var _merge2 = _interopRequireDefault(require("lodash/merge"));
|
24
|
+
var _isObject2 = _interopRequireDefault(require("lodash/isObject"));
|
14
25
|
var _jsxRuntime = require("react/jsx-runtime");
|
15
26
|
var _icons = require("@ant-design/icons");
|
16
|
-
var _antd = require("antd");
|
17
27
|
var _classnames2 = _interopRequireDefault(require("classnames"));
|
18
28
|
var _react = _interopRequireWildcard(require("react"));
|
19
|
-
var _lodash = require("lodash");
|
20
29
|
var _components = require("./components");
|
21
30
|
var _RenderFields = _interopRequireDefault(require("./components/render/RenderFields"));
|
22
31
|
var _ProConfigProvider = require("../ProConfigProvider");
|
@@ -132,12 +141,12 @@ var ProForm = function ProForm(props, ref) {
|
|
132
141
|
return !!expand && columns.length > Number(expand) && (0, _jsxRuntime.jsx)("div", {
|
133
142
|
className: "expand-button",
|
134
143
|
onClick: expandHandle,
|
135
|
-
children: !openState ? (0, _jsxRuntime.jsxs)(
|
144
|
+
children: !openState ? (0, _jsxRuntime.jsxs)(_space.default, {
|
136
145
|
align: "center",
|
137
146
|
children: [_locale.default.ProForm.unfold, (0, _jsxRuntime.jsx)(_icons.DoubleLeftOutlined, {
|
138
147
|
className: "rotate-to-bottom"
|
139
148
|
})]
|
140
|
-
}) : (0, _jsxRuntime.jsxs)(
|
149
|
+
}) : (0, _jsxRuntime.jsxs)(_space.default, {
|
141
150
|
align: "center",
|
142
151
|
children: [_locale.default.ProForm.packUp, (0, _jsxRuntime.jsx)(_icons.DoubleLeftOutlined, {
|
143
152
|
className: "rotate-to-top"
|
@@ -179,7 +188,7 @@ var ProForm = function ProForm(props, ref) {
|
|
179
188
|
}
|
180
189
|
return {};
|
181
190
|
});
|
182
|
-
onValuesChange((0, _index.filterInternalFields)(
|
191
|
+
onValuesChange((0, _index.filterInternalFields)(_merge2.default.apply(void 0, [changedValue].concat((0, _toConsumableArray2.default)(values))), optimize), form.getFieldsValue());
|
183
192
|
}
|
184
193
|
};
|
185
194
|
// 包装一层兼容 names 改变
|
@@ -201,16 +210,16 @@ var ProForm = function ProForm(props, ref) {
|
|
201
210
|
} else if (/*#__PURE__*/_react.default.isValidElement(footer)) {
|
202
211
|
// 传入组件渲染组件
|
203
212
|
footerEle = footer;
|
204
|
-
} else if (footer === undefined || footer || (0,
|
213
|
+
} else if (footer === undefined || footer || (0, _isObject2.default)(footer)) {
|
205
214
|
// 不传或者传入对象 渲染默认
|
206
215
|
footerEle = defaultFooter(footer);
|
207
216
|
}
|
208
217
|
// 展开折叠按钮
|
209
218
|
var expandEle = expandRender();
|
210
219
|
var hasElement = footerEle || expandEle;
|
211
|
-
return hasElement ? (0, _jsxRuntime.jsx)(
|
220
|
+
return hasElement ? (0, _jsxRuntime.jsx)(_col.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, colProps), {}, {
|
212
221
|
className: footerCls,
|
213
|
-
children: (0, _jsxRuntime.jsxs)(
|
222
|
+
children: (0, _jsxRuntime.jsxs)(_space.default, {
|
214
223
|
align: "center",
|
215
224
|
children: [footerEle, expandEle]
|
216
225
|
})
|
@@ -226,7 +235,7 @@ var ProForm = function ProForm(props, ref) {
|
|
226
235
|
otherProps.layout = otherProps.layout || 'vertical';
|
227
236
|
}
|
228
237
|
}
|
229
|
-
return (0, _jsxRuntime.jsxs)(
|
238
|
+
return (0, _jsxRuntime.jsxs)(_form.default, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({
|
230
239
|
onKeyPress: function onKeyPress(event) {
|
231
240
|
if (!submitOnEnter) return;
|
232
241
|
if (event.key === 'Enter') {
|
@@ -235,7 +244,7 @@ var ProForm = function ProForm(props, ref) {
|
|
235
244
|
},
|
236
245
|
className: cls,
|
237
246
|
form: form
|
238
|
-
}, formProps), (0,
|
247
|
+
}, formProps), (0, _omit2.default)(config, ['isDiffAll'])), otherProps), {}, {
|
239
248
|
labelAlign: (_ref3 = labelAlign !== null && labelAlign !== void 0 ? labelAlign : config.labelAlign) !== null && _ref3 !== void 0 ? _ref3 : 'left',
|
240
249
|
onValuesChange: handleValuesChange,
|
241
250
|
onFinish: handleFinish,
|
@@ -244,7 +253,7 @@ var ProForm = function ProForm(props, ref) {
|
|
244
253
|
block: 'center',
|
245
254
|
behavior: 'smooth'
|
246
255
|
},
|
247
|
-
children: [(0, _jsxRuntime.jsxs)(
|
256
|
+
children: [(0, _jsxRuntime.jsxs)(_row.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({
|
248
257
|
gutter: 24
|
249
258
|
}, rowProps), {}, {
|
250
259
|
children: [(0, _jsxRuntime.jsx)(_RenderFields.default, {
|
@@ -298,7 +307,7 @@ var ProFormProvider = exports.ProFormProvider = function ProFormProvider(props)
|
|
298
307
|
// @ts-ignore
|
299
308
|
onFormChange(formName, info);
|
300
309
|
};
|
301
|
-
return (0, _jsxRuntime.jsx)(
|
310
|
+
return (0, _jsxRuntime.jsx)(_form.default.Provider, {
|
302
311
|
onFormChange: onFormChange ? handleFormChange : undefined,
|
303
312
|
onFormFinish: onFormFinish,
|
304
313
|
children: children
|
@@ -1,11 +1,13 @@
|
|
1
1
|
"use strict";
|
2
2
|
|
3
|
+
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
|
3
4
|
Object.defineProperty(exports, "__esModule", {
|
4
5
|
value: true
|
5
6
|
});
|
6
7
|
exports.useChanged = void 0;
|
7
|
-
|
8
|
-
var
|
8
|
+
require("antd/es/form/style");
|
9
|
+
var _form = _interopRequireDefault(require("antd/es/form"));
|
10
|
+
var _get2 = _interopRequireDefault(require("lodash/get"));
|
9
11
|
var _diffOriginal = require("./diffOriginal");
|
10
12
|
var useChanged = exports.useChanged = function useChanged(_ref) {
|
11
13
|
var name = _ref.name,
|
@@ -15,11 +17,11 @@ var useChanged = exports.useChanged = function useChanged(_ref) {
|
|
15
17
|
form = _ref.form,
|
16
18
|
onDiff = _ref.onDiff;
|
17
19
|
var originalValue = (names === null || names === void 0 ? void 0 : names.length) ? names.map(function (name) {
|
18
|
-
return (0,
|
19
|
-
}) : (0,
|
20
|
+
return (0, _get2.default)(originalValues, name);
|
21
|
+
}) : (0, _get2.default)(originalValues, name);
|
20
22
|
var notWatch = !onDiff && (!originalValues || originalValue === undefined);
|
21
23
|
if (notWatch) return [false];
|
22
|
-
var value =
|
24
|
+
var value = _form.default.useWatch(namesStr || name, form);
|
23
25
|
var changed = (0, _diffOriginal.diffOriginal)({
|
24
26
|
originalValue: originalValue,
|
25
27
|
value: value,
|
@@ -1,11 +1,13 @@
|
|
1
1
|
"use strict";
|
2
2
|
|
3
|
+
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
|
3
4
|
Object.defineProperty(exports, "__esModule", {
|
4
5
|
value: true
|
5
6
|
});
|
6
7
|
exports.useListChanged = void 0;
|
7
|
-
|
8
|
-
var
|
8
|
+
require("antd/es/form/style");
|
9
|
+
var _form2 = _interopRequireDefault(require("antd/es/form"));
|
10
|
+
var _get2 = _interopRequireDefault(require("lodash/get"));
|
9
11
|
var _diffOriginal = require("./diffOriginal");
|
10
12
|
var toNamePath = function toNamePath(name) {
|
11
13
|
if (Array.isArray(name)) {
|
@@ -35,14 +37,14 @@ var getOriginalValue = function getOriginalValue(_ref) {
|
|
35
37
|
if (!rowValue) return undefined;
|
36
38
|
var keyValue = rowValue[rowKeyName]; // 获取表单中rowKey值
|
37
39
|
if (!keyValue) return undefined;
|
38
|
-
var originalValueList = (0,
|
40
|
+
var originalValueList = (0, _get2.default)(originalValues, originalName.slice(0, rowKeyPath.length - 2));
|
39
41
|
var originalValueRow = originalValueList.find(function (item) {
|
40
42
|
return item[rowKeyPath[rowKeyPath.length - 1]] === keyValue;
|
41
43
|
});
|
42
44
|
var originalValue;
|
43
45
|
if (originalNames === null || originalNames === void 0 ? void 0 : originalNames.length) {
|
44
46
|
var originalNamesValue = originalNames.map(function (originalName) {
|
45
|
-
return (0,
|
47
|
+
return (0, _get2.default)(originalValueRow, originalName.slice(rowKeyPath.length - 1));
|
46
48
|
});
|
47
49
|
// 有可能出现数组中全是undefined的情况 视为没有值
|
48
50
|
var fillUndefined = originalNamesValue.every(function (valItem) {
|
@@ -50,14 +52,14 @@ var getOriginalValue = function getOriginalValue(_ref) {
|
|
50
52
|
});
|
51
53
|
originalValue = fillUndefined ? undefined : originalNamesValue;
|
52
54
|
} else {
|
53
|
-
originalValue = (0,
|
55
|
+
originalValue = (0, _get2.default)(originalValueRow, originalName.slice(rowKeyPath.length - 1));
|
54
56
|
}
|
55
57
|
return originalValue;
|
56
58
|
}
|
57
59
|
// 这个方法是给editTable专用的 暂时不存在不传rowKey的情况
|
58
60
|
return (originalNames === null || originalNames === void 0 ? void 0 : originalNames.length) ? originalNames.map(function (originalName) {
|
59
|
-
return (0,
|
60
|
-
}) : (0,
|
61
|
+
return (0, _get2.default)(originalValues, originalName);
|
62
|
+
}) : (0, _get2.default)(originalValues, originalName);
|
61
63
|
};
|
62
64
|
var useListChanged = exports.useListChanged = function useListChanged(params) {
|
63
65
|
var name = params.name,
|
@@ -86,7 +88,7 @@ var useListChanged = exports.useListChanged = function useListChanged(params) {
|
|
86
88
|
var noChange = !onDiff && (!originalValues || originalValue === undefined);
|
87
89
|
var _form = form;
|
88
90
|
if (notWatch || noChange) return [false];
|
89
|
-
var value =
|
91
|
+
var value = _form2.default.useWatch(namePath, _form);
|
90
92
|
var changed = (0, _diffOriginal.diffOriginal)({
|
91
93
|
value: value,
|
92
94
|
originalValue: originalValue,
|
@@ -1,15 +1,18 @@
|
|
1
1
|
"use strict";
|
2
2
|
|
3
|
+
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
|
3
4
|
Object.defineProperty(exports, "__esModule", {
|
4
5
|
value: true
|
5
6
|
});
|
6
7
|
exports.diffOriginal = void 0;
|
7
|
-
var
|
8
|
+
var _isObject2 = _interopRequireDefault(require("lodash/isObject"));
|
9
|
+
var _isFunction2 = _interopRequireDefault(require("lodash/isFunction"));
|
10
|
+
var _isEqual2 = _interopRequireDefault(require("lodash/isEqual"));
|
8
11
|
var _utils = require("../../utils");
|
9
12
|
// 过滤对象中undefined字段
|
10
13
|
// 防止{a: '1'} {a: '1', b: undefined | null}被认为不相等
|
11
14
|
var filterObject = function filterObject(data) {
|
12
|
-
if (!(0,
|
15
|
+
if (!(0, _isObject2.default)(data) || data === null) return data;
|
13
16
|
// ['1', undefined] ['1', ''] 视为相等
|
14
17
|
if (Array.isArray(data)) {
|
15
18
|
// 数组中全是empty值的话 视为null
|
@@ -38,7 +41,7 @@ var diffOriginal = exports.diffOriginal = function diffOriginal(params) {
|
|
38
41
|
value = params.value,
|
39
42
|
onDiff = params.onDiff;
|
40
43
|
// 支持传入自定义比较事件
|
41
|
-
if ((0,
|
44
|
+
if ((0, _isFunction2.default)(onDiff)) {
|
42
45
|
var diffRes = onDiff(originalValue, value);
|
43
46
|
// 如果返回undefined走内置比较逻辑
|
44
47
|
if (diffRes !== undefined) {
|
@@ -56,5 +59,5 @@ var diffOriginal = exports.diffOriginal = function diffOriginal(params) {
|
|
56
59
|
if (isEmptyOrg && isEmptyVal) return 'same';
|
57
60
|
// 如果原始值为空 且当前有值的话 视为新增
|
58
61
|
if (isEmptyOrg && !isEmptyVal) return 'add';
|
59
|
-
return (0,
|
62
|
+
return (0, _isEqual2.default)(_value, _originalValue) ? 'same' : 'changed';
|
60
63
|
};
|
@@ -1,10 +1,12 @@
|
|
1
1
|
"use strict";
|
2
2
|
|
3
|
+
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
|
3
4
|
Object.defineProperty(exports, "__esModule", {
|
4
5
|
value: true
|
5
6
|
});
|
6
7
|
exports.getDefaultProps = void 0;
|
7
|
-
var
|
8
|
+
var _isEqual2 = _interopRequireDefault(require("lodash/isEqual"));
|
9
|
+
var _get2 = _interopRequireDefault(require("lodash/get"));
|
8
10
|
var defaultPropsMap = {
|
9
11
|
ProSelect: function ProSelect(props) {
|
10
12
|
var fieldProps = props.fieldProps,
|
@@ -18,13 +20,13 @@ var defaultPropsMap = {
|
|
18
20
|
var _listName = namePath.slice(0, -1);
|
19
21
|
var _namePath = name.slice(1);
|
20
22
|
defaultProps.shouldUpdate = function (preValues, curValues) {
|
21
|
-
var preListValue = (0,
|
22
|
-
return (0,
|
23
|
+
var preListValue = (0, _get2.default)(preValues, _listName).map(function (item) {
|
24
|
+
return (0, _get2.default)(item, _namePath);
|
23
25
|
});
|
24
|
-
var curListValue = (0,
|
25
|
-
return (0,
|
26
|
+
var curListValue = (0, _get2.default)(curValues, _listName).map(function (item) {
|
27
|
+
return (0, _get2.default)(item, _namePath);
|
26
28
|
});
|
27
|
-
return !(0,
|
29
|
+
return !(0, _isEqual2.default)(preListValue, curListValue);
|
28
30
|
};
|
29
31
|
}
|
30
32
|
return defaultProps;
|
@@ -18,9 +18,14 @@ var _createForOfIteratorHelper2 = _interopRequireDefault(require("@babel/runtime
|
|
18
18
|
var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
|
19
19
|
var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
|
20
20
|
var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
|
21
|
+
var _isNaN2 = _interopRequireDefault(require("lodash/isNaN"));
|
22
|
+
var _omit2 = _interopRequireDefault(require("lodash/omit"));
|
23
|
+
var _set2 = _interopRequireDefault(require("lodash/set"));
|
24
|
+
var _get2 = _interopRequireDefault(require("lodash/get"));
|
25
|
+
var _isFunction2 = _interopRequireDefault(require("lodash/isFunction"));
|
26
|
+
var _isObject2 = _interopRequireDefault(require("lodash/isObject"));
|
21
27
|
var _react = _interopRequireWildcard(require("react"));
|
22
28
|
var _moment = _interopRequireDefault(require("moment"));
|
23
|
-
var _lodash = _interopRequireWildcard(require("lodash"));
|
24
29
|
var getLayout = exports.getLayout = function getLayout(params) {
|
25
30
|
var _params$span = params.span,
|
26
31
|
span = _params$span === void 0 ? 8 : _params$span,
|
@@ -126,7 +131,7 @@ var weedOutProps = exports.weedOutProps = function weedOutProps(data, keys) {
|
|
126
131
|
// 对比字段变化
|
127
132
|
var diffField = exports.diffField = function diffField(prevValues, curValues, names) {
|
128
133
|
return names.some(function (name) {
|
129
|
-
return
|
134
|
+
return (0, _get2.default)(prevValues, name) !== (0, _get2.default)(curValues, name);
|
130
135
|
});
|
131
136
|
};
|
132
137
|
// 表单name展开
|
@@ -153,7 +158,7 @@ var _filterInternalFields = exports.filterInternalFields = function filterIntern
|
|
153
158
|
return _filterInternalFields(item);
|
154
159
|
});
|
155
160
|
}
|
156
|
-
if ((0,
|
161
|
+
if ((0, _isObject2.default)(nextValues)) {
|
157
162
|
var result = {};
|
158
163
|
Object.keys(nextValues).forEach(function (key) {
|
159
164
|
if (key.includes('-')) return;
|
@@ -176,7 +181,7 @@ var _getAllNamePath = exports.getAllNamePath = function getAllNamePath(object) {
|
|
176
181
|
}));
|
177
182
|
}
|
178
183
|
// 深度获取对象key
|
179
|
-
if ((0,
|
184
|
+
if ((0, _isObject2.default)(value)) {
|
180
185
|
resultKeys.concat(_getAllNamePath(value, [].concat((0, _toConsumableArray2.default)(currentPath), [key])));
|
181
186
|
}
|
182
187
|
resultKeys.push([].concat((0, _toConsumableArray2.default)(currentPath), [key]));
|
@@ -282,9 +287,9 @@ function initialValuesToNames() {
|
|
282
287
|
}).join('-');
|
283
288
|
var formInitialValue = item.names.map(function (name, index) {
|
284
289
|
if (item.initialValue) {
|
285
|
-
(0,
|
290
|
+
(0, _set2.default)(values, name, item.initialValue[index]);
|
286
291
|
}
|
287
|
-
return (0,
|
292
|
+
return (0, _get2.default)(values, name);
|
288
293
|
});
|
289
294
|
// 过滤掉不存在的初始值 防止names字段值为空数组
|
290
295
|
var namesInitialValue = formInitialValue.filter(function (item) {
|
@@ -295,7 +300,7 @@ function initialValuesToNames() {
|
|
295
300
|
}
|
296
301
|
}
|
297
302
|
// 给FormList默认增加一行
|
298
|
-
if (item.type === 'FormList' && !item.initialValue && !(0,
|
303
|
+
if (item.type === 'FormList' && !item.initialValue && !(0, _get2.default)(values, item.name)) {
|
299
304
|
item.initialValue = [{}];
|
300
305
|
}
|
301
306
|
});
|
@@ -313,7 +318,7 @@ function getArrayBeforeNumber(arr) {
|
|
313
318
|
}
|
314
319
|
// 自定义深比对 如果两边都是函数类型则认为相等
|
315
320
|
var customEqualForFun = exports.customEqualForFun = function customEqualForFun(value, other) {
|
316
|
-
if ((0,
|
321
|
+
if ((0, _isFunction2.default)(value) && (0, _isFunction2.default)(other) || /*#__PURE__*/_react.default.isValidElement(value) && /*#__PURE__*/_react.default.isValidElement(other)) {
|
317
322
|
return true;
|
318
323
|
}
|
319
324
|
};
|
@@ -383,18 +388,18 @@ var deleteForPath = exports.deleteForPath = function deleteForPath(values, nameP
|
|
383
388
|
* @returns {}
|
384
389
|
*/
|
385
390
|
var _findOptionByValue = exports.findOptionByValue = function findOptionByValue(treeData, value, fieldNames) {
|
386
|
-
if ((0,
|
391
|
+
if ((0, _isObject2.default)(value)) {
|
387
392
|
return value;
|
388
393
|
}
|
389
394
|
for (var i = 0; i < (treeData === null || treeData === void 0 ? void 0 : treeData.length); i++) {
|
390
395
|
var node = treeData[i];
|
391
396
|
if (node[(fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.value) || 'value'] === value) {
|
392
|
-
return (0,
|
397
|
+
return (0, _omit2.default)(node, ['children', fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children]);
|
393
398
|
}
|
394
399
|
if (node.children) {
|
395
400
|
var foundNode = _findOptionByValue(node[(fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children) || 'children'], value, fieldNames);
|
396
401
|
if (foundNode) {
|
397
|
-
return (0,
|
402
|
+
return (0, _omit2.default)(foundNode, ['children', fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children]);
|
398
403
|
}
|
399
404
|
}
|
400
405
|
}
|
@@ -405,8 +410,8 @@ var _findOptionByValue = exports.findOptionByValue = function findOptionByValue(
|
|
405
410
|
var equalDependencies = exports.equalDependencies = function equalDependencies(dependencies, prevValues, currentValues) {
|
406
411
|
if (dependencies === null || dependencies === void 0 ? void 0 : dependencies.length) {
|
407
412
|
return dependencies.some(function (namePath) {
|
408
|
-
var prevValue = (0,
|
409
|
-
var currentValue = (0,
|
413
|
+
var prevValue = (0, _get2.default)(prevValues, namePath);
|
414
|
+
var currentValue = (0, _get2.default)(currentValues, namePath);
|
410
415
|
return prevValue !== currentValue;
|
411
416
|
});
|
412
417
|
}
|
@@ -416,12 +421,12 @@ var equalDependencies = exports.equalDependencies = function equalDependencies(d
|
|
416
421
|
var parseNamePath = exports.parseNamePath = function parseNamePath(input) {
|
417
422
|
var parts = input.split('_');
|
418
423
|
if (parts.every(function (item) {
|
419
|
-
return (0,
|
424
|
+
return (0, _isNaN2.default)(Number(item));
|
420
425
|
})) {
|
421
426
|
return [input];
|
422
427
|
}
|
423
428
|
var result = parts.map(function (item) {
|
424
|
-
return (0,
|
429
|
+
return (0, _isNaN2.default)(Number(item)) ? item : Number(item);
|
425
430
|
});
|
426
431
|
return [result];
|
427
432
|
};
|
@@ -7,14 +7,15 @@ Object.defineProperty(exports, "__esModule", {
|
|
7
7
|
});
|
8
8
|
exports.rulesCreator = void 0;
|
9
9
|
var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
|
10
|
+
var _isNumber2 = _interopRequireDefault(require("lodash/isNumber"));
|
11
|
+
var _isString2 = _interopRequireDefault(require("lodash/isString"));
|
10
12
|
var _utils = require("@zat-design/utils");
|
11
|
-
var _lodash = require("lodash");
|
12
13
|
var _index = require("./index");
|
13
14
|
var _locale = _interopRequireWildcard(require("../../locale"));
|
14
15
|
var getNonEmptyValuesByIndex = function getNonEmptyValuesByIndex(required, valueArray) {
|
15
16
|
var result = [];
|
16
17
|
required.forEach(function (item, index) {
|
17
|
-
if (item && !(valueArray === null || valueArray === void 0 ? void 0 : valueArray[index]) && !(0,
|
18
|
+
if (item && !(valueArray === null || valueArray === void 0 ? void 0 : valueArray[index]) && !(0, _isNumber2.default)(valueArray === null || valueArray === void 0 ? void 0 : valueArray[index])) {
|
18
19
|
result.push(index + 1);
|
19
20
|
}
|
20
21
|
});
|
@@ -28,7 +29,7 @@ var rulesCreator = exports.rulesCreator = function rulesCreator(_ref) {
|
|
28
29
|
isSelect = _ref.isSelect,
|
29
30
|
names = _ref.names,
|
30
31
|
required = _ref.required;
|
31
|
-
var message = "".concat(isSelect ? "".concat(_locale.default.ProForm.selectPlaceHolder) : "".concat(_locale.default.ProForm.inputPlaceholder)).concat(_locale.default.ProForm.ruleText).concat((0,
|
32
|
+
var message = "".concat(isSelect ? "".concat(_locale.default.ProForm.selectPlaceHolder) : "".concat(_locale.default.ProForm.inputPlaceholder)).concat(_locale.default.ProForm.ruleText).concat((0, _isString2.default)(label) ? label : '');
|
32
33
|
var result = [];
|
33
34
|
if (Array.isArray(rules)) {
|
34
35
|
result = rules.map(function (ruleItem) {
|
@@ -1,10 +1,11 @@
|
|
1
1
|
"use strict";
|
2
2
|
|
3
|
+
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
|
3
4
|
Object.defineProperty(exports, "__esModule", {
|
4
5
|
value: true
|
5
6
|
});
|
6
7
|
exports.default = void 0;
|
7
|
-
var
|
8
|
+
var _union2 = _interopRequireDefault(require("lodash/union"));
|
8
9
|
var _transformValue2 = require("./transformValue");
|
9
10
|
var transformNames = function transformNames(formItem, form, names, fieldName, type) {
|
10
11
|
var _ref = formItem || {},
|
@@ -15,7 +16,7 @@ var transformNames = function transformNames(formItem, form, names, fieldName, t
|
|
15
16
|
return {};
|
16
17
|
}
|
17
18
|
// 当在formList场景下,给transformValue函数的setFiledProps的name, 需要全namePath
|
18
|
-
var _fieldName = Array.isArray(formItem === null || formItem === void 0 ? void 0 : formItem.name) ? (0,
|
19
|
+
var _fieldName = Array.isArray(formItem === null || formItem === void 0 ? void 0 : formItem.name) ? (0, _union2.default)(formItem === null || formItem === void 0 ? void 0 : formItem.namePath, formItem === null || formItem === void 0 ? void 0 : formItem.name) : fieldName;
|
19
20
|
var _transformValue = (0, _transformValue2.transformValue)(names, form, _fieldName, normalize, getValueProps),
|
20
21
|
_normalize = _transformValue.normalize,
|
21
22
|
_getValueProps = _transformValue.getValueProps,
|
@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
|
|
6
6
|
});
|
7
7
|
exports.transformValue = exports.default = void 0;
|
8
8
|
var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
|
9
|
-
var
|
9
|
+
var _set2 = _interopRequireDefault(require("lodash/set"));
|
10
10
|
var _utils = require("../utils");
|
11
11
|
var _utils2 = require("../../utils");
|
12
12
|
var transformValue = exports.transformValue = function transformValue(names, form, fieldName, _normalize, _getValueProps) {
|
@@ -22,7 +22,7 @@ var transformValue = exports.transformValue = function transformValue(names, for
|
|
22
22
|
}
|
23
23
|
names.forEach(function (name, index) {
|
24
24
|
var _value2;
|
25
|
-
(0,
|
25
|
+
(0, _set2.default)(form.getFieldsValue(true), name, (_value2 = _value) === null || _value2 === void 0 ? void 0 : _value2[index]);
|
26
26
|
});
|
27
27
|
return _value;
|
28
28
|
},
|
@@ -52,7 +52,7 @@ var transformValue = exports.transformValue = function transformValue(names, for
|
|
52
52
|
}
|
53
53
|
// 如果来源是比对且有names场景, 则不更新表单值
|
54
54
|
if (!isOrigin) {
|
55
|
-
(0,
|
55
|
+
(0, _set2.default)(form.getFieldsValue(true), fieldName, curValue);
|
56
56
|
}
|
57
57
|
// 如果表单里的值和组合得到的值不全等 更新表单里的值、
|
58
58
|
return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, res), {}, {
|
@@ -1,17 +1,18 @@
|
|
1
1
|
"use strict";
|
2
2
|
|
3
|
+
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
|
3
4
|
Object.defineProperty(exports, "__esModule", {
|
4
5
|
value: true
|
5
6
|
});
|
6
7
|
exports.useDeepCompareMemo = void 0;
|
8
|
+
var _isEqualWith2 = _interopRequireDefault(require("lodash/isEqualWith"));
|
7
9
|
var _react = require("react");
|
8
|
-
var _lodash = require("lodash");
|
9
10
|
var _ = require(".");
|
10
11
|
/** 深度比较依赖变化memo */
|
11
12
|
var useDeepCompareMemo = exports.useDeepCompareMemo = function useDeepCompareMemo(fun, changedCb, depList) {
|
12
13
|
var lastDependency = (0, _react.useRef)(); // 上一次的依赖
|
13
14
|
var lastRes = (0, _react.useRef)(); // 上一次的结果
|
14
|
-
if (!(0,
|
15
|
+
if (!(0, _isEqualWith2.default)(depList, lastDependency.current, _.customEqualForFun)) {
|
15
16
|
var res = fun();
|
16
17
|
changedCb === null || changedCb === void 0 ? void 0 : changedCb(lastRes.current, res);
|
17
18
|
lastRes.current = res;
|
@@ -10,8 +10,9 @@ var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers
|
|
10
10
|
var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
|
11
11
|
var _createForOfIteratorHelper2 = _interopRequireDefault(require("@babel/runtime/helpers/createForOfIteratorHelper"));
|
12
12
|
var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
|
13
|
+
require("antd/es/form/style");
|
14
|
+
var _form = _interopRequireDefault(require("antd/es/form"));
|
13
15
|
var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
|
14
|
-
var _antd = require("antd");
|
15
16
|
var _react = require("react");
|
16
17
|
var _index = require("./index");
|
17
18
|
var _tools = require("../../ProEditTable/utils/tools");
|
@@ -31,7 +32,7 @@ var useForm = exports.useForm = function useForm(originForm, options) {
|
|
31
32
|
source = _ref.source;
|
32
33
|
// formKey全局共享逻辑
|
33
34
|
var forms = (0, _react.useContext)(_FormsProvider.FormsContext);
|
34
|
-
var _Form$useForm =
|
35
|
+
var _Form$useForm = _form.default.useForm(forms[formKey] || _originForm),
|
35
36
|
_Form$useForm2 = (0, _slicedToArray2.default)(_Form$useForm, 1),
|
36
37
|
form = _Form$useForm2[0];
|
37
38
|
if (formKey && forms[formKey] !== form) {
|
@@ -6,8 +6,9 @@ Object.defineProperty(exports, "__esModule", {
|
|
6
6
|
});
|
7
7
|
exports.default = void 0;
|
8
8
|
var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
|
9
|
+
var _isString2 = _interopRequireDefault(require("lodash/isString"));
|
10
|
+
var _isBoolean2 = _interopRequireDefault(require("lodash/isBoolean"));
|
9
11
|
var _react = require("react");
|
10
|
-
var _lodash = require("lodash");
|
11
12
|
var _rulesCreator = require("./rulesCreator");
|
12
13
|
var _index = require("./index");
|
13
14
|
var _locale = _interopRequireDefault(require("../../locale"));
|
@@ -19,7 +20,7 @@ var useRules = function useRules(props) {
|
|
19
20
|
names = props.names,
|
20
21
|
labelRequired = props.labelRequired,
|
21
22
|
type = props.type;
|
22
|
-
var _label = (0,
|
23
|
+
var _label = (0, _isString2.default)(label) ? label : '';
|
23
24
|
var requiredRule = Array.isArray(rules) && (rules === null || rules === void 0 ? void 0 : rules.find(function (rule) {
|
24
25
|
return rule.required === true;
|
25
26
|
}));
|
@@ -70,7 +71,7 @@ var useRules = function useRules(props) {
|
|
70
71
|
});
|
71
72
|
(0, _react.useEffect)(function () {
|
72
73
|
// 添加完整性校验
|
73
|
-
if (names && !(0,
|
74
|
+
if (names && !(0, _isBoolean2.default)(labelRequired)) {
|
74
75
|
var customRequired = {
|
75
76
|
validator: function validator(rules, value) {
|
76
77
|
// 完整性校验, 空数组不校验, 数组有值且值不完整则校验不通过
|