@zat-design/sisyphus-react 3.8.3-beta.7 → 3.8.3-beta.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/dist/index.esm.css +6 -0
- package/dist/less.esm.css +6 -0
- package/es/ProAction/index.js +5 -5
- package/es/ProDownload/index.d.ts +1 -1
- package/es/ProDownload/index.js +3 -3
- package/es/ProDownload/utils.js +3 -3
- package/es/ProDrawerForm/components/ProDrawer/index.js +4 -4
- package/es/ProDrawerForm/components/ProModal/index.js +3 -3
- package/es/ProEditLabel/index.js +3 -3
- package/es/ProEditTable/components/ActionButton/index.d.ts +1 -1
- package/es/ProEditTable/components/ActionButton/index.js +3 -3
- package/es/ProEditTable/components/RcTable/BaseTable.d.ts +1 -1
- package/es/ProEditTable/components/RcTable/DraggableTable.d.ts +1 -1
- package/es/ProEditTable/components/RcTable/VirtualTable.d.ts +1 -1
- package/es/ProEditTable/components/RenderField/ListChangedWrapper.js +21 -7
- package/es/ProEditTable/components/RenderField/index.d.ts +1 -1
- package/es/ProEditTable/components/RenderField/index.js +13 -6
- package/es/ProEditTable/components/RenderToolbar/index.d.ts +1 -1
- package/es/ProEditTable/components/RenderToolbar/index.js +1 -1
- package/es/ProEditTable/components/Summary/index.d.ts +1 -1
- package/es/ProEditTable/utils/config.d.ts +1 -1
- package/es/ProEditTable/utils/config.js +2 -2
- package/es/ProEditTable/utils/index.js +5 -5
- package/es/ProEditTable/utils/tools.js +4 -4
- package/es/ProEnum/components/Group.d.ts +1 -1
- package/es/ProEnum/components/Tag.d.ts +1 -1
- package/es/ProEnum/hooks/useEnumRequest.js +2 -2
- package/es/ProEnum/index.d.ts +2 -2
- package/es/ProEnum/index.js +1 -1
- package/es/ProEnum/utils/eventCenter.js +1 -2
- package/es/ProEnum/utils/getEnumLabel.d.ts +1 -1
- package/es/ProForm/components/base/Input/index.d.ts +1 -1
- package/es/ProForm/components/combination/FormList/components/ActionButton.js +2 -2
- package/es/ProForm/components/combination/FormList/components/BlockTitle.js +1 -1
- package/es/ProForm/components/combination/FormList/components/ToolbarButton.js +1 -1
- package/es/ProForm/components/combination/FormList/utils.js +1 -1
- package/es/ProForm/components/combination/Group/component/ComRender.js +1 -1
- package/es/ProForm/components/combination/ProCascader/index.d.ts +1 -1
- package/es/ProForm/components/combination/ProCascader/index.js +8 -8
- package/es/ProForm/components/combination/ProModalSelect/hooks/useRequestList.js +1 -1
- package/es/ProForm/components/combination/ProModalSelect/index.js +5 -5
- package/es/ProForm/components/old/InputRange/index.d.ts +1 -1
- package/es/ProForm/components/old/InputWithSuffix/index.d.ts +1 -1
- package/es/ProForm/components/old/ProAddress/index.d.ts +1 -2
- package/es/ProForm/components/old/ProAddress/index.js +1 -1
- package/es/ProForm/components/old/ProRangeBox/index.d.ts +1 -2
- package/es/ProForm/components/render/ChangedWrapper.js +11 -1
- package/es/ProForm/components/render/ConfirmWrapper.js +1 -1
- package/es/ProForm/components/render/Render.js +6 -4
- package/es/ProForm/components/render/RenderFields.js +2 -1
- package/es/ProForm/index.js +1 -1
- package/es/ProForm/style/index.less +7 -0
- package/es/ProForm/utils/diffOriginal.js +14 -2
- package/es/ProForm/utils/index.js +14 -10
- package/es/ProForm/utils/useForm.js +1 -1
- package/es/ProIcon/utils/index.js +4 -3
- package/es/ProLayout/components/Layout/Menu/OpenMenu/index.d.ts +1 -1
- package/es/ProLayout/components/Layout/Menu/OpenMenu/index.js +3 -3
- package/es/ProLayout/components/ProCollapse/index.d.ts +1 -1
- package/es/ProLayout/components/ProFooter/index.d.ts +1 -1
- package/es/ProLayout/components/ProHeader/components/Copy/index.d.ts +1 -1
- package/es/ProLayout/components/ProHeader/index.d.ts +1 -1
- package/es/ProLayout/index.d.ts +4 -4
- package/es/ProLayout/utils/index.js +9 -9
- package/es/ProSelect/components/AdaptiveTooltip.d.ts +1 -1
- package/es/ProSelect/index.d.ts +1 -1
- package/es/ProStep/components/Anchor/index.d.ts +1 -1
- package/es/ProStep/components/Item/index.d.ts +1 -1
- package/es/ProStep/components/Listener/index.js +1 -1
- package/es/ProStep/components/Step/index.d.ts +1 -1
- package/es/ProStep/index.d.ts +2 -2
- package/es/ProStep/index.js +3 -3
- package/es/ProTable/components/FormatColumn/index.js +13 -5
- package/es/ProTable/components/RcTable/components/BaseTable/index.d.ts +1 -1
- package/es/ProTable/components/RcTable/components/DraggableTable/components/DndWrapper/index.js +2 -2
- package/es/ProTable/components/RcTable/components/DraggableTable/components/DndWrapper/utils/index.js +9 -8
- package/es/ProTable/components/RcTable/components/DraggableTable/index.d.ts +1 -1
- package/es/ProTable/components/RenderFooter/index.d.ts +1 -1
- package/es/ProTable/components/RenderTableHeader/index.d.ts +1 -1
- package/es/ProTable/components/TableResizable/index.d.ts +1 -1
- package/es/ProTable/hooks/useAntdTable.js +3 -3
- package/es/ProTable/index.d.ts +1 -1
- package/es/ProTable/index.js +2 -2
- package/es/ProTable/propsType.d.ts +1 -0
- package/es/ProTabs/components/Card/index.d.ts +1 -1
- package/es/ProThemeTools/component/ProTools/index.d.ts +1 -1
- package/es/ProThemeTools/index.d.ts +1 -1
- package/es/ProTooltip/index.d.ts +1 -1
- package/es/ProTree/components/AdaptiveTooltip.d.ts +1 -1
- package/es/ProTree/components/CloseIcon.d.ts +1 -2
- package/es/ProTree/components/List.d.ts +1 -1
- package/es/ProTree/components/ProTree.d.ts +1 -1
- package/es/ProTree/components/ProTree.js +1 -1
- package/es/ProTree/components/ProTreeSelect/index.d.ts +1 -1
- package/es/ProTree/components/ProTreeSelect/index.js +18 -18
- package/es/ProTree/components/SearchTitle.d.ts +1 -1
- package/es/ProTree/components/Tree.d.ts +1 -1
- package/es/ProTree/components/Tree.js +4 -4
- package/es/ProTree/index.d.ts +1 -1
- package/es/ProTree/utils.js +12 -11
- package/es/ProTreeModal/components/Cascader.d.ts +1 -1
- package/es/ProTreeModal/components/CloseIcon.d.ts +1 -2
- package/es/ProTreeModal/components/SearchTitle.d.ts +1 -1
- package/es/ProTreeModal/components/Tree.js +6 -6
- package/es/ProTreeModal/components/Trigger.d.ts +1 -1
- package/es/ProTreeModal/index.d.ts +1 -1
- package/es/ProTreeModal/index.js +3 -3
- package/es/ProTreeModal/utils.js +16 -14
- package/es/ProUpload/components/DraggableUploadListItem.d.ts +1 -1
- package/es/ProUpload/components/ImageRender.js +1 -1
- package/es/ProViewer/index.js +2 -2
- package/es/old/ProEditableTable/index.js +4 -4
- package/lib/ProAction/index.js +5 -5
- package/lib/ProDownload/index.d.ts +1 -1
- package/lib/ProDownload/index.js +3 -3
- package/lib/ProDownload/utils.js +3 -3
- package/lib/ProDrawerForm/components/ProDrawer/index.js +4 -4
- package/lib/ProDrawerForm/components/ProModal/index.js +3 -3
- package/lib/ProEditLabel/index.js +3 -3
- package/lib/ProEditTable/components/ActionButton/index.d.ts +1 -1
- package/lib/ProEditTable/components/ActionButton/index.js +3 -3
- package/lib/ProEditTable/components/RcTable/BaseTable.d.ts +1 -1
- package/lib/ProEditTable/components/RcTable/DraggableTable.d.ts +1 -1
- package/lib/ProEditTable/components/RcTable/VirtualTable.d.ts +1 -1
- package/lib/ProEditTable/components/RenderField/ListChangedWrapper.js +20 -6
- package/lib/ProEditTable/components/RenderField/index.d.ts +1 -1
- package/lib/ProEditTable/components/RenderField/index.js +13 -6
- package/lib/ProEditTable/components/RenderToolbar/index.d.ts +1 -1
- package/lib/ProEditTable/components/RenderToolbar/index.js +1 -1
- package/lib/ProEditTable/components/Summary/index.d.ts +1 -1
- package/lib/ProEditTable/utils/config.d.ts +1 -1
- package/lib/ProEditTable/utils/config.js +2 -2
- package/lib/ProEditTable/utils/index.js +5 -5
- package/lib/ProEditTable/utils/tools.js +4 -4
- package/lib/ProEnum/components/Group.d.ts +1 -1
- package/lib/ProEnum/components/Tag.d.ts +1 -1
- package/lib/ProEnum/hooks/useEnumRequest.js +2 -2
- package/lib/ProEnum/index.d.ts +2 -2
- package/lib/ProEnum/index.js +1 -1
- package/lib/ProEnum/utils/eventCenter.js +1 -2
- package/lib/ProEnum/utils/getEnumLabel.d.ts +1 -1
- package/lib/ProForm/components/base/Input/index.d.ts +1 -1
- package/lib/ProForm/components/combination/FormList/components/ActionButton.js +2 -2
- package/lib/ProForm/components/combination/FormList/components/BlockTitle.js +1 -1
- package/lib/ProForm/components/combination/FormList/components/ToolbarButton.js +1 -1
- package/lib/ProForm/components/combination/FormList/utils.js +1 -1
- package/lib/ProForm/components/combination/Group/component/ComRender.js +1 -1
- package/lib/ProForm/components/combination/ProCascader/index.d.ts +1 -1
- package/lib/ProForm/components/combination/ProCascader/index.js +8 -8
- package/lib/ProForm/components/combination/ProModalSelect/hooks/useRequestList.js +1 -1
- package/lib/ProForm/components/combination/ProModalSelect/index.js +5 -5
- package/lib/ProForm/components/old/InputRange/index.d.ts +1 -1
- package/lib/ProForm/components/old/InputWithSuffix/index.d.ts +1 -1
- package/lib/ProForm/components/old/ProAddress/index.d.ts +1 -2
- package/lib/ProForm/components/old/ProAddress/index.js +1 -1
- package/lib/ProForm/components/old/ProRangeBox/index.d.ts +1 -2
- package/lib/ProForm/components/render/ChangedWrapper.js +11 -1
- package/lib/ProForm/components/render/ConfirmWrapper.js +1 -1
- package/lib/ProForm/components/render/Render.js +6 -4
- package/lib/ProForm/components/render/RenderFields.js +2 -1
- package/lib/ProForm/index.js +1 -1
- package/lib/ProForm/style/index.less +7 -0
- package/lib/ProForm/utils/diffOriginal.js +13 -1
- package/lib/ProForm/utils/index.js +10 -10
- package/lib/ProForm/utils/useForm.js +1 -1
- package/lib/ProIcon/utils/index.js +3 -3
- package/lib/ProLayout/components/Layout/Menu/OpenMenu/index.d.ts +1 -1
- package/lib/ProLayout/components/Layout/Menu/OpenMenu/index.js +3 -3
- package/lib/ProLayout/components/ProCollapse/index.d.ts +1 -1
- package/lib/ProLayout/components/ProFooter/index.d.ts +1 -1
- package/lib/ProLayout/components/ProHeader/components/Copy/index.d.ts +1 -1
- package/lib/ProLayout/components/ProHeader/index.d.ts +1 -1
- package/lib/ProLayout/index.d.ts +4 -4
- package/lib/ProLayout/utils/index.js +9 -9
- package/lib/ProSelect/components/AdaptiveTooltip.d.ts +1 -1
- package/lib/ProSelect/index.d.ts +1 -1
- package/lib/ProStep/components/Anchor/index.d.ts +1 -1
- package/lib/ProStep/components/Item/index.d.ts +1 -1
- package/lib/ProStep/components/Listener/index.js +1 -1
- package/lib/ProStep/components/Step/index.d.ts +1 -1
- package/lib/ProStep/index.d.ts +2 -2
- package/lib/ProStep/index.js +3 -3
- package/lib/ProTable/components/FormatColumn/index.js +13 -5
- package/lib/ProTable/components/RcTable/components/BaseTable/index.d.ts +1 -1
- package/lib/ProTable/components/RcTable/components/DraggableTable/components/DndWrapper/index.js +2 -2
- package/lib/ProTable/components/RcTable/components/DraggableTable/components/DndWrapper/utils/index.js +8 -8
- package/lib/ProTable/components/RcTable/components/DraggableTable/index.d.ts +1 -1
- package/lib/ProTable/components/RenderFooter/index.d.ts +1 -1
- package/lib/ProTable/components/RenderTableHeader/index.d.ts +1 -1
- package/lib/ProTable/components/TableResizable/index.d.ts +1 -1
- package/lib/ProTable/hooks/useAntdTable.js +3 -3
- package/lib/ProTable/index.d.ts +1 -1
- package/lib/ProTable/index.js +2 -2
- package/lib/ProTable/propsType.d.ts +1 -0
- package/lib/ProTabs/components/Card/index.d.ts +1 -1
- package/lib/ProThemeTools/component/ProTools/index.d.ts +1 -1
- package/lib/ProThemeTools/index.d.ts +1 -1
- package/lib/ProTooltip/index.d.ts +1 -1
- package/lib/ProTree/components/AdaptiveTooltip.d.ts +1 -1
- package/lib/ProTree/components/CloseIcon.d.ts +1 -2
- package/lib/ProTree/components/List.d.ts +1 -1
- package/lib/ProTree/components/ProTree.d.ts +1 -1
- package/lib/ProTree/components/ProTree.js +1 -1
- package/lib/ProTree/components/ProTreeSelect/index.d.ts +1 -1
- package/lib/ProTree/components/ProTreeSelect/index.js +18 -18
- package/lib/ProTree/components/SearchTitle.d.ts +1 -1
- package/lib/ProTree/components/Tree.d.ts +1 -1
- package/lib/ProTree/components/Tree.js +4 -4
- package/lib/ProTree/index.d.ts +1 -1
- package/lib/ProTree/utils.js +11 -11
- package/lib/ProTreeModal/components/Cascader.d.ts +1 -1
- package/lib/ProTreeModal/components/CloseIcon.d.ts +1 -2
- package/lib/ProTreeModal/components/SearchTitle.d.ts +1 -1
- package/lib/ProTreeModal/components/Tree.js +6 -6
- package/lib/ProTreeModal/components/Trigger.d.ts +1 -1
- package/lib/ProTreeModal/index.d.ts +1 -1
- package/lib/ProTreeModal/index.js +3 -3
- package/lib/ProTreeModal/utils.js +13 -13
- package/lib/ProUpload/components/DraggableUploadListItem.d.ts +1 -1
- package/lib/ProUpload/components/ImageRender.js +1 -1
- package/lib/ProViewer/index.js +2 -2
- package/lib/old/ProEditableTable/index.js +4 -4
- package/package.json +1 -1
|
@@ -17,7 +17,7 @@ var _react = _interopRequireWildcard(require("react"));
|
|
|
17
17
|
var _diffOriginal = require("../../utils/diffOriginal");
|
|
18
18
|
var _ProConfigProvider = require("../../../ProConfigProvider");
|
|
19
19
|
var _utils = require("../../../utils");
|
|
20
|
-
var _excluded = ["name", "names", "namesStr", "form", "equalWith", "children", "type", "diffConfig", "valuePropName", "normalize", "getValueProps"];
|
|
20
|
+
var _excluded = ["name", "names", "namesStr", "form", "equalWith", "children", "type", "diffConfig", "valuePropName", "normalize", "getValueProps", "viewRender"];
|
|
21
21
|
var ChangedWrapper = function ChangedWrapper(props) {
|
|
22
22
|
var _diffConfig$toolTip, _children$props, _children$props2, _children$props3;
|
|
23
23
|
var name = props.name,
|
|
@@ -32,6 +32,7 @@ var ChangedWrapper = function ChangedWrapper(props) {
|
|
|
32
32
|
valuePropName = _props$valuePropName === void 0 ? 'value' : _props$valuePropName,
|
|
33
33
|
normalize = props.normalize,
|
|
34
34
|
getValueProps = props.getValueProps,
|
|
35
|
+
viewRender = props.viewRender,
|
|
35
36
|
rest = (0, _objectWithoutProperties2.default)(props, _excluded);
|
|
36
37
|
var _useProConfig = (0, _ProConfigProvider.useProConfig)('ProForm'),
|
|
37
38
|
isDiffAll = _useProConfig.isDiffAll;
|
|
@@ -57,11 +58,20 @@ var ChangedWrapper = function ChangedWrapper(props) {
|
|
|
57
58
|
}, [isWatch, noChange, props[valuePropName], originalValue]);
|
|
58
59
|
var isAdd = diffType === 'add';
|
|
59
60
|
var isChanged = diffType === 'changed';
|
|
61
|
+
var viewRenderFun = (0, _react.useMemo)(function () {
|
|
62
|
+
var record = form.getFieldsValue();
|
|
63
|
+
return function (orgValue) {
|
|
64
|
+
return viewRender(orgValue, record, {
|
|
65
|
+
form: form
|
|
66
|
+
});
|
|
67
|
+
};
|
|
68
|
+
}, [form]);
|
|
60
69
|
var tipContent = (0, _react.useMemo)(function () {
|
|
61
70
|
if (!isWatch || noChange) return undefined;
|
|
62
71
|
var valueProps = getValueProps && !names ? getValueProps(originalValue) : {
|
|
63
72
|
value: originalValue
|
|
64
73
|
};
|
|
74
|
+
if (viewRender) return viewRenderFun(valueProps === null || valueProps === void 0 ? void 0 : valueProps.value);
|
|
65
75
|
return /*#__PURE__*/_react.default.isValidElement(children) ? /*#__PURE__*/_react.default.cloneElement(children, (0, _objectSpread3.default)((0, _objectSpread3.default)({}, children.props), {}, (0, _defineProperty2.default)({
|
|
66
76
|
isView: true
|
|
67
77
|
}, valuePropName, valueProps === null || valueProps === void 0 ? void 0 : valueProps.value))) : undefined;
|
|
@@ -28,7 +28,7 @@ var ConfirmWrapper = function ConfirmWrapper(props) {
|
|
|
28
28
|
var _ProForm$useFieldProp = _index.default.useFieldProps(),
|
|
29
29
|
form = _ProForm$useFieldProp.form;
|
|
30
30
|
var handleChange = /*#__PURE__*/function () {
|
|
31
|
-
var _ref = (0, _asyncToGenerator2.default)(
|
|
31
|
+
var _ref = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(value) {
|
|
32
32
|
var _len,
|
|
33
33
|
other,
|
|
34
34
|
_key,
|
|
@@ -50,7 +50,8 @@ var Render = function Render(props) {
|
|
|
50
50
|
requiredOnView = props.requiredOnView,
|
|
51
51
|
confirm = props.confirm,
|
|
52
52
|
globalControl = props.globalControl,
|
|
53
|
-
diffConfig = props.diffConfig
|
|
53
|
+
diffConfig = props.diffConfig,
|
|
54
|
+
viewRender = props.viewRender;
|
|
54
55
|
var colProps = props.colProps;
|
|
55
56
|
// 剔除一些不是FormItem的属性, 防止控制台报warning
|
|
56
57
|
var labelWidth = formItemProps.labelWidth,
|
|
@@ -240,7 +241,7 @@ var Render = function Render(props) {
|
|
|
240
241
|
_args = functionArgs([].concat(args));
|
|
241
242
|
}
|
|
242
243
|
var inList = _otherFormItemProps === null || _otherFormItemProps === void 0 ? void 0 : (_otherFormItemProps$n3 = _otherFormItemProps.namePath) === null || _otherFormItemProps$n3 === void 0 ? void 0 : _otherFormItemProps$n3.length;
|
|
243
|
-
if (
|
|
244
|
+
if (/*#__PURE__*/_react.default.isValidElement(AutoComponent)) {
|
|
244
245
|
var _AutoComponent$props$, _AutoComponent$props, _lastComponentProps$c;
|
|
245
246
|
((_AutoComponent$props$ = (_AutoComponent$props = AutoComponent === null || AutoComponent === void 0 ? void 0 : AutoComponent.props)[changeKey]) === null || _AutoComponent$props$ === void 0 ? void 0 : _AutoComponent$props$.call.apply(_AutoComponent$props$, [_AutoComponent$props].concat((0, _toConsumableArray2.default)(_args)))) || ((_lastComponentProps$c = lastComponentProps[changeKey]) === null || _lastComponentProps$c === void 0 ? void 0 : _lastComponentProps$c.call.apply(_lastComponentProps$c, [lastComponentProps].concat((0, _toConsumableArray2.default)(_args))));
|
|
246
247
|
return false;
|
|
@@ -290,7 +291,7 @@ var Render = function Render(props) {
|
|
|
290
291
|
* onBlur参数重置 (value, record, { form, index, namePath, option }) => void
|
|
291
292
|
*/
|
|
292
293
|
var handleBlur = /*#__PURE__*/function () {
|
|
293
|
-
var _ref7 = (0, _asyncToGenerator2.default)(
|
|
294
|
+
var _ref7 = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
|
|
294
295
|
var _len3,
|
|
295
296
|
args,
|
|
296
297
|
_key3,
|
|
@@ -373,7 +374,7 @@ var Render = function Render(props) {
|
|
|
373
374
|
if (originComponent) {
|
|
374
375
|
delete childProps.otherProps;
|
|
375
376
|
}
|
|
376
|
-
var child = /*#__PURE__*/_react.default.isValidElement(AutoComponent) ? (
|
|
377
|
+
var child = /*#__PURE__*/_react.default.isValidElement(AutoComponent) ? (/*#__PURE__*/_react.default.cloneElement(AutoComponent, childProps)) : (0, _jsxRuntime.jsx)(AutoComponent, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(lastComponentProps, [].concat(lastComponentPropsFilter, ['debounceWait']))), {}, {
|
|
377
378
|
otherProps: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, otherProps), {}, {
|
|
378
379
|
show: show,
|
|
379
380
|
disabled: lastDisabled,
|
|
@@ -439,6 +440,7 @@ var Render = function Render(props) {
|
|
|
439
440
|
valuePropName: _otherFormItemProps.valuePropName,
|
|
440
441
|
normalize: _otherFormItemProps.normalize,
|
|
441
442
|
getValueProps: _otherFormItemProps.getValueProps,
|
|
443
|
+
viewRender: viewRender,
|
|
442
444
|
children: child
|
|
443
445
|
});
|
|
444
446
|
}
|
|
@@ -218,7 +218,8 @@ var RenderFields = function RenderFields(props) {
|
|
|
218
218
|
diffConfig: diffConfig,
|
|
219
219
|
equalWith: equalWith,
|
|
220
220
|
requiredOnView: requiredOnView,
|
|
221
|
-
globalControl: globalControl
|
|
221
|
+
globalControl: globalControl,
|
|
222
|
+
viewRender: viewRender
|
|
222
223
|
})
|
|
223
224
|
}, "".concat(_formItemProps.name || _formItemProps.label).concat(index));
|
|
224
225
|
});
|
package/lib/ProForm/index.js
CHANGED
|
@@ -201,7 +201,7 @@ var ProForm = function ProForm(props, ref) {
|
|
|
201
201
|
if (isView || disabled) {
|
|
202
202
|
// 查看或禁用模式
|
|
203
203
|
footerEle = null;
|
|
204
|
-
} else if (
|
|
204
|
+
} else if (/*#__PURE__*/_react.default.isValidElement(footer)) {
|
|
205
205
|
// 传入组件渲染组件
|
|
206
206
|
footerEle = footer;
|
|
207
207
|
} else if (footer === undefined || footer || (0, _lodash.isObject)(footer)) {
|
|
@@ -329,6 +329,9 @@
|
|
|
329
329
|
border-radius: 4px;
|
|
330
330
|
background: @zaui-contract-bg !important;
|
|
331
331
|
|
|
332
|
+
.@{ant-prefix}-input {
|
|
333
|
+
background: @zaui-contract-bg !important;
|
|
334
|
+
}
|
|
332
335
|
.@{ant-prefix}-select.@{ant-prefix}-select-disabled .@{ant-prefix}-select-selector{
|
|
333
336
|
background: @zaui-contract-bg !important;
|
|
334
337
|
}
|
|
@@ -403,6 +406,10 @@
|
|
|
403
406
|
border-radius: 4px;
|
|
404
407
|
background: @zaui-contract-bg-add !important;
|
|
405
408
|
|
|
409
|
+
.@{ant-prefix}-input {
|
|
410
|
+
background: @zaui-contract-bg !important;
|
|
411
|
+
}
|
|
412
|
+
|
|
406
413
|
.@{ant-prefix}-select.@{ant-prefix}-select-disabled .@{ant-prefix}-select-selector{
|
|
407
414
|
background: @zaui-contract-bg-add !important;
|
|
408
415
|
}
|
|
@@ -6,6 +6,18 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
6
6
|
exports.diffOriginal = void 0;
|
|
7
7
|
var _lodash = require("lodash");
|
|
8
8
|
var _utils = require("../../utils");
|
|
9
|
+
// 过滤对象中undefined字段
|
|
10
|
+
// 防止{a: '1'} {a: '1', b: undefined}被认为不相等
|
|
11
|
+
var filterUndefined = function filterUndefined(data) {
|
|
12
|
+
if (!(0, _lodash.isObject)(data) || Array.isArray(data) || data === null) return data;
|
|
13
|
+
var resData = {};
|
|
14
|
+
Object.keys(data).forEach(function (key) {
|
|
15
|
+
if (data[key] !== undefined) {
|
|
16
|
+
resData[key] = data[key];
|
|
17
|
+
}
|
|
18
|
+
});
|
|
19
|
+
return resData;
|
|
20
|
+
};
|
|
9
21
|
var nullValue = [null, undefined, '']; // 输入框空值时可能存在的三种值 视为相等
|
|
10
22
|
var diffOriginal = exports.diffOriginal = function diffOriginal(params) {
|
|
11
23
|
var originalValue = params.originalValue,
|
|
@@ -35,7 +47,7 @@ var diffOriginal = exports.diffOriginal = function diffOriginal(params) {
|
|
|
35
47
|
return isSame ? 'same' : 'changed';
|
|
36
48
|
}
|
|
37
49
|
if (!nullValue.includes(value) || !nullValue.includes(originalValue)) {
|
|
38
|
-
return (0, _lodash.isEqual)(value, originalValue) ? 'same' : 'changed';
|
|
50
|
+
return (0, _lodash.isEqual)(filterUndefined(value), filterUndefined(originalValue)) ? 'same' : 'changed';
|
|
39
51
|
}
|
|
40
52
|
return 'same';
|
|
41
53
|
};
|
|
@@ -136,7 +136,7 @@ var splitNameStr = exports.splitNameStr = function splitNameStr(name) {
|
|
|
136
136
|
});
|
|
137
137
|
};
|
|
138
138
|
// 过滤掉字段名中包含 '-' 的字段
|
|
139
|
-
var
|
|
139
|
+
var _filterInternalFields = exports.filterInternalFields = function filterInternalFields(values, optimize) {
|
|
140
140
|
if (optimize) {
|
|
141
141
|
return values;
|
|
142
142
|
}
|
|
@@ -150,20 +150,20 @@ var filterInternalFields = exports.filterInternalFields = function filterInterna
|
|
|
150
150
|
}
|
|
151
151
|
if (Array.isArray(nextValues)) {
|
|
152
152
|
return nextValues.map(function (item) {
|
|
153
|
-
return
|
|
153
|
+
return _filterInternalFields(item);
|
|
154
154
|
});
|
|
155
155
|
}
|
|
156
156
|
if ((0, _lodash.isObject)(nextValues)) {
|
|
157
157
|
var result = {};
|
|
158
158
|
Object.keys(nextValues).forEach(function (key) {
|
|
159
159
|
if (key.includes('-')) return;
|
|
160
|
-
result[key] =
|
|
160
|
+
result[key] = _filterInternalFields(nextValues[key]);
|
|
161
161
|
});
|
|
162
162
|
return result;
|
|
163
163
|
}
|
|
164
164
|
return nextValues;
|
|
165
165
|
};
|
|
166
|
-
var
|
|
166
|
+
var _getAllNamePath = exports.getAllNamePath = function getAllNamePath(object) {
|
|
167
167
|
var currentPath = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
|
|
168
168
|
var keys = Object.keys(object);
|
|
169
169
|
var resultKeys = [];
|
|
@@ -177,7 +177,7 @@ var getAllNamePath = exports.getAllNamePath = function getAllNamePath(object) {
|
|
|
177
177
|
}
|
|
178
178
|
// 深度获取对象key
|
|
179
179
|
if ((0, _lodash.isObject)(value)) {
|
|
180
|
-
resultKeys.concat(
|
|
180
|
+
resultKeys.concat(_getAllNamePath(value, [].concat((0, _toConsumableArray2.default)(currentPath), [key])));
|
|
181
181
|
}
|
|
182
182
|
resultKeys.push([].concat((0, _toConsumableArray2.default)(currentPath), [key]));
|
|
183
183
|
});
|
|
@@ -320,7 +320,7 @@ var customEqualForFun = exports.customEqualForFun = function customEqualForFun(v
|
|
|
320
320
|
/**
|
|
321
321
|
* 查询数据中是否包含rowKey
|
|
322
322
|
*/
|
|
323
|
-
var
|
|
323
|
+
var _hasRowKey = exports.hasRowKey = function hasRowKey(obj) {
|
|
324
324
|
if ((0, _typeof2.default)(obj) !== 'object' || obj === null) {
|
|
325
325
|
return false;
|
|
326
326
|
}
|
|
@@ -330,7 +330,7 @@ var hasRowKey = exports.hasRowKey = function hasRowKey(obj) {
|
|
|
330
330
|
return true;
|
|
331
331
|
}
|
|
332
332
|
return keys.some(function (key) {
|
|
333
|
-
return
|
|
333
|
+
return _hasRowKey(obj[key]);
|
|
334
334
|
});
|
|
335
335
|
};
|
|
336
336
|
/**
|
|
@@ -346,7 +346,7 @@ var view = exports.view = function view(obj) {
|
|
|
346
346
|
return true;
|
|
347
347
|
}
|
|
348
348
|
return keys.some(function (key) {
|
|
349
|
-
return
|
|
349
|
+
return _hasRowKey(obj[key]);
|
|
350
350
|
});
|
|
351
351
|
};
|
|
352
352
|
/**
|
|
@@ -382,7 +382,7 @@ var deleteForPath = exports.deleteForPath = function deleteForPath(values, nameP
|
|
|
382
382
|
* @param value 选中值
|
|
383
383
|
* @returns {}
|
|
384
384
|
*/
|
|
385
|
-
var
|
|
385
|
+
var _findOptionByValue = exports.findOptionByValue = function findOptionByValue(treeData, value, fieldNames) {
|
|
386
386
|
if ((0, _lodash.isObject)(value)) {
|
|
387
387
|
return value;
|
|
388
388
|
}
|
|
@@ -392,7 +392,7 @@ var findOptionByValue = exports.findOptionByValue = function findOptionByValue(t
|
|
|
392
392
|
return (0, _lodash.omit)(node, ['children', fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children]);
|
|
393
393
|
}
|
|
394
394
|
if (node.children) {
|
|
395
|
-
var foundNode =
|
|
395
|
+
var foundNode = _findOptionByValue(node[(fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children) || 'children'], value, fieldNames);
|
|
396
396
|
if (foundNode) {
|
|
397
397
|
return (0, _lodash.omit)(foundNode, ['children', fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children]);
|
|
398
398
|
}
|
|
@@ -44,7 +44,7 @@ var useForm = exports.useForm = function useForm(originForm, options) {
|
|
|
44
44
|
return getFieldsValue(nameList, filterFunc);
|
|
45
45
|
};
|
|
46
46
|
var _validateFields = /*#__PURE__*/function () {
|
|
47
|
-
var _ref2 = (0, _asyncToGenerator2.default)(
|
|
47
|
+
var _ref2 = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(nameList) {
|
|
48
48
|
var _rest$,
|
|
49
49
|
_len,
|
|
50
50
|
rest,
|
|
@@ -7,7 +7,7 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
7
7
|
exports.recurseGetNodes = exports.onBeforeInjection = void 0;
|
|
8
8
|
var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
|
|
9
9
|
var _config = require("../config");
|
|
10
|
-
var
|
|
10
|
+
var _recurseGetNodes = exports.recurseGetNodes = function recurseGetNodes(type, node, queue) {
|
|
11
11
|
switch (type) {
|
|
12
12
|
// 渐变
|
|
13
13
|
case 'gradation':
|
|
@@ -26,7 +26,7 @@ var recurseGetNodes = exports.recurseGetNodes = function recurseGetNodes(type, n
|
|
|
26
26
|
}
|
|
27
27
|
if (node.childNodes) {
|
|
28
28
|
for (var i = 0; i < node.childNodes.length; i++) {
|
|
29
|
-
|
|
29
|
+
_recurseGetNodes(type, node.childNodes[i], queue);
|
|
30
30
|
}
|
|
31
31
|
}
|
|
32
32
|
};
|
|
@@ -56,7 +56,7 @@ var onBeforeInjection = exports.onBeforeInjection = function onBeforeInjection(_
|
|
|
56
56
|
// 目前只支持处理渐变及fill填充
|
|
57
57
|
var types = Reflect.ownKeys(nodeMap !== null && nodeMap !== void 0 ? nodeMap : {});
|
|
58
58
|
types.forEach(function (typeKey) {
|
|
59
|
-
|
|
59
|
+
_recurseGetNodes(typeKey, svg, nodeMap[typeKey]);
|
|
60
60
|
});
|
|
61
61
|
if ((gradList === null || gradList === void 0 ? void 0 : gradList.length) > 0) {
|
|
62
62
|
nodeMap.gradation.forEach(function (item, index) {
|
|
@@ -56,7 +56,7 @@ var OpenMenu = function OpenMenu(props) {
|
|
|
56
56
|
if (!Array.isArray(result) || !result.length) {
|
|
57
57
|
return [];
|
|
58
58
|
}
|
|
59
|
-
var
|
|
59
|
+
var _menuDeep = function menuDeep(data) {
|
|
60
60
|
data.forEach(function (item) {
|
|
61
61
|
var _item$keyIdPath, _item$keyIdPath2, _item$children;
|
|
62
62
|
// 是否是第一级菜单,展开模式一级菜单有icon, 收起模式二级菜单有icon
|
|
@@ -97,7 +97,7 @@ var OpenMenu = function OpenMenu(props) {
|
|
|
97
97
|
if ((_item === null || _item === void 0 ? void 0 : _item.hideInMenu) || ['TAB', 'QUERY', 'BUTTON'].includes(_item === null || _item === void 0 ? void 0 : _item.type)) {
|
|
98
98
|
delete item.children;
|
|
99
99
|
} else {
|
|
100
|
-
|
|
100
|
+
_menuDeep(item.children);
|
|
101
101
|
}
|
|
102
102
|
} else {
|
|
103
103
|
delete item.children;
|
|
@@ -105,7 +105,7 @@ var OpenMenu = function OpenMenu(props) {
|
|
|
105
105
|
});
|
|
106
106
|
return data;
|
|
107
107
|
};
|
|
108
|
-
|
|
108
|
+
_menuDeep(result);
|
|
109
109
|
return result;
|
|
110
110
|
}, [dataSource]);
|
|
111
111
|
(0, _ahooks.useDeepCompareEffect)(function () {
|
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
/// <reference types="react" />
|
|
2
2
|
import { ProFooterProps } from './PropTypes';
|
|
3
|
-
declare const _default: import("react").MemoExoticComponent<(props: ProFooterProps) => JSX.Element>;
|
|
3
|
+
declare const _default: import("react").MemoExoticComponent<(props: ProFooterProps) => import("react/jsx-runtime").JSX.Element>;
|
|
4
4
|
export default _default;
|
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
2
|
import type { ProHeaderProps } from './PropTypes';
|
|
3
|
-
declare const _default: React.MemoExoticComponent<(props: ProHeaderProps) => JSX.Element>;
|
|
3
|
+
declare const _default: React.MemoExoticComponent<(props: ProHeaderProps) => import("react/jsx-runtime").JSX.Element>;
|
|
4
4
|
export default _default;
|
package/lib/ProLayout/index.d.ts
CHANGED
|
@@ -5,7 +5,7 @@ export declare const LayoutContext: import("react").Context<{
|
|
|
5
5
|
onSelected: (params: any) => void;
|
|
6
6
|
}>;
|
|
7
7
|
declare const ProLayout: {
|
|
8
|
-
(props: ProLayoutProps): JSX.Element;
|
|
8
|
+
(props: ProLayoutProps): import("react/jsx-runtime").JSX.Element;
|
|
9
9
|
defaultProps: {
|
|
10
10
|
menus: any[];
|
|
11
11
|
iconfontUrl: string;
|
|
@@ -17,8 +17,8 @@ declare const ProLayout: {
|
|
|
17
17
|
headerHeight: number;
|
|
18
18
|
contentStyle: {};
|
|
19
19
|
};
|
|
20
|
-
ProCollapse: (props: import("./components/ProCollapse/PropTypes").ProCollapseProps) => JSX.Element;
|
|
21
|
-
ProFooter: import("react").MemoExoticComponent<(props: import("./components/ProFooter/PropTypes").ProFooterProps) => JSX.Element>;
|
|
22
|
-
ProHeader: import("react").MemoExoticComponent<(props: import("./components/ProHeader/PropTypes").ProHeaderProps) => JSX.Element>;
|
|
20
|
+
ProCollapse: (props: import("./components/ProCollapse/PropTypes").ProCollapseProps) => import("react/jsx-runtime").JSX.Element;
|
|
21
|
+
ProFooter: import("react").MemoExoticComponent<(props: import("./components/ProFooter/PropTypes").ProFooterProps) => import("react/jsx-runtime").JSX.Element>;
|
|
22
|
+
ProHeader: import("react").MemoExoticComponent<(props: import("./components/ProHeader/PropTypes").ProHeaderProps) => import("react/jsx-runtime").JSX.Element>;
|
|
23
23
|
};
|
|
24
24
|
export default ProLayout;
|
|
@@ -25,7 +25,7 @@ var getIdsByPathName = exports.getIdsByPathName = function getIdsByPathName(menu
|
|
|
25
25
|
_pathName = activeMenu;
|
|
26
26
|
}
|
|
27
27
|
var result;
|
|
28
|
-
var
|
|
28
|
+
var _menuDeep = function menuDeep(menuDeepItem) {
|
|
29
29
|
for (var i = 0; i <= menuDeepItem.length - 1; i++) {
|
|
30
30
|
var item = menuDeepItem[i];
|
|
31
31
|
// 只包含一级菜单时,解决URL:/endorsement/demo/123无法选中问题
|
|
@@ -34,7 +34,7 @@ var getIdsByPathName = exports.getIdsByPathName = function getIdsByPathName(menu
|
|
|
34
34
|
break;
|
|
35
35
|
}
|
|
36
36
|
if (Array.isArray(item.children) && item.children.length) {
|
|
37
|
-
|
|
37
|
+
_menuDeep(item.children);
|
|
38
38
|
} else if (((item === null || item === void 0 ? void 0 : item.url) && _pathName.includes(item.url.split('?')[0]) || (item === null || item === void 0 ? void 0 : item.redirectUrl) && _pathName.includes(item.redirectUrl.split('?')[0])) && !result) {
|
|
39
39
|
// 当循环到最后一层时判断URL是否包含最后一层的URL,解决URL在URL中不存在的场景
|
|
40
40
|
result = item.keyIdPath;
|
|
@@ -42,7 +42,7 @@ var getIdsByPathName = exports.getIdsByPathName = function getIdsByPathName(menu
|
|
|
42
42
|
}
|
|
43
43
|
}
|
|
44
44
|
};
|
|
45
|
-
|
|
45
|
+
_menuDeep(menus);
|
|
46
46
|
return result || [];
|
|
47
47
|
};
|
|
48
48
|
/**
|
|
@@ -52,7 +52,7 @@ var getIdsByPathName = exports.getIdsByPathName = function getIdsByPathName(menu
|
|
|
52
52
|
*/
|
|
53
53
|
var transformMenu = exports.transformMenu = function transformMenu(menuData, pathPrefix) {
|
|
54
54
|
var data = (0, _toConsumableArray2.default)(menuData);
|
|
55
|
-
var
|
|
55
|
+
var _menuDeep2 = function menuDeep(menuDeepItem) {
|
|
56
56
|
if (!Array.isArray(menuDeepItem) || !menuDeepItem.length) {
|
|
57
57
|
return [];
|
|
58
58
|
}
|
|
@@ -85,11 +85,11 @@ var transformMenu = exports.transformMenu = function transformMenu(menuData, pat
|
|
|
85
85
|
childrenItem.keyUrlPath = (0, _toConsumableArray2.default)(item.keyUrlPath);
|
|
86
86
|
childrenItem.keyIdPath = (0, _toConsumableArray2.default)(item.keyIdPath);
|
|
87
87
|
});
|
|
88
|
-
|
|
88
|
+
_menuDeep2(item.children);
|
|
89
89
|
}
|
|
90
90
|
});
|
|
91
91
|
};
|
|
92
|
-
|
|
92
|
+
_menuDeep2(data);
|
|
93
93
|
return data;
|
|
94
94
|
};
|
|
95
95
|
/**
|
|
@@ -144,7 +144,7 @@ var getPathNameKey = exports.getPathNameKey = function getPathNameKey(_ref) {
|
|
|
144
144
|
var menus = _ref.menus,
|
|
145
145
|
pathName = _ref.pathName;
|
|
146
146
|
var result;
|
|
147
|
-
var
|
|
147
|
+
var _menuDeep3 = function menuDeep(menuDeepItem) {
|
|
148
148
|
if (!Array.isArray(menuDeepItem) || !menuDeepItem.length) {
|
|
149
149
|
return [];
|
|
150
150
|
}
|
|
@@ -158,7 +158,7 @@ var getPathNameKey = exports.getPathNameKey = function getPathNameKey(_ref) {
|
|
|
158
158
|
break;
|
|
159
159
|
}
|
|
160
160
|
if (Array.isArray(item.children) && item.children.length) {
|
|
161
|
-
|
|
161
|
+
_menuDeep3(item.children);
|
|
162
162
|
} else if (((item === null || item === void 0 ? void 0 : item.url) && pathName.includes(item.url.split('?')[0]) || (item === null || item === void 0 ? void 0 : item.redirectUrl) && pathName.includes(item.redirectUrl.split('?')[0])) && !result) {
|
|
163
163
|
// URL未匹配时,循环到最后一层时判断URL是否包含最后一层的URL,解决URL在URL中不存在的场景
|
|
164
164
|
result = item.keyIdPath;
|
|
@@ -166,6 +166,6 @@ var getPathNameKey = exports.getPathNameKey = function getPathNameKey(_ref) {
|
|
|
166
166
|
}
|
|
167
167
|
}
|
|
168
168
|
};
|
|
169
|
-
|
|
169
|
+
_menuDeep3(menus);
|
|
170
170
|
return result;
|
|
171
171
|
};
|
package/lib/ProSelect/index.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
2
|
import { PropSelectProps, ProSelectAction } from './propsType';
|
|
3
3
|
import './index.less';
|
|
4
|
-
export declare const ProSelect: (props: PropSelectProps, ref: React.Ref<ProSelectAction> | undefined) => JSX.Element;
|
|
4
|
+
export declare const ProSelect: (props: PropSelectProps, ref: React.Ref<ProSelectAction> | undefined) => import("react/jsx-runtime").JSX.Element;
|
|
5
5
|
declare const _default: React.ForwardRefExoticComponent<PropSelectProps & React.RefAttributes<ProSelectAction>>;
|
|
6
6
|
export default _default;
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export declare const MenuItem: (props: any) => JSX.Element;
|
|
1
|
+
export declare const MenuItem: (props: any) => import("react/jsx-runtime").JSX.Element;
|
|
2
2
|
export default MenuItem;
|
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
import { ProStepItem } from '../../propsType';
|
|
2
|
-
declare const _default: ({ id, title, collapse: collapseItem, children, ...restProps }: ProStepItem) => JSX.Element;
|
|
2
|
+
declare const _default: ({ id, title, collapse: collapseItem, children, ...restProps }: ProStepItem) => import("react/jsx-runtime").JSX.Element;
|
|
3
3
|
export default _default;
|
|
@@ -21,7 +21,7 @@ var _default = exports.default = function _default(_ref) {
|
|
|
21
21
|
var _useStep = (0, _index.useStep)(),
|
|
22
22
|
notify = _useStep.notify;
|
|
23
23
|
return /*#__PURE__*/_react.default.cloneElement(children, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, props), {}, {
|
|
24
|
-
onClick: (0, _lodash.throttle)(
|
|
24
|
+
onClick: (0, _lodash.throttle)(/*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
|
|
25
25
|
var values;
|
|
26
26
|
return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
|
|
27
27
|
while (1) switch (_context.prev = _context.next) {
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { ProStepPropsType } from '../../propsType';
|
|
2
2
|
export declare const Step: ({ fixedTop, dataSource, activeKey, errorCollection, style, targetOffset, scrollToError, }: ProStepPropsType & {
|
|
3
3
|
errorCollection: object;
|
|
4
|
-
}) => JSX.Element;
|
|
4
|
+
}) => import("react/jsx-runtime").JSX.Element;
|
|
5
5
|
export default Step;
|
package/lib/ProStep/index.d.ts
CHANGED
|
@@ -4,9 +4,9 @@ import './style/index.less';
|
|
|
4
4
|
export declare const ProStepContext: import("react").Context<any>;
|
|
5
5
|
export declare const useStep: () => any;
|
|
6
6
|
declare const ProStep: {
|
|
7
|
-
({ children, ...resetProps }: ProStepPropsType): JSX.Element;
|
|
7
|
+
({ children, ...resetProps }: ProStepPropsType): import("react/jsx-runtime").JSX.Element;
|
|
8
8
|
useStep: () => any;
|
|
9
|
-
Item: ({ id, title, collapse: collapseItem, children, ...restProps }: import("./propsType").ProStepItem) => JSX.Element;
|
|
9
|
+
Item: ({ id, title, collapse: collapseItem, children, ...restProps }: import("./propsType").ProStepItem) => import("react/jsx-runtime").JSX.Element;
|
|
10
10
|
Listener: ({ children, delayTime, excludes, ...props }: any) => import("react").DetailedReactHTMLElement<any, HTMLElement>;
|
|
11
11
|
};
|
|
12
12
|
export default ProStep;
|
package/lib/ProStep/index.js
CHANGED
|
@@ -89,7 +89,7 @@ var ProStep = function ProStep(_ref) {
|
|
|
89
89
|
return null;
|
|
90
90
|
}
|
|
91
91
|
var subEvent = /*#__PURE__*/function () {
|
|
92
|
-
var _ref5 = (0, _asyncToGenerator2.default)(
|
|
92
|
+
var _ref5 = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
|
|
93
93
|
var value, _form$validateFields, _error$errorFields;
|
|
94
94
|
return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
|
|
95
95
|
while (1) switch (_context.prev = _context.next) {
|
|
@@ -135,7 +135,7 @@ var ProStep = function ProStep(_ref) {
|
|
|
135
135
|
registerMap.current[id] = record;
|
|
136
136
|
};
|
|
137
137
|
var notify = /*#__PURE__*/function () {
|
|
138
|
-
var _ref6 = (0, _asyncToGenerator2.default)(
|
|
138
|
+
var _ref6 = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee2(params) {
|
|
139
139
|
var _ref7, excludes, triggerIds, events, res, nextErrorCollection;
|
|
140
140
|
return (0, _regeneratorRuntime2.default)().wrap(function _callee2$(_context2) {
|
|
141
141
|
while (1) switch (_context2.prev = _context2.next) {
|
|
@@ -174,7 +174,7 @@ var ProStep = function ProStep(_ref) {
|
|
|
174
174
|
};
|
|
175
175
|
}();
|
|
176
176
|
var triggerTo = /*#__PURE__*/function () {
|
|
177
|
-
var _ref9 = (0, _asyncToGenerator2.default)(
|
|
177
|
+
var _ref9 = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee3(keys) {
|
|
178
178
|
var events, result, nextErrorCollection;
|
|
179
179
|
return (0, _regeneratorRuntime2.default)().wrap(function _callee3$(_context3) {
|
|
180
180
|
while (1) switch (_context3.prev = _context3.next) {
|
|
@@ -78,7 +78,8 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
|
|
|
78
78
|
originalDiffTip = _column$originalDiffT === void 0 ? true : _column$originalDiffT,
|
|
79
79
|
_column$toolTipProps = column.toolTipProps,
|
|
80
80
|
toolTipProps = _column$toolTipProps === void 0 ? {} : _column$toolTipProps,
|
|
81
|
-
minWidth = column.minWidth
|
|
81
|
+
minWidth = column.minWidth,
|
|
82
|
+
diffTeleport = column.diffTeleport;
|
|
82
83
|
// 仅在 {x: 'max-content', y: 300 } 且 column无指定 width minWidth 情况下 才开启 minWidth的自动计算
|
|
83
84
|
var isMaxContentOverFlow = (0, _lodash.isObject)(scroll) ? (scroll === null || scroll === void 0 ? void 0 : scroll.x) === 'max-content' && Reflect.ownKeys(scroll).includes('y') : false;
|
|
84
85
|
calcMinWidth({
|
|
@@ -115,7 +116,7 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
|
|
|
115
116
|
}
|
|
116
117
|
};
|
|
117
118
|
if (column === null || column === void 0 ? void 0 : column.render) {
|
|
118
|
-
if (!originalObj && Object.keys(originalObj !== null && originalObj !== void 0 ? originalObj : {}).length === 0) {
|
|
119
|
+
if (!originalObj && Object.keys(originalObj !== null && originalObj !== void 0 ? originalObj : {}).length === 0 && !diffTeleport) {
|
|
119
120
|
return;
|
|
120
121
|
}
|
|
121
122
|
var originalRender = column.render; // 保存原始的 render 方法
|
|
@@ -127,6 +128,13 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
|
|
|
127
128
|
var originalValue = (0, _utils2.getOriginalValue)(value, record !== null && record !== void 0 ? record : {}, originalObj, rowKey, dataIndex);
|
|
128
129
|
var originalRenderValue = isFn ? originalRender === null || originalRender === void 0 ? void 0 : originalRender(originalValue, (_originalObj$record$r = originalObj === null || originalObj === void 0 ? void 0 : originalObj[record === null || record === void 0 ? void 0 : record[rowKey]]) !== null && _originalObj$record$r !== void 0 ? _originalObj$record$r : {}, index) : undefined;
|
|
129
130
|
var isInNewRowFlag = isInNewRow(record);
|
|
131
|
+
// 把比对结果告诉我
|
|
132
|
+
if (diffTeleport) {
|
|
133
|
+
var isDiff = diffTeleport(value, record, index, originalObj === null || originalObj === void 0 ? void 0 : originalObj[record === null || record === void 0 ? void 0 : record[rowKey]]);
|
|
134
|
+
if (!isDiff) {
|
|
135
|
+
originalValue = undefined;
|
|
136
|
+
}
|
|
137
|
+
}
|
|
130
138
|
return (0, _jsxRuntime.jsx)(_RenderColumn.default, {
|
|
131
139
|
valueType: valueType,
|
|
132
140
|
originalValue: originalValue === undefined ? undefined : originalRenderValue,
|
|
@@ -519,14 +527,14 @@ var getParentElement = exports.getParentElement = function getParentElement(elem
|
|
|
519
527
|
if (!element || !name) {
|
|
520
528
|
return result;
|
|
521
529
|
}
|
|
522
|
-
var
|
|
530
|
+
var _searchDom = function searchDom(element, name) {
|
|
523
531
|
var type = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'className';
|
|
524
532
|
if (element.parentElement[type] === name) {
|
|
525
533
|
result = element.parentElement;
|
|
526
534
|
return false;
|
|
527
535
|
}
|
|
528
|
-
|
|
536
|
+
_searchDom(element.parentElement, name, type = 'className');
|
|
529
537
|
};
|
|
530
|
-
|
|
538
|
+
_searchDom(element, name, type = 'className');
|
|
531
539
|
return result;
|
|
532
540
|
};
|
package/lib/ProTable/components/RcTable/components/DraggableTable/components/DndWrapper/index.js
CHANGED
|
@@ -81,7 +81,7 @@ var DndWrapper = function DndWrapper(_ref2) {
|
|
|
81
81
|
onDragStartGuard = _ref2.onDragStartGuard,
|
|
82
82
|
onDragEndGuard = _ref2.onDragEndGuard;
|
|
83
83
|
var onDragStart = /*#__PURE__*/function () {
|
|
84
|
-
var _ref4 = (0, _asyncToGenerator2.default)(
|
|
84
|
+
var _ref4 = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(_ref3) {
|
|
85
85
|
var active, _transformedValue, activeObject;
|
|
86
86
|
return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
|
|
87
87
|
while (1) switch (_context.prev = _context.next) {
|
|
@@ -112,7 +112,7 @@ var DndWrapper = function DndWrapper(_ref2) {
|
|
|
112
112
|
};
|
|
113
113
|
}();
|
|
114
114
|
var onDragEnd = /*#__PURE__*/function () {
|
|
115
|
-
var _ref6 = (0, _asyncToGenerator2.default)(
|
|
115
|
+
var _ref6 = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee2(_ref5) {
|
|
116
116
|
var active, over, transformedValue, activeObject, overObject, activeLevel, activeParentId, overLevel, overParentId, nextDataSource, _flatTree, activeIndex, overIndex, nextValue;
|
|
117
117
|
return (0, _regeneratorRuntime2.default)().wrap(function _callee2$(_context2) {
|
|
118
118
|
while (1) switch (_context2.prev = _context2.next) {
|