@zat-design/sisyphus-react 3.13.6 → 3.13.7-beta.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/components/CheckModalContent/index.d.ts +8 -0
- package/es/ProAction/components/CheckModalContent/index.js +44 -0
- package/es/ProAction/components/CheckModalContent/index.less +29 -0
- package/es/ProAction/index.js +38 -38
- package/es/ProAction/propsType.d.ts +7 -0
- 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.d.ts +8 -0
- package/lib/ProAction/components/CheckModalContent/index.js +49 -0
- package/lib/ProAction/components/CheckModalContent/index.less +29 -0
- package/lib/ProAction/index.js +38 -38
- package/lib/ProAction/propsType.d.ts +7 -0
- 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
package/es/locale/en_US.d.ts
CHANGED
package/es/locale/en_US.js
CHANGED
package/es/locale/zh_CN.d.ts
CHANGED
package/es/locale/zh_CN.js
CHANGED
@@ -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,49 @@
|
|
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
|
+
var _antd = require("antd");
|
9
|
+
require("./index.less");
|
10
|
+
/*
|
11
|
+
* @Author: za-xuwenli xuwenli@zhongan.io
|
12
|
+
* @Date: 2025-02-17 11:49:02
|
13
|
+
* @LastEditors: za-xuwenli xuwenli@zhongan.io
|
14
|
+
* @LastEditTime: 2025-05-28 18:23:47
|
15
|
+
* @FilePath: /zat-wjs-pro-product-web/src/components/CheckModalContent/index.tsx
|
16
|
+
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
|
17
|
+
*/
|
18
|
+
|
19
|
+
var CheckModalContent = function CheckModalContent(props) {
|
20
|
+
var _ref = props !== null && props !== void 0 ? props : {},
|
21
|
+
errorTitle = _ref.errorTitle,
|
22
|
+
_ref$list = _ref.list,
|
23
|
+
list = _ref$list === void 0 ? [] : _ref$list;
|
24
|
+
return (0, _jsxRuntime.jsx)("div", {
|
25
|
+
className: "pro-action-check-modal-box",
|
26
|
+
children: (0, _jsxRuntime.jsxs)("div", {
|
27
|
+
className: "res-err-list",
|
28
|
+
children: [(0, _jsxRuntime.jsx)("span", {
|
29
|
+
className: "err-tip",
|
30
|
+
children: errorTitle
|
31
|
+
}), (0, _jsxRuntime.jsxs)(_antd.Tooltip, {
|
32
|
+
title: list.join('\n') || [],
|
33
|
+
children: [Array.isArray(list) && list.length === 1 ? (0, _jsxRuntime.jsx)("span", {
|
34
|
+
className: "err-item",
|
35
|
+
children: list[0]
|
36
|
+
}) : null, Array.isArray(list) && list.length > 1 ? (0, _jsxRuntime.jsx)("div", {
|
37
|
+
className: "list-wrap",
|
38
|
+
children: list.map(function (item) {
|
39
|
+
return (0, _jsxRuntime.jsx)("div", {
|
40
|
+
className: "err-item",
|
41
|
+
children: item
|
42
|
+
});
|
43
|
+
})
|
44
|
+
}) : null]
|
45
|
+
})]
|
46
|
+
})
|
47
|
+
});
|
48
|
+
};
|
49
|
+
var _default = exports.default = CheckModalContent;
|
@@ -0,0 +1,29 @@
|
|
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
|
+
color: var(--zaui-brand);
|
14
|
+
background-color: #f0f0f0;
|
15
|
+
}
|
16
|
+
}
|
17
|
+
|
18
|
+
.list-wrap {
|
19
|
+
box-sizing: border-box;
|
20
|
+
height: 110px;
|
21
|
+
margin-top: 12px;
|
22
|
+
padding: 4px;
|
23
|
+
overflow-y: auto;
|
24
|
+
line-height: 1.8;
|
25
|
+
border: 1px solid #ccc;
|
26
|
+
border-radius: 6px;
|
27
|
+
}
|
28
|
+
}
|
29
|
+
}
|
package/lib/ProAction/index.js
CHANGED
@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
|
|
5
5
|
value: true
|
6
6
|
});
|
7
7
|
exports.default = void 0;
|
8
|
+
var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
|
8
9
|
var _regeneratorRuntime2 = _interopRequireDefault(require("@babel/runtime/helpers/regeneratorRuntime"));
|
9
10
|
var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
|
10
11
|
var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
|
@@ -14,6 +15,7 @@ var _react = _interopRequireDefault(require("react"));
|
|
14
15
|
var _ahooks = require("ahooks");
|
15
16
|
var _antd = require("antd");
|
16
17
|
var _lodash = require("lodash");
|
18
|
+
var _CheckModalContent = _interopRequireDefault(require("./components/CheckModalContent"));
|
17
19
|
var _index = require("../index");
|
18
20
|
var _locale = _interopRequireDefault(require("../locale"));
|
19
21
|
require("./index.less");
|
@@ -28,7 +30,8 @@ var ProAction = function ProAction(props) {
|
|
28
30
|
index: 0,
|
29
31
|
open: false,
|
30
32
|
servicesArray: [],
|
31
|
-
loading: false
|
33
|
+
loading: false,
|
34
|
+
errorModalDataSource: null
|
32
35
|
}),
|
33
36
|
_useSetState2 = (0, _slicedToArray2.default)(_useSetState, 2),
|
34
37
|
state = _useSetState2[0],
|
@@ -41,12 +44,12 @@ var ProAction = function ProAction(props) {
|
|
41
44
|
});
|
42
45
|
}
|
43
46
|
var index = state.index,
|
44
|
-
|
47
|
+
errorModalDataSource = state.errorModalDataSource;
|
45
48
|
var length = config.length;
|
46
49
|
var _onActionRun = /*#__PURE__*/function () {
|
47
50
|
var _ref = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(currentIndex, array) {
|
48
51
|
var _actionProps$useReque, _options$defaultParam, _options$onSuccess, _newServicesArray$cur, _newServicesArray$cur2, _newServicesArray$cur3, _actionProps$onAction, _actionProps$continue;
|
49
|
-
var actionProps, newServicesArray, _ref2, service, options, transformResponse, params, res, data, open, _newServicesArray$cur4, _newServicesArray$cur5,
|
52
|
+
var actionProps, newServicesArray, _ref2, service, options, transformResponse, params, res, data, open, _newServicesArray$cur4, _newServicesArray$cur5, list, errorTitle, isContinue;
|
50
53
|
return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
|
51
54
|
while (1) switch (_context.prev = _context.next) {
|
52
55
|
case 0:
|
@@ -113,14 +116,18 @@ var ProAction = function ProAction(props) {
|
|
113
116
|
_context.next = 37;
|
114
117
|
break;
|
115
118
|
}
|
116
|
-
list = ((_newServicesArray$cur4 = newServicesArray[currentIndex]) === null || _newServicesArray$cur4 === void 0 ? void 0 :
|
117
|
-
errorTitle = (_newServicesArray$
|
119
|
+
list = ((_newServicesArray$cur4 = newServicesArray[currentIndex]) === null || _newServicesArray$cur4 === void 0 ? void 0 : _newServicesArray$cur4.list) || [];
|
120
|
+
errorTitle = (_newServicesArray$cur5 = newServicesArray[currentIndex]) === null || _newServicesArray$cur5 === void 0 ? void 0 : _newServicesArray$cur5.errorTitle;
|
118
121
|
form.setFieldsValue({
|
119
122
|
errorTitle: errorTitle,
|
120
123
|
list: list
|
121
124
|
});
|
122
125
|
setState({
|
123
|
-
loading: false
|
126
|
+
loading: false,
|
127
|
+
errorModalDataSource: {
|
128
|
+
errorTitle: errorTitle,
|
129
|
+
list: list
|
130
|
+
}
|
124
131
|
});
|
125
132
|
return _context.abrupt("return");
|
126
133
|
case 37:
|
@@ -168,6 +175,27 @@ var ProAction = function ProAction(props) {
|
|
168
175
|
open: false
|
169
176
|
});
|
170
177
|
};
|
178
|
+
var errorModalConfig = config === null || config === void 0 ? void 0 : config[index];
|
179
|
+
var _ref3 = errorModalConfig || {},
|
180
|
+
contextRender = _ref3.contextRender;
|
181
|
+
var renderContent = function renderContent() {
|
182
|
+
var TargetComponent = (0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {});
|
183
|
+
if (typeof contextRender === 'function') {
|
184
|
+
var View = contextRender(errorModalDataSource);
|
185
|
+
TargetComponent = (0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
|
186
|
+
children: View
|
187
|
+
});
|
188
|
+
} else if (typeof contextRender === 'string' || typeof contextRender === 'number') {
|
189
|
+
TargetComponent = (0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
|
190
|
+
children: contextRender
|
191
|
+
});
|
192
|
+
} else if (/*#__PURE__*/_react.default.isValidElement(contextRender)) {
|
193
|
+
TargetComponent = (0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
|
194
|
+
children: contextRender
|
195
|
+
});
|
196
|
+
}
|
197
|
+
return TargetComponent;
|
198
|
+
};
|
171
199
|
return (0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
|
172
200
|
children: [((_config$ = config[0]) === null || _config$ === void 0 ? void 0 : _config$.mode) === 'confirm' ? (0, _jsxRuntime.jsx)(_antd.Popconfirm, {
|
173
201
|
onConfirm: function onConfirm() {
|
@@ -180,8 +208,10 @@ var ProAction = function ProAction(props) {
|
|
180
208
|
mode: "Modal",
|
181
209
|
title: config === null || config === void 0 ? void 0 : (_config$index = config[index]) === null || _config$index === void 0 ? void 0 : _config$index.title,
|
182
210
|
onCancel: function onCancel() {
|
211
|
+
form.resetFields();
|
183
212
|
setState({
|
184
|
-
open: false
|
213
|
+
open: false,
|
214
|
+
errorModalDataSource: null
|
185
215
|
});
|
186
216
|
},
|
187
217
|
modalProps: {
|
@@ -190,37 +220,7 @@ var ProAction = function ProAction(props) {
|
|
190
220
|
size: "small",
|
191
221
|
onOk: onOk,
|
192
222
|
form: form,
|
193
|
-
|
194
|
-
span: 24,
|
195
|
-
isView: true,
|
196
|
-
columns: [{
|
197
|
-
type: 'Input',
|
198
|
-
name: 'errorTitle',
|
199
|
-
viewRender: function viewRender(value) {
|
200
|
-
var _servicesArray$index;
|
201
|
-
var list = ((_servicesArray$index = servicesArray[index]) === null || _servicesArray$index === void 0 ? void 0 : _servicesArray$index.list) || [];
|
202
|
-
return (0, _jsxRuntime.jsxs)("div", {
|
203
|
-
className: "pro-action-view-tile",
|
204
|
-
children: [value, list.length === 1 ? (0, _jsxRuntime.jsxs)("span", {
|
205
|
-
children: [" ", list[0]]
|
206
|
-
}) : '']
|
207
|
-
});
|
208
|
-
}
|
209
|
-
}, {
|
210
|
-
type: 'TextArea',
|
211
|
-
name: 'list',
|
212
|
-
fieldProps: {
|
213
|
-
autoSize: {
|
214
|
-
minRows: 4,
|
215
|
-
maxRows: 7
|
216
|
-
}
|
217
|
-
},
|
218
|
-
show: function show() {
|
219
|
-
var _servicesArray$index2, _servicesArray$index3;
|
220
|
-
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;
|
221
|
-
}
|
222
|
-
}]
|
223
|
-
}
|
223
|
+
children: !contextRender ? (0, _jsxRuntime.jsx)(_CheckModalContent.default, (0, _objectSpread2.default)({}, errorModalDataSource !== null && errorModalDataSource !== void 0 ? errorModalDataSource : {})) : renderContent()
|
224
224
|
}) : null]
|
225
225
|
});
|
226
226
|
};
|
@@ -1,5 +1,10 @@
|
|
1
1
|
import { ReactNode } from 'react';
|
2
2
|
import { Service, Options } from 'ahooks/lib/useRequest/src/types';
|
3
|
+
/**
|
4
|
+
* 视图渲染函数类型
|
5
|
+
* @template T 记录类型
|
6
|
+
*/
|
7
|
+
export type contextRenderFn = (errorTitle?: string, list?: string[]) => string | number | ReactNode | void;
|
3
8
|
export interface ProActionType {
|
4
9
|
/**
|
5
10
|
* @description 模式类型:check执行校验并解析错误信息展示,confirm确认提示
|
@@ -40,5 +45,7 @@ export interface ProActionType {
|
|
40
45
|
* @default -
|
41
46
|
*/
|
42
47
|
continue?: (previouData: any, args: any[]) => boolean;
|
48
|
+
/** 自定义错误弹窗内容视图渲染 */
|
49
|
+
contextRender?: string | number | ReactNode | contextRenderFn;
|
43
50
|
}
|
44
51
|
export type ProActionProps = ProActionType;
|
@@ -136,8 +136,8 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
|
|
136
136
|
if ((0, _lodash.isFunction)(otherProps === null || otherProps === void 0 ? void 0 : otherProps.viewRender)) {
|
137
137
|
var _originalObj$record$r;
|
138
138
|
var diffResult = otherProps.viewRender({
|
139
|
-
|
140
|
-
|
139
|
+
originValue: originalValue,
|
140
|
+
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 : {},
|
141
141
|
value: value,
|
142
142
|
record: record,
|
143
143
|
index: index
|
@@ -173,8 +173,8 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
|
|
173
173
|
if ((0, _lodash.isFunction)(onDiff)) {
|
174
174
|
var _originalObj$record$r2;
|
175
175
|
var _diffResult = onDiff({
|
176
|
-
|
177
|
-
|
176
|
+
originValue: originalValue,
|
177
|
+
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 : {},
|
178
178
|
value: value,
|
179
179
|
record: record,
|
180
180
|
index: index
|
@@ -43,7 +43,8 @@ function useAntdTable(service, options, useRequestOptions) {
|
|
43
43
|
filters: undefined,
|
44
44
|
sorter: undefined
|
45
45
|
},
|
46
|
-
allSelected: false
|
46
|
+
allSelected: false,
|
47
|
+
searchValues: {}
|
47
48
|
}),
|
48
49
|
_useSetState2 = (0, _slicedToArray2.default)(_useSetState, 2),
|
49
50
|
_useSetState2$ = _useSetState2[0],
|
@@ -53,9 +54,10 @@ function useAntdTable(service, options, useRequestOptions) {
|
|
53
54
|
selectedRowKeys = _useSetState2$.selectedRowKeys,
|
54
55
|
extraFilter = _useSetState2$.extraFilter,
|
55
56
|
allSelected = _useSetState2$.allSelected,
|
57
|
+
searchValues = _useSetState2$.searchValues,
|
56
58
|
setState = _useSetState2[1];
|
57
59
|
var _useDefaultOptions = useDefaultOptions(options),
|
58
|
-
|
60
|
+
_form = _useDefaultOptions.form,
|
59
61
|
page = _useDefaultOptions.page,
|
60
62
|
extraParams = _useDefaultOptions.extraParams,
|
61
63
|
rowKey = _useDefaultOptions.rowKey,
|
@@ -71,12 +73,15 @@ function useAntdTable(service, options, useRequestOptions) {
|
|
71
73
|
transformParams = _useDefaultOptions.transformParams,
|
72
74
|
transformResponse = _useDefaultOptions.transformResponse,
|
73
75
|
disabled = _useDefaultOptions.disabled;
|
76
|
+
var _Form$useForm = _antd.Form.useForm(_form),
|
77
|
+
_Form$useForm2 = (0, _slicedToArray2.default)(_Form$useForm, 1),
|
78
|
+
form = _Form$useForm2[0];
|
74
79
|
var _ref = useRequestOptions || {},
|
75
80
|
defaultParams = _ref.defaultParams;
|
76
81
|
var defaultParam = Array.isArray(defaultParams) ? defaultParams === null || defaultParams === void 0 ? void 0 : defaultParams[0] : defaultParams || {};
|
77
82
|
var initPage = (options === null || options === void 0 ? void 0 : options.page) || _index.defaultPage;
|
78
83
|
var previousPage = (0, _ahooks.usePrevious)(page || _index.defaultPage);
|
79
|
-
var getTransformParams =
|
84
|
+
var getTransformParams = function getTransformParams(params) {
|
80
85
|
var _pickBy;
|
81
86
|
var realParams = (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, defaultParam), extraParams), params);
|
82
87
|
var _realParams$page = realParams.page,
|
@@ -97,7 +102,7 @@ function useAntdTable(service, options, useRequestOptions) {
|
|
97
102
|
return transformParams(realParams, requestParams);
|
98
103
|
}
|
99
104
|
return requestParams;
|
100
|
-
}
|
105
|
+
};
|
101
106
|
// 仅清数据源相关,查询相关
|
102
107
|
var handleSetStateCallback = function handleSetStateCallback(values) {
|
103
108
|
setState((0, _objectSpread2.default)({
|
@@ -142,13 +147,13 @@ function useAntdTable(service, options, useRequestOptions) {
|
|
142
147
|
var run = result.run,
|
143
148
|
refreshAsync = result.refreshAsync;
|
144
149
|
// service变化时触发 (禁止掉防止service变更时导致的死循环)
|
145
|
-
var clearSelected =
|
150
|
+
var clearSelected = function clearSelected() {
|
146
151
|
setState({
|
147
152
|
allSelected: false,
|
148
153
|
selectedRecords: [],
|
149
154
|
selectedRowKeys: []
|
150
155
|
});
|
151
|
-
}
|
156
|
+
};
|
152
157
|
/**
|
153
158
|
* 手动触发时,手动调用run
|
154
159
|
*/
|
@@ -194,7 +199,7 @@ function useAntdTable(service, options, useRequestOptions) {
|
|
194
199
|
};
|
195
200
|
}, []);
|
196
201
|
// 分页变更
|
197
|
-
var handlePageChange =
|
202
|
+
var handlePageChange = function handlePageChange(current, pageSize) {
|
198
203
|
var _form$getFieldsValue;
|
199
204
|
var page = {
|
200
205
|
pageNum: current,
|
@@ -212,8 +217,8 @@ function useAntdTable(service, options, useRequestOptions) {
|
|
212
217
|
run(getTransformParams((0, _objectSpread2.default)((0, _objectSpread2.default)({
|
213
218
|
page: page
|
214
219
|
}, nextValues), extraFilter)));
|
215
|
-
}
|
216
|
-
var handleTableChange =
|
220
|
+
};
|
221
|
+
var handleTableChange = function handleTableChange(pagination, filters, sorter, extra) {
|
217
222
|
var _form$getFieldsValue2;
|
218
223
|
// 跳过分页改变,使用pagination的onChange
|
219
224
|
if (extra.action === 'paginate') {
|
@@ -232,15 +237,15 @@ function useAntdTable(service, options, useRequestOptions) {
|
|
232
237
|
sorter: sorter
|
233
238
|
}
|
234
239
|
});
|
235
|
-
var _values = (_form$getFieldsValue2 = form.getFieldsValue()) !== null && _form$getFieldsValue2 !== void 0 ? _form$getFieldsValue2 : {};
|
240
|
+
var _values = (_form$getFieldsValue2 = form === null || form === void 0 ? void 0 : form.getFieldsValue()) !== null && _form$getFieldsValue2 !== void 0 ? _form$getFieldsValue2 : {};
|
236
241
|
run(getTransformParams((0, _objectSpread2.default)((0, _objectSpread2.default)({
|
237
242
|
page: page
|
238
243
|
}, _values), {}, {
|
239
244
|
filters: filters,
|
240
245
|
sorter: sorter
|
241
246
|
})));
|
242
|
-
}
|
243
|
-
var onSearch =
|
247
|
+
};
|
248
|
+
var onSearch = function onSearch(values) {
|
244
249
|
var newPage = {
|
245
250
|
pageNum: 1,
|
246
251
|
pageSize: page.pageSize
|
@@ -254,6 +259,7 @@ function useAntdTable(service, options, useRequestOptions) {
|
|
254
259
|
if ((selectedRecords === null || selectedRecords === void 0 ? void 0 : selectedRecords.length) || (0, _utils.isNonEmptyObject)(_values) || !(0, _lodash.isEqual)(previousSearchValues, _values)) {
|
255
260
|
previousSearchValues = _values;
|
256
261
|
setState({
|
262
|
+
searchValues: _values,
|
257
263
|
allSelected: false,
|
258
264
|
selectedRecords: [],
|
259
265
|
selectedRowKeys: []
|
@@ -262,9 +268,10 @@ function useAntdTable(service, options, useRequestOptions) {
|
|
262
268
|
run(getTransformParams((0, _objectSpread2.default)((0, _objectSpread2.default)({
|
263
269
|
page: newPage
|
264
270
|
}, extraFilter), _values)));
|
265
|
-
}
|
266
|
-
var resetParams =
|
271
|
+
};
|
272
|
+
var resetParams = function resetParams(page) {
|
267
273
|
setState({
|
274
|
+
searchValues: {},
|
268
275
|
allSelected: false,
|
269
276
|
selectedRecords: [],
|
270
277
|
selectedRowKeys: [],
|
@@ -273,9 +280,9 @@ function useAntdTable(service, options, useRequestOptions) {
|
|
273
280
|
sorter: undefined
|
274
281
|
}
|
275
282
|
});
|
276
|
-
}
|
283
|
+
};
|
277
284
|
// 重置查询条件: 页码还原、勾选清空
|
278
|
-
var onReset =
|
285
|
+
var onReset = function onReset() {
|
279
286
|
form === null || form === void 0 ? void 0 : form.resetFields();
|
280
287
|
var newPage = {
|
281
288
|
pageNum: 1,
|
@@ -288,7 +295,7 @@ function useAntdTable(service, options, useRequestOptions) {
|
|
288
295
|
page: newPage
|
289
296
|
}));
|
290
297
|
}
|
291
|
-
}
|
298
|
+
};
|
292
299
|
var refreshPage = function refreshPage(res) {
|
293
300
|
var transformResult = transformResponse ? transformResponse(res) : res || {};
|
294
301
|
var _ref3 = (0, _utils.isListResult)(transformResult) ? transformResult : (transformResult === null || transformResult === void 0 ? void 0 : transformResult.data) || {},
|
@@ -482,7 +489,7 @@ function useAntdTable(service, options, useRequestOptions) {
|
|
482
489
|
data: data,
|
483
490
|
params: (result === null || result === void 0 ? void 0 : (_result$params = result.params) === null || _result$params === void 0 ? void 0 : _result$params[0]) || {},
|
484
491
|
rowSelection: rowSelection,
|
485
|
-
searchValues: (_form$getFieldsValue3 = form.getFieldsValue()) !== null && _form$getFieldsValue3 !== void 0 ? _form$getFieldsValue3 : {},
|
492
|
+
searchValues: (_form$getFieldsValue3 = form === null || form === void 0 ? void 0 : form.getFieldsValue()) !== null && _form$getFieldsValue3 !== void 0 ? _form$getFieldsValue3 : {},
|
486
493
|
allSelected: allSelected,
|
487
494
|
selectedTip: selectedTip,
|
488
495
|
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 标记列值是否已变更
|
@@ -37,8 +37,8 @@ var getOriginalValue = exports.getOriginalValue = function getOriginalValue(valu
|
|
37
37
|
isAddCell: null
|
38
38
|
};
|
39
39
|
}
|
40
|
-
var
|
41
|
-
var originalValue = (0, _lodash.get)(
|
40
|
+
var originRecord = (0, _lodash.get)(originalObj, (0, _lodash.get)(record, rowKey));
|
41
|
+
var originalValue = (0, _lodash.get)(originRecord, dataIndex);
|
42
42
|
if (isEmpty(originalValue) && !isEmpty(value)) {
|
43
43
|
return {
|
44
44
|
originalValue: originalValue,
|
@@ -1,51 +1,24 @@
|
|
1
1
|
"use strict";
|
2
2
|
|
3
|
-
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
|
4
3
|
Object.defineProperty(exports, "__esModule", {
|
5
4
|
value: true
|
6
5
|
});
|
7
6
|
exports.default = void 0;
|
8
|
-
var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
|
9
7
|
var _jsxRuntime = require("react/jsx-runtime");
|
10
8
|
var _antd = require("antd");
|
11
|
-
var _react = require("react");
|
12
9
|
var AdaptiveTooltip = function AdaptiveTooltip(_ref) {
|
13
10
|
var children = _ref.children;
|
14
|
-
var _useState = (0, _react.useState)('right'),
|
15
|
-
_useState2 = (0, _slicedToArray2.default)(_useState, 2),
|
16
|
-
placement = _useState2[0],
|
17
|
-
setPlacement = _useState2[1];
|
18
|
-
(0, _react.useEffect)(function () {
|
19
|
-
var handleResize = function handleResize() {
|
20
|
-
var tooltipElement = document.getElementById('adaptive-tooltip');
|
21
|
-
if (tooltipElement) {
|
22
|
-
var boundingRect = tooltipElement.getBoundingClientRect();
|
23
|
-
var windowWidth = window.innerWidth;
|
24
|
-
if (windowWidth - boundingRect.right < 150) {
|
25
|
-
setPlacement('left');
|
26
|
-
} else {
|
27
|
-
setPlacement('right');
|
28
|
-
}
|
29
|
-
}
|
30
|
-
};
|
31
|
-
window.addEventListener('resize', handleResize);
|
32
|
-
handleResize();
|
33
|
-
return function () {
|
34
|
-
window.removeEventListener('resize', handleResize);
|
35
|
-
};
|
36
|
-
}, [children]);
|
37
11
|
return (0, _jsxRuntime.jsx)(_antd.Tooltip, {
|
38
|
-
placement:
|
12
|
+
placement: "rightTop",
|
39
13
|
title: (0, _jsxRuntime.jsx)("div", {
|
40
14
|
onMouseDown: function onMouseDown(e) {
|
41
15
|
return e.stopPropagation();
|
42
16
|
},
|
43
17
|
children: children
|
44
18
|
}),
|
45
|
-
|
46
|
-
children: (0, _jsxRuntime.jsxs)("span", {
|
19
|
+
children: (0, _jsxRuntime.jsx)("span", {
|
47
20
|
className: "pro-tree-wrap-ellipse",
|
48
|
-
children:
|
21
|
+
children: children
|
49
22
|
})
|
50
23
|
});
|
51
24
|
};
|
@@ -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 = (0, _objectWithoutProperties2.default)(props, _excluded);
|
78
|
-
var fieldNameLabel = fieldNames.label;
|
79
78
|
var fieldNameValue = fieldNames.value;
|
80
79
|
var _useSetState = (0, _ahooks.useSetState)({
|
81
80
|
open: false,
|