@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/es/ProIcon/index.js
CHANGED
@@ -7,11 +7,11 @@ import _Tooltip from "antd/es/tooltip";
|
|
7
7
|
import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
|
8
8
|
import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
|
9
9
|
import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
|
10
|
+
import _uniqBy from "lodash/uniqBy";
|
10
11
|
var _excluded = ["type", "onClick", "size", "color", "className", "style", "spin", "rotate", "theme", "disabled", "mode", "buttonProps", "children", "mapList", "src", "actionMap", "tooltip", "buttonIcon"];
|
11
12
|
import { Fragment as _Fragment, jsx as _jsx } from "react/jsx-runtime";
|
12
13
|
import { useLocalStorageState, useSetState, useDeepCompareLayoutEffect } from 'ahooks';
|
13
14
|
import classNames from 'classnames';
|
14
|
-
import { uniqBy } from 'lodash';
|
15
15
|
import { ReactSVG } from 'react-svg';
|
16
16
|
import { useEffect } from 'react';
|
17
17
|
import { useProConfig } from '../ProConfigProvider';
|
@@ -97,7 +97,7 @@ var ProIcon = function ProIcon(props) {
|
|
97
97
|
var targetTextFill = "text-".concat(language); // text-cn text-en
|
98
98
|
var isIconMode = _mode === 'icon';
|
99
99
|
var isExtendButtonMode = !isIconMode || isIconMode && disabled;
|
100
|
-
var mergedMapList =
|
100
|
+
var mergedMapList = _uniqBy(mapList.concat(iconMap), targetTextFill);
|
101
101
|
var _type = type;
|
102
102
|
var _text = children;
|
103
103
|
// svg图标对应文本
|
@@ -2,13 +2,13 @@ import "antd/es/menu/style";
|
|
2
2
|
import _Menu from "antd/es/menu";
|
3
3
|
import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
|
4
4
|
import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
|
5
|
+
import _cloneDeep from "lodash/cloneDeep";
|
5
6
|
import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
|
6
7
|
import { useMemo, useRef, useContext } from 'react';
|
7
8
|
import { useDeepCompareEffect, useSetState } from 'ahooks';
|
8
9
|
import { CaretDownOutlined } from '@ant-design/icons';
|
9
10
|
import classnames from 'classnames';
|
10
11
|
import { Link } from 'react-router-dom';
|
11
|
-
import { cloneDeep } from 'lodash';
|
12
12
|
import { LayoutContext } from '../../../../index';
|
13
13
|
import { getIdsByPathName } from '../../../../utils';
|
14
14
|
import { Icon } from '../../index';
|
@@ -47,7 +47,7 @@ var OpenMenu = function OpenMenu(props) {
|
|
47
47
|
return String(item);
|
48
48
|
})) || [];
|
49
49
|
var itemsTransform = useMemo(function () {
|
50
|
-
var result =
|
50
|
+
var result = _cloneDeep(menus);
|
51
51
|
if (!Array.isArray(result) || !result.length) {
|
52
52
|
return [];
|
53
53
|
}
|
@@ -6,11 +6,11 @@ import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
|
|
6
6
|
import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
|
7
7
|
import "antd/es/collapse/style";
|
8
8
|
import _Collapse from "antd/es/collapse";
|
9
|
+
import _isBoolean from "lodash/isBoolean";
|
9
10
|
import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
|
10
11
|
import { useLayoutEffect } from 'react';
|
11
12
|
import { CaretRightOutlined } from '@ant-design/icons';
|
12
13
|
import classNames from 'classnames';
|
13
|
-
import { isBoolean } from 'lodash';
|
14
14
|
import foldSvg from '../../../assets/fold.svg';
|
15
15
|
import ProIcon from '../../../ProIcon/index';
|
16
16
|
var Panel = _Collapse.Panel;
|
@@ -88,7 +88,7 @@ var ProCollapse = function ProCollapse(props) {
|
|
88
88
|
align: "center",
|
89
89
|
children: [_jsx("div", {
|
90
90
|
className: "pro-collapse-icon",
|
91
|
-
children:
|
91
|
+
children: _isBoolean(icon) ? _jsx(ProIcon, {
|
92
92
|
src: foldSvg,
|
93
93
|
actionMap: {
|
94
94
|
fill: []
|
@@ -11,6 +11,10 @@ import _Tooltip from "antd/es/tooltip";
|
|
11
11
|
import "antd/es/space/style";
|
12
12
|
import _Space from "antd/es/space";
|
13
13
|
import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
|
14
|
+
import _isString from "lodash/isString";
|
15
|
+
import _isNumber from "lodash/isNumber";
|
16
|
+
import _isEmpty from "lodash/isEmpty";
|
17
|
+
import _isFunction from "lodash/isFunction";
|
14
18
|
import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
|
15
19
|
/* eslint-disable react/no-array-index-key */
|
16
20
|
|
@@ -19,7 +23,6 @@ import { tools } from '@zat-design/utils';
|
|
19
23
|
import classnames from 'classnames';
|
20
24
|
import moment from 'moment';
|
21
25
|
import { useToggle, useSize } from 'ahooks';
|
22
|
-
import { isFunction, isEmpty, isNumber, isString } from 'lodash';
|
23
26
|
import { ReactSVG } from 'react-svg';
|
24
27
|
import foldSvg from '../../../assets/arrow.svg';
|
25
28
|
import { Copy, ProBackBtn } from './components';
|
@@ -145,7 +148,7 @@ var ProHeader = function ProHeader(props) {
|
|
145
148
|
rel: "noopener noreferrer",
|
146
149
|
target: "_blank",
|
147
150
|
children: parmas === null || parmas === void 0 ? void 0 : parmas.value
|
148
|
-
}) : parmas === null || parmas === void 0 ? void 0 : parmas.value, (parmas === null || parmas === void 0 ? void 0 : parmas.copyable) &&
|
151
|
+
}) : parmas === null || parmas === void 0 ? void 0 : parmas.value, (parmas === null || parmas === void 0 ? void 0 : parmas.copyable) && _isString(parmas === null || parmas === void 0 ? void 0 : parmas.value) ? _jsx(Copy, {
|
149
152
|
text: parmas.value
|
150
153
|
}) : null, tagRender({
|
151
154
|
tag: parmas === null || parmas === void 0 ? void 0 : parmas.tag
|
@@ -191,7 +194,7 @@ var ProHeader = function ProHeader(props) {
|
|
191
194
|
};
|
192
195
|
var tagCls = classnames({
|
193
196
|
'pro-header-only-tag': onlyTag,
|
194
|
-
'pro-header-describe-items-calc':
|
197
|
+
'pro-header-describe-items-calc': _isString(width) ? width.includes('calc') : false
|
195
198
|
});
|
196
199
|
return _jsx("li", {
|
197
200
|
className: tagCls,
|
@@ -242,7 +245,7 @@ var ProHeader = function ProHeader(props) {
|
|
242
245
|
case 'thousandth':
|
243
246
|
case 'money':
|
244
247
|
// 千分位
|
245
|
-
result = value ||
|
248
|
+
result = value || _isNumber(value) ? formatAmount(value, precision) : '-';
|
246
249
|
break;
|
247
250
|
case 'enumName':
|
248
251
|
// 枚举-展示name
|
@@ -284,7 +287,7 @@ var ProHeader = function ProHeader(props) {
|
|
284
287
|
}),
|
285
288
|
children: actionRender.map(function (item, index) {
|
286
289
|
var _item$props;
|
287
|
-
if (
|
290
|
+
if (_isFunction(item === null || item === void 0 ? void 0 : item.type)) {
|
288
291
|
return _jsx("div", {
|
289
292
|
children: item
|
290
293
|
}, index);
|
@@ -439,10 +442,10 @@ var ProHeader = function ProHeader(props) {
|
|
439
442
|
'pro-header-fixed': fixedTop,
|
440
443
|
'pro-header-shadow': showShadow,
|
441
444
|
'pro-header-no-back': !backState,
|
442
|
-
'pro-header-has-describe': !
|
443
|
-
'pro-header-no-describe':
|
445
|
+
'pro-header-has-describe': !_isEmpty(_subDescribeColumns) || !_isEmpty(describeColumns) || !_isEmpty(describeColumns),
|
446
|
+
'pro-header-no-describe': _isEmpty(_subDescribeColumns) && _isEmpty(describeColumns) || _isEmpty(describeColumns)
|
444
447
|
}, "".concat(className), className));
|
445
|
-
if (title && !
|
448
|
+
if (title && !_isEmpty(_breadcrumbColumns)) {
|
446
449
|
console.error('warning: The title and the breadcrumbList cannot be used together');
|
447
450
|
}
|
448
451
|
// title默认不显示返回按钮,只有showBack设置为true时才显示
|
@@ -500,7 +503,7 @@ var ProHeader = function ProHeader(props) {
|
|
500
503
|
className: "pro-header-right",
|
501
504
|
children: actionsRender()
|
502
505
|
})]
|
503
|
-
}), describeRender(describeColumns), !
|
506
|
+
}), describeRender(describeColumns), !_isEmpty(_subDescribeColumns) ? _jsxs("div", {
|
504
507
|
className: classnames({
|
505
508
|
'pro-header-nav': true,
|
506
509
|
'pro-header-nav-open': fold,
|
@@ -1,8 +1,9 @@
|
|
1
1
|
import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
|
2
2
|
import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
|
3
|
+
import _isPlainObject from "lodash/isPlainObject";
|
3
4
|
/* eslint-disable prefer-destructuring */
|
4
5
|
/* eslint-disable no-mixed-operators */
|
5
|
-
|
6
|
+
|
6
7
|
/**
|
7
8
|
* 通过URL获取对应keyIdPath
|
8
9
|
* @param menus 菜单数据
|
@@ -88,7 +89,7 @@ export var transformMenu = function transformMenu(menuData, pathPrefix) {
|
|
88
89
|
* @returns []
|
89
90
|
*/
|
90
91
|
export var transformMenus = function transformMenus(data, pathPrefix) {
|
91
|
-
if (
|
92
|
+
if (_isPlainObject(data)) {
|
92
93
|
// @ts-ignore
|
93
94
|
if (!Array.isArray(data === null || data === void 0 ? void 0 : data.menus)) {
|
94
95
|
return [];
|
package/es/ProSelect/index.js
CHANGED
@@ -9,11 +9,15 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
|
|
9
9
|
import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
|
10
10
|
import "antd/es/select/style";
|
11
11
|
import _Select from "antd/es/select";
|
12
|
+
import _isNumber from "lodash/isNumber";
|
13
|
+
import _omit from "lodash/omit";
|
14
|
+
import _isString from "lodash/isString";
|
15
|
+
import _isObject from "lodash/isObject";
|
16
|
+
import _isFunction from "lodash/isFunction";
|
12
17
|
var _excluded = ["dataSource", "defaultDisableValue", "useRequest", "fieldNames", "tooltip", "otherProps", "labelInValue", "filterInList", "scrollFollowParent", "defaultOne", "onSearch", "optionRender", "onChange", "updateDataSource", "transformResponse", "getValueProps", "isView"];
|
13
18
|
import { jsx as _jsx } from "react/jsx-runtime";
|
14
19
|
import { useDeepCompareEffect, useRequest as useRequestFunc } from 'ahooks';
|
15
20
|
import React, { useImperativeHandle, useState, forwardRef, isValidElement, useCallback } from 'react';
|
16
|
-
import { isFunction, isObject, isString, omit, isNumber } from 'lodash';
|
17
21
|
import { useProConfig } from '../ProConfigProvider';
|
18
22
|
import Container from '../ProForm/components/Container';
|
19
23
|
import AdaptiveTooltip from './components/AdaptiveTooltip';
|
@@ -223,7 +227,7 @@ export var ProSelect = function ProSelect(props, ref) {
|
|
223
227
|
})
|
224
228
|
});
|
225
229
|
};
|
226
|
-
return
|
230
|
+
return _isFunction(props.optionRender) && record.length ? _optionRender() : labelList === null || labelList === void 0 ? void 0 : labelList.join(',');
|
227
231
|
};
|
228
232
|
if (isView || props.isView) {
|
229
233
|
if (Array.isArray(value)) {
|
@@ -235,7 +239,7 @@ export var ProSelect = function ProSelect(props, ref) {
|
|
235
239
|
}
|
236
240
|
return _jsx(Container, {
|
237
241
|
viewEmpty: viewEmpty,
|
238
|
-
children: value ||
|
242
|
+
children: value || _isNumber(value) ? transToLabel([value]) : null
|
239
243
|
});
|
240
244
|
}
|
241
245
|
var TooltipOption = function TooltipOption(props) {
|
@@ -281,7 +285,7 @@ export var ProSelect = function ProSelect(props, ref) {
|
|
281
285
|
*/
|
282
286
|
var transformValue = function transformValue() {
|
283
287
|
if (labelInValue && !selectProps.mode) {
|
284
|
-
if (!
|
288
|
+
if (!_isObject(value)) {
|
285
289
|
return undefined;
|
286
290
|
}
|
287
291
|
return (value === null || value === void 0 ? void 0 : value[code]) || (value === null || value === void 0 ? void 0 : value.value);
|
@@ -337,9 +341,9 @@ export var ProSelect = function ProSelect(props, ref) {
|
|
337
341
|
// optionLabelProp={otherProps?.isDiffChange ? 'label' : 'children'} // 解决warning报错,添加默认值
|
338
342
|
// optionLabelProp="label" // 解决warning报错,添加默认值
|
339
343
|
showSearch: true,
|
340
|
-
filterOption:
|
344
|
+
filterOption: _isFunction(_onSearch) ? false : function (input, option) {
|
341
345
|
var _option$children, _option$children$prop;
|
342
|
-
var value =
|
346
|
+
var value = _isString(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;
|
343
347
|
return value.toLowerCase().includes(input.toLowerCase());
|
344
348
|
},
|
345
349
|
onSearch: function onSearch(value) {
|
@@ -348,7 +352,7 @@ export var ProSelect = function ProSelect(props, ref) {
|
|
348
352
|
getPopupContainer: function getPopupContainer(trigger) {
|
349
353
|
return scrollFollowParent ? trigger.parentElement : document.body;
|
350
354
|
}
|
351
|
-
},
|
355
|
+
}, _omit(_objectSpread({}, selectProps), ['isView', 'showCodeName', 'form', 'name', 'style', 'onFieldChange'])), {}, {
|
352
356
|
value: transformValue(),
|
353
357
|
children: Array.isArray(newSelectList) && newSelectList.map(function (item) {
|
354
358
|
return _jsx(Option, {
|
@@ -1,7 +1,9 @@
|
|
1
1
|
import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
|
2
2
|
import _createForOfIteratorHelper from "@babel/runtime/helpers/esm/createForOfIteratorHelper";
|
3
|
+
import _difference from "lodash/difference";
|
4
|
+
import _isNumber from "lodash/isNumber";
|
3
5
|
/* eslint-disable no-restricted-syntax */
|
4
|
-
|
6
|
+
|
5
7
|
/**
|
6
8
|
* 查找选择器名称的值
|
7
9
|
* @param list 表单列表
|
@@ -45,7 +47,7 @@ var findSelectNameValues = function findSelectNameValues(_ref) {
|
|
45
47
|
selectValues.push(result);
|
46
48
|
}
|
47
49
|
});
|
48
|
-
var diffList =
|
50
|
+
var diffList = _difference(selectValues, mode === 'multiple' ? value : [value]);
|
49
51
|
return dataSource.filter(function (item) {
|
50
52
|
return !diffList.includes(labelInValue ? item : item[fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.value] || (item === null || item === void 0 ? void 0 : item.value));
|
51
53
|
});
|
@@ -67,7 +69,7 @@ export var getSelectList = function getSelectList(_ref2) {
|
|
67
69
|
listName = otherProps.listName,
|
68
70
|
form = otherProps.form;
|
69
71
|
// 修复formlist无法过滤的问题
|
70
|
-
var _name = Array.isArray(name) &&
|
72
|
+
var _name = Array.isArray(name) && _isNumber(name[0]) ? listName : name;
|
71
73
|
var firstNumberIndex = listName.lastIndexOf(listName.findLast(function (item) {
|
72
74
|
return typeof item === 'number';
|
73
75
|
}));
|
@@ -1,10 +1,10 @@
|
|
1
1
|
import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
|
2
2
|
import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
|
3
|
+
import _isBoolean from "lodash/isBoolean";
|
3
4
|
var _excluded = ["id", "title", "collapse", "children", "lazyLoad", "order"];
|
4
5
|
import { jsx as _jsx } from "react/jsx-runtime";
|
5
6
|
import { useEffect } from 'react';
|
6
7
|
import LazyLoad, { forceCheck } from 'react-lazyload';
|
7
|
-
import { isBoolean } from 'lodash';
|
8
8
|
import { useStep } from '../../index';
|
9
9
|
import ProCollapse from '../../../ProLayout/components/ProCollapse';
|
10
10
|
// 默认的懒加载配置
|
@@ -44,7 +44,7 @@ var ProStepItem = function ProStepItem(_ref) {
|
|
44
44
|
}, [id, title, order, lazyLoad, restProps, register]);
|
45
45
|
var renderChildren = function renderChildren() {
|
46
46
|
if (lazyLoad) {
|
47
|
-
var lazyLoadProps =
|
47
|
+
var lazyLoadProps = _isBoolean(lazyLoad) ? defaultLazyLoadConfig : lazyLoad;
|
48
48
|
return _jsx(LazyLoad, _objectSpread(_objectSpread({}, lazyLoadProps), {}, {
|
49
49
|
classNamePrefix: id,
|
50
50
|
children: children
|
@@ -2,8 +2,8 @@ import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
|
|
2
2
|
import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
|
3
3
|
import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
|
4
4
|
import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
|
5
|
+
import _throttle from "lodash/throttle";
|
5
6
|
var _excluded = ["children", "delayTime", "excludes"];
|
6
|
-
import { throttle } from 'lodash';
|
7
7
|
import React from 'react';
|
8
8
|
import { forceVisible } from 'react-lazyload';
|
9
9
|
import { useStep } from '../../index';
|
@@ -27,7 +27,7 @@ var Listener = function Listener(_ref) {
|
|
27
27
|
notify = _useStep.notify,
|
28
28
|
registerMap = _useStep.registerMap;
|
29
29
|
return /*#__PURE__*/React.cloneElement(children, _objectSpread(_objectSpread({}, props), {}, {
|
30
|
-
onClick:
|
30
|
+
onClick: _throttle(/*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
|
31
31
|
var loadedMap, loaded, values;
|
32
32
|
return _regeneratorRuntime().wrap(function _callee$(_context) {
|
33
33
|
while (1) switch (_context.prev = _context.next) {
|
@@ -1,8 +1,8 @@
|
|
1
1
|
import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
|
2
2
|
import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
|
3
|
+
import _cloneDeep from "lodash/cloneDeep";
|
3
4
|
import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
|
4
5
|
import React, { useMemo, useState } from 'react';
|
5
|
-
import { cloneDeep } from 'lodash';
|
6
6
|
import ProIcon from '../../../ProIcon/index';
|
7
7
|
import catalogSvg from '../../../assets/catalog.svg';
|
8
8
|
import Anchor from '../Anchor';
|
@@ -22,7 +22,7 @@ export var Step = function Step(_ref) {
|
|
22
22
|
onOff = _useState2[0],
|
23
23
|
setOnOff = _useState2[1];
|
24
24
|
var options = useMemo(function () {
|
25
|
-
var nextDataSource =
|
25
|
+
var nextDataSource = _cloneDeep(dataSource);
|
26
26
|
var activeIndex;
|
27
27
|
if (activeKey) {
|
28
28
|
activeIndex = nextDataSource.findIndex(function (item) {
|
package/es/ProStep/index.js
CHANGED
@@ -3,11 +3,11 @@ import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
|
|
3
3
|
import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
|
4
4
|
import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
|
5
5
|
import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
|
6
|
+
import _debounce from "lodash/debounce";
|
6
7
|
var _excluded = ["children"],
|
7
8
|
_excluded2 = ["id", "form", "title", "validator", "order", "disabled", "lazyLoad"];
|
8
9
|
import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
|
9
10
|
import { createContext, useCallback, useContext, useMemo, useRef, useState } from 'react';
|
10
|
-
import { debounce } from 'lodash';
|
11
11
|
import { useSetState, useLocalStorageState } from 'ahooks';
|
12
12
|
import { handleScroll, handleScrollError } from './utils';
|
13
13
|
import Step from './components/Step';
|
@@ -64,7 +64,7 @@ var ProStep = function ProStep(_ref) {
|
|
64
64
|
return pre.order - next.order;
|
65
65
|
});
|
66
66
|
}, [resetProps === null || resetProps === void 0 ? void 0 : resetProps.dataSource, registerMap.current, ids]);
|
67
|
-
var debounceReRender = useCallback(
|
67
|
+
var debounceReRender = useCallback(_debounce(function () {
|
68
68
|
return reRender({});
|
69
69
|
}, 500), []);
|
70
70
|
// 用来注册form匹配到对应的模块id
|
@@ -1,5 +1,6 @@
|
|
1
1
|
import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
|
2
|
-
import
|
2
|
+
import _pick from "lodash/pick";
|
3
|
+
import _debounce from "lodash/debounce";
|
3
4
|
/**
|
4
5
|
* 滚动到错误位置, 延迟200ms解决ProForm错误还未生成
|
5
6
|
*/
|
@@ -34,7 +35,7 @@ export var handleScroll = function handleScroll(id, options) {
|
|
34
35
|
handleScrollError(errorDom);
|
35
36
|
} else {
|
36
37
|
// 如果没有错误表单项,则滚动到指定元素位置
|
37
|
-
setTimeout(
|
38
|
+
setTimeout(_debounce(function () {
|
38
39
|
window.scrollTo({
|
39
40
|
top: dom.offsetTop - targetOffset,
|
40
41
|
behavior: 'smooth'
|
@@ -53,7 +54,7 @@ export var getLoadedMap = function getLoadedMap(registerMap) {
|
|
53
54
|
return [];
|
54
55
|
}
|
55
56
|
var stepList = Object.values(registerMap === null || registerMap === void 0 ? void 0 : registerMap.current).map(function (item) {
|
56
|
-
return _objectSpread(_objectSpread({},
|
57
|
+
return _objectSpread(_objectSpread({}, _pick(item, ['id', 'order', 'title'])), {}, {
|
57
58
|
loaded: !document.querySelector(".".concat(item === null || item === void 0 ? void 0 : item.id, "-placeholder"))
|
58
59
|
});
|
59
60
|
});
|
package/es/ProStepTab/index.js
CHANGED
@@ -4,9 +4,9 @@ import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
|
|
4
4
|
import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
|
5
5
|
import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
|
6
6
|
import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
|
7
|
+
import _isNaN from "lodash/isNaN";
|
7
8
|
var _excluded = ["children"];
|
8
9
|
import React, { useState, useCallback, useEffect, createContext, useContext } from 'react';
|
9
|
-
import { isNaN } from 'lodash';
|
10
10
|
// 存储当前的 StepTab 实例
|
11
11
|
var StepTabInstanceContext = /*#__PURE__*/createContext(null);
|
12
12
|
/**
|
@@ -81,7 +81,7 @@ export function useStepTab() {
|
|
81
81
|
var urlSearchParams = new URLSearchParams(location.search);
|
82
82
|
var stepValue = urlSearchParams.get(routerSearchKey);
|
83
83
|
// 如果stepValue是数字,则返回数字
|
84
|
-
if (stepValue && !
|
84
|
+
if (stepValue && !_isNaN(Number(stepValue))) {
|
85
85
|
return Number(stepValue);
|
86
86
|
}
|
87
87
|
}
|
@@ -260,7 +260,7 @@ export function useStepTab() {
|
|
260
260
|
}
|
261
261
|
// 只有当activeKey能转换为数字时才执行自动跳转
|
262
262
|
currentKeyNum = Number(activeKey);
|
263
|
-
if (
|
263
|
+
if (_isNaN(currentKeyNum)) {
|
264
264
|
_context4.next = 12;
|
265
265
|
break;
|
266
266
|
}
|
@@ -2,6 +2,11 @@ import "antd/es/space/style";
|
|
2
2
|
import _Space from "antd/es/space";
|
3
3
|
import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
|
4
4
|
import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
|
5
|
+
import _isBoolean from "lodash/isBoolean";
|
6
|
+
import _isObject from "lodash/isObject";
|
7
|
+
import _isString from "lodash/isString";
|
8
|
+
import _isFunction from "lodash/isFunction";
|
9
|
+
import _isEqual from "lodash/isEqual";
|
5
10
|
var _excluded = ["title", "valueType", "format", "precision", "ellipsis", "code", "copyable", "width", "tooltip", "transform", "prefix", "suffix", "dataIndex", "toolTipProps", "minWidth", "onDiff"];
|
6
11
|
import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
|
7
12
|
/**
|
@@ -11,7 +16,6 @@ import { isValidElement } from 'react';
|
|
11
16
|
import moment from 'moment';
|
12
17
|
import classnames from 'classnames';
|
13
18
|
import ReactDOM from 'react-dom';
|
14
|
-
import { isEqual, isFunction, isString, isObject, isBoolean } from 'lodash';
|
15
19
|
import { tools } from '@zat-design/utils';
|
16
20
|
import TooltipTitle from '../TooltipTitle';
|
17
21
|
import RenderColumn from '../RenderColumn';
|
@@ -32,7 +36,7 @@ var calcMinWidth = function calcMinWidth(_ref) {
|
|
32
36
|
var tempEl = document.createElement('div');
|
33
37
|
tempEl.style.display = 'inline-block';
|
34
38
|
document.body.appendChild(tempEl);
|
35
|
-
if (
|
39
|
+
if (_isFunction(title)) {
|
36
40
|
var component = title();
|
37
41
|
ReactDOM.render(component, tempEl);
|
38
42
|
} else if (isReactElement(title)) {
|
@@ -79,7 +83,7 @@ export var formatColumn = function formatColumn(_ref2) {
|
|
79
83
|
otherProps = _objectWithoutProperties(column, _excluded);
|
80
84
|
otherProps.scroll = scroll;
|
81
85
|
// 仅在 {x: 'max-content', y: 300 } 且 column无指定 width minWidth 情况下 才开启 minWidth的自动计算
|
82
|
-
var isMaxContentOverFlow =
|
86
|
+
var isMaxContentOverFlow = _isObject(scroll) ? (scroll === null || scroll === void 0 ? void 0 : scroll.x) === 'max-content' && Reflect.ownKeys(scroll).includes('y') : false;
|
83
87
|
calcMinWidth({
|
84
88
|
minWidth: minWidth,
|
85
89
|
width: width,
|
@@ -96,19 +100,19 @@ export var formatColumn = function formatColumn(_ref2) {
|
|
96
100
|
}
|
97
101
|
return '';
|
98
102
|
}
|
99
|
-
if (
|
103
|
+
if (_isString(prefix) || /*#__PURE__*/isValidElement(prefix)) {
|
100
104
|
return prefix;
|
101
105
|
}
|
102
|
-
if (
|
106
|
+
if (_isFunction(prefix)) {
|
103
107
|
return prefix(value, record, index);
|
104
108
|
}
|
105
109
|
};
|
106
110
|
// 后缀处理
|
107
111
|
var suffixNode = function suffixNode(value, record, index) {
|
108
|
-
if (
|
112
|
+
if (_isString(suffix) || /*#__PURE__*/isValidElement(suffix)) {
|
109
113
|
return suffix;
|
110
114
|
}
|
111
|
-
if (
|
115
|
+
if (_isFunction(suffix)) {
|
112
116
|
return suffix(value, record, index);
|
113
117
|
}
|
114
118
|
};
|
@@ -116,7 +120,7 @@ export var formatColumn = function formatColumn(_ref2) {
|
|
116
120
|
var originalRender = column.render; // 保存原始的 render 方法
|
117
121
|
// 自定义render 手动重载下
|
118
122
|
column.render = function (value, record, index) {
|
119
|
-
var isFn =
|
123
|
+
var isFn = _isFunction(originalRender);
|
120
124
|
var _value = isFn ? originalRender === null || originalRender === void 0 ? void 0 : originalRender(value, record !== null && record !== void 0 ? record : {}, index) : null;
|
121
125
|
var originalResult = getOriginalValue(value, record !== null && record !== void 0 ? record : {}, originalObj, rowKey, dataIndex);
|
122
126
|
var originalValue = originalResult.originalValue;
|
@@ -127,7 +131,7 @@ export var formatColumn = function formatColumn(_ref2) {
|
|
127
131
|
otherProps.isChanged = isChanged;
|
128
132
|
if (Array.isArray(diffConfig === null || diffConfig === void 0 ? void 0 : diffConfig.originalDataSource)) {
|
129
133
|
// 存在比对
|
130
|
-
if (
|
134
|
+
if (_isFunction(otherProps === null || otherProps === void 0 ? void 0 : otherProps.viewRender)) {
|
131
135
|
var _originalObj$record$r;
|
132
136
|
var diffResult = otherProps.viewRender({
|
133
137
|
originValue: originalValue,
|
@@ -137,7 +141,7 @@ export var formatColumn = function formatColumn(_ref2) {
|
|
137
141
|
index: index
|
138
142
|
});
|
139
143
|
// viewRender 返回值为 false 时,不显示对比
|
140
|
-
if (
|
144
|
+
if (_isBoolean(diffResult)) {
|
141
145
|
if (!diffResult) {
|
142
146
|
otherProps.isChanged = false;
|
143
147
|
_isAddCell = false;
|
@@ -164,7 +168,7 @@ export var formatColumn = function formatColumn(_ref2) {
|
|
164
168
|
originalValue = diffResult;
|
165
169
|
}
|
166
170
|
// 存在自定义onDiff比对
|
167
|
-
if (
|
171
|
+
if (_isFunction(onDiff)) {
|
168
172
|
var _originalObj$record$r2;
|
169
173
|
var _diffResult = onDiff({
|
170
174
|
originValue: originalValue,
|
@@ -464,7 +468,7 @@ export var formatColumn = function formatColumn(_ref2) {
|
|
464
468
|
var isEmpty = !realValue || Array.isArray(realValue) && (realValue === null || realValue === void 0 ? void 0 : (_realValue$filter = realValue.filter(function (item) {
|
465
469
|
return !!item;
|
466
470
|
})) === null || _realValue$filter === void 0 ? void 0 : _realValue$filter.length) === 0;
|
467
|
-
if (
|
471
|
+
if (_isEqual(value, originalValue) && isEmpty) {
|
468
472
|
_jsx("div", {
|
469
473
|
style: {
|
470
474
|
minWidth: minWidth
|
package/es/ProTable/components/RcTable/components/DraggableTable/components/DndWrapper/index.js
CHANGED
@@ -2,13 +2,13 @@ import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
|
|
2
2
|
import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
|
3
3
|
import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
|
4
4
|
import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
|
5
|
+
import _isFunction from "lodash/isFunction";
|
5
6
|
var _excluded = ["disabled", "children"];
|
6
7
|
import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
|
7
8
|
import React from 'react';
|
8
9
|
import { DndContext, closestCorners } from '@dnd-kit/core';
|
9
10
|
import { arrayMove, useSortable, SortableContext, verticalListSortingStrategy } from '@dnd-kit/sortable';
|
10
11
|
import { CSS } from '@dnd-kit/utilities';
|
11
|
-
import { isFunction } from 'lodash';
|
12
12
|
import { addLevelAndParentId, treeNodeFind, transformTreeToArray, createTreeFromArray } from './utils/index';
|
13
13
|
import ProIcon from '../../../../../../../ProIcon';
|
14
14
|
export var Row = function Row(props) {
|
@@ -80,7 +80,7 @@ var DndWrapper = function DndWrapper(_ref2) {
|
|
80
80
|
while (1) switch (_context.prev = _context.next) {
|
81
81
|
case 0:
|
82
82
|
active = _ref3.active;
|
83
|
-
if (!(onDragStartGuard &&
|
83
|
+
if (!(onDragStartGuard && _isFunction(onDragStartGuard))) {
|
84
84
|
_context.next = 6;
|
85
85
|
break;
|
86
86
|
}
|
@@ -153,7 +153,7 @@ var DndWrapper = function DndWrapper(_ref2) {
|
|
153
153
|
childrenKey: 'children'
|
154
154
|
});
|
155
155
|
// 如果传了onDragEndGuard 则视为外部业务逻辑自处理
|
156
|
-
if (!(onDragEndGuard &&
|
156
|
+
if (!(onDragEndGuard && _isFunction(onDragEndGuard))) {
|
157
157
|
_context2.next = 19;
|
158
158
|
break;
|
159
159
|
}
|
@@ -6,10 +6,10 @@ import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
|
|
6
6
|
import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
|
7
7
|
import "antd/es/typography/style";
|
8
8
|
import _Typography from "antd/es/typography";
|
9
|
+
import _isBoolean from "lodash/isBoolean";
|
9
10
|
import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
|
10
11
|
import { useRef } from 'react';
|
11
12
|
import { useSetState } from 'ahooks';
|
12
|
-
import { isBoolean } from 'lodash';
|
13
13
|
import classNames from 'classnames';
|
14
14
|
import { CheckOutlined } from '@ant-design/icons';
|
15
15
|
import { ReactSVG } from 'react-svg';
|
@@ -68,7 +68,7 @@ var RenderColumn = function RenderColumn(props) {
|
|
68
68
|
}
|
69
69
|
}, toolTipProps);
|
70
70
|
// 比对场景走的逻辑
|
71
|
-
if (!isInNewRowFlag &&
|
71
|
+
if (!isInNewRowFlag && _isBoolean(props === null || props === void 0 ? void 0 : props.isChanged)) {
|
72
72
|
var renderNode = value ? node : '-';
|
73
73
|
var isXMaxContent = (scroll === null || scroll === void 0 ? void 0 : scroll.x) === 'max-content';
|
74
74
|
if (ellipsis || (props === null || props === void 0 ? void 0 : props.isChanged)) {
|
@@ -1,8 +1,8 @@
|
|
1
1
|
import "antd/es/table/style";
|
2
2
|
import _Table from "antd/es/table";
|
3
3
|
import _typeof from "@babel/runtime/helpers/esm/typeof";
|
4
|
+
import _get from "lodash/get";
|
4
5
|
import { jsxs as _jsxs, jsx as _jsx } from "react/jsx-runtime";
|
5
|
-
import { get } from 'lodash';
|
6
6
|
import { tools } from '@zat-design/utils';
|
7
7
|
import { valueTypeRender } from '../../../ProUtils/utils';
|
8
8
|
var renderSummary = function renderSummary(props) {
|
@@ -37,8 +37,8 @@ var renderSummary = function renderSummary(props) {
|
|
37
37
|
var _dataSource$reduce;
|
38
38
|
var format = valueTypeRender === null || valueTypeRender === void 0 ? void 0 : valueTypeRender[valueType];
|
39
39
|
var sum = dataSource === null || dataSource === void 0 ? void 0 : (_dataSource$reduce = dataSource.reduce) === null || _dataSource$reduce === void 0 ? void 0 : _dataSource$reduce.call(dataSource, function (pre, cur) {
|
40
|
-
var
|
41
|
-
return tools.calc(pre, '+', (
|
40
|
+
var _get2;
|
41
|
+
return tools.calc(pre, '+', (_get2 = _get(cur, key)) !== null && _get2 !== void 0 ? _get2 : 0);
|
42
42
|
}, 0);
|
43
43
|
text = format ? format(sum, precision !== null && precision !== void 0 ? precision : 2) : sum;
|
44
44
|
}
|