@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
@@ -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;
|
@@ -19,12 +19,12 @@ import "antd/es/form/style";
|
|
19
19
|
import _Form from "antd/es/form";
|
20
20
|
import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
|
21
21
|
import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
|
22
|
+
import _cloneDeep from "lodash/cloneDeep";
|
22
23
|
var _excluded = ["form", "dataSource", "setDataSource", "columns", "actionRef", "addButtonProps", "pagination", "editType", "onlyOneLineEditorAlertMessage", "noSaveAlertMessage", "mulDeletePoconfirmMsg", "name", "disabled", "formProps"],
|
23
24
|
_excluded2 = ["isCanAdd", "isCanMultipleDelete", "multipleDeleteModalProps", "position", "buttonText", "emptyButtonText", "insertType", "onlyAddOneLineAlertMessage"];
|
24
25
|
import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
|
25
26
|
import { PlusOutlined } from '@ant-design/icons';
|
26
27
|
import { useSetState, useDeepCompareEffect } from 'ahooks';
|
27
|
-
import { cloneDeep } from 'lodash';
|
28
28
|
import { cloneElement, forwardRef, useImperativeHandle, useMemo, useRef, useState } from 'react';
|
29
29
|
import Empty from '../../assets/empty.png';
|
30
30
|
import { formatList, transformColumns, getRandom } from './utils';
|
@@ -106,7 +106,7 @@ var ProEditableTable = /*#__PURE__*/forwardRef(function (props, ref) {
|
|
106
106
|
* @returns {promise}
|
107
107
|
*/
|
108
108
|
var onUpdateRowData = function onUpdateRowData(rowIndex, values) {
|
109
|
-
var nextList =
|
109
|
+
var nextList = _cloneDeep(list);
|
110
110
|
nextList[rowIndex] = _objectSpread(_objectSpread({}, nextList[rowIndex]), values);
|
111
111
|
setDataSource ? setDataSource(nextList) : setList(_toConsumableArray(nextList));
|
112
112
|
return Promise.resolve({
|
@@ -143,7 +143,7 @@ var ProEditableTable = /*#__PURE__*/forwardRef(function (props, ref) {
|
|
143
143
|
}
|
144
144
|
}
|
145
145
|
var rowIndex = 0;
|
146
|
-
var nextList =
|
146
|
+
var nextList = _cloneDeep(list);
|
147
147
|
if (insertType === 'before') {
|
148
148
|
handleMulResetForm();
|
149
149
|
nextList.unshift(_objectSpread(_objectSpread({}, rowData), {}, {
|
@@ -195,8 +195,8 @@ var ProEditableTable = /*#__PURE__*/forwardRef(function (props, ref) {
|
|
195
195
|
_context.next = 20;
|
196
196
|
break;
|
197
197
|
}
|
198
|
-
values =
|
199
|
-
nextList =
|
198
|
+
values = _cloneDeep(form.getFieldsValue(true));
|
199
|
+
nextList = _cloneDeep(list);
|
200
200
|
nextList = nextList.filter(function (item) {
|
201
201
|
return !selectedRowKeys.includes(getRowKey(item));
|
202
202
|
});
|
@@ -240,10 +240,10 @@ var ProEditableTable = /*#__PURE__*/forwardRef(function (props, ref) {
|
|
240
240
|
* @returns {Promise<{nextList: IRowDataPropsType[], list: IRowDataPropsType[], rowData: IRowDataPropsType, rowIndex: number}>}
|
241
241
|
*/
|
242
242
|
var onDelete = function onDelete(rowIndex) {
|
243
|
-
var values =
|
243
|
+
var values = _cloneDeep(form.getFieldsValue(true));
|
244
244
|
var lastIndex = list.length - 1;
|
245
245
|
form.resetFields([rowIndex]);
|
246
|
-
var nextList =
|
246
|
+
var nextList = _cloneDeep(list);
|
247
247
|
setSelectedRows(selectedRows.filter(function (item) {
|
248
248
|
var _nextList$rowIndex;
|
249
249
|
return item.rowKey !== ((_nextList$rowIndex = nextList[rowIndex]) === null || _nextList$rowIndex === void 0 ? void 0 : _nextList$rowIndex.rowKey);
|
@@ -18,8 +18,8 @@ import "antd/es/date-picker/style";
|
|
18
18
|
import _DatePicker from "antd/es/date-picker";
|
19
19
|
import "antd/es/select/style";
|
20
20
|
import _Select from "antd/es/select";
|
21
|
+
import _cloneDeep from "lodash/cloneDeep";
|
21
22
|
import { jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
|
22
|
-
import { cloneDeep } from 'lodash';
|
23
23
|
import moment from 'moment';
|
24
24
|
import { InputRange } from '../../ProForm/components';
|
25
25
|
var Option = _Select.Option;
|
@@ -304,7 +304,7 @@ export var transformColumns = function transformColumns() {
|
|
304
304
|
};
|
305
305
|
// 过滤list中多余数据,保证数据的纯净
|
306
306
|
export var formatList = function formatList(list) {
|
307
|
-
var formatList =
|
307
|
+
var formatList = _cloneDeep(list);
|
308
308
|
formatList.forEach(function (item) {
|
309
309
|
if (item.rowKey) {
|
310
310
|
delete item.rowKey;
|
@@ -0,0 +1,22 @@
|
|
1
|
+
.pro-action-check-modal-box .res-err-list .err-tip {
|
2
|
+
color: #666;
|
3
|
+
}
|
4
|
+
.pro-action-check-modal-box .res-err-list .err-item {
|
5
|
+
box-sizing: border-box;
|
6
|
+
padding-left: 6px;
|
7
|
+
color: #333;
|
8
|
+
border-radius: 4px;
|
9
|
+
}
|
10
|
+
.pro-action-check-modal-box .res-err-list .err-item:hover {
|
11
|
+
background-color: #f0f0f0;
|
12
|
+
}
|
13
|
+
.pro-action-check-modal-box .res-err-list .list-wrap {
|
14
|
+
box-sizing: border-box;
|
15
|
+
max-height: 50vh;
|
16
|
+
margin: 12px 0;
|
17
|
+
padding: 4px;
|
18
|
+
overflow-y: auto;
|
19
|
+
line-height: 1.8;
|
20
|
+
border: 1px solid #ccc;
|
21
|
+
border-radius: 6px;
|
22
|
+
}
|
@@ -0,0 +1,8 @@
|
|
1
|
+
import './index.less';
|
2
|
+
interface propsWithCheckModal {
|
3
|
+
errorTitle?: string;
|
4
|
+
list?: string[];
|
5
|
+
[key: string]: any;
|
6
|
+
}
|
7
|
+
declare const CheckModalContent: (props: propsWithCheckModal) => import("react/jsx-runtime").JSX.Element;
|
8
|
+
export default CheckModalContent;
|
@@ -0,0 +1,45 @@
|
|
1
|
+
"use strict";
|
2
|
+
|
3
|
+
Object.defineProperty(exports, "__esModule", {
|
4
|
+
value: true
|
5
|
+
});
|
6
|
+
exports.default = void 0;
|
7
|
+
var _jsxRuntime = require("react/jsx-runtime");
|
8
|
+
require("./index.less");
|
9
|
+
/*
|
10
|
+
* @Author: za-xuwenli xuwenli@zhongan.io
|
11
|
+
* @Date: 2025-02-17 11:49:02
|
12
|
+
* @LastEditors: za-xuwenli xuwenli@zhongan.io
|
13
|
+
* @LastEditTime: 2025-05-29 13:55:34
|
14
|
+
* @FilePath: /zat-wjs-pro-product-web/src/components/CheckModalContent/index.tsx
|
15
|
+
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
|
16
|
+
*/
|
17
|
+
|
18
|
+
var CheckModalContent = function CheckModalContent(props) {
|
19
|
+
var _ref = props !== null && props !== void 0 ? props : {},
|
20
|
+
errorTitle = _ref.errorTitle,
|
21
|
+
_ref$list = _ref.list,
|
22
|
+
list = _ref$list === void 0 ? [] : _ref$list;
|
23
|
+
return (0, _jsxRuntime.jsx)("div", {
|
24
|
+
className: "pro-action-check-modal-box",
|
25
|
+
children: (0, _jsxRuntime.jsxs)("div", {
|
26
|
+
className: "res-err-list",
|
27
|
+
children: [(0, _jsxRuntime.jsx)("span", {
|
28
|
+
className: "err-tip",
|
29
|
+
children: errorTitle
|
30
|
+
}), Array.isArray(list) && list.length === 1 ? (0, _jsxRuntime.jsx)("span", {
|
31
|
+
className: "err-item",
|
32
|
+
children: list[0]
|
33
|
+
}) : null, Array.isArray(list) && list.length > 1 ? (0, _jsxRuntime.jsx)("div", {
|
34
|
+
className: "list-wrap",
|
35
|
+
children: list.map(function (item) {
|
36
|
+
return (0, _jsxRuntime.jsx)("div", {
|
37
|
+
className: "err-item",
|
38
|
+
children: item
|
39
|
+
});
|
40
|
+
})
|
41
|
+
}) : null]
|
42
|
+
})
|
43
|
+
});
|
44
|
+
};
|
45
|
+
var _default = exports.default = CheckModalContent;
|
@@ -0,0 +1,28 @@
|
|
1
|
+
.pro-action-check-modal-box {
|
2
|
+
.res-err-list {
|
3
|
+
.err-tip {
|
4
|
+
color: #666;
|
5
|
+
}
|
6
|
+
|
7
|
+
.err-item {
|
8
|
+
box-sizing: border-box;
|
9
|
+
padding-left: 6px;
|
10
|
+
color: #333;
|
11
|
+
border-radius: 4px;
|
12
|
+
&:hover {
|
13
|
+
background-color: #f0f0f0;
|
14
|
+
}
|
15
|
+
}
|
16
|
+
|
17
|
+
.list-wrap {
|
18
|
+
box-sizing: border-box;
|
19
|
+
max-height: 50vh;
|
20
|
+
margin: 12px 0;
|
21
|
+
padding: 4px;
|
22
|
+
overflow-y: auto;
|
23
|
+
line-height: 1.8;
|
24
|
+
border: 1px solid #ccc;
|
25
|
+
border-radius: 6px;
|
26
|
+
}
|
27
|
+
}
|
28
|
+
}
|