@zat-design/sisyphus-react 3.13.7 → 3.13.9
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/es/ProAction/components/CheckModalContent/index.css +22 -0
- package/es/ProAction/components/CheckModalContent/index.d.ts +8 -0
- package/es/ProAction/components/CheckModalContent/index.js +38 -0
- package/es/ProAction/components/CheckModalContent/index.less +28 -0
- package/es/ProAction/index.js +39 -41
- package/es/ProAction/index.less +5 -6
- package/es/ProAction/propsType.d.ts +8 -6
- package/es/ProDownload/index.js +4 -3
- package/es/ProDownload/utils.js +5 -4
- package/es/ProDrawerForm/components/ProDrawer/index.js +2 -2
- package/es/ProDrawerForm/components/ProModal/index.js +2 -2
- package/es/ProEditLabel/components/RenderProForm.js +3 -3
- package/es/ProEditLabel/index.js +2 -2
- package/es/ProEditTable/components/ActionButton/index.js +9 -8
- package/es/ProEditTable/components/RenderField/ListChangedWrapper.js +6 -6
- package/es/ProEditTable/components/RenderField/index.js +20 -16
- package/es/ProEditTable/index.js +10 -7
- package/es/ProEditTable/utils/config.js +3 -3
- package/es/ProEditTable/utils/diffOriginal.js +6 -4
- package/es/ProEditTable/utils/getDefaultProps.js +8 -7
- package/es/ProEditTable/utils/index.js +21 -18
- package/es/ProEditTable/utils/tools.js +32 -24
- package/es/ProEditTable/utils/useEditTableError.js +2 -2
- package/es/ProEnum/index.js +16 -11
- package/es/ProEnum/utils/eventCenter.js +2 -2
- package/es/ProEnum/utils/getEnumLabel.js +5 -4
- package/es/ProEnum/utils/index.js +3 -2
- package/es/ProForm/components/base/DatePicker/index.js +11 -8
- package/es/ProForm/components/base/Input/index.js +3 -3
- package/es/ProForm/components/base/InputNumber/index.js +6 -4
- package/es/ProForm/components/base/RangePicker/index.js +12 -8
- package/es/ProForm/components/base/Select/index.js +2 -2
- package/es/ProForm/components/base/Switch/index.js +3 -2
- package/es/ProForm/components/base/SwitchCheckbox/index.js +3 -2
- package/es/ProForm/components/base/TextArea/index.js +2 -2
- package/es/ProForm/components/combination/Container/index.js +2 -2
- package/es/ProForm/components/combination/FormList/components/ActionButton.js +7 -6
- package/es/ProForm/components/combination/FormList/components/BlockFields.js +2 -2
- package/es/ProForm/components/combination/FormList/components/BlockTitle.js +2 -2
- package/es/ProForm/components/combination/FormList/components/ToolbarButton.js +5 -4
- package/es/ProForm/components/combination/FormList/index.js +2 -2
- package/es/ProForm/components/combination/FormList/utils.js +2 -2
- package/es/ProForm/components/combination/Group/hooks/index.js +4 -3
- package/es/ProForm/components/combination/Group/index.js +2 -2
- package/es/ProForm/components/combination/Group/utils.js +6 -6
- package/es/ProForm/components/combination/ProCascader/index.js +6 -4
- package/es/ProForm/components/combination/ProCascader/utils/index.js +2 -2
- package/es/ProForm/components/combination/ProModalSelect/hooks/useRequestList.js +3 -3
- package/es/ProForm/components/combination/ProModalSelect/index.js +13 -10
- package/es/ProForm/components/combination/ProNumberRange/index.js +2 -2
- package/es/ProForm/components/combination/ProRangeLimit/index.js +8 -5
- package/es/ProForm/components/combination/ProTimeLimit/index.js +10 -7
- package/es/ProForm/components/old/EnumSelect/hooks/useRequestList.js +3 -3
- package/es/ProForm/components/old/EnumSelect/index.js +3 -3
- package/es/ProForm/components/render/ChangedWrapper.js +3 -3
- package/es/ProForm/components/render/ConfirmWrapper.js +4 -3
- package/es/ProForm/components/render/Render.js +17 -13
- package/es/ProForm/components/render/RenderFields.js +9 -6
- package/es/ProForm/index.js +6 -4
- package/es/ProForm/utils/_useChanged.js +3 -3
- package/es/ProForm/utils/_useListChanged.js +6 -6
- package/es/ProForm/utils/diffOriginal.js +6 -4
- package/es/ProForm/utils/getDefaultProps.js +7 -6
- package/es/ProForm/utils/index.js +20 -15
- package/es/ProForm/utils/rulesCreator.js +4 -3
- package/es/ProForm/utils/transformNames.js +2 -2
- package/es/ProForm/utils/transformValue.js +3 -3
- package/es/ProForm/utils/useDeepCompareMemo.js +2 -2
- package/es/ProForm/utils/useRules.js +4 -3
- package/es/ProForm/utils/useShouldUpdate.js +23 -21
- package/es/ProForm/utils/useWatch.js +2 -2
- package/es/ProForm/utils/valueType.js +2 -2
- package/es/ProIcon/index.js +2 -2
- package/es/ProLayout/components/Layout/Menu/OpenMenu/index.js +2 -2
- package/es/ProLayout/components/ProCollapse/index.js +2 -2
- package/es/ProLayout/components/ProHeader/index.js +12 -9
- package/es/ProLayout/utils/index.js +3 -2
- package/es/ProSelect/index.js +11 -7
- package/es/ProSelect/utils/index.js +5 -3
- package/es/ProStep/components/Item/index.js +2 -2
- package/es/ProStep/components/Listener/index.js +2 -2
- package/es/ProStep/components/Step/index.js +2 -2
- package/es/ProStep/index.js +2 -2
- package/es/ProStep/utils/index.js +4 -3
- package/es/ProStepTab/index.js +3 -3
- package/es/ProTable/components/FormatColumn/index.js +16 -12
- package/es/ProTable/components/RcTable/components/DraggableTable/components/DndWrapper/index.js +3 -3
- package/es/ProTable/components/RenderColumn/index.js +2 -2
- package/es/ProTable/components/RenderSummary/index.js +3 -3
- package/es/ProTable/hooks/useAntdTable.js +15 -10
- package/es/ProTable/index.js +12 -7
- package/es/ProTable/utils/index.js +5 -4
- package/es/ProTabs/index.js +2 -2
- package/es/ProThemeTools/index.js +2 -2
- package/es/ProTree/components/ProTree.js +5 -4
- package/es/ProTree/components/ProTreeSelect/index.js +6 -5
- package/es/ProTreeModal/index.js +5 -4
- package/es/ProUpload/components/ImageRender.js +2 -2
- package/es/ProUpload/index.js +5 -4
- package/es/old/ProEditableTable/index.js +7 -7
- package/es/old/ProEditableTable/utils.js +2 -2
- package/lib/ProAction/components/CheckModalContent/index.css +22 -0
- package/lib/ProAction/components/CheckModalContent/index.d.ts +8 -0
- package/lib/ProAction/components/CheckModalContent/index.js +45 -0
- package/lib/ProAction/components/CheckModalContent/index.less +28 -0
- package/lib/ProAction/index.js +45 -44
- package/lib/ProAction/index.less +5 -6
- package/lib/ProAction/propsType.d.ts +8 -6
- package/lib/ProConfigProvider/index.js +3 -2
- package/lib/ProDownload/index.js +7 -6
- package/lib/ProDownload/utils.js +9 -7
- package/lib/ProDrawerForm/components/ProDrawer/index.js +12 -7
- package/lib/ProDrawerForm/components/ProModal/index.js +12 -7
- package/lib/ProEditLabel/components/RenderProForm.js +6 -5
- package/lib/ProEditLabel/index.js +15 -8
- package/lib/ProEditTable/components/ActionButton/index.js +15 -11
- package/lib/ProEditTable/components/RcTable/BaseTable.js +6 -3
- package/lib/ProEditTable/components/RcTable/DraggableTable.js +3 -2
- package/lib/ProEditTable/components/RenderField/ListChangedWrapper.js +14 -11
- package/lib/ProEditTable/components/RenderField/index.js +25 -20
- package/lib/ProEditTable/components/RenderToolbar/index.js +3 -2
- package/lib/ProEditTable/components/Summary/index.js +8 -5
- package/lib/ProEditTable/components/Validator/index.js +7 -3
- package/lib/ProEditTable/index.js +20 -12
- package/lib/ProEditTable/utils/config.js +8 -7
- package/lib/ProEditTable/utils/diffOriginal.js +7 -4
- package/lib/ProEditTable/utils/getDefaultProps.js +8 -7
- package/lib/ProEditTable/utils/index.js +27 -21
- package/lib/ProEditTable/utils/tools.js +32 -24
- package/lib/ProEditTable/utils/useEditTableError.js +2 -2
- package/lib/ProEnum/index.js +31 -19
- package/lib/ProEnum/utils/eventCenter.js +2 -2
- package/lib/ProEnum/utils/getEnumLabel.js +5 -4
- package/lib/ProEnum/utils/index.js +3 -2
- package/lib/ProForm/components/Container.js +3 -2
- package/lib/ProForm/components/FormFooter/index.js +7 -4
- package/lib/ProForm/components/base/Checkbox/index.js +4 -3
- package/lib/ProForm/components/base/DatePicker/index.js +14 -10
- package/lib/ProForm/components/base/Input/index.js +6 -5
- package/lib/ProForm/components/base/InputNumber/index.js +12 -7
- package/lib/ProForm/components/base/Radio/index.js +4 -3
- package/lib/ProForm/components/base/RangePicker/index.js +15 -10
- package/lib/ProForm/components/base/Select/index.js +5 -4
- package/lib/ProForm/components/base/Switch/index.js +6 -4
- package/lib/ProForm/components/base/SwitchCheckbox/index.js +6 -4
- package/lib/ProForm/components/base/TextArea/index.js +5 -4
- package/lib/ProForm/components/base/TimePicker/index.js +3 -2
- package/lib/ProForm/components/combination/Container/index.js +2 -2
- package/lib/ProForm/components/combination/FormList/components/ActionButton.js +16 -10
- package/lib/ProForm/components/combination/FormList/components/BlockFields.js +8 -5
- package/lib/ProForm/components/combination/FormList/components/BlockTitle.js +2 -2
- package/lib/ProForm/components/combination/FormList/components/LineFields.js +3 -2
- package/lib/ProForm/components/combination/FormList/components/ToolbarButton.js +10 -6
- package/lib/ProForm/components/combination/FormList/index.js +5 -4
- package/lib/ProForm/components/combination/FormList/utils.js +2 -2
- package/lib/ProForm/components/combination/Group/hooks/index.js +4 -3
- package/lib/ProForm/components/combination/Group/index.js +6 -5
- package/lib/ProForm/components/combination/Group/utils.js +10 -9
- package/lib/ProForm/components/combination/ProCascader/index.js +14 -7
- package/lib/ProForm/components/combination/ProCascader/utils/index.js +2 -2
- package/lib/ProForm/components/combination/ProCombination/index.js +9 -4
- package/lib/ProForm/components/combination/ProModalSelect/hooks/useRequestList.js +3 -3
- package/lib/ProForm/components/combination/ProModalSelect/index.js +35 -19
- package/lib/ProForm/components/combination/ProNumberRange/index.js +17 -10
- package/lib/ProForm/components/combination/ProRangeLimit/index.js +17 -9
- package/lib/ProForm/components/combination/ProTimeLimit/index.js +19 -11
- package/lib/ProForm/components/old/EnumSelect/hooks/useRequestList.js +3 -3
- package/lib/ProForm/components/old/EnumSelect/index.js +15 -8
- package/lib/ProForm/components/old/InputRange/index.js +8 -5
- package/lib/ProForm/components/old/InputWithSuffix/index.js +4 -3
- package/lib/ProForm/components/old/ProAddress/index.js +18 -11
- package/lib/ProForm/components/old/ProCertNo/index.js +12 -7
- package/lib/ProForm/components/old/ProCertValidity/index.js +11 -6
- package/lib/ProForm/components/old/ProRangeBox/index.js +21 -12
- package/lib/ProForm/components/render/ChangedWrapper.js +11 -8
- package/lib/ProForm/components/render/ConfirmWrapper.js +8 -6
- package/lib/ProForm/components/render/Render.js +34 -23
- package/lib/ProForm/components/render/RenderFields.js +9 -6
- package/lib/ProForm/index.js +21 -12
- package/lib/ProForm/utils/_useChanged.js +7 -5
- package/lib/ProForm/utils/_useListChanged.js +10 -8
- package/lib/ProForm/utils/diffOriginal.js +7 -4
- package/lib/ProForm/utils/getDefaultProps.js +8 -6
- package/lib/ProForm/utils/index.js +20 -15
- package/lib/ProForm/utils/rulesCreator.js +4 -3
- package/lib/ProForm/utils/transformNames.js +3 -2
- package/lib/ProForm/utils/transformValue.js +3 -3
- package/lib/ProForm/utils/useDeepCompareMemo.js +3 -2
- package/lib/ProForm/utils/useForm.js +3 -2
- package/lib/ProForm/utils/useRules.js +4 -3
- package/lib/ProForm/utils/useShouldUpdate.js +23 -21
- package/lib/ProForm/utils/useWatch.js +2 -2
- package/lib/ProForm/utils/valueType.js +2 -2
- package/lib/ProIcon/index.js +13 -8
- package/lib/ProLayout/components/Layout/Menu/FoldMenu/index.js +6 -3
- package/lib/ProLayout/components/Layout/Menu/OpenMenu/index.js +5 -4
- package/lib/ProLayout/components/ProCollapse/index.js +13 -8
- package/lib/ProLayout/components/ProFooter/index.js +3 -2
- package/lib/ProLayout/components/ProHeader/components/Copy/index.js +3 -2
- package/lib/ProLayout/components/ProHeader/components/ProBackBtn/index.js +3 -2
- package/lib/ProLayout/components/ProHeader/index.js +37 -25
- package/lib/ProLayout/index.js +3 -2
- package/lib/ProLayout/utils/index.js +2 -2
- package/lib/ProSelect/components/AdaptiveTooltip.js +3 -2
- package/lib/ProSelect/index.js +25 -14
- package/lib/ProSelect/utils/index.js +4 -4
- package/lib/ProStep/components/Anchor/index.js +3 -2
- package/lib/ProStep/components/Item/index.js +2 -2
- package/lib/ProStep/components/Listener/index.js +2 -2
- package/lib/ProStep/components/Step/index.js +2 -2
- package/lib/ProStep/index.js +2 -2
- package/lib/ProStep/utils/index.js +4 -3
- package/lib/ProStepTab/index.js +3 -3
- package/lib/ProTable/components/FormatColumn/index.js +26 -21
- package/lib/ProTable/components/RcTable/components/BaseTable/index.js +3 -2
- package/lib/ProTable/components/RcTable/components/DraggableTable/components/DndWrapper/index.js +3 -3
- package/lib/ProTable/components/RcTable/components/DraggableTable/index.js +3 -2
- package/lib/ProTable/components/RenderColumn/index.js +17 -12
- package/lib/ProTable/components/RenderSummary/index.js +8 -7
- package/lib/ProTable/components/RenderTableHeader/index.js +5 -3
- package/lib/ProTable/components/RenderTabs/index.js +6 -3
- package/lib/ProTable/components/TooltipTitle/index.js +3 -2
- package/lib/ProTable/hooks/useAntdTable.js +21 -13
- package/lib/ProTable/index.js +12 -7
- package/lib/ProTable/utils/index.js +5 -4
- package/lib/ProTabs/components/Card/index.js +11 -5
- package/lib/ProTabs/index.js +5 -4
- package/lib/ProThemeTools/component/ProTools/index.js +19 -12
- package/lib/ProThemeTools/index.js +12 -9
- package/lib/ProThemeTools/utils/index.js +3 -2
- package/lib/ProTooltip/index.js +5 -4
- package/lib/ProTree/components/AdaptiveTooltip.js +4 -2
- package/lib/ProTree/components/List.js +4 -3
- package/lib/ProTree/components/ProTree.js +17 -9
- package/lib/ProTree/components/ProTreeSelect/index.js +22 -14
- package/lib/ProTree/components/Tree.js +6 -3
- package/lib/ProTreeModal/components/Cascader.js +4 -3
- package/lib/ProTreeModal/components/List.js +14 -9
- package/lib/ProTreeModal/components/SortableItem.js +3 -2
- package/lib/ProTreeModal/components/Tree.js +4 -3
- package/lib/ProTreeModal/components/Trigger.js +11 -6
- package/lib/ProTreeModal/index.js +21 -13
- package/lib/ProUpload/components/ButtonRender.js +6 -3
- package/lib/ProUpload/components/DragRender.js +3 -2
- package/lib/ProUpload/components/FileItem.js +15 -10
- package/lib/ProUpload/components/ImageRender.js +19 -10
- package/lib/ProUpload/index.js +9 -7
- package/lib/ProViewer/index.js +9 -4
- package/lib/old/ProCertValidity/index.js +11 -6
- package/lib/old/ProEditableTable/index.js +36 -23
- package/lib/old/ProEditableTable/utils.js +35 -18
- package/package.json +2 -1
package/lib/ProLayout/index.js
CHANGED
@@ -7,9 +7,10 @@ Object.defineProperty(exports, "__esModule", {
|
|
7
7
|
exports.default = exports.LayoutContext = void 0;
|
8
8
|
var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
|
9
9
|
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
10
|
+
require("antd/es/message/style");
|
11
|
+
var _message2 = _interopRequireDefault(require("antd/es/message"));
|
10
12
|
var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
|
11
13
|
var _jsxRuntime = require("react/jsx-runtime");
|
12
|
-
var _antd = require("antd");
|
13
14
|
var _react = require("react");
|
14
15
|
var _classnames = _interopRequireDefault(require("classnames"));
|
15
16
|
var _ahooks = require("ahooks");
|
@@ -59,7 +60,7 @@ var ProLayout = function ProLayout(props) {
|
|
59
60
|
}, [props.collapsed]);
|
60
61
|
(0, _ahooks.useDeepCompareEffect)(function () {
|
61
62
|
if (Array.isArray(dataSource) && !dataSource.length) {
|
62
|
-
return
|
63
|
+
return _message2.default.warning('Warning: Missing menu data source, or menu data source is not an array');
|
63
64
|
}
|
64
65
|
var userData = (0, _utils.transformMenus)(dataSource, pathPrefix);
|
65
66
|
// 确保 menus 始终是一个数组
|
@@ -9,7 +9,7 @@ exports.getUrlParams = getUrlParams;
|
|
9
9
|
exports.transformMenus = exports.transformMenu = void 0;
|
10
10
|
var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
|
11
11
|
var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
|
12
|
-
var
|
12
|
+
var _isPlainObject2 = _interopRequireDefault(require("lodash/isPlainObject"));
|
13
13
|
/* eslint-disable prefer-destructuring */
|
14
14
|
/* eslint-disable no-mixed-operators */
|
15
15
|
|
@@ -98,7 +98,7 @@ var transformMenu = exports.transformMenu = function transformMenu(menuData, pat
|
|
98
98
|
* @returns []
|
99
99
|
*/
|
100
100
|
var transformMenus = exports.transformMenus = function transformMenus(data, pathPrefix) {
|
101
|
-
if ((0,
|
101
|
+
if ((0, _isPlainObject2.default)(data)) {
|
102
102
|
// @ts-ignore
|
103
103
|
if (!Array.isArray(data === null || data === void 0 ? void 0 : data.menus)) {
|
104
104
|
return [];
|
@@ -5,9 +5,10 @@ Object.defineProperty(exports, "__esModule", {
|
|
5
5
|
value: true
|
6
6
|
});
|
7
7
|
exports.default = void 0;
|
8
|
+
require("antd/es/tooltip/style");
|
9
|
+
var _tooltip = _interopRequireDefault(require("antd/es/tooltip"));
|
8
10
|
var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
|
9
11
|
var _jsxRuntime = require("react/jsx-runtime");
|
10
|
-
var _antd = require("antd");
|
11
12
|
var _react = require("react");
|
12
13
|
var AdaptiveTooltip = function AdaptiveTooltip(_ref) {
|
13
14
|
var children = _ref.children;
|
@@ -34,7 +35,7 @@ var AdaptiveTooltip = function AdaptiveTooltip(_ref) {
|
|
34
35
|
window.removeEventListener('resize', handleResize);
|
35
36
|
};
|
36
37
|
}, [children]);
|
37
|
-
return (0, _jsxRuntime.jsx)(
|
38
|
+
return (0, _jsxRuntime.jsx)(_tooltip.default, {
|
38
39
|
placement: placement,
|
39
40
|
title: (0, _jsxRuntime.jsx)("div", {
|
40
41
|
onMouseDown: function onMouseDown(e) {
|
package/lib/ProSelect/index.js
CHANGED
@@ -6,14 +6,25 @@ Object.defineProperty(exports, "__esModule", {
|
|
6
6
|
value: true
|
7
7
|
});
|
8
8
|
exports.default = exports.ProSelect = void 0;
|
9
|
+
require("antd/es/space/style");
|
10
|
+
var _space = _interopRequireDefault(require("antd/es/space"));
|
11
|
+
require("antd/es/input/style");
|
12
|
+
var _input = _interopRequireDefault(require("antd/es/input"));
|
9
13
|
var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
|
14
|
+
require("antd/es/message/style");
|
15
|
+
var _message2 = _interopRequireDefault(require("antd/es/message"));
|
10
16
|
var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
|
11
17
|
var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
|
18
|
+
require("antd/es/select/style");
|
19
|
+
var _select = _interopRequireDefault(require("antd/es/select"));
|
20
|
+
var _isNumber2 = _interopRequireDefault(require("lodash/isNumber"));
|
21
|
+
var _omit2 = _interopRequireDefault(require("lodash/omit"));
|
22
|
+
var _isString2 = _interopRequireDefault(require("lodash/isString"));
|
23
|
+
var _isObject2 = _interopRequireDefault(require("lodash/isObject"));
|
24
|
+
var _isFunction2 = _interopRequireDefault(require("lodash/isFunction"));
|
12
25
|
var _jsxRuntime = require("react/jsx-runtime");
|
13
26
|
var _ahooks = require("ahooks");
|
14
|
-
var _antd = require("antd");
|
15
27
|
var _react = _interopRequireWildcard(require("react"));
|
16
|
-
var _lodash = require("lodash");
|
17
28
|
var _ProConfigProvider = require("../ProConfigProvider");
|
18
29
|
var _Container = _interopRequireDefault(require("../ProForm/components/Container"));
|
19
30
|
var _AdaptiveTooltip = _interopRequireDefault(require("./components/AdaptiveTooltip"));
|
@@ -22,7 +33,7 @@ var _locale = _interopRequireDefault(require("../locale"));
|
|
22
33
|
var _utils = require("./utils");
|
23
34
|
require("./index.less");
|
24
35
|
var _excluded = ["dataSource", "defaultDisableValue", "useRequest", "fieldNames", "tooltip", "otherProps", "labelInValue", "filterInList", "scrollFollowParent", "defaultOne", "onSearch", "optionRender", "onChange", "updateDataSource", "transformResponse", "getValueProps", "isView"];
|
25
|
-
var Option =
|
36
|
+
var Option = _select.default.Option;
|
26
37
|
var ProSelect = exports.ProSelect = function ProSelect(props, ref) {
|
27
38
|
var _selectProps$showCode, _useRequest$options3, _locale$ProSelect;
|
28
39
|
var _ref = (0, _ProConfigProvider.useProConfig)('ProSelect') || {},
|
@@ -83,7 +94,7 @@ var ProSelect = exports.ProSelect = function ProSelect(props, ref) {
|
|
83
94
|
msg = res.message,
|
84
95
|
data = res.data;
|
85
96
|
if (status !== 200) {
|
86
|
-
|
97
|
+
_message2.default.error(msg);
|
87
98
|
return;
|
88
99
|
}
|
89
100
|
setSelectList(data || []);
|
@@ -98,7 +109,7 @@ var ProSelect = exports.ProSelect = function ProSelect(props, ref) {
|
|
98
109
|
msg = _ref3.message,
|
99
110
|
data = _ref3.data;
|
100
111
|
if (status !== 200) {
|
101
|
-
|
112
|
+
_message2.default.error(msg);
|
102
113
|
return;
|
103
114
|
}
|
104
115
|
return data;
|
@@ -172,7 +183,7 @@ var ProSelect = exports.ProSelect = function ProSelect(props, ref) {
|
|
172
183
|
if (defaultDisableValue) {
|
173
184
|
return (0, _jsxRuntime.jsx)("span", {
|
174
185
|
title: defaultDisableValue,
|
175
|
-
children: (0, _jsxRuntime.jsx)(
|
186
|
+
children: (0, _jsxRuntime.jsx)(_input.default, {
|
176
187
|
disabled: true,
|
177
188
|
defaultValue: defaultDisableValue,
|
178
189
|
style: props === null || props === void 0 ? void 0 : props.style
|
@@ -214,7 +225,7 @@ var ProSelect = exports.ProSelect = function ProSelect(props, ref) {
|
|
214
225
|
record.forEach(function (item) {
|
215
226
|
arr.push(props.optionRender(item));
|
216
227
|
});
|
217
|
-
return (0, _jsxRuntime.jsx)(
|
228
|
+
return (0, _jsxRuntime.jsx)(_space.default, {
|
218
229
|
direction: "vertical",
|
219
230
|
size: 4,
|
220
231
|
children: arr.map(function (item) {
|
@@ -224,7 +235,7 @@ var ProSelect = exports.ProSelect = function ProSelect(props, ref) {
|
|
224
235
|
})
|
225
236
|
});
|
226
237
|
};
|
227
|
-
return (0,
|
238
|
+
return (0, _isFunction2.default)(props.optionRender) && record.length ? _optionRender() : labelList === null || labelList === void 0 ? void 0 : labelList.join(',');
|
228
239
|
};
|
229
240
|
if (isView || props.isView) {
|
230
241
|
if (Array.isArray(value)) {
|
@@ -236,7 +247,7 @@ var ProSelect = exports.ProSelect = function ProSelect(props, ref) {
|
|
236
247
|
}
|
237
248
|
return (0, _jsxRuntime.jsx)(_Container.default, {
|
238
249
|
viewEmpty: viewEmpty,
|
239
|
-
children: value || (0,
|
250
|
+
children: value || (0, _isNumber2.default)(value) ? transToLabel([value]) : null
|
240
251
|
});
|
241
252
|
}
|
242
253
|
var TooltipOption = function TooltipOption(props) {
|
@@ -282,7 +293,7 @@ var ProSelect = exports.ProSelect = function ProSelect(props, ref) {
|
|
282
293
|
*/
|
283
294
|
var transformValue = function transformValue() {
|
284
295
|
if (labelInValue && !selectProps.mode) {
|
285
|
-
if (!(0,
|
296
|
+
if (!(0, _isObject2.default)(value)) {
|
286
297
|
return undefined;
|
287
298
|
}
|
288
299
|
return (value === null || value === void 0 ? void 0 : value[code]) || (value === null || value === void 0 ? void 0 : value.value);
|
@@ -329,7 +340,7 @@ var ProSelect = exports.ProSelect = function ProSelect(props, ref) {
|
|
329
340
|
return (0, _jsxRuntime.jsx)("div", {
|
330
341
|
style: props.style,
|
331
342
|
className: "pro-select",
|
332
|
-
children: (0, _jsxRuntime.jsx)(
|
343
|
+
children: (0, _jsxRuntime.jsx)(_select.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({
|
333
344
|
placeholder: _locale.default === null || _locale.default === void 0 ? void 0 : (_locale$ProSelect = _locale.default.ProSelect) === null || _locale$ProSelect === void 0 ? void 0 : _locale$ProSelect.select,
|
334
345
|
allowClear: true,
|
335
346
|
showArrow: true,
|
@@ -338,9 +349,9 @@ var ProSelect = exports.ProSelect = function ProSelect(props, ref) {
|
|
338
349
|
// optionLabelProp={otherProps?.isDiffChange ? 'label' : 'children'} // 解决warning报错,添加默认值
|
339
350
|
// optionLabelProp="label" // 解决warning报错,添加默认值
|
340
351
|
showSearch: true,
|
341
|
-
filterOption: (0,
|
352
|
+
filterOption: (0, _isFunction2.default)(_onSearch) ? false : function (input, option) {
|
342
353
|
var _option$children, _option$children$prop;
|
343
|
-
var value = (0,
|
354
|
+
var value = (0, _isString2.default)(option === null || option === void 0 ? void 0 : option.children) ? option === null || option === void 0 ? void 0 : option.children : option === null || option === void 0 ? void 0 : (_option$children = option.children) === null || _option$children === void 0 ? void 0 : (_option$children$prop = _option$children.props) === null || _option$children$prop === void 0 ? void 0 : _option$children$prop.title;
|
344
355
|
return value.toLowerCase().includes(input.toLowerCase());
|
345
356
|
},
|
346
357
|
onSearch: function onSearch(value) {
|
@@ -349,7 +360,7 @@ var ProSelect = exports.ProSelect = function ProSelect(props, ref) {
|
|
349
360
|
getPopupContainer: function getPopupContainer(trigger) {
|
350
361
|
return scrollFollowParent ? trigger.parentElement : document.body;
|
351
362
|
}
|
352
|
-
}, (0,
|
363
|
+
}, (0, _omit2.default)((0, _objectSpread2.default)({}, selectProps), ['isView', 'showCodeName', 'form', 'name', 'style', 'onFieldChange'])), {}, {
|
353
364
|
value: transformValue(),
|
354
365
|
children: Array.isArray(newSelectList) && newSelectList.map(function (item) {
|
355
366
|
return (0, _jsxRuntime.jsx)(Option, {
|
@@ -1,6 +1,5 @@
|
|
1
1
|
"use strict";
|
2
2
|
|
3
|
-
var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
|
4
3
|
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
|
5
4
|
Object.defineProperty(exports, "__esModule", {
|
6
5
|
value: true
|
@@ -8,7 +7,8 @@ Object.defineProperty(exports, "__esModule", {
|
|
8
7
|
exports.getSelectList = void 0;
|
9
8
|
var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
|
10
9
|
var _createForOfIteratorHelper2 = _interopRequireDefault(require("@babel/runtime/helpers/createForOfIteratorHelper"));
|
11
|
-
var
|
10
|
+
var _difference2 = _interopRequireDefault(require("lodash/difference"));
|
11
|
+
var _isNumber2 = _interopRequireDefault(require("lodash/isNumber"));
|
12
12
|
/* eslint-disable no-restricted-syntax */
|
13
13
|
|
14
14
|
/**
|
@@ -54,7 +54,7 @@ var findSelectNameValues = function findSelectNameValues(_ref) {
|
|
54
54
|
selectValues.push(result);
|
55
55
|
}
|
56
56
|
});
|
57
|
-
var diffList =
|
57
|
+
var diffList = (0, _difference2.default)(selectValues, mode === 'multiple' ? value : [value]);
|
58
58
|
return dataSource.filter(function (item) {
|
59
59
|
return !diffList.includes(labelInValue ? item : item[fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.value] || (item === null || item === void 0 ? void 0 : item.value));
|
60
60
|
});
|
@@ -76,7 +76,7 @@ var getSelectList = exports.getSelectList = function getSelectList(_ref2) {
|
|
76
76
|
listName = otherProps.listName,
|
77
77
|
form = otherProps.form;
|
78
78
|
// 修复formlist无法过滤的问题
|
79
|
-
var _name = Array.isArray(name) && (0,
|
79
|
+
var _name = Array.isArray(name) && (0, _isNumber2.default)(name[0]) ? listName : name;
|
80
80
|
var firstNumberIndex = listName.lastIndexOf(listName.findLast(function (item) {
|
81
81
|
return typeof item === 'number';
|
82
82
|
}));
|
@@ -5,9 +5,10 @@ Object.defineProperty(exports, "__esModule", {
|
|
5
5
|
value: true
|
6
6
|
});
|
7
7
|
exports.default = exports.MenuItem = void 0;
|
8
|
+
require("antd/es/badge/style");
|
9
|
+
var _badge = _interopRequireDefault(require("antd/es/badge"));
|
8
10
|
var _jsxRuntime = require("react/jsx-runtime");
|
9
11
|
var _classnames = _interopRequireDefault(require("classnames"));
|
10
|
-
var _antd = require("antd");
|
11
12
|
var _utils = require("../../utils");
|
12
13
|
var AnchorSvg = function AnchorSvg(_ref) {
|
13
14
|
var color = _ref.color;
|
@@ -106,7 +107,7 @@ var MenuItem = exports.MenuItem = function MenuItem(props) {
|
|
106
107
|
className: "pro-step-checked-status",
|
107
108
|
children: [isChecked && (0, _jsxRuntime.jsx)(SuccessSvg, {}), errorNum > 0 && (0, _jsxRuntime.jsx)("div", {
|
108
109
|
className: "pro-step-error-dot",
|
109
|
-
children: (0, _jsxRuntime.jsx)(
|
110
|
+
children: (0, _jsxRuntime.jsx)(_badge.default, {
|
110
111
|
count: errorNum
|
111
112
|
})
|
112
113
|
})]
|
@@ -8,10 +8,10 @@ Object.defineProperty(exports, "__esModule", {
|
|
8
8
|
exports.default = void 0;
|
9
9
|
var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
|
10
10
|
var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
|
11
|
+
var _isBoolean2 = _interopRequireDefault(require("lodash/isBoolean"));
|
11
12
|
var _jsxRuntime = require("react/jsx-runtime");
|
12
13
|
var _react = require("react");
|
13
14
|
var _reactLazyload = _interopRequireWildcard(require("react-lazyload"));
|
14
|
-
var _lodash = require("lodash");
|
15
15
|
var _index = require("../../index");
|
16
16
|
var _ProCollapse = _interopRequireDefault(require("../../../ProLayout/components/ProCollapse"));
|
17
17
|
var _excluded = ["id", "title", "collapse", "children", "lazyLoad", "order"];
|
@@ -52,7 +52,7 @@ var ProStepItem = function ProStepItem(_ref) {
|
|
52
52
|
}, [id, title, order, lazyLoad, restProps, register]);
|
53
53
|
var renderChildren = function renderChildren() {
|
54
54
|
if (lazyLoad) {
|
55
|
-
var lazyLoadProps = (0,
|
55
|
+
var lazyLoadProps = (0, _isBoolean2.default)(lazyLoad) ? defaultLazyLoadConfig : lazyLoad;
|
56
56
|
return (0, _jsxRuntime.jsx)(_reactLazyload.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, lazyLoadProps), {}, {
|
57
57
|
classNamePrefix: id,
|
58
58
|
children: children
|
@@ -9,7 +9,7 @@ var _regeneratorRuntime2 = _interopRequireDefault(require("@babel/runtime/helper
|
|
9
9
|
var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
|
10
10
|
var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
|
11
11
|
var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
|
12
|
-
var
|
12
|
+
var _throttle2 = _interopRequireDefault(require("lodash/throttle"));
|
13
13
|
var _react = _interopRequireDefault(require("react"));
|
14
14
|
var _reactLazyload = require("react-lazyload");
|
15
15
|
var _index = require("../../index");
|
@@ -34,7 +34,7 @@ var Listener = function Listener(_ref) {
|
|
34
34
|
notify = _useStep.notify,
|
35
35
|
registerMap = _useStep.registerMap;
|
36
36
|
return /*#__PURE__*/_react.default.cloneElement(children, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, props), {}, {
|
37
|
-
onClick: (0,
|
37
|
+
onClick: (0, _throttle2.default)(/*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
|
38
38
|
var loadedMap, loaded, values;
|
39
39
|
return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
|
40
40
|
while (1) switch (_context.prev = _context.next) {
|
@@ -8,9 +8,9 @@ Object.defineProperty(exports, "__esModule", {
|
|
8
8
|
exports.default = exports.Step = void 0;
|
9
9
|
var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
|
10
10
|
var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
|
11
|
+
var _cloneDeep2 = _interopRequireDefault(require("lodash/cloneDeep"));
|
11
12
|
var _jsxRuntime = require("react/jsx-runtime");
|
12
13
|
var _react = _interopRequireWildcard(require("react"));
|
13
|
-
var _lodash = require("lodash");
|
14
14
|
var _index = _interopRequireDefault(require("../../../ProIcon/index"));
|
15
15
|
var _catalog = _interopRequireDefault(require("../../../assets/catalog.svg"));
|
16
16
|
var _Anchor = _interopRequireDefault(require("../Anchor"));
|
@@ -30,7 +30,7 @@ var Step = exports.Step = function Step(_ref) {
|
|
30
30
|
onOff = _useState2[0],
|
31
31
|
setOnOff = _useState2[1];
|
32
32
|
var options = (0, _react.useMemo)(function () {
|
33
|
-
var nextDataSource = (0,
|
33
|
+
var nextDataSource = (0, _cloneDeep2.default)(dataSource);
|
34
34
|
var activeIndex;
|
35
35
|
if (activeKey) {
|
36
36
|
activeIndex = nextDataSource.findIndex(function (item) {
|
package/lib/ProStep/index.js
CHANGED
@@ -10,9 +10,9 @@ var _regeneratorRuntime2 = _interopRequireDefault(require("@babel/runtime/helper
|
|
10
10
|
var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
|
11
11
|
var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
|
12
12
|
var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
|
13
|
+
var _debounce2 = _interopRequireDefault(require("lodash/debounce"));
|
13
14
|
var _jsxRuntime = require("react/jsx-runtime");
|
14
15
|
var _react = require("react");
|
15
|
-
var _lodash = require("lodash");
|
16
16
|
var _ahooks = require("ahooks");
|
17
17
|
var _utils = require("./utils");
|
18
18
|
var _Step = _interopRequireDefault(require("./components/Step"));
|
@@ -71,7 +71,7 @@ var ProStep = function ProStep(_ref) {
|
|
71
71
|
return pre.order - next.order;
|
72
72
|
});
|
73
73
|
}, [resetProps === null || resetProps === void 0 ? void 0 : resetProps.dataSource, registerMap.current, ids]);
|
74
|
-
var debounceReRender = (0, _react.useCallback)((0,
|
74
|
+
var debounceReRender = (0, _react.useCallback)((0, _debounce2.default)(function () {
|
75
75
|
return reRender({});
|
76
76
|
}, 500), []);
|
77
77
|
// 用来注册form匹配到对应的模块id
|
@@ -6,7 +6,8 @@ Object.defineProperty(exports, "__esModule", {
|
|
6
6
|
});
|
7
7
|
exports.handleScrollError = exports.handleScroll = exports.getLoadedMap = exports.default = void 0;
|
8
8
|
var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
|
9
|
-
var
|
9
|
+
var _pick2 = _interopRequireDefault(require("lodash/pick"));
|
10
|
+
var _debounce2 = _interopRequireDefault(require("lodash/debounce"));
|
10
11
|
/**
|
11
12
|
* 滚动到错误位置, 延迟200ms解决ProForm错误还未生成
|
12
13
|
*/
|
@@ -41,7 +42,7 @@ var handleScroll = exports.handleScroll = function handleScroll(id, options) {
|
|
41
42
|
handleScrollError(errorDom);
|
42
43
|
} else {
|
43
44
|
// 如果没有错误表单项,则滚动到指定元素位置
|
44
|
-
setTimeout((0,
|
45
|
+
setTimeout((0, _debounce2.default)(function () {
|
45
46
|
window.scrollTo({
|
46
47
|
top: dom.offsetTop - targetOffset,
|
47
48
|
behavior: 'smooth'
|
@@ -60,7 +61,7 @@ var getLoadedMap = exports.getLoadedMap = function getLoadedMap(registerMap) {
|
|
60
61
|
return [];
|
61
62
|
}
|
62
63
|
var stepList = Object.values(registerMap === null || registerMap === void 0 ? void 0 : registerMap.current).map(function (item) {
|
63
|
-
return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0,
|
64
|
+
return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _pick2.default)(item, ['id', 'order', 'title'])), {}, {
|
64
65
|
loaded: !document.querySelector(".".concat(item === null || item === void 0 ? void 0 : item.id, "-placeholder"))
|
65
66
|
});
|
66
67
|
});
|
package/lib/ProStepTab/index.js
CHANGED
@@ -14,8 +14,8 @@ var _objectSpread3 = _interopRequireDefault(require("@babel/runtime/helpers/obje
|
|
14
14
|
var _regeneratorRuntime2 = _interopRequireDefault(require("@babel/runtime/helpers/regeneratorRuntime"));
|
15
15
|
var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
|
16
16
|
var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
|
17
|
+
var _isNaN2 = _interopRequireDefault(require("lodash/isNaN"));
|
17
18
|
var _react = _interopRequireWildcard(require("react"));
|
18
|
-
var _lodash = require("lodash");
|
19
19
|
var _excluded = ["children"];
|
20
20
|
// 存储当前的 StepTab 实例
|
21
21
|
var StepTabInstanceContext = /*#__PURE__*/(0, _react.createContext)(null);
|
@@ -91,7 +91,7 @@ function useStepTab() {
|
|
91
91
|
var urlSearchParams = new URLSearchParams(location.search);
|
92
92
|
var stepValue = urlSearchParams.get(routerSearchKey);
|
93
93
|
// 如果stepValue是数字,则返回数字
|
94
|
-
if (stepValue && !(0,
|
94
|
+
if (stepValue && !(0, _isNaN2.default)(Number(stepValue))) {
|
95
95
|
return Number(stepValue);
|
96
96
|
}
|
97
97
|
}
|
@@ -270,7 +270,7 @@ function useStepTab() {
|
|
270
270
|
}
|
271
271
|
// 只有当activeKey能转换为数字时才执行自动跳转
|
272
272
|
currentKeyNum = Number(activeKey);
|
273
|
-
if ((0,
|
273
|
+
if ((0, _isNaN2.default)(currentKeyNum)) {
|
274
274
|
_context4.next = 12;
|
275
275
|
break;
|
276
276
|
}
|
@@ -5,15 +5,20 @@ Object.defineProperty(exports, "__esModule", {
|
|
5
5
|
value: true
|
6
6
|
});
|
7
7
|
exports.getParentElement = exports.formatColumn = void 0;
|
8
|
+
require("antd/es/space/style");
|
9
|
+
var _space = _interopRequireDefault(require("antd/es/space"));
|
8
10
|
var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
|
9
11
|
var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
|
12
|
+
var _isBoolean2 = _interopRequireDefault(require("lodash/isBoolean"));
|
13
|
+
var _isObject2 = _interopRequireDefault(require("lodash/isObject"));
|
14
|
+
var _isString2 = _interopRequireDefault(require("lodash/isString"));
|
15
|
+
var _isFunction2 = _interopRequireDefault(require("lodash/isFunction"));
|
16
|
+
var _isEqual2 = _interopRequireDefault(require("lodash/isEqual"));
|
10
17
|
var _jsxRuntime = require("react/jsx-runtime");
|
11
18
|
var _react = require("react");
|
12
19
|
var _moment15 = _interopRequireDefault(require("moment"));
|
13
20
|
var _classnames = _interopRequireDefault(require("classnames"));
|
14
21
|
var _reactDom = _interopRequireDefault(require("react-dom"));
|
15
|
-
var _antd = require("antd");
|
16
|
-
var _lodash = require("lodash");
|
17
22
|
var _utils = require("@zat-design/utils");
|
18
23
|
var _TooltipTitle = _interopRequireDefault(require("../TooltipTitle"));
|
19
24
|
var _RenderColumn = _interopRequireDefault(require("../RenderColumn"));
|
@@ -38,7 +43,7 @@ var calcMinWidth = function calcMinWidth(_ref) {
|
|
38
43
|
var tempEl = document.createElement('div');
|
39
44
|
tempEl.style.display = 'inline-block';
|
40
45
|
document.body.appendChild(tempEl);
|
41
|
-
if ((0,
|
46
|
+
if ((0, _isFunction2.default)(title)) {
|
42
47
|
var component = title();
|
43
48
|
_reactDom.default.render(component, tempEl);
|
44
49
|
} else if (isReactElement(title)) {
|
@@ -85,7 +90,7 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
|
|
85
90
|
otherProps = (0, _objectWithoutProperties2.default)(column, _excluded);
|
86
91
|
otherProps.scroll = scroll;
|
87
92
|
// 仅在 {x: 'max-content', y: 300 } 且 column无指定 width minWidth 情况下 才开启 minWidth的自动计算
|
88
|
-
var isMaxContentOverFlow = (0,
|
93
|
+
var isMaxContentOverFlow = (0, _isObject2.default)(scroll) ? (scroll === null || scroll === void 0 ? void 0 : scroll.x) === 'max-content' && Reflect.ownKeys(scroll).includes('y') : false;
|
89
94
|
calcMinWidth({
|
90
95
|
minWidth: minWidth,
|
91
96
|
width: width,
|
@@ -102,19 +107,19 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
|
|
102
107
|
}
|
103
108
|
return '';
|
104
109
|
}
|
105
|
-
if ((0,
|
110
|
+
if ((0, _isString2.default)(prefix) || /*#__PURE__*/(0, _react.isValidElement)(prefix)) {
|
106
111
|
return prefix;
|
107
112
|
}
|
108
|
-
if ((0,
|
113
|
+
if ((0, _isFunction2.default)(prefix)) {
|
109
114
|
return prefix(value, record, index);
|
110
115
|
}
|
111
116
|
};
|
112
117
|
// 后缀处理
|
113
118
|
var suffixNode = function suffixNode(value, record, index) {
|
114
|
-
if ((0,
|
119
|
+
if ((0, _isString2.default)(suffix) || /*#__PURE__*/(0, _react.isValidElement)(suffix)) {
|
115
120
|
return suffix;
|
116
121
|
}
|
117
|
-
if ((0,
|
122
|
+
if ((0, _isFunction2.default)(suffix)) {
|
118
123
|
return suffix(value, record, index);
|
119
124
|
}
|
120
125
|
};
|
@@ -122,7 +127,7 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
|
|
122
127
|
var originalRender = column.render; // 保存原始的 render 方法
|
123
128
|
// 自定义render 手动重载下
|
124
129
|
column.render = function (value, record, index) {
|
125
|
-
var isFn = (0,
|
130
|
+
var isFn = (0, _isFunction2.default)(originalRender);
|
126
131
|
var _value = isFn ? originalRender === null || originalRender === void 0 ? void 0 : originalRender(value, record !== null && record !== void 0 ? record : {}, index) : null;
|
127
132
|
var originalResult = (0, _utils2.getOriginalValue)(value, record !== null && record !== void 0 ? record : {}, originalObj, rowKey, dataIndex);
|
128
133
|
var originalValue = originalResult.originalValue;
|
@@ -133,7 +138,7 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
|
|
133
138
|
otherProps.isChanged = isChanged;
|
134
139
|
if (Array.isArray(diffConfig === null || diffConfig === void 0 ? void 0 : diffConfig.originalDataSource)) {
|
135
140
|
// 存在比对
|
136
|
-
if ((0,
|
141
|
+
if ((0, _isFunction2.default)(otherProps === null || otherProps === void 0 ? void 0 : otherProps.viewRender)) {
|
137
142
|
var _originalObj$record$r;
|
138
143
|
var diffResult = otherProps.viewRender({
|
139
144
|
originValue: originalValue,
|
@@ -143,7 +148,7 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
|
|
143
148
|
index: index
|
144
149
|
});
|
145
150
|
// viewRender 返回值为 false 时,不显示对比
|
146
|
-
if ((0,
|
151
|
+
if ((0, _isBoolean2.default)(diffResult)) {
|
147
152
|
if (!diffResult) {
|
148
153
|
otherProps.isChanged = false;
|
149
154
|
_isAddCell = false;
|
@@ -170,7 +175,7 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
|
|
170
175
|
originalValue = diffResult;
|
171
176
|
}
|
172
177
|
// 存在自定义onDiff比对
|
173
|
-
if ((0,
|
178
|
+
if ((0, _isFunction2.default)(onDiff)) {
|
174
179
|
var _originalObj$record$r2;
|
175
180
|
var _diffResult = onDiff({
|
176
181
|
originValue: originalValue,
|
@@ -247,7 +252,7 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
|
|
247
252
|
children: "-"
|
248
253
|
});
|
249
254
|
}
|
250
|
-
var node = (0, _jsxRuntime.jsxs)(
|
255
|
+
var node = (0, _jsxRuntime.jsxs)(_space.default, {
|
251
256
|
size: 8,
|
252
257
|
children: [prefixNode(value, record, index), renderValue, suffixNode(value, record, index)]
|
253
258
|
});
|
@@ -281,7 +286,7 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
|
|
281
286
|
if ((0, _utils3.isEmpty)(originalValue)) {
|
282
287
|
originalRenderValue = '-';
|
283
288
|
}
|
284
|
-
var node = (0, _jsxRuntime.jsxs)(
|
289
|
+
var node = (0, _jsxRuntime.jsxs)(_space.default, {
|
285
290
|
size: 8,
|
286
291
|
children: [prefixNode(value, record, index), renderValue, suffixNode(value, record, index)]
|
287
292
|
});
|
@@ -346,7 +351,7 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
|
|
346
351
|
if (!originalValue) {
|
347
352
|
originalRenderValue = '-';
|
348
353
|
}
|
349
|
-
var node = (0, _jsxRuntime.jsxs)(
|
354
|
+
var node = (0, _jsxRuntime.jsxs)(_space.default, {
|
350
355
|
size: 8,
|
351
356
|
children: [prefixNode(value, record, index), renderValue, suffixNode(value, record, index)]
|
352
357
|
});
|
@@ -399,7 +404,7 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
|
|
399
404
|
});
|
400
405
|
}
|
401
406
|
}
|
402
|
-
var node = (0, _jsxRuntime.jsxs)(
|
407
|
+
var node = (0, _jsxRuntime.jsxs)(_space.default, {
|
403
408
|
size: 8,
|
404
409
|
children: [prefixNode(value, record, index), renderValue, suffixNode(value, record, index)]
|
405
410
|
});
|
@@ -427,7 +432,7 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
|
|
427
432
|
isAddCell = originalResult.isAddCell;
|
428
433
|
otherProps.isChanged = isChanged;
|
429
434
|
var originalRenderValue = originalValue === 'number' ? originalValue.toFixed(precision) : originalValue;
|
430
|
-
var node = (0, _jsxRuntime.jsxs)(
|
435
|
+
var node = (0, _jsxRuntime.jsxs)(_space.default, {
|
431
436
|
size: 8,
|
432
437
|
children: [prefixNode(value, record, index), renderValue, suffixNode(value, record, index)]
|
433
438
|
});
|
@@ -470,7 +475,7 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
|
|
470
475
|
var isEmpty = !realValue || Array.isArray(realValue) && (realValue === null || realValue === void 0 ? void 0 : (_realValue$filter = realValue.filter(function (item) {
|
471
476
|
return !!item;
|
472
477
|
})) === null || _realValue$filter === void 0 ? void 0 : _realValue$filter.length) === 0;
|
473
|
-
if ((0,
|
478
|
+
if ((0, _isEqual2.default)(value, originalValue) && isEmpty) {
|
474
479
|
(0, _jsxRuntime.jsx)("div", {
|
475
480
|
style: {
|
476
481
|
minWidth: minWidth
|
@@ -519,7 +524,7 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
|
|
519
524
|
} else if (copyable) {
|
520
525
|
column.render = function (value, record, index) {
|
521
526
|
var isInNewRowFlag = isInNewRow(record);
|
522
|
-
return (0, _jsxRuntime.jsxs)(
|
527
|
+
return (0, _jsxRuntime.jsxs)(_space.default, {
|
523
528
|
size: 8,
|
524
529
|
children: [prefixNode(value, record, index), (0, _jsxRuntime.jsx)(_RenderColumn.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, otherProps), {}, {
|
525
530
|
valueType: valueType,
|
@@ -551,7 +556,7 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
|
|
551
556
|
});
|
552
557
|
}
|
553
558
|
var isInNewRowFlag = isInNewRow(record);
|
554
|
-
return (0, _jsxRuntime.jsxs)(
|
559
|
+
return (0, _jsxRuntime.jsxs)(_space.default, {
|
555
560
|
size: 8,
|
556
561
|
children: [prefixNode(value, record, index), (0, _jsxRuntime.jsx)(_RenderColumn.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, otherProps), {}, {
|
557
562
|
valueType: valueType,
|
@@ -575,7 +580,7 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
|
|
575
580
|
originalValue = originalResult.originalValue,
|
576
581
|
isAddCell = originalResult.isAddCell;
|
577
582
|
otherProps.isChanged = isChanged;
|
578
|
-
var node = (0, _jsxRuntime.jsxs)(
|
583
|
+
var node = (0, _jsxRuntime.jsxs)(_space.default, {
|
579
584
|
size: 8,
|
580
585
|
children: [prefixNode(value, record, index), value, suffixNode(value, record, index)]
|
581
586
|
});
|
@@ -6,9 +6,10 @@ Object.defineProperty(exports, "__esModule", {
|
|
6
6
|
});
|
7
7
|
exports.default = void 0;
|
8
8
|
var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
|
9
|
+
require("antd/es/table/style");
|
10
|
+
var _table = _interopRequireDefault(require("antd/es/table"));
|
9
11
|
var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
|
10
12
|
var _jsxRuntime = require("react/jsx-runtime");
|
11
|
-
var _antd = require("antd");
|
12
13
|
var _react = require("react");
|
13
14
|
var _index = require("../../../index");
|
14
15
|
require("../../../../style/index.less");
|
@@ -30,7 +31,7 @@ var BaseTable = function BaseTable(_ref) {
|
|
30
31
|
}
|
31
32
|
return null;
|
32
33
|
};
|
33
|
-
return (0, _jsxRuntime.jsx)(
|
34
|
+
return (0, _jsxRuntime.jsx)(_table.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({
|
34
35
|
components: renderComponents(),
|
35
36
|
columns: columns,
|
36
37
|
locale: {
|
package/lib/ProTable/components/RcTable/components/DraggableTable/components/DndWrapper/index.js
CHANGED
@@ -9,12 +9,12 @@ var _regeneratorRuntime2 = _interopRequireDefault(require("@babel/runtime/helper
|
|
9
9
|
var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
|
10
10
|
var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
|
11
11
|
var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
|
12
|
+
var _isFunction2 = _interopRequireDefault(require("lodash/isFunction"));
|
12
13
|
var _jsxRuntime = require("react/jsx-runtime");
|
13
14
|
var _react = _interopRequireDefault(require("react"));
|
14
15
|
var _core = require("@dnd-kit/core");
|
15
16
|
var _sortable = require("@dnd-kit/sortable");
|
16
17
|
var _utilities = require("@dnd-kit/utilities");
|
17
|
-
var _lodash = require("lodash");
|
18
18
|
var _index = require("./utils/index");
|
19
19
|
var _ProIcon = _interopRequireDefault(require("../../../../../../../ProIcon"));
|
20
20
|
var _excluded = ["disabled", "children"];
|
@@ -87,7 +87,7 @@ var DndWrapper = function DndWrapper(_ref2) {
|
|
87
87
|
while (1) switch (_context.prev = _context.next) {
|
88
88
|
case 0:
|
89
89
|
active = _ref3.active;
|
90
|
-
if (!(onDragStartGuard && (0,
|
90
|
+
if (!(onDragStartGuard && (0, _isFunction2.default)(onDragStartGuard))) {
|
91
91
|
_context.next = 6;
|
92
92
|
break;
|
93
93
|
}
|
@@ -160,7 +160,7 @@ var DndWrapper = function DndWrapper(_ref2) {
|
|
160
160
|
childrenKey: 'children'
|
161
161
|
});
|
162
162
|
// 如果传了onDragEndGuard 则视为外部业务逻辑自处理
|
163
|
-
if (!(onDragEndGuard && (0,
|
163
|
+
if (!(onDragEndGuard && (0, _isFunction2.default)(onDragEndGuard))) {
|
164
164
|
_context2.next = 19;
|
165
165
|
break;
|
166
166
|
}
|
@@ -7,9 +7,10 @@ Object.defineProperty(exports, "__esModule", {
|
|
7
7
|
});
|
8
8
|
exports.default = void 0;
|
9
9
|
var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
|
10
|
+
require("antd/es/table/style");
|
11
|
+
var _table = _interopRequireDefault(require("antd/es/table"));
|
10
12
|
var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
|
11
13
|
var _jsxRuntime = require("react/jsx-runtime");
|
12
|
-
var _antd = require("antd");
|
13
14
|
var _react = require("react");
|
14
15
|
var _DndWrapper = _interopRequireWildcard(require("./components/DndWrapper"));
|
15
16
|
var _index = require("../../../index");
|
@@ -39,7 +40,7 @@ var DraggableTable = function DraggableTable(_ref) {
|
|
39
40
|
rowKey: rowKey,
|
40
41
|
onDragStartGuard: onDragStartGuard,
|
41
42
|
onDragEndGuard: onDragEndGuard,
|
42
|
-
children: (0, _jsxRuntime.jsx)(
|
43
|
+
children: (0, _jsxRuntime.jsx)(_table.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({
|
43
44
|
className: "pro-edit-table-drag",
|
44
45
|
components: {
|
45
46
|
body: {
|