@zat-design/sisyphus-react 3.13.8 → 3.13.10-deta.1
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/index.js +2 -2
- 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/index.js +8 -5
- 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 +4 -3
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
|
}
|
@@ -8,10 +8,15 @@ import "antd/es/form/style";
|
|
8
8
|
import _Form from "antd/es/form";
|
9
9
|
import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
|
10
10
|
import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
|
11
|
+
import _omit from "lodash/omit";
|
12
|
+
import _isEqual from "lodash/isEqual";
|
13
|
+
import _set from "lodash/set";
|
14
|
+
import _merge from "lodash/merge";
|
15
|
+
import _isObject from "lodash/isObject";
|
16
|
+
import _pickBy from "lodash/pickBy";
|
11
17
|
var _excluded = ["page", "filters", "sorter"];
|
12
18
|
import { useEffect, useMemo, useState } from 'react';
|
13
19
|
import { useRequest, useSetState, useDeepCompareEffect, usePrevious } from 'ahooks';
|
14
|
-
import { pickBy, isObject, merge, set, isEqual, omit } from 'lodash';
|
15
20
|
import { defaultPage } from '../index';
|
16
21
|
import { isListResult, removeEmptyKeys, isNonEmptyObject } from '../utils';
|
17
22
|
import locale, { formatMessage } from '../../locale';
|
@@ -77,7 +82,7 @@ function useAntdTable(service, options, useRequestOptions) {
|
|
77
82
|
var initPage = (options === null || options === void 0 ? void 0 : options.page) || defaultPage;
|
78
83
|
var previousPage = usePrevious(page || defaultPage);
|
79
84
|
var getTransformParams = function getTransformParams(params) {
|
80
|
-
var
|
85
|
+
var _pickBy2;
|
81
86
|
var realParams = _objectSpread(_objectSpread(_objectSpread({}, defaultParam), extraParams), params);
|
82
87
|
var _realParams$page = realParams.page,
|
83
88
|
page = _realParams$page === void 0 ? initPage : _realParams$page,
|
@@ -89,9 +94,9 @@ function useAntdTable(service, options, useRequestOptions) {
|
|
89
94
|
sorter: JSON.stringify(sorter) === '{}' ? undefined : sorter
|
90
95
|
}, otherParams);
|
91
96
|
var requestParams = _objectSpread(_objectSpread({}, page), {}, {
|
92
|
-
queryBean: (
|
97
|
+
queryBean: (_pickBy2 = _pickBy(queryBean, function (item) {
|
93
98
|
return item !== undefined;
|
94
|
-
})) !== null &&
|
99
|
+
})) !== null && _pickBy2 !== void 0 ? _pickBy2 : {}
|
95
100
|
});
|
96
101
|
if (transformParams) {
|
97
102
|
return transformParams(realParams, requestParams);
|
@@ -247,11 +252,11 @@ function useAntdTable(service, options, useRequestOptions) {
|
|
247
252
|
};
|
248
253
|
var _values = removeEmptyKeys(values);
|
249
254
|
// 如果 previousPage 存在且与 page 不相等,则触发页面变化
|
250
|
-
if (previousPage && !
|
255
|
+
if (previousPage && !_isEqual(previousPage, page)) {
|
251
256
|
onPageChange(newPage);
|
252
257
|
}
|
253
258
|
// 减少查询按钮的渲染,只有需要重置值时才需要调用
|
254
|
-
if ((selectedRecords === null || selectedRecords === void 0 ? void 0 : selectedRecords.length) || isNonEmptyObject(_values) || !
|
259
|
+
if ((selectedRecords === null || selectedRecords === void 0 ? void 0 : selectedRecords.length) || isNonEmptyObject(_values) || !_isEqual(previousSearchValues, _values)) {
|
255
260
|
previousSearchValues = _values;
|
256
261
|
setState({
|
257
262
|
searchValues: _values,
|
@@ -445,12 +450,12 @@ function useAntdTable(service, options, useRequestOptions) {
|
|
445
450
|
}()
|
446
451
|
}] : false
|
447
452
|
};
|
448
|
-
var rowSelection =
|
449
|
-
if (
|
453
|
+
var rowSelection = _isObject(returnRowSelection) ? _merge(_rowSelection, returnRowSelection) : _rowSelection;
|
454
|
+
if (_isObject(returnRowSelection) && !_isEqual(rowSelection, _rowSelection)) {
|
450
455
|
// getCheckboxProps需要特殊兼容原有的逻辑,特殊处理
|
451
456
|
var isHasGetCheckboxProps = Reflect.ownKeys(returnRowSelection).includes('getCheckboxProps');
|
452
457
|
if (isHasGetCheckboxProps) {
|
453
|
-
|
458
|
+
_set(rowSelection, 'getCheckboxProps', function (record) {
|
454
459
|
var _rowSelection$getChec;
|
455
460
|
var passReturnObjects = (_rowSelection$getChec = rowSelection.getCheckboxProps(record)) !== null && _rowSelection$getChec !== void 0 ? _rowSelection$getChec : {};
|
456
461
|
return _objectSpread({
|
@@ -514,7 +519,7 @@ function useAntdTable(service, options, useRequestOptions) {
|
|
514
519
|
},
|
515
520
|
handleSetStateCallback: handleSetStateCallback
|
516
521
|
});
|
517
|
-
useAntdTableProps.tableProps.formTableProps = _objectSpread(_objectSpread({},
|
522
|
+
useAntdTableProps.tableProps.formTableProps = _objectSpread(_objectSpread({}, _omit(useAntdTableProps, 'tableProps')), {}, {
|
518
523
|
form: form
|
519
524
|
});
|
520
525
|
return useAntdTableProps;
|
package/es/ProTable/index.js
CHANGED
@@ -5,11 +5,16 @@ import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
|
|
5
5
|
import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
|
6
6
|
import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
|
7
7
|
import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
|
8
|
+
import _isBoolean from "lodash/isBoolean";
|
9
|
+
import _isFunction from "lodash/isFunction";
|
10
|
+
import _isObject from "lodash/isObject";
|
11
|
+
import _assign from "lodash/assign";
|
12
|
+
import _keyBy from "lodash/keyBy";
|
13
|
+
import _get from "lodash/get";
|
8
14
|
var _excluded = ["tableId", "headerRender", "footerRender", "quickConfig", "stripe", "columns", "className", "draggable", "disabled", "isView", "rowDisabled", "summary", "emptyText", "diffConfig", "onDragStart", "onDragEnd", "tabs"],
|
9
15
|
_excluded2 = ["resizeColumn", "columnConfig", "cacheTime", "storage"];
|
10
16
|
import { Fragment as _Fragment, jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
|
11
17
|
import { useEffect, useMemo, useState, createContext } from 'react';
|
12
|
-
import { get, keyBy, assign, isObject, isFunction, isBoolean } from 'lodash';
|
13
18
|
import { useDebounceEffect, useDeepCompareEffect, useSetState } from 'ahooks';
|
14
19
|
import classnames from 'classnames';
|
15
20
|
import { useProConfig } from '../index';
|
@@ -114,7 +119,7 @@ var ProTable = function ProTable(props) {
|
|
114
119
|
rowKey: getRowKey(rowKey, item)
|
115
120
|
});
|
116
121
|
});
|
117
|
-
var originalObj = _originalDataSource ?
|
122
|
+
var originalObj = _originalDataSource ? _keyBy(_originalDataSource, 'rowKey') : undefined;
|
118
123
|
var propsColumnObj = useMemo(function () {
|
119
124
|
return propsColumns.reduce(function (acc, cur) {
|
120
125
|
// @ts-ignore
|
@@ -184,7 +189,7 @@ var ProTable = function ProTable(props) {
|
|
184
189
|
};
|
185
190
|
};
|
186
191
|
var _rowClassName = function _rowClassName(record, index) {
|
187
|
-
if (originalDataSource && !originalObj.hasOwnProperty(
|
192
|
+
if (originalDataSource && !originalObj.hasOwnProperty(_get(record, 'rowKey'))) {
|
188
193
|
return 'new-cell';
|
189
194
|
}
|
190
195
|
};
|
@@ -235,10 +240,10 @@ var ProTable = function ProTable(props) {
|
|
235
240
|
var _columns = useMemo(function () {
|
236
241
|
return columns === null || columns === void 0 ? void 0 : columns.filter(function (item, index) {
|
237
242
|
var show = item.show;
|
238
|
-
if (
|
243
|
+
if (_isBoolean(show)) {
|
239
244
|
return show;
|
240
245
|
}
|
241
|
-
if (
|
246
|
+
if (_isFunction(show)) {
|
242
247
|
return show();
|
243
248
|
}
|
244
249
|
return true;
|
@@ -265,7 +270,7 @@ var ProTable = function ProTable(props) {
|
|
265
270
|
return _objectSpread({}, propsColumnObj === null || propsColumnObj === void 0 ? void 0 : propsColumnObj[item]);
|
266
271
|
});
|
267
272
|
}
|
268
|
-
if (!
|
273
|
+
if (!_isObject(columnConfig)) {
|
269
274
|
_context.next = 6;
|
270
275
|
break;
|
271
276
|
}
|
@@ -369,7 +374,7 @@ var ProTable = function ProTable(props) {
|
|
369
374
|
dataSource: nextDataSource
|
370
375
|
});
|
371
376
|
// 覆盖引用值
|
372
|
-
|
377
|
+
_assign(dataSource, nextDataSource);
|
373
378
|
case 2:
|
374
379
|
case "end":
|
375
380
|
return _context2.stop();
|
@@ -1,6 +1,7 @@
|
|
1
1
|
import _typeof from "@babel/runtime/helpers/esm/typeof";
|
2
2
|
import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
|
3
|
-
import
|
3
|
+
import _isEqual from "lodash/isEqual";
|
4
|
+
import _get from "lodash/get";
|
4
5
|
import { validate } from '@zat-design/utils';
|
5
6
|
var isEmpty = validate.isEmpty;
|
6
7
|
/**
|
@@ -30,8 +31,8 @@ export var getOriginalValue = function getOriginalValue(value, record, originalO
|
|
30
31
|
isAddCell: null
|
31
32
|
};
|
32
33
|
}
|
33
|
-
var originRecord =
|
34
|
-
var originalValue =
|
34
|
+
var originRecord = _get(originalObj, _get(record, rowKey));
|
35
|
+
var originalValue = _get(originRecord, dataIndex);
|
35
36
|
if (isEmpty(originalValue) && !isEmpty(value)) {
|
36
37
|
return {
|
37
38
|
originalValue: originalValue,
|
@@ -39,7 +40,7 @@ export var getOriginalValue = function getOriginalValue(value, record, originalO
|
|
39
40
|
isChanged: false
|
40
41
|
};
|
41
42
|
}
|
42
|
-
if (!
|
43
|
+
if (!_isEqual(originalValue, value)) {
|
43
44
|
return {
|
44
45
|
originalValue: originalValue,
|
45
46
|
isChanged: true,
|
package/es/ProTabs/index.js
CHANGED
@@ -4,13 +4,13 @@ import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
|
|
4
4
|
import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
|
5
5
|
import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
|
6
6
|
import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
|
7
|
+
import _omit from "lodash/omit";
|
7
8
|
var _excluded = ["style", "className", "dataSource", "onChange", "transformResponse", "useRequest", "tabSearch", "mode"];
|
8
9
|
import { jsx as _jsx } from "react/jsx-runtime";
|
9
10
|
/* eslint-disable @typescript-eslint/consistent-type-assertions */
|
10
11
|
import { useMemo, useState, forwardRef, useImperativeHandle } from 'react';
|
11
12
|
import { useDeepCompareEffect, useRequest as useRequestFunc } from 'ahooks';
|
12
13
|
import classNames from 'classnames';
|
13
|
-
import { omit } from 'lodash';
|
14
14
|
import { Card } from './components';
|
15
15
|
var ProTabs = function ProTabs(props, ref) {
|
16
16
|
var style = props.style,
|
@@ -63,7 +63,7 @@ var ProTabs = function ProTabs(props, ref) {
|
|
63
63
|
title: itemProps.title || itemProps.label,
|
64
64
|
loading: fetchFunction === null || fetchFunction === void 0 ? void 0 : fetchFunction.loading
|
65
65
|
};
|
66
|
-
return _objectSpread(_objectSpread({},
|
66
|
+
return _objectSpread(_objectSpread({}, _omit(itemProps, ['total', 'label', 'icon'])), {}, {
|
67
67
|
label: _jsx(Card, _objectSpread({}, cardItemProps))
|
68
68
|
});
|
69
69
|
});
|
@@ -6,6 +6,7 @@ import _message from "antd/es/message";
|
|
6
6
|
import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
|
7
7
|
import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
|
8
8
|
import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
|
9
|
+
import _isEqual from "lodash/isEqual";
|
9
10
|
var _excluded = ["size", "className", "cacheTime", "color", "mode", "iconFollowTheme", "prefixCls", "tableBorder", "tableStripe", "theme", "onChange"];
|
10
11
|
import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
|
11
12
|
/* eslint-disable prefer-const */
|
@@ -13,7 +14,6 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
|
|
13
14
|
import { useEffect, useState } from 'react';
|
14
15
|
import { usePrevious, useUpdateEffect, useToggle } from 'ahooks';
|
15
16
|
import { ReactSVG } from 'react-svg';
|
16
|
-
import { isEqual } from 'lodash';
|
17
17
|
import classnames from 'classnames';
|
18
18
|
import { getKebabCase, setThemes, setTableBorder, getMapKebabCase, getMapHumpCase } from './utils/index';
|
19
19
|
import settingSvg from '../assets/setting.svg';
|
@@ -167,7 +167,7 @@ var ProThemeTools = function ProThemeTools(_ref) {
|
|
167
167
|
}
|
168
168
|
}, [state, cacheTime]);
|
169
169
|
useUpdateEffect(function () {
|
170
|
-
if (!
|
170
|
+
if (!_isEqual(state, previousState) && visible) {
|
171
171
|
onChange === null || onChange === void 0 ? void 0 : onChange(state);
|
172
172
|
}
|
173
173
|
}, [state]);
|
@@ -14,13 +14,14 @@ import _message from "antd/es/message";
|
|
14
14
|
import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
|
15
15
|
import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
|
16
16
|
import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
|
17
|
+
import _isFunction from "lodash/isFunction";
|
18
|
+
import _cloneDeep from "lodash/cloneDeep";
|
17
19
|
var _excluded = ["value", "onChange", "dataSource", "mode", "code", "useRequest", "allValue", "showCodeName", "checkStrictly", "tags", "placeholder", "labelInValue", "fieldNames", "disabled", "isView", "transformResponse", "optionRender", "onSelect", "loading", "style", "className", "showSearch", "title", "footer", "expandedKeys", "showExpand", "defaultExpandAll"];
|
18
20
|
import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
|
19
21
|
import { useEffect } from 'react';
|
20
22
|
import classNames from 'classnames';
|
21
23
|
import { CaretDownOutlined, Loading3QuartersOutlined } from '@ant-design/icons';
|
22
24
|
import { useDeepCompareEffect, useSetState, useRequest as useRequestFunc } from 'ahooks';
|
23
|
-
import { cloneDeep, isFunction } from 'lodash';
|
24
25
|
import { ReactSVG } from 'react-svg';
|
25
26
|
import { useProConfig } from '../../ProConfigProvider';
|
26
27
|
import { TreeView } from './index';
|
@@ -140,7 +141,7 @@ var ProTree = function ProTree(props) {
|
|
140
141
|
var allKey = getAllKeys(dataSource, fieldNames);
|
141
142
|
setState({
|
142
143
|
treeData: dataSource,
|
143
|
-
originalTreeData:
|
144
|
+
originalTreeData: _cloneDeep(dataSource),
|
144
145
|
flatTreeData: getFlatTreeData(dataSource, fieldNames),
|
145
146
|
allKeys: allKey
|
146
147
|
// innerExpandKeys: props?.expandedKeys ? props?.expandedKeys : getDefaultExpandKeys(defaultExpandAll, allKey),
|
@@ -148,7 +149,7 @@ var ProTree = function ProTree(props) {
|
|
148
149
|
} else if (enumCode) {
|
149
150
|
var dictEnum = dics[enumCode] || [];
|
150
151
|
// transform dictEnum
|
151
|
-
if (transformResponse &&
|
152
|
+
if (transformResponse && _isFunction(transformResponse)) {
|
152
153
|
dictEnum = transformResponse(dictEnum);
|
153
154
|
}
|
154
155
|
// check dictEnum isArray
|
@@ -159,7 +160,7 @@ var ProTree = function ProTree(props) {
|
|
159
160
|
var _allKey2 = getAllKeys(dictEnum, fieldNames);
|
160
161
|
setState({
|
161
162
|
treeData: dictEnum,
|
162
|
-
originalTreeData:
|
163
|
+
originalTreeData: _cloneDeep(dictEnum),
|
163
164
|
flatTreeData: getFlatTreeData(dictEnum, fieldNames),
|
164
165
|
allKeys: getAllKeys(dictEnum, fieldNames)
|
165
166
|
// innerExpandKeys: props?.expandedKeys ? props?.expandedKeys : getDefaultExpandKeys(defaultExpandAll, allKey),
|
@@ -12,6 +12,8 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
|
|
12
12
|
import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
|
13
13
|
import "antd/es/tree-select/style";
|
14
14
|
import _TreeSelect from "antd/es/tree-select";
|
15
|
+
import _debounce from "lodash/debounce";
|
16
|
+
import _cloneDeep from "lodash/cloneDeep";
|
15
17
|
var _excluded = ["disabled", "code", "dataSource", "defaultDisableValue", "onChange", "useRequest", "transformResponse", "fieldNames", "placeholder", "tooltip", "showSearch", "filterTreeNode", "treeNodeFilterProp", "defaultExpandAll", "expandedKeys", "treeCheckable", "onSearch", "otherProps", "width", "dropdownStyle", "popupClassName", "style", "allowClear", "listHeight", "showCodeName", "className", "checkStrictly", "checkable"],
|
16
18
|
_excluded2 = ["children"];
|
17
19
|
import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
|
@@ -20,7 +22,6 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
|
|
20
22
|
import { useDeepCompareEffect, useRequest as useRequestFunc, useSetState } from 'ahooks';
|
21
23
|
import classnames from 'classnames';
|
22
24
|
import { useImperativeHandle, forwardRef, useCallback } from 'react';
|
23
|
-
import { cloneDeep, debounce } from 'lodash';
|
24
25
|
import locale from '../../../locale';
|
25
26
|
import { useProConfig } from '../../../ProConfigProvider';
|
26
27
|
import Container from '../../../ProForm/components/Container';
|
@@ -141,7 +142,7 @@ export var ProTreeSelect = function ProTreeSelect(props, ref) {
|
|
141
142
|
* @returns 转换结果
|
142
143
|
*/
|
143
144
|
var transferDataSource = function transferDataSource(dataArr, showCodeAndName) {
|
144
|
-
var copyData =
|
145
|
+
var copyData = _cloneDeep(dataArr);
|
145
146
|
var _loop = function loop(arr) {
|
146
147
|
arr.map(function (item) {
|
147
148
|
item[label] = "".concat(item[code], "-").concat(item[label]);
|
@@ -437,7 +438,7 @@ export var ProTreeSelect = function ProTreeSelect(props, ref) {
|
|
437
438
|
sourceList = _filterData(sourceList);
|
438
439
|
return sourceList;
|
439
440
|
}
|
440
|
-
var searchTreeEvent =
|
441
|
+
var searchTreeEvent = _debounce(/*#__PURE__*/function () {
|
441
442
|
var _ref6 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(searchVal) {
|
442
443
|
var result;
|
443
444
|
return _regeneratorRuntime().wrap(function _callee$(_context) {
|
@@ -448,11 +449,11 @@ export var ProTreeSelect = function ProTreeSelect(props, ref) {
|
|
448
449
|
break;
|
449
450
|
}
|
450
451
|
setState({
|
451
|
-
selectList:
|
452
|
+
selectList: _cloneDeep(origDataSource || [])
|
452
453
|
});
|
453
454
|
return _context.abrupt("return", null);
|
454
455
|
case 3:
|
455
|
-
result = filterTree(
|
456
|
+
result = filterTree(_cloneDeep(origDataSource || []), searchVal);
|
456
457
|
setState({
|
457
458
|
selectList: result || []
|
458
459
|
});
|
package/es/ProTreeModal/index.js
CHANGED
@@ -10,10 +10,11 @@ import "antd/es/message/style";
|
|
10
10
|
import _message from "antd/es/message";
|
11
11
|
import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
|
12
12
|
import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
|
13
|
+
import _isFunction from "lodash/isFunction";
|
14
|
+
import _cloneDeep from "lodash/cloneDeep";
|
13
15
|
import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
|
14
16
|
import React, { useEffect, useMemo, useRef } from 'react';
|
15
17
|
import { useDeepCompareEffect, useSetState, useRequest as useRequestFunc, useDebounceFn } from 'ahooks';
|
16
|
-
import { cloneDeep, isFunction } from 'lodash';
|
17
18
|
import { ReactSVG } from 'react-svg';
|
18
19
|
import classNames from 'classnames';
|
19
20
|
import { ProDrawerForm, useProConfig } from '../index';
|
@@ -124,14 +125,14 @@ var ProTreeModal = function ProTreeModal(props) {
|
|
124
125
|
if (dataSource && dataSource.length) {
|
125
126
|
setState({
|
126
127
|
treeData: dataSource,
|
127
|
-
originalTreeData:
|
128
|
+
originalTreeData: _cloneDeep(dataSource),
|
128
129
|
flatTreeData: getFlatTreeData(dataSource, fieldNames),
|
129
130
|
allKeys: getAllKeys(dataSource, fieldNames)
|
130
131
|
});
|
131
132
|
} else if (enumCode) {
|
132
133
|
var dictEnum = dics[enumCode] || [];
|
133
134
|
// transform dictEnum
|
134
|
-
if (transformResponse &&
|
135
|
+
if (transformResponse && _isFunction(transformResponse)) {
|
135
136
|
dictEnum = transformResponse(dictEnum);
|
136
137
|
}
|
137
138
|
// check dictEnum isArray
|
@@ -142,7 +143,7 @@ var ProTreeModal = function ProTreeModal(props) {
|
|
142
143
|
}
|
143
144
|
setState({
|
144
145
|
treeData: dictEnum,
|
145
|
-
originalTreeData:
|
146
|
+
originalTreeData: _cloneDeep(dictEnum),
|
146
147
|
flatTreeData: getFlatTreeData(dictEnum, fieldNames),
|
147
148
|
allKeys: getAllKeys(dictEnum, fieldNames)
|
148
149
|
});
|
@@ -12,11 +12,11 @@ import "antd/es/progress/style";
|
|
12
12
|
import _Progress from "antd/es/progress";
|
13
13
|
import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
|
14
14
|
import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
|
15
|
+
import _isFunction from "lodash/isFunction";
|
15
16
|
import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
|
16
17
|
import { useRef, useState } from 'react';
|
17
18
|
import { DndContext } from '@dnd-kit/core';
|
18
19
|
import { SortableContext, rectSortingStrategy } from '@dnd-kit/sortable';
|
19
|
-
import { isFunction } from 'lodash';
|
20
20
|
import { ReactSVG } from 'react-svg';
|
21
21
|
import { PlusOutlined } from '@ant-design/icons';
|
22
22
|
import { Example } from './Example';
|
@@ -229,7 +229,7 @@ var ImageRender = function ImageRender(props) {
|
|
229
229
|
}),
|
230
230
|
strategy: rectSortingStrategy,
|
231
231
|
children: _jsx(_Upload, _objectSpread(_objectSpread({}, imageUploadProps), {}, {
|
232
|
-
children: fileList.length < maxCount && !isView && (centerRender ?
|
232
|
+
children: fileList.length < maxCount && !isView && (centerRender ? _isFunction(centerRender) ? centerRender() : centerRender : _jsxs("div", {
|
233
233
|
className: "pro-upload-image-inner ".concat(disabled ? 'pro-upload-image-disabled' : '', " "),
|
234
234
|
children: [_jsx(PlusOutlined, {}), _jsx("div", {
|
235
235
|
style: {
|
package/es/ProUpload/index.js
CHANGED
@@ -3,10 +3,11 @@ import _message from "antd/es/message";
|
|
3
3
|
import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
|
4
4
|
import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
|
5
5
|
import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
|
6
|
+
import _omit from "lodash/omit";
|
7
|
+
import _isFunction from "lodash/isFunction";
|
6
8
|
var _excluded = ["value", "size", "action", "maxCount", "headerRender", "footerRender", "centerRender", "disabled", "uploadType", "buttonProps", "accept", "extraTipText", "beforeUpload", "onChange", "onDownload", "onPreview", "onRemove", "filterOriginFileObj", "method", "className", "dataParams", "name", "showExampleContent", "showUploadList", "otherProps", "transformResponse", "exampleTitle", "exampleContent", "exampleModalProps", "buttonText", "afterRender", "fieldNames", "isConfirmDelete"];
|
7
9
|
import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
|
8
10
|
import React, { useEffect, useState, useImperativeHandle } from 'react';
|
9
|
-
import { isFunction, omit } from 'lodash';
|
10
11
|
import { PointerSensor, useSensor } from '@dnd-kit/core';
|
11
12
|
import { arrayMove } from '@dnd-kit/sortable';
|
12
13
|
import { useProConfig } from '../ProConfigProvider';
|
@@ -85,7 +86,7 @@ var ProUpload = /*#__PURE__*/React.forwardRef(function (props, ref) {
|
|
85
86
|
var nfile = _objectSpread({}, file);
|
86
87
|
// 过滤掉originFileObj
|
87
88
|
if (filterOriginFileObj) {
|
88
|
-
return
|
89
|
+
return _omit(nfile, 'originFileObj');
|
89
90
|
}
|
90
91
|
if (transformResponse) {
|
91
92
|
var data = transformResponse(file.response) || {};
|
@@ -196,14 +197,14 @@ var ProUpload = /*#__PURE__*/React.forwardRef(function (props, ref) {
|
|
196
197
|
};
|
197
198
|
// 自定义顶部
|
198
199
|
var _headerRender = function _headerRender() {
|
199
|
-
if (
|
200
|
+
if (_isFunction(headerRender)) {
|
200
201
|
return headerRender();
|
201
202
|
}
|
202
203
|
return headerRender;
|
203
204
|
};
|
204
205
|
// 自定义底部
|
205
206
|
var _footerRender = function _footerRender() {
|
206
|
-
if (
|
207
|
+
if (_isFunction(footerRender)) {
|
207
208
|
return footerRender();
|
208
209
|
}
|
209
210
|
return footerRender;
|