@zat-design/sisyphus-react 3.9.0-beta.2 → 3.9.0-beta.21
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 +41 -15
- package/dist/less.esm.css +37 -13
- 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 +7 -5
- package/es/ProDrawerForm/components/ProModal/index.js +8 -6
- package/es/ProDrawerForm/propsType.d.ts +1 -0
- 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 +7 -3
- package/es/ProEditTable/components/RenderField/index.d.ts +1 -1
- package/es/ProEditTable/components/RenderField/index.js +8 -7
- 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/index.js +23 -16
- package/es/ProEditTable/style/index.less +14 -2
- 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 +7 -5
- package/es/ProEnum/propsType.d.ts +1 -0
- package/es/ProEnum/utils/eventCenter.js +2 -1
- package/es/ProEnum/utils/getEnumLabel.d.ts +1 -1
- package/es/ProForm/components/base/Input/index.d.ts +1 -1
- package/es/ProForm/components/base/SwitchCheckbox/index.js +9 -2
- 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.d.ts +1 -0
- package/es/ProForm/components/combination/Group/component/ComRender.js +13 -2
- package/es/ProForm/components/combination/Group/index.js +4 -3
- 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 +7 -6
- 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 +2 -1
- package/es/ProForm/components/old/ProAddress/index.js +1 -1
- package/es/ProForm/components/old/ProRangeBox/index.d.ts +2 -1
- package/es/ProForm/components/render/ChangedWrapper.js +1 -2
- package/es/ProForm/components/render/ConfirmWrapper.js +1 -1
- package/es/ProForm/components/render/Render.js +3 -3
- package/es/ProForm/components/render/RenderFields.js +3 -2
- package/es/ProForm/components/render/propsType.d.ts +1 -0
- package/es/ProForm/index.js +1 -1
- package/es/ProForm/style/index.less +8 -5
- package/es/ProForm/utils/diffOriginal.js +18 -12
- package/es/ProForm/utils/index.js +10 -14
- package/es/ProForm/utils/useForm.js +1 -1
- package/es/ProIcon/utils/index.js +3 -4
- 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.d.ts +5 -3
- package/es/ProTable/components/FormatColumn/index.js +95 -74
- 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 +8 -9
- package/es/ProTable/components/RcTable/components/DraggableTable/index.d.ts +1 -1
- package/es/ProTable/components/RenderColumn/index.d.ts +1 -1
- package/es/ProTable/components/RenderColumn/index.js +29 -11
- 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/components/TableResizable/index.js +1 -5
- package/es/ProTable/hooks/useAntdTable.js +3 -3
- package/es/ProTable/index.d.ts +6 -5
- package/es/ProTable/index.js +6 -8
- package/es/ProTable/propsType.d.ts +2 -1
- package/es/ProTable/style/index.less +10 -1
- package/es/ProTable/utils/index.d.ts +5 -2
- package/es/ProTable/utils/index.js +13 -4
- 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 +2 -1
- 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 +50 -31
- 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 +11 -12
- package/es/ProTreeModal/components/Cascader.d.ts +1 -1
- package/es/ProTreeModal/components/CloseIcon.d.ts +2 -1
- 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 +14 -16
- 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/es/style/theme/antd.less +4 -2
- package/es/utils/index.d.ts +1 -1
- package/es/utils/index.js +4 -1
- 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 +7 -5
- package/lib/ProDrawerForm/components/ProModal/index.js +8 -6
- package/lib/ProDrawerForm/propsType.d.ts +1 -0
- 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 +5 -1
- package/lib/ProEditTable/components/RenderField/index.d.ts +1 -1
- package/lib/ProEditTable/components/RenderField/index.js +8 -7
- 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/index.js +23 -16
- package/lib/ProEditTable/style/index.less +14 -2
- 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 +7 -5
- package/lib/ProEnum/propsType.d.ts +1 -0
- package/lib/ProEnum/utils/eventCenter.js +2 -1
- package/lib/ProEnum/utils/getEnumLabel.d.ts +1 -1
- package/lib/ProForm/components/base/Input/index.d.ts +1 -1
- package/lib/ProForm/components/base/SwitchCheckbox/index.js +9 -2
- 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.d.ts +1 -0
- package/lib/ProForm/components/combination/Group/component/ComRender.js +13 -2
- package/lib/ProForm/components/combination/Group/index.js +4 -3
- 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 +7 -6
- 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 +2 -1
- package/lib/ProForm/components/old/ProAddress/index.js +1 -1
- package/lib/ProForm/components/old/ProRangeBox/index.d.ts +2 -1
- package/lib/ProForm/components/render/ChangedWrapper.js +1 -2
- package/lib/ProForm/components/render/ConfirmWrapper.js +1 -1
- package/lib/ProForm/components/render/Render.js +3 -3
- package/lib/ProForm/components/render/RenderFields.js +3 -2
- package/lib/ProForm/components/render/propsType.d.ts +1 -0
- package/lib/ProForm/index.js +1 -1
- package/lib/ProForm/style/index.less +8 -5
- package/lib/ProForm/utils/diffOriginal.js +18 -12
- 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.d.ts +5 -3
- package/lib/ProTable/components/FormatColumn/index.js +94 -73
- 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/RenderColumn/index.d.ts +1 -1
- package/lib/ProTable/components/RenderColumn/index.js +29 -11
- 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/components/TableResizable/index.js +0 -4
- package/lib/ProTable/hooks/useAntdTable.js +3 -3
- package/lib/ProTable/index.d.ts +6 -5
- package/lib/ProTable/index.js +6 -8
- package/lib/ProTable/propsType.d.ts +2 -1
- package/lib/ProTable/style/index.less +10 -1
- package/lib/ProTable/utils/index.d.ts +5 -2
- package/lib/ProTable/utils/index.js +13 -4
- 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 +2 -1
- 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 +49 -30
- 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 +2 -1
- 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/lib/style/theme/antd.less +4 -2
- package/lib/utils/index.d.ts +1 -1
- package/lib/utils/index.js +4 -1
- package/package.json +1 -1
- package/.vscode/extensions.json +0 -5
@@ -135,7 +135,7 @@ var ProEditLabel = function ProEditLabel(_ref) {
|
|
135
135
|
* pop确认回调
|
136
136
|
*/
|
137
137
|
var onConfirmHandle = /*#__PURE__*/function () {
|
138
|
-
var _ref2 = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
|
138
|
+
var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
|
139
139
|
var res, value;
|
140
140
|
return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
|
141
141
|
while (1) switch (_context.prev = _context.next) {
|
@@ -222,7 +222,7 @@ var ProEditLabel = function ProEditLabel(_ref) {
|
|
222
222
|
})
|
223
223
|
});
|
224
224
|
if (disabled) {
|
225
|
-
if (/*#__PURE__*/_react.default.isValidElement(children)) {
|
225
|
+
if ( /*#__PURE__*/_react.default.isValidElement(children)) {
|
226
226
|
return children;
|
227
227
|
}
|
228
228
|
if (props.value && !popupProps) {
|
@@ -254,7 +254,7 @@ var ProEditLabel = function ProEditLabel(_ref) {
|
|
254
254
|
if (mode === 'popup') {
|
255
255
|
// 查看时内容渲染
|
256
256
|
var labelRender = function labelRender() {
|
257
|
-
if (/*#__PURE__*/_react.default.isValidElement(children)) {
|
257
|
+
if ( /*#__PURE__*/_react.default.isValidElement(children)) {
|
258
258
|
return children;
|
259
259
|
}
|
260
260
|
return TextNode;
|
@@ -1,2 +1,2 @@
|
|
1
|
-
declare const ActionButton: ({ record, index, config, btnConfig }: any) =>
|
1
|
+
declare const ActionButton: ({ record, index, config, btnConfig }: any) => JSX.Element;
|
2
2
|
export default ActionButton;
|
@@ -86,7 +86,7 @@ var ActionButton = function ActionButton(_ref) {
|
|
86
86
|
disabled: isDisabled,
|
87
87
|
okText: _locale.default.ProEditTable.confirm,
|
88
88
|
cancelText: _locale.default.ProEditTable.cancel,
|
89
|
-
children: /*#__PURE__*/_react.default.isValidElement(btnConfig.label) ? (/*#__PURE__*/_react.default.cloneElement(btnConfig.label, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(delBtnProps, ['buttonProps', 'isEditable', 'onEvent'])), {}, {
|
89
|
+
children: /*#__PURE__*/_react.default.isValidElement(btnConfig.label) ? ( /*#__PURE__*/_react.default.cloneElement(btnConfig.label, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(delBtnProps, ['buttonProps', 'isEditable', 'onEvent'])), {}, {
|
90
90
|
record: record,
|
91
91
|
index: index,
|
92
92
|
disabled: isDisabled
|
@@ -96,7 +96,7 @@ var ActionButton = function ActionButton(_ref) {
|
|
96
96
|
children: btnConfig.label
|
97
97
|
}))
|
98
98
|
}) : (0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
|
99
|
-
children: /*#__PURE__*/_react.default.isValidElement(btnConfig.label) ? (/*#__PURE__*/_react.default.cloneElement(btnConfig.label, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(delBtnProps, ['buttonProps', 'isEditable', 'onEvent'])), {}, {
|
99
|
+
children: /*#__PURE__*/_react.default.isValidElement(btnConfig.label) ? ( /*#__PURE__*/_react.default.cloneElement(btnConfig.label, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(delBtnProps, ['buttonProps', 'isEditable', 'onEvent'])), {}, {
|
100
100
|
record: record,
|
101
101
|
index: index,
|
102
102
|
disabled: isDisabled,
|
@@ -113,7 +113,7 @@ var ActionButton = function ActionButton(_ref) {
|
|
113
113
|
}))
|
114
114
|
})
|
115
115
|
}) : (0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
|
116
|
-
children: /*#__PURE__*/_react.default.isValidElement(btnConfig.label) ? (/*#__PURE__*/_react.default.cloneElement(btnConfig.label, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(actionBtnProps, ['buttonProps', 'isEditable', 'onEvent'])), {}, {
|
116
|
+
children: /*#__PURE__*/_react.default.isValidElement(btnConfig.label) ? ( /*#__PURE__*/_react.default.cloneElement(btnConfig.label, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(actionBtnProps, ['buttonProps', 'isEditable', 'onEvent'])), {}, {
|
117
117
|
record: record,
|
118
118
|
index: index
|
119
119
|
}))) : (0, _jsxRuntime.jsx)(_antd.Button, (0, _objectSpread2.default)((0, _objectSpread2.default)({
|
@@ -167,6 +167,10 @@ var ListChangedWrapper = function ListChangedWrapper(props) {
|
|
167
167
|
};
|
168
168
|
// @ts-ignore
|
169
169
|
var _showEllipse = ((_children$props = children.props) === null || _children$props === void 0 ? void 0 : _children$props.showEllipse) || ((_children$props2 = children.props) === null || _children$props2 === void 0 ? void 0 : _children$props2.tooltip);
|
170
|
+
var classNames = (0, _classnames.default)({
|
171
|
+
'original-value-tooltip': true,
|
172
|
+
'original-value-tooltip-fixed': true
|
173
|
+
});
|
170
174
|
var diffClassName = (0, _classnames.default)({
|
171
175
|
'pro-form-item-changed': isChanged,
|
172
176
|
'pro-form-item-add': isAdd
|
@@ -177,7 +181,7 @@ var ListChangedWrapper = function ListChangedWrapper(props) {
|
|
177
181
|
getPopupContainer: function getPopupContainer(trigger) {
|
178
182
|
return scrollFollowParent ? trigger.parentElement : document.body;
|
179
183
|
},
|
180
|
-
overlayClassName:
|
184
|
+
overlayClassName: classNames,
|
181
185
|
placement: "topLeft",
|
182
186
|
autoAdjustOverflow: false,
|
183
187
|
title: (0, _jsxRuntime.jsxs)(_antd.Space, {
|
@@ -1,2 +1,2 @@
|
|
1
|
-
declare const RenderField: ({ text: value, record, index, column, config }: any) =>
|
1
|
+
declare const RenderField: ({ text: value, record, index, column, config }: any) => JSX.Element;
|
2
2
|
export default RenderField;
|
@@ -30,7 +30,7 @@ var _utils = require("../../../ProForm/utils");
|
|
30
30
|
var _ConfirmWrapper = _interopRequireDefault(require("../../../ProForm/components/render/ConfirmWrapper"));
|
31
31
|
var _getDefaultProps = require("../../utils/getDefaultProps");
|
32
32
|
var _ListChangedWrapper = _interopRequireDefault(require("./ListChangedWrapper"));
|
33
|
-
var _excluded = ["type", "valueType", "names", "fieldProps", "labelRequired", "editRender", "component", "viewRender", "title", "originTitle", "label", "dataIndex", "formItemProps", "isEditable", "required", "rules", "equalWith", "className", "trim", "confirm"];
|
33
|
+
var _excluded = ["type", "valueType", "names", "fieldProps", "labelRequired", "editRender", "component", "viewRender", "title", "originTitle", "label", "dataIndex", "formItemProps", "isEditable", "required", "rules", "equalWith", "onDiff", "className", "trim", "confirm"];
|
34
34
|
/* eslint-disable prefer-destructuring */
|
35
35
|
/* eslint-disable prefer-const */
|
36
36
|
var RenderField = function RenderField(_ref) {
|
@@ -60,6 +60,7 @@ var RenderField = function RenderField(_ref) {
|
|
60
60
|
_column$rules = column.rules,
|
61
61
|
rules = _column$rules === void 0 ? [] : _column$rules,
|
62
62
|
equalWith = column.equalWith,
|
63
|
+
onDiff = column.onDiff,
|
63
64
|
className = column.className,
|
64
65
|
trim = column.trim,
|
65
66
|
confirm = column.confirm,
|
@@ -252,7 +253,7 @@ var RenderField = function RenderField(_ref) {
|
|
252
253
|
if (typeof _editRender === 'function') {
|
253
254
|
TargetComponent = _editRender.apply(void 0, rowParams);
|
254
255
|
}
|
255
|
-
if (/*#__PURE__*/_react.default.isValidElement(_editRender)) {
|
256
|
+
if ( /*#__PURE__*/_react.default.isValidElement(_editRender)) {
|
256
257
|
TargetComponent = _editRender;
|
257
258
|
}
|
258
259
|
}
|
@@ -268,7 +269,7 @@ var RenderField = function RenderField(_ref) {
|
|
268
269
|
children: View
|
269
270
|
});
|
270
271
|
}
|
271
|
-
if (/*#__PURE__*/_react.default.isValidElement(viewRender)) {
|
272
|
+
if ( /*#__PURE__*/_react.default.isValidElement(viewRender)) {
|
272
273
|
TargetComponent = viewRender;
|
273
274
|
}
|
274
275
|
}
|
@@ -311,7 +312,7 @@ var RenderField = function RenderField(_ref) {
|
|
311
312
|
}, 100);
|
312
313
|
};
|
313
314
|
// 单元格更新数据时,加个防抖,防止更新频率过快,卡顿
|
314
|
-
var _onChange = (0, _lodash.debounce)(/*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
|
315
|
+
var _onChange = (0, _lodash.debounce)( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
|
315
316
|
var _len2,
|
316
317
|
args,
|
317
318
|
_key2,
|
@@ -415,7 +416,7 @@ var RenderField = function RenderField(_ref) {
|
|
415
416
|
}, _callee);
|
416
417
|
})), 300);
|
417
418
|
var _onblur = /*#__PURE__*/function () {
|
418
|
-
var _ref3 = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee2() {
|
419
|
+
var _ref3 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee2() {
|
419
420
|
var _TargetComponent3, _TargetComponent3$pro, _TargetComponent$prop4;
|
420
421
|
var _len3,
|
421
422
|
args,
|
@@ -551,7 +552,7 @@ var RenderField = function RenderField(_ref) {
|
|
551
552
|
var getFieldItem = function getFieldItem() {
|
552
553
|
var _componentProps;
|
553
554
|
var FormItem = null;
|
554
|
-
var FieldComponent = /*#__PURE__*/_react.default.isValidElement(TargetComponent) ? (/*#__PURE__*/_react.default.cloneElement(TargetComponent, componentProps)) : (0, _jsxRuntime.jsx)(TargetComponent, (0, _objectSpread2.default)({}, componentProps));
|
555
|
+
var FieldComponent = /*#__PURE__*/_react.default.isValidElement(TargetComponent) ? ( /*#__PURE__*/_react.default.cloneElement(TargetComponent, componentProps)) : (0, _jsxRuntime.jsx)(TargetComponent, (0, _objectSpread2.default)({}, componentProps));
|
555
556
|
if (originalValues) {
|
556
557
|
FieldComponent = (0, _jsxRuntime.jsx)(_ListChangedWrapper.default, {
|
557
558
|
name: cellName,
|
@@ -562,7 +563,7 @@ var RenderField = function RenderField(_ref) {
|
|
562
563
|
originalNames: originalNames,
|
563
564
|
originalValues: originalValues,
|
564
565
|
form: form,
|
565
|
-
equalWith: equalWith,
|
566
|
+
equalWith: onDiff || equalWith,
|
566
567
|
type: type,
|
567
568
|
onChange: _onChange,
|
568
569
|
valuePropName: _formItemProps.valuePropName,
|
@@ -1,2 +1,2 @@
|
|
1
|
-
declare const RenderToolbar: (config: any) =>
|
1
|
+
declare const RenderToolbar: (config: any) => JSX.Element;
|
2
2
|
export default RenderToolbar;
|
@@ -82,7 +82,7 @@ var RenderToolbar = function RenderToolbar(config) {
|
|
82
82
|
toolbar.show = show !== null && show !== void 0 ? show : true;
|
83
83
|
toolbar.needConfirm = needConfirm !== null && needConfirm !== void 0 ? needConfirm : true;
|
84
84
|
toolbar.onEvent = /*#__PURE__*/function () {
|
85
|
-
var _ref = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(record, index) {
|
85
|
+
var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(record, index) {
|
86
86
|
var onEvent, result;
|
87
87
|
return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
|
88
88
|
while (1) switch (_context.prev = _context.next) {
|
@@ -8,5 +8,5 @@ interface SummaryProps<T = any> {
|
|
8
8
|
};
|
9
9
|
rowSelection: any;
|
10
10
|
}
|
11
|
-
declare const Summary: ({ data, summary, rowSelection, }: SummaryProps) =>
|
11
|
+
declare const Summary: ({ data, summary, rowSelection, }: SummaryProps) => JSX.Element;
|
12
12
|
export default Summary;
|
@@ -8,6 +8,7 @@ Object.defineProperty(exports, "__esModule", {
|
|
8
8
|
exports.default = void 0;
|
9
9
|
var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
|
10
10
|
var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
|
11
|
+
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
11
12
|
var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
|
12
13
|
var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
|
13
14
|
var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
|
@@ -24,7 +25,7 @@ var _ProForm = _interopRequireDefault(require("../ProForm"));
|
|
24
25
|
var _empty = _interopRequireDefault(require("../assets/empty.png"));
|
25
26
|
var _locale = _interopRequireWildcard(require("../locale"));
|
26
27
|
var _RcTable = require("./components/RcTable");
|
27
|
-
var _excluded = ["value", "onChange", "onDrag", "className", "columns", "type", "mode", "stripe", "draggable", "virtual", "disabled", "insertType", "emptyBtnText", "actionWidth", "actionProps", "toolbarProps", "toolbarSticky", "rowSelection", "onlyOneLineMsg", "deletePoConfirmMsg", "mulDeletePoConfirmMsg", "requiredAlign", "summary", "max", "headerRender", "pagination", "
|
28
|
+
var _excluded = ["value", "onChange", "onDrag", "className", "columns", "type", "mode", "stripe", "draggable", "virtual", "disabled", "insertType", "emptyBtnText", "actionWidth", "actionProps", "toolbarProps", "toolbarSticky", "rowSelection", "onlyOneLineMsg", "deletePoConfirmMsg", "mulDeletePoConfirmMsg", "requiredAlign", "summary", "max", "headerRender", "pagination", "rowKey", "rowDisabled", "rowDraggable", "footerRender", "scroll", "actionDirection", "diffConfig"];
|
28
29
|
var ProEditTable = function ProEditTable(_ref, ref) {
|
29
30
|
var _resetProps$id, _resetProps$id$split, _themeConfig$data2, _resetProps$otherProp;
|
30
31
|
var value = _ref.value,
|
@@ -53,7 +54,6 @@ var ProEditTable = function ProEditTable(_ref, ref) {
|
|
53
54
|
max = _ref.max,
|
54
55
|
headerRender = _ref.headerRender,
|
55
56
|
pagination = _ref.pagination,
|
56
|
-
originalValues = _ref.originalValues,
|
57
57
|
rowKey = _ref.rowKey,
|
58
58
|
rowDisabled = _ref.rowDisabled,
|
59
59
|
rowDraggable = _ref.rowDraggable,
|
@@ -139,6 +139,25 @@ var ProEditTable = function ProEditTable(_ref, ref) {
|
|
139
139
|
return getRowKey(item) === getRowKey(record);
|
140
140
|
}));
|
141
141
|
};
|
142
|
+
var originalValues = (0, _react.useMemo)(function () {
|
143
|
+
var _originalArr$every, _originalArr$some;
|
144
|
+
// 原始值也需要设置对应的rowkey,后续比对通过rowkey对比
|
145
|
+
var originalArr = (0, _lodash.get)(resetProps === null || resetProps === void 0 ? void 0 : resetProps.originalValues, name);
|
146
|
+
var isOriginalAllHasKey = originalArr ? originalArr === null || originalArr === void 0 ? void 0 : (_originalArr$every = originalArr.every) === null || _originalArr$every === void 0 ? void 0 : _originalArr$every.call(originalArr, function (item) {
|
147
|
+
return item.rowKey;
|
148
|
+
}) : true;
|
149
|
+
var isNeedCoverOriginal = originalArr === null || originalArr === void 0 ? void 0 : (_originalArr$some = originalArr.some) === null || _originalArr$some === void 0 ? void 0 : _originalArr$some.call(originalArr, function (item) {
|
150
|
+
return item.rowKey !== getRowKey(item);
|
151
|
+
});
|
152
|
+
// 初始化默认生成row-key
|
153
|
+
if ((originalArr === null || originalArr === void 0 ? void 0 : originalArr.length) && (!isOriginalAllHasKey || isNeedCoverOriginal)) {
|
154
|
+
var _originalArr$forEach;
|
155
|
+
originalArr === null || originalArr === void 0 ? void 0 : (_originalArr$forEach = originalArr.forEach) === null || _originalArr$forEach === void 0 ? void 0 : _originalArr$forEach.call(originalArr, function (item) {
|
156
|
+
item.rowKey = getRowKey(item);
|
157
|
+
});
|
158
|
+
}
|
159
|
+
return (0, _defineProperty2.default)({}, name, originalArr);
|
160
|
+
}, [resetProps === null || resetProps === void 0 ? void 0 : resetProps.originalValues]);
|
142
161
|
var config = (0, _objectSpread2.default)({
|
143
162
|
form: form,
|
144
163
|
mode: mode,
|
@@ -278,33 +297,21 @@ var ProEditTable = function ProEditTable(_ref, ref) {
|
|
278
297
|
return (0, _utils.transformColumns)(columns, config);
|
279
298
|
}, [valueChangeRef.current, disabled, forceUpdate, columns, page, actionProps, editingKeys, cellNamePath]);
|
280
299
|
var initDataSource = function initDataSource() {
|
281
|
-
var _value$every,
|
300
|
+
var _value$every, _value$some;
|
282
301
|
var isAllHasKey = value === null || value === void 0 ? void 0 : (_value$every = value.every) === null || _value$every === void 0 ? void 0 : _value$every.call(value, function (item) {
|
283
302
|
return item.rowKey;
|
284
303
|
});
|
285
|
-
// 原始值也需要设置对应的rowkey,后续比对通过rowkey对比
|
286
|
-
var originalArr = (0, _lodash.get)(originalValues, name);
|
287
|
-
var isOriginalAllHasKey = originalArr ? originalArr === null || originalArr === void 0 ? void 0 : (_originalArr$every = originalArr.every) === null || _originalArr$every === void 0 ? void 0 : _originalArr$every.call(originalArr, function (item) {
|
288
|
-
return item.rowKey;
|
289
|
-
}) : true;
|
290
304
|
// 检测当前rowkey是否与制定key的值是否一致,不一致,则执行覆盖
|
291
305
|
var isNeedCover = value === null || value === void 0 ? void 0 : (_value$some = value.some) === null || _value$some === void 0 ? void 0 : _value$some.call(value, function (item) {
|
292
306
|
return item.rowKey !== getRowKey(item);
|
293
307
|
});
|
294
|
-
var isNeedCoverOriginal = originalArr === null || originalArr === void 0 ? void 0 : (_originalArr$some = originalArr.some) === null || _originalArr$some === void 0 ? void 0 : _originalArr$some.call(originalArr, function (item) {
|
295
|
-
return item.rowKey !== getRowKey(item);
|
296
|
-
});
|
297
308
|
// 初始化默认生成row-key
|
298
|
-
if ((value === null || value === void 0 ? void 0 : value.length) && (!isAllHasKey || isNeedCover)
|
299
|
-
var _originalArr$forEach;
|
309
|
+
if ((value === null || value === void 0 ? void 0 : value.length) && (!isAllHasKey || isNeedCover)) {
|
300
310
|
var nextValues = value === null || value === void 0 ? void 0 : value.map(function (item) {
|
301
311
|
return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, item), {}, {
|
302
312
|
rowKey: getRowKey(item)
|
303
313
|
});
|
304
314
|
});
|
305
|
-
originalArr === null || originalArr === void 0 ? void 0 : (_originalArr$forEach = originalArr.forEach) === null || _originalArr$forEach === void 0 ? void 0 : _originalArr$forEach.call(originalArr, function (item) {
|
306
|
-
item.rowKey = getRowKey(item);
|
307
|
-
});
|
308
315
|
onChange(nextValues);
|
309
316
|
if (virtualKey) {
|
310
317
|
form.setFieldValue(virtualRowName, nextValues);
|
@@ -281,8 +281,20 @@
|
|
281
281
|
}
|
282
282
|
}
|
283
283
|
|
284
|
-
|
285
|
-
|
284
|
+
.@{ant-prefix}-table .@{ant-prefix}-table-tbody, .@{ant-prefix}-table-tbody .is-new-row.@{ant-prefix}-table-row td{
|
285
|
+
background: var(--zaui-contract-bg-add, #d2fff4) !important;
|
286
|
+
}
|
287
|
+
.@{ant-prefix}-table .@{ant-prefix}-table-tbody .@{ant-prefix}-table-tbody .is-new-row.@{ant-prefix}-table-row:hover{
|
288
|
+
td, .@{ant-prefix}-table-cell-row-hover {
|
289
|
+
background: var(--zaui-contract-bg-add, #d2fff4) !important;
|
290
|
+
}
|
291
|
+
}
|
292
|
+
|
293
|
+
.@{ant-prefix}-table .@{ant-prefix}-table-body, .@{ant-prefix}-table-tbody .is-new-row.@{ant-prefix}-table-row td{
|
294
|
+
background: var(--zaui-contract-bg-add, #d2fff4) !important;
|
295
|
+
}
|
296
|
+
.@{ant-prefix}-table .@{ant-prefix}-table-body .@{ant-prefix}-table-tbody .is-new-row.@{ant-prefix}-table-row:hover{
|
297
|
+
td, .@{ant-prefix}-table-cell-row-hover {
|
286
298
|
background: var(--zaui-contract-bg-add, #d2fff4) !important;
|
287
299
|
}
|
288
300
|
}
|
@@ -9,7 +9,7 @@ export declare const defaultBtnNameMap: {
|
|
9
9
|
custom: any;
|
10
10
|
};
|
11
11
|
export declare const iconMap: {
|
12
|
-
add:
|
12
|
+
add: JSX.Element;
|
13
13
|
};
|
14
14
|
export declare const defaultSingleActionKeys: string[];
|
15
15
|
export declare const defaultMultipleActionKeys: string[];
|
@@ -69,7 +69,7 @@ var actions = exports.actions = {
|
|
69
69
|
});
|
70
70
|
},
|
71
71
|
save: function () {
|
72
|
-
var _save = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(_ref2) {
|
72
|
+
var _save = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(_ref2) {
|
73
73
|
var record, editingKeys, setState, form, rowName, virtualRowName, result, updateData, nextEditingKeys, values;
|
74
74
|
return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
|
75
75
|
while (1) switch (_context.prev = _context.next) {
|
@@ -172,7 +172,7 @@ var actions = exports.actions = {
|
|
172
172
|
}
|
173
173
|
},
|
174
174
|
add: function () {
|
175
|
-
var _add = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee2(_ref5) {
|
175
|
+
var _add = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee2(_ref5) {
|
176
176
|
var _tableRef$current$que, _tableRef$current$que2;
|
177
177
|
var result, insertType, editingKeys, setState, form, name, virtualName, virtualKey, onlyOneLineMsg, tableRef, _ref5$prefixCls, prefixCls, nextData, rowKey, addData, nextEditingKeys;
|
178
178
|
return (0, _regeneratorRuntime2.default)().wrap(function _callee2$(_context2) {
|
@@ -30,7 +30,7 @@ var _excluded = ["type", "label", "show", "needConfirm", "onHandle", "onClick"],
|
|
30
30
|
// 渲染操作栏
|
31
31
|
var getActionColumn = function getActionColumn(config) {
|
32
32
|
var _cloneDeepWith = (0, _lodash.cloneDeepWith)(config, function (value) {
|
33
|
-
if (/*#__PURE__*/_react.default.isValidElement(value)) {
|
33
|
+
if ( /*#__PURE__*/_react.default.isValidElement(value)) {
|
34
34
|
return value;
|
35
35
|
}
|
36
36
|
}),
|
@@ -87,7 +87,7 @@ var getActionColumn = function getActionColumn(config) {
|
|
87
87
|
action.show = show !== null && show !== void 0 ? show : true;
|
88
88
|
action.needConfirm = needConfirm !== null && needConfirm !== void 0 ? needConfirm : true;
|
89
89
|
action.onEvent = /*#__PURE__*/function () {
|
90
|
-
var _ref = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(record, index) {
|
90
|
+
var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(record, index) {
|
91
91
|
var _form$getFieldValue;
|
92
92
|
var rowName, _record, onEvent, result;
|
93
93
|
return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
|
@@ -238,7 +238,7 @@ var transformColumns = exports.transformColumns = function transformColumns() {
|
|
238
238
|
children: [before, columnTitle, (0, _jsxRuntime.jsx)(_antd.Tooltip, (0, _objectSpread2.default)((0, _objectSpread2.default)({
|
239
239
|
title: tooltipTitle !== null && tooltipTitle !== void 0 ? tooltipTitle : tooltip
|
240
240
|
}, resetProps), {}, {
|
241
|
-
children: icon ? (/*#__PURE__*/_react.default.cloneElement(icon, {
|
241
|
+
children: icon ? ( /*#__PURE__*/_react.default.cloneElement(icon, {
|
242
242
|
className: 'icon-tip'
|
243
243
|
})) : (0, _jsxRuntime.jsx)(_reactSvg.ReactSVG, {
|
244
244
|
className: "icon-tip",
|
@@ -391,8 +391,8 @@ var transformColumns = exports.transformColumns = function transformColumns() {
|
|
391
391
|
}
|
392
392
|
// cacheMap 用来存储缓存值,若有值后不再请求
|
393
393
|
if (JSON.stringify(cacheMap.current) === '{}') {
|
394
|
-
Promise.all(Object.entries(_cacheMap).map(/*#__PURE__*/function () {
|
395
|
-
var _ref3 = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee2(item) {
|
394
|
+
Promise.all(Object.entries(_cacheMap).map( /*#__PURE__*/function () {
|
395
|
+
var _ref3 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee2(item) {
|
396
396
|
var _item, key, value, _ref4, service, option;
|
397
397
|
return (0, _regeneratorRuntime2.default)().wrap(function _callee2$(_context2) {
|
398
398
|
while (1) switch (_context2.prev = _context2.next) {
|
@@ -14,14 +14,14 @@ var getRandom = exports.getRandom = function getRandom() {
|
|
14
14
|
};
|
15
15
|
// 深层次对比两个对象且取出来差异值
|
16
16
|
var difference = exports.difference = function difference(object, base) {
|
17
|
-
var
|
17
|
+
var changes = function changes(object, base) {
|
18
18
|
return (0, _lodash.transform)(object, function (result, value, key) {
|
19
19
|
if (!(0, _lodash.isEqual)(value, base[key])) {
|
20
|
-
result[key] = (0, _lodash.isObject)(value) && (0, _lodash.isObject)(base[key]) ?
|
20
|
+
result[key] = (0, _lodash.isObject)(value) && (0, _lodash.isObject)(base[key]) ? changes(value, base[key]) : value;
|
21
21
|
}
|
22
22
|
});
|
23
23
|
};
|
24
|
-
return
|
24
|
+
return changes(object, base);
|
25
25
|
};
|
26
26
|
// 数组字段循环校验,解决validateFields无法批量校验的问题
|
27
27
|
var customValidate = exports.customValidate = function customValidate(validateKeys, form, rowName) {
|
@@ -199,7 +199,7 @@ var handleScrollToError = exports.handleScrollToError = function handleScrollToE
|
|
199
199
|
*/
|
200
200
|
function cloneDeepFilterNode(value) {
|
201
201
|
return (0, _lodash.cloneDeepWith)(value, function (val) {
|
202
|
-
if (/*#__PURE__*/_react.default.isValidElement(val)) {
|
202
|
+
if ( /*#__PURE__*/_react.default.isValidElement(val)) {
|
203
203
|
return val;
|
204
204
|
}
|
205
205
|
});
|
@@ -6,5 +6,5 @@ interface Props extends Pick<ProEnum, 'id' | 'value' | 'onChange' | 'dataSource'
|
|
6
6
|
allowClear?: boolean;
|
7
7
|
button?: boolean;
|
8
8
|
}
|
9
|
-
declare const Group: (props: Props) =>
|
9
|
+
declare const Group: (props: Props) => JSX.Element;
|
10
10
|
export default Group;
|
@@ -3,5 +3,5 @@ interface Props extends Pick<ProEnum, 'id' | 'value' | 'onChange' | 'dataSource'
|
|
3
3
|
fieldValue: string;
|
4
4
|
fieldLabel: string;
|
5
5
|
}
|
6
|
-
declare const ProEnumTag: (props: Props) =>
|
6
|
+
declare const ProEnumTag: (props: Props) => JSX.Element;
|
7
7
|
export default ProEnumTag;
|
@@ -59,7 +59,7 @@ var useEnumRequest = function useEnumRequest(props, dispatch) {
|
|
59
59
|
staleTime: 6e4 * 60
|
60
60
|
}, useRequest === null || useRequest === void 0 ? void 0 : useRequest.options), {}, {
|
61
61
|
setCache: function () {
|
62
|
-
var _setCache = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(res) {
|
62
|
+
var _setCache = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(res) {
|
63
63
|
var response, _locale$ProEnum2, _useRequest$options, ignoreCodes, cacheData;
|
64
64
|
return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
|
65
65
|
while (1) switch (_context.prev = _context.next) {
|
@@ -169,7 +169,7 @@ var useEnumRequest = function useEnumRequest(props, dispatch) {
|
|
169
169
|
}
|
170
170
|
}));
|
171
171
|
var mergeData = /*#__PURE__*/function () {
|
172
|
-
var _ref3 = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee2() {
|
172
|
+
var _ref3 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee2() {
|
173
173
|
var cacheData, _useRequest$options2, _useRequest$options3, enumData, cacheCodes, codes, ignoreCodes, diff, response, res, _locale$ProEnum6;
|
174
174
|
return (0, _regeneratorRuntime2.default)().wrap(function _callee2$(_context2) {
|
175
175
|
while (1) switch (_context2.prev = _context2.next) {
|
package/lib/ProEnum/index.d.ts
CHANGED
@@ -2,8 +2,8 @@ import useEnum from './hooks/useEnum';
|
|
2
2
|
import { ProEnumProps } from './propsType';
|
3
3
|
import './style/index.less';
|
4
4
|
declare const ProEnum: {
|
5
|
-
(props: ProEnumProps):
|
6
|
-
getEnumLabel: (code: string | string[], value: any, compose?: boolean, fieldNameLabel?: string, fieldNameValue?: string) =>
|
5
|
+
(props: ProEnumProps): JSX.Element;
|
6
|
+
getEnumLabel: (code: string | string[], value: any, compose?: boolean, fieldNameLabel?: string, fieldNameValue?: string) => JSX.Element;
|
7
7
|
useEnum: typeof useEnum;
|
8
8
|
};
|
9
9
|
export default ProEnum;
|
package/lib/ProEnum/index.js
CHANGED
@@ -44,7 +44,8 @@ var ProEnum = function ProEnum(props) {
|
|
44
44
|
enumProps = (0, _objectWithoutProperties2.default)(props, _excluded);
|
45
45
|
var _ref = otherProps || {},
|
46
46
|
viewEmpty = _ref.viewEmpty;
|
47
|
-
var _isView = isView
|
47
|
+
var _isView = isView !== undefined && isView !== null ? isView : otherProps === null || otherProps === void 0 ? void 0 : otherProps.isView;
|
48
|
+
var _defalutValue = props === null || props === void 0 ? void 0 : props.defaultValue;
|
48
49
|
var _ref2 = (0, _ProConfigProvider.useProConfig)('ProEnum') || {},
|
49
50
|
fieldNames = _ref2.fieldNames,
|
50
51
|
_ref2$clear = _ref2.clear,
|
@@ -154,7 +155,7 @@ var ProEnum = function ProEnum(props) {
|
|
154
155
|
list = [];
|
155
156
|
}
|
156
157
|
}
|
157
|
-
if (/*#__PURE__*/_react.default.isValidElement(component)) {
|
158
|
+
if ( /*#__PURE__*/_react.default.isValidElement(component)) {
|
158
159
|
var Component = component;
|
159
160
|
return (0, _jsxRuntime.jsx)(Component, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, enumProps), {}, {
|
160
161
|
dataSource: list,
|
@@ -274,16 +275,17 @@ var ProEnum = function ProEnum(props) {
|
|
274
275
|
return (0, _lodash.isFunction)(props.optionRender) && record.length ? _optionRender() : labelList === null || labelList === void 0 ? void 0 : labelList.join(',');
|
275
276
|
};
|
276
277
|
if (_isView) {
|
277
|
-
|
278
|
+
var __value = value || _defalutValue;
|
279
|
+
if (Array.isArray(__value)) {
|
278
280
|
return (0, _jsxRuntime.jsx)(_Container.default, {
|
279
281
|
tooltip: true,
|
280
282
|
viewEmpty: viewEmpty,
|
281
|
-
children: transToLabel(
|
283
|
+
children: transToLabel(__value)
|
282
284
|
});
|
283
285
|
}
|
284
286
|
return (0, _jsxRuntime.jsx)(_Container.default, {
|
285
287
|
viewEmpty: viewEmpty,
|
286
|
-
children:
|
288
|
+
children: __value || (0, _lodash.isNumber)(__value) ? transToLabel([__value]) : null
|
287
289
|
});
|
288
290
|
}
|
289
291
|
return (0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
|
@@ -10,7 +10,7 @@ var SimpleEventCenter = /*#__PURE__*/function () {
|
|
10
10
|
this.events = void 0;
|
11
11
|
this.events = new Map();
|
12
12
|
}
|
13
|
-
|
13
|
+
(0, _createClass2.default)(SimpleEventCenter, [{
|
14
14
|
key: "subscribe",
|
15
15
|
value: function subscribe(eventName, callback) {
|
16
16
|
if (!this.events.has(eventName)) {
|
@@ -37,5 +37,6 @@ var SimpleEventCenter = /*#__PURE__*/function () {
|
|
37
37
|
}
|
38
38
|
}
|
39
39
|
}]);
|
40
|
+
return SimpleEventCenter;
|
40
41
|
}(); // 将 eventCenter 实例添加到 window 对象上
|
41
42
|
window.eventCenter = new SimpleEventCenter();
|
@@ -1,2 +1,2 @@
|
|
1
|
-
declare const getEnumLabel: (code: string | string[], value: any, compose?: boolean, fieldNameLabel?: string, fieldNameValue?: string) =>
|
1
|
+
declare const getEnumLabel: (code: string | string[], value: any, compose?: boolean, fieldNameLabel?: string, fieldNameValue?: string) => JSX.Element;
|
2
2
|
export default getEnumLabel;
|
@@ -10,15 +10,17 @@ var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/h
|
|
10
10
|
var _jsxRuntime = require("react/jsx-runtime");
|
11
11
|
var _antd = require("antd");
|
12
12
|
var _lodash = require("lodash");
|
13
|
+
var _classnames = _interopRequireDefault(require("classnames"));
|
13
14
|
var _ProConfigProvider = require("../../../../ProConfigProvider");
|
14
15
|
var _locale = _interopRequireDefault(require("../../../../locale"));
|
15
16
|
var _ProForm = _interopRequireDefault(require("../../../../ProForm"));
|
16
|
-
var _excluded = ["onChange", "disabled", "value", "otherProps"];
|
17
|
+
var _excluded = ["onChange", "disabled", "value", "otherProps", "className"];
|
17
18
|
var SwitchCheckbox = function SwitchCheckbox(props) {
|
18
19
|
var onChange = props.onChange,
|
19
20
|
disabled = props.disabled,
|
20
21
|
value = props.value,
|
21
22
|
otherProps = props.otherProps,
|
23
|
+
className = props.className,
|
22
24
|
restProps = (0, _objectWithoutProperties2.default)(props, _excluded);
|
23
25
|
var _ref = _ProForm.default.useFieldProps() || {},
|
24
26
|
isViewCon = _ref.isView,
|
@@ -53,9 +55,14 @@ var SwitchCheckbox = function SwitchCheckbox(props) {
|
|
53
55
|
})]
|
54
56
|
});
|
55
57
|
}
|
58
|
+
var classNames = (0, _classnames.default)({
|
59
|
+
'pro-switch-checkbox': true,
|
60
|
+
className: className
|
61
|
+
});
|
56
62
|
return (0, _jsxRuntime.jsx)(_antd.Checkbox, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({
|
57
63
|
disabled: disabled,
|
58
|
-
onChange: changeVal
|
64
|
+
onChange: changeVal,
|
65
|
+
className: classNames
|
59
66
|
}, initialConfig), restProps), {}, {
|
60
67
|
children: restProps.label
|
61
68
|
}));
|
@@ -134,7 +134,7 @@ var ActionButton = function ActionButton(props) {
|
|
134
134
|
return _actionProps;
|
135
135
|
}, [props.actionProps]);
|
136
136
|
var handleClick = /*#__PURE__*/function () {
|
137
|
-
var _ref6 = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(defaultCallback, callback, index, item) {
|
137
|
+
var _ref6 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(defaultCallback, callback, index, item) {
|
138
138
|
var value, data;
|
139
139
|
return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
|
140
140
|
while (1) switch (_context.prev = _context.next) {
|
@@ -273,7 +273,7 @@ var ActionButton = function ActionButton(props) {
|
|
273
273
|
},
|
274
274
|
children: label
|
275
275
|
}))
|
276
|
-
}), "".concat(item === null || item === void 0 ? void 0 : item.type).concat(index)) : (/*#__PURE__*/(0, _react.createElement)(_antd.Button, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, rest), {}, {
|
276
|
+
}), "".concat(item === null || item === void 0 ? void 0 : item.type).concat(index)) : ( /*#__PURE__*/(0, _react.createElement)(_antd.Button, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, rest), {}, {
|
277
277
|
key: "".concat(item === null || item === void 0 ? void 0 : item.type).concat(index),
|
278
278
|
type: "text",
|
279
279
|
onClick: function onClick(e) {
|
@@ -20,7 +20,7 @@ var BlockTitle = function BlockTitle(props) {
|
|
20
20
|
if (!title) {
|
21
21
|
return (0, _jsxRuntime.jsx)("div", {});
|
22
22
|
}
|
23
|
-
if (/*#__PURE__*/_react.default.isValidElement(title)) {
|
23
|
+
if ( /*#__PURE__*/_react.default.isValidElement(title)) {
|
24
24
|
return title;
|
25
25
|
}
|
26
26
|
var titleContent = title;
|
@@ -59,7 +59,7 @@ var ToolbarButton = function ToolbarButton(props) {
|
|
59
59
|
return _toolbarProps;
|
60
60
|
}, [props.toolbarProps]);
|
61
61
|
var handleClick = /*#__PURE__*/function () {
|
62
|
-
var _ref2 = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(defaultCallback, callback, item) {
|
62
|
+
var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(defaultCallback, callback, item) {
|
63
63
|
var value, data;
|
64
64
|
return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
|
65
65
|
while (1) switch (_context.prev = _context.next) {
|