@zat-design/sisyphus-react 3.13.6 → 3.13.7-beta.2
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 +44 -0
- package/es/ProAction/components/CheckModalContent/index.less +28 -0
- package/es/ProAction/index.js +35 -38
- package/es/ProAction/propsType.d.ts +8 -6
- package/es/ProTable/components/FormatColumn/index.js +4 -4
- package/es/ProTable/hooks/useAntdTable.js +28 -19
- package/es/ProTable/propsType.d.ts +2 -2
- package/es/ProTable/utils/index.js +2 -2
- package/es/ProTree/components/AdaptiveTooltip.js +4 -30
- package/es/ProTree/components/ProTree.js +0 -1
- package/es/ProTree/components/ProTreeSelect/index.js +52 -12
- package/es/locale/en_US.d.ts +1 -0
- package/es/locale/en_US.js +1 -0
- package/es/locale/zh_CN.d.ts +1 -0
- package/es/locale/zh_CN.js +1 -0
- 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 +49 -0
- package/lib/ProAction/components/CheckModalContent/index.less +28 -0
- package/lib/ProAction/index.js +35 -38
- package/lib/ProAction/propsType.d.ts +8 -6
- package/lib/ProTable/components/FormatColumn/index.js +4 -4
- package/lib/ProTable/hooks/useAntdTable.js +25 -18
- package/lib/ProTable/propsType.d.ts +2 -2
- package/lib/ProTable/utils/index.js +2 -2
- package/lib/ProTree/components/AdaptiveTooltip.js +3 -30
- package/lib/ProTree/components/ProTree.js +0 -1
- package/lib/ProTree/components/ProTreeSelect/index.js +51 -11
- package/lib/locale/en_US.d.ts +1 -0
- package/lib/locale/en_US.js +1 -0
- package/lib/locale/zh_CN.d.ts +1 -0
- package/lib/locale/zh_CN.js +1 -0
- package/package.json +1 -1
@@ -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
|
+
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,44 @@
|
|
1
|
+
import "antd/es/tooltip/style";
|
2
|
+
import _Tooltip from "antd/es/tooltip";
|
3
|
+
import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
|
4
|
+
/*
|
5
|
+
* @Author: za-xuwenli xuwenli@zhongan.io
|
6
|
+
* @Date: 2025-02-17 11:49:02
|
7
|
+
* @LastEditors: za-xuwenli xuwenli@zhongan.io
|
8
|
+
* @LastEditTime: 2025-05-28 18:23:47
|
9
|
+
* @FilePath: /zat-wjs-pro-product-web/src/components/CheckModalContent/index.tsx
|
10
|
+
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
|
11
|
+
*/
|
12
|
+
|
13
|
+
import './index.less';
|
14
|
+
var CheckModalContent = function CheckModalContent(props) {
|
15
|
+
var _ref = props !== null && props !== void 0 ? props : {},
|
16
|
+
errorTitle = _ref.errorTitle,
|
17
|
+
_ref$list = _ref.list,
|
18
|
+
list = _ref$list === void 0 ? [] : _ref$list;
|
19
|
+
return _jsx("div", {
|
20
|
+
className: "pro-action-check-modal-box",
|
21
|
+
children: _jsxs("div", {
|
22
|
+
className: "res-err-list",
|
23
|
+
children: [_jsx("span", {
|
24
|
+
className: "err-tip",
|
25
|
+
children: errorTitle
|
26
|
+
}), _jsxs(_Tooltip, {
|
27
|
+
title: list.join('\n') || [],
|
28
|
+
children: [Array.isArray(list) && list.length === 1 ? _jsx("span", {
|
29
|
+
className: "err-item",
|
30
|
+
children: list[0]
|
31
|
+
}) : null, Array.isArray(list) && list.length > 1 ? _jsx("div", {
|
32
|
+
className: "list-wrap",
|
33
|
+
children: list.map(function (item) {
|
34
|
+
return _jsx("div", {
|
35
|
+
className: "err-item",
|
36
|
+
children: item
|
37
|
+
});
|
38
|
+
})
|
39
|
+
}) : null]
|
40
|
+
})]
|
41
|
+
})
|
42
|
+
});
|
43
|
+
};
|
44
|
+
export 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
|
+
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
|
+
}
|
package/es/ProAction/index.js
CHANGED
@@ -1,3 +1,4 @@
|
|
1
|
+
import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
|
1
2
|
import "antd/es/popconfirm/style";
|
2
3
|
import _Popconfirm from "antd/es/popconfirm";
|
3
4
|
import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
|
@@ -10,6 +11,7 @@ import { Fragment as _Fragment, jsx as _jsx, jsxs as _jsxs } from "react/jsx-run
|
|
10
11
|
import React from 'react';
|
11
12
|
import { useSetState } from 'ahooks';
|
12
13
|
import { isFunction } from 'lodash';
|
14
|
+
import CheckModalContent from './components/CheckModalContent';
|
13
15
|
import { ProDrawerForm } from '../index';
|
14
16
|
import locale from '../locale';
|
15
17
|
import './index.less';
|
@@ -24,7 +26,8 @@ var ProAction = function ProAction(props) {
|
|
24
26
|
index: 0,
|
25
27
|
open: false,
|
26
28
|
servicesArray: [],
|
27
|
-
loading: false
|
29
|
+
loading: false,
|
30
|
+
errorModalData: null
|
28
31
|
}),
|
29
32
|
_useSetState2 = _slicedToArray(_useSetState, 2),
|
30
33
|
state = _useSetState2[0],
|
@@ -37,12 +40,12 @@ var ProAction = function ProAction(props) {
|
|
37
40
|
});
|
38
41
|
}
|
39
42
|
var index = state.index,
|
40
|
-
|
43
|
+
errorModalData = state.errorModalData;
|
41
44
|
var length = config.length;
|
42
45
|
var _onActionRun = /*#__PURE__*/function () {
|
43
46
|
var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(currentIndex, array) {
|
44
47
|
var _actionProps$useReque, _options$defaultParam, _options$onSuccess, _newServicesArray$cur, _newServicesArray$cur2, _newServicesArray$cur3, _actionProps$onAction, _actionProps$continue;
|
45
|
-
var actionProps, newServicesArray, _ref2, service, options, transformResponse, params, res, data, open, _newServicesArray$cur4, _newServicesArray$cur5,
|
48
|
+
var actionProps, newServicesArray, _ref2, service, options, transformResponse, params, res, data, open, _newServicesArray$cur4, _newServicesArray$cur5, list, errorTitle, isContinue;
|
46
49
|
return _regeneratorRuntime().wrap(function _callee$(_context) {
|
47
50
|
while (1) switch (_context.prev = _context.next) {
|
48
51
|
case 0:
|
@@ -109,14 +112,15 @@ var ProAction = function ProAction(props) {
|
|
109
112
|
_context.next = 37;
|
110
113
|
break;
|
111
114
|
}
|
112
|
-
list = ((_newServicesArray$cur4 = newServicesArray[currentIndex]) === null || _newServicesArray$cur4 === void 0 ? void 0 :
|
113
|
-
errorTitle = (_newServicesArray$
|
115
|
+
list = ((_newServicesArray$cur4 = newServicesArray[currentIndex]) === null || _newServicesArray$cur4 === void 0 ? void 0 : _newServicesArray$cur4.list) || [];
|
116
|
+
errorTitle = (_newServicesArray$cur5 = newServicesArray[currentIndex]) === null || _newServicesArray$cur5 === void 0 ? void 0 : _newServicesArray$cur5.errorTitle;
|
114
117
|
form.setFieldsValue({
|
115
118
|
errorTitle: errorTitle,
|
116
119
|
list: list
|
117
120
|
});
|
118
121
|
setState({
|
119
|
-
loading: false
|
122
|
+
loading: false,
|
123
|
+
errorModalData: newServicesArray[currentIndex]
|
120
124
|
});
|
121
125
|
return _context.abrupt("return");
|
122
126
|
case 37:
|
@@ -164,6 +168,27 @@ var ProAction = function ProAction(props) {
|
|
164
168
|
open: false
|
165
169
|
});
|
166
170
|
};
|
171
|
+
var errorModalConfig = config === null || config === void 0 ? void 0 : config[index];
|
172
|
+
var _ref3 = errorModalConfig || {},
|
173
|
+
contextRender = _ref3.contextRender;
|
174
|
+
var renderContent = function renderContent() {
|
175
|
+
var TargetComponent = _jsx(_Fragment, {});
|
176
|
+
if (typeof contextRender === 'function') {
|
177
|
+
var View = contextRender(errorModalData);
|
178
|
+
TargetComponent = _jsx(_Fragment, {
|
179
|
+
children: View
|
180
|
+
});
|
181
|
+
} else if (typeof contextRender === 'string' || typeof contextRender === 'number') {
|
182
|
+
TargetComponent = _jsx(_Fragment, {
|
183
|
+
children: contextRender
|
184
|
+
});
|
185
|
+
} else if (/*#__PURE__*/React.isValidElement(contextRender)) {
|
186
|
+
TargetComponent = _jsx(_Fragment, {
|
187
|
+
children: contextRender
|
188
|
+
});
|
189
|
+
}
|
190
|
+
return TargetComponent;
|
191
|
+
};
|
167
192
|
return _jsxs(_Fragment, {
|
168
193
|
children: [((_config$ = config[0]) === null || _config$ === void 0 ? void 0 : _config$.mode) === 'confirm' ? _jsx(_Popconfirm, {
|
169
194
|
onConfirm: function onConfirm() {
|
@@ -176,8 +201,10 @@ var ProAction = function ProAction(props) {
|
|
176
201
|
mode: "Modal",
|
177
202
|
title: config === null || config === void 0 ? void 0 : (_config$index = config[index]) === null || _config$index === void 0 ? void 0 : _config$index.title,
|
178
203
|
onCancel: function onCancel() {
|
204
|
+
form.resetFields();
|
179
205
|
setState({
|
180
|
-
open: false
|
206
|
+
open: false,
|
207
|
+
errorModalData: null
|
181
208
|
});
|
182
209
|
},
|
183
210
|
modalProps: {
|
@@ -186,37 +213,7 @@ var ProAction = function ProAction(props) {
|
|
186
213
|
size: "small",
|
187
214
|
onOk: onOk,
|
188
215
|
form: form,
|
189
|
-
|
190
|
-
span: 24,
|
191
|
-
isView: true,
|
192
|
-
columns: [{
|
193
|
-
type: 'Input',
|
194
|
-
name: 'errorTitle',
|
195
|
-
viewRender: function viewRender(value) {
|
196
|
-
var _servicesArray$index;
|
197
|
-
var list = ((_servicesArray$index = servicesArray[index]) === null || _servicesArray$index === void 0 ? void 0 : _servicesArray$index.list) || [];
|
198
|
-
return _jsxs("div", {
|
199
|
-
className: "pro-action-view-tile",
|
200
|
-
children: [value, list.length === 1 ? _jsxs("span", {
|
201
|
-
children: [" ", list[0]]
|
202
|
-
}) : '']
|
203
|
-
});
|
204
|
-
}
|
205
|
-
}, {
|
206
|
-
type: 'TextArea',
|
207
|
-
name: 'list',
|
208
|
-
fieldProps: {
|
209
|
-
autoSize: {
|
210
|
-
minRows: 4,
|
211
|
-
maxRows: 7
|
212
|
-
}
|
213
|
-
},
|
214
|
-
show: function show() {
|
215
|
-
var _servicesArray$index2, _servicesArray$index3;
|
216
|
-
return ((_servicesArray$index2 = servicesArray[index]) === null || _servicesArray$index2 === void 0 ? void 0 : (_servicesArray$index3 = _servicesArray$index2.list) === null || _servicesArray$index3 === void 0 ? void 0 : _servicesArray$index3.length) > 1;
|
217
|
-
}
|
218
|
-
}]
|
219
|
-
}
|
216
|
+
children: !contextRender ? _jsx(CheckModalContent, _objectSpread({}, errorModalData !== null && errorModalData !== void 0 ? errorModalData : {})) : renderContent()
|
220
217
|
}) : null]
|
221
218
|
});
|
222
219
|
};
|
@@ -13,32 +13,34 @@ export interface ProActionType {
|
|
13
13
|
title?: string | ReactNode;
|
14
14
|
/**
|
15
15
|
* @description 操作回调函数
|
16
|
-
* @param
|
16
|
+
* @param previousData 接上一个 useRequest 返回的值
|
17
17
|
* @param args 接所有链式 useRequest 返回的值
|
18
18
|
* @param index 当前操作的索引
|
19
19
|
* @returns void或Promise<void>
|
20
20
|
* @default -
|
21
21
|
*/
|
22
|
-
onAction?: (
|
22
|
+
onAction?: (previousData?: any, args?: any[], index?: number) => void | Promise<void>;
|
23
23
|
/**
|
24
24
|
* @description 自定义请求
|
25
|
-
* @param
|
25
|
+
* @param previousData 接上一个 useRequest 返回的值
|
26
26
|
* @param args 接所有链式 useRequest 返回的值
|
27
27
|
* @returns 包含service、options和transformResponse的对象
|
28
28
|
* @default -
|
29
29
|
*/
|
30
|
-
useRequest?: (
|
30
|
+
useRequest?: (previousData: any, args: any) => {
|
31
31
|
service?: Service<any, any>;
|
32
32
|
options?: Options<any, any>;
|
33
33
|
transformResponse?: (data: any) => any;
|
34
34
|
};
|
35
35
|
/**
|
36
36
|
* @description 是否中断链式操作
|
37
|
-
* @param
|
37
|
+
* @param previousData 上一个操作的返回数据
|
38
38
|
* @param args 所有链式的数据合集
|
39
39
|
* @returns 布尔值,返回true继续执行,返回false中断操作
|
40
40
|
* @default -
|
41
41
|
*/
|
42
|
-
continue?: (
|
42
|
+
continue?: (previousData: any, args: any[]) => boolean;
|
43
|
+
/** 自定义错误弹窗内容视图渲染 */
|
44
|
+
contextRender?: (data: any) => string | ReactNode;
|
43
45
|
}
|
44
46
|
export type ProActionProps = ProActionType;
|
@@ -130,8 +130,8 @@ export var formatColumn = function formatColumn(_ref2) {
|
|
130
130
|
if (isFunction(otherProps === null || otherProps === void 0 ? void 0 : otherProps.viewRender)) {
|
131
131
|
var _originalObj$record$r;
|
132
132
|
var diffResult = otherProps.viewRender({
|
133
|
-
|
134
|
-
|
133
|
+
originValue: originalValue,
|
134
|
+
originRecord: (_originalObj$record$r = originalObj === null || originalObj === void 0 ? void 0 : originalObj[record === null || record === void 0 ? void 0 : record[rowKey]]) !== null && _originalObj$record$r !== void 0 ? _originalObj$record$r : {},
|
135
135
|
value: value,
|
136
136
|
record: record,
|
137
137
|
index: index
|
@@ -167,8 +167,8 @@ export var formatColumn = function formatColumn(_ref2) {
|
|
167
167
|
if (isFunction(onDiff)) {
|
168
168
|
var _originalObj$record$r2;
|
169
169
|
var _diffResult = onDiff({
|
170
|
-
|
171
|
-
|
170
|
+
originValue: originalValue,
|
171
|
+
originRecord: (_originalObj$record$r2 = originalObj === null || originalObj === void 0 ? void 0 : originalObj[record === null || record === void 0 ? void 0 : record[rowKey]]) !== null && _originalObj$record$r2 !== void 0 ? _originalObj$record$r2 : {},
|
172
172
|
value: value,
|
173
173
|
record: record,
|
174
174
|
index: index
|
@@ -4,10 +4,12 @@ import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
|
|
4
4
|
import "antd/es/message/style";
|
5
5
|
import _message from "antd/es/message";
|
6
6
|
import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
|
7
|
+
import "antd/es/form/style";
|
8
|
+
import _Form from "antd/es/form";
|
7
9
|
import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
|
8
10
|
import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
|
9
11
|
var _excluded = ["page", "filters", "sorter"];
|
10
|
-
import {
|
12
|
+
import { useEffect, useMemo, useState } from 'react';
|
11
13
|
import { useRequest, useSetState, useDeepCompareEffect, usePrevious } from 'ahooks';
|
12
14
|
import { pickBy, isObject, merge, set, isEqual, omit } from 'lodash';
|
13
15
|
import { defaultPage } from '../index';
|
@@ -36,7 +38,8 @@ function useAntdTable(service, options, useRequestOptions) {
|
|
36
38
|
filters: undefined,
|
37
39
|
sorter: undefined
|
38
40
|
},
|
39
|
-
allSelected: false
|
41
|
+
allSelected: false,
|
42
|
+
searchValues: {}
|
40
43
|
}),
|
41
44
|
_useSetState2 = _slicedToArray(_useSetState, 2),
|
42
45
|
_useSetState2$ = _useSetState2[0],
|
@@ -46,9 +49,10 @@ function useAntdTable(service, options, useRequestOptions) {
|
|
46
49
|
selectedRowKeys = _useSetState2$.selectedRowKeys,
|
47
50
|
extraFilter = _useSetState2$.extraFilter,
|
48
51
|
allSelected = _useSetState2$.allSelected,
|
52
|
+
searchValues = _useSetState2$.searchValues,
|
49
53
|
setState = _useSetState2[1];
|
50
54
|
var _useDefaultOptions = useDefaultOptions(options),
|
51
|
-
|
55
|
+
_form = _useDefaultOptions.form,
|
52
56
|
page = _useDefaultOptions.page,
|
53
57
|
extraParams = _useDefaultOptions.extraParams,
|
54
58
|
rowKey = _useDefaultOptions.rowKey,
|
@@ -64,12 +68,15 @@ function useAntdTable(service, options, useRequestOptions) {
|
|
64
68
|
transformParams = _useDefaultOptions.transformParams,
|
65
69
|
transformResponse = _useDefaultOptions.transformResponse,
|
66
70
|
disabled = _useDefaultOptions.disabled;
|
71
|
+
var _Form$useForm = _Form.useForm(_form),
|
72
|
+
_Form$useForm2 = _slicedToArray(_Form$useForm, 1),
|
73
|
+
form = _Form$useForm2[0];
|
67
74
|
var _ref = useRequestOptions || {},
|
68
75
|
defaultParams = _ref.defaultParams;
|
69
76
|
var defaultParam = Array.isArray(defaultParams) ? defaultParams === null || defaultParams === void 0 ? void 0 : defaultParams[0] : defaultParams || {};
|
70
77
|
var initPage = (options === null || options === void 0 ? void 0 : options.page) || defaultPage;
|
71
78
|
var previousPage = usePrevious(page || defaultPage);
|
72
|
-
var getTransformParams =
|
79
|
+
var getTransformParams = function getTransformParams(params) {
|
73
80
|
var _pickBy;
|
74
81
|
var realParams = _objectSpread(_objectSpread(_objectSpread({}, defaultParam), extraParams), params);
|
75
82
|
var _realParams$page = realParams.page,
|
@@ -90,7 +97,7 @@ function useAntdTable(service, options, useRequestOptions) {
|
|
90
97
|
return transformParams(realParams, requestParams);
|
91
98
|
}
|
92
99
|
return requestParams;
|
93
|
-
}
|
100
|
+
};
|
94
101
|
// 仅清数据源相关,查询相关
|
95
102
|
var handleSetStateCallback = function handleSetStateCallback(values) {
|
96
103
|
setState(_objectSpread({
|
@@ -135,13 +142,13 @@ function useAntdTable(service, options, useRequestOptions) {
|
|
135
142
|
var run = result.run,
|
136
143
|
refreshAsync = result.refreshAsync;
|
137
144
|
// service变化时触发 (禁止掉防止service变更时导致的死循环)
|
138
|
-
var clearSelected =
|
145
|
+
var clearSelected = function clearSelected() {
|
139
146
|
setState({
|
140
147
|
allSelected: false,
|
141
148
|
selectedRecords: [],
|
142
149
|
selectedRowKeys: []
|
143
150
|
});
|
144
|
-
}
|
151
|
+
};
|
145
152
|
/**
|
146
153
|
* 手动触发时,手动调用run
|
147
154
|
*/
|
@@ -187,7 +194,7 @@ function useAntdTable(service, options, useRequestOptions) {
|
|
187
194
|
};
|
188
195
|
}, []);
|
189
196
|
// 分页变更
|
190
|
-
var handlePageChange =
|
197
|
+
var handlePageChange = function handlePageChange(current, pageSize) {
|
191
198
|
var _form$getFieldsValue;
|
192
199
|
var page = {
|
193
200
|
pageNum: current,
|
@@ -205,8 +212,8 @@ function useAntdTable(service, options, useRequestOptions) {
|
|
205
212
|
run(getTransformParams(_objectSpread(_objectSpread({
|
206
213
|
page: page
|
207
214
|
}, nextValues), extraFilter)));
|
208
|
-
}
|
209
|
-
var handleTableChange =
|
215
|
+
};
|
216
|
+
var handleTableChange = function handleTableChange(pagination, filters, sorter, extra) {
|
210
217
|
var _form$getFieldsValue2;
|
211
218
|
// 跳过分页改变,使用pagination的onChange
|
212
219
|
if (extra.action === 'paginate') {
|
@@ -225,15 +232,15 @@ function useAntdTable(service, options, useRequestOptions) {
|
|
225
232
|
sorter: sorter
|
226
233
|
}
|
227
234
|
});
|
228
|
-
var _values = (_form$getFieldsValue2 = form.getFieldsValue()) !== null && _form$getFieldsValue2 !== void 0 ? _form$getFieldsValue2 : {};
|
235
|
+
var _values = (_form$getFieldsValue2 = form === null || form === void 0 ? void 0 : form.getFieldsValue()) !== null && _form$getFieldsValue2 !== void 0 ? _form$getFieldsValue2 : {};
|
229
236
|
run(getTransformParams(_objectSpread(_objectSpread({
|
230
237
|
page: page
|
231
238
|
}, _values), {}, {
|
232
239
|
filters: filters,
|
233
240
|
sorter: sorter
|
234
241
|
})));
|
235
|
-
}
|
236
|
-
var onSearch =
|
242
|
+
};
|
243
|
+
var onSearch = function onSearch(values) {
|
237
244
|
var newPage = {
|
238
245
|
pageNum: 1,
|
239
246
|
pageSize: page.pageSize
|
@@ -247,6 +254,7 @@ function useAntdTable(service, options, useRequestOptions) {
|
|
247
254
|
if ((selectedRecords === null || selectedRecords === void 0 ? void 0 : selectedRecords.length) || isNonEmptyObject(_values) || !isEqual(previousSearchValues, _values)) {
|
248
255
|
previousSearchValues = _values;
|
249
256
|
setState({
|
257
|
+
searchValues: _values,
|
250
258
|
allSelected: false,
|
251
259
|
selectedRecords: [],
|
252
260
|
selectedRowKeys: []
|
@@ -255,9 +263,10 @@ function useAntdTable(service, options, useRequestOptions) {
|
|
255
263
|
run(getTransformParams(_objectSpread(_objectSpread({
|
256
264
|
page: newPage
|
257
265
|
}, extraFilter), _values)));
|
258
|
-
}
|
259
|
-
var resetParams =
|
266
|
+
};
|
267
|
+
var resetParams = function resetParams(page) {
|
260
268
|
setState({
|
269
|
+
searchValues: {},
|
261
270
|
allSelected: false,
|
262
271
|
selectedRecords: [],
|
263
272
|
selectedRowKeys: [],
|
@@ -266,9 +275,9 @@ function useAntdTable(service, options, useRequestOptions) {
|
|
266
275
|
sorter: undefined
|
267
276
|
}
|
268
277
|
});
|
269
|
-
}
|
278
|
+
};
|
270
279
|
// 重置查询条件: 页码还原、勾选清空
|
271
|
-
var onReset =
|
280
|
+
var onReset = function onReset() {
|
272
281
|
form === null || form === void 0 ? void 0 : form.resetFields();
|
273
282
|
var newPage = {
|
274
283
|
pageNum: 1,
|
@@ -281,7 +290,7 @@ function useAntdTable(service, options, useRequestOptions) {
|
|
281
290
|
page: newPage
|
282
291
|
}));
|
283
292
|
}
|
284
|
-
}
|
293
|
+
};
|
285
294
|
var refreshPage = function refreshPage(res) {
|
286
295
|
var transformResult = transformResponse ? transformResponse(res) : res || {};
|
287
296
|
var _ref3 = isListResult(transformResult) ? transformResult : (transformResult === null || transformResult === void 0 ? void 0 : transformResult.data) || {},
|
@@ -475,7 +484,7 @@ function useAntdTable(service, options, useRequestOptions) {
|
|
475
484
|
data: data,
|
476
485
|
params: (result === null || result === void 0 ? void 0 : (_result$params = result.params) === null || _result$params === void 0 ? void 0 : _result$params[0]) || {},
|
477
486
|
rowSelection: rowSelection,
|
478
|
-
searchValues: (_form$getFieldsValue3 = form.getFieldsValue()) !== null && _form$getFieldsValue3 !== void 0 ? _form$getFieldsValue3 : {},
|
487
|
+
searchValues: (_form$getFieldsValue3 = form === null || form === void 0 ? void 0 : form.getFieldsValue()) !== null && _form$getFieldsValue3 !== void 0 ? _form$getFieldsValue3 : {},
|
479
488
|
allSelected: allSelected,
|
480
489
|
selectedTip: selectedTip,
|
481
490
|
selectedRowKeys: selectedRowKeys,
|
@@ -186,13 +186,13 @@ export interface ProTableColumnType extends Omit<ColumnType<any>, 'dataIndex'> {
|
|
186
186
|
* @description 自定义如何比较数据差异,触发条件必须写render
|
187
187
|
* @default undefined
|
188
188
|
*/
|
189
|
-
onDiff?: ({ value, record, index,
|
189
|
+
onDiff?: ({ value, record, index, originValue, originRecord }: any) => any;
|
190
190
|
/**
|
191
191
|
* 自定义比对渲染
|
192
192
|
* @description 用于开启比对时,自定义 render 渲染初始值,触发条件必须写render
|
193
193
|
* @default undefined
|
194
194
|
*/
|
195
|
-
viewRender?: ({ value, record, index,
|
195
|
+
viewRender?: ({ value, record, index, originValue, originRecord, }: any) => 'same' | 'changed' | 'add' | undefined;
|
196
196
|
/**
|
197
197
|
* 是否已更改
|
198
198
|
* @description 标记列值是否已变更
|
@@ -30,8 +30,8 @@ export var getOriginalValue = function getOriginalValue(value, record, originalO
|
|
30
30
|
isAddCell: null
|
31
31
|
};
|
32
32
|
}
|
33
|
-
var
|
34
|
-
var originalValue = get(
|
33
|
+
var originRecord = get(originalObj, get(record, rowKey));
|
34
|
+
var originalValue = get(originRecord, dataIndex);
|
35
35
|
if (isEmpty(originalValue) && !isEmpty(value)) {
|
36
36
|
return {
|
37
37
|
originalValue: originalValue,
|
@@ -1,45 +1,19 @@
|
|
1
1
|
import "antd/es/tooltip/style";
|
2
2
|
import _Tooltip from "antd/es/tooltip";
|
3
|
-
import
|
4
|
-
import { jsxs as _jsxs, jsx as _jsx } from "react/jsx-runtime";
|
5
|
-
import { useEffect, useState } from 'react';
|
3
|
+
import { jsx as _jsx } from "react/jsx-runtime";
|
6
4
|
var AdaptiveTooltip = function AdaptiveTooltip(_ref) {
|
7
5
|
var children = _ref.children;
|
8
|
-
var _useState = useState('right'),
|
9
|
-
_useState2 = _slicedToArray(_useState, 2),
|
10
|
-
placement = _useState2[0],
|
11
|
-
setPlacement = _useState2[1];
|
12
|
-
useEffect(function () {
|
13
|
-
var handleResize = function handleResize() {
|
14
|
-
var tooltipElement = document.getElementById('adaptive-tooltip');
|
15
|
-
if (tooltipElement) {
|
16
|
-
var boundingRect = tooltipElement.getBoundingClientRect();
|
17
|
-
var windowWidth = window.innerWidth;
|
18
|
-
if (windowWidth - boundingRect.right < 150) {
|
19
|
-
setPlacement('left');
|
20
|
-
} else {
|
21
|
-
setPlacement('right');
|
22
|
-
}
|
23
|
-
}
|
24
|
-
};
|
25
|
-
window.addEventListener('resize', handleResize);
|
26
|
-
handleResize();
|
27
|
-
return function () {
|
28
|
-
window.removeEventListener('resize', handleResize);
|
29
|
-
};
|
30
|
-
}, [children]);
|
31
6
|
return _jsx(_Tooltip, {
|
32
|
-
placement:
|
7
|
+
placement: "rightTop",
|
33
8
|
title: _jsx("div", {
|
34
9
|
onMouseDown: function onMouseDown(e) {
|
35
10
|
return e.stopPropagation();
|
36
11
|
},
|
37
12
|
children: children
|
38
13
|
}),
|
39
|
-
|
40
|
-
children: _jsxs("span", {
|
14
|
+
children: _jsx("span", {
|
41
15
|
className: "pro-tree-wrap-ellipse",
|
42
|
-
children:
|
16
|
+
children: children
|
43
17
|
})
|
44
18
|
});
|
45
19
|
};
|
@@ -75,7 +75,6 @@ var ProTree = function ProTree(props) {
|
|
75
75
|
showExpand = _props$showExpand === void 0 ? false : _props$showExpand,
|
76
76
|
defaultExpandAll = props.defaultExpandAll,
|
77
77
|
other = _objectWithoutProperties(props, _excluded);
|
78
|
-
var fieldNameLabel = fieldNames.label;
|
79
78
|
var fieldNameValue = fieldNames.value;
|
80
79
|
var _useSetState = useSetState({
|
81
80
|
open: false,
|