@zat-design/sisyphus-react 3.9.0-beta.4 → 3.9.0-beta.6
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/coverage/lcov-report/src/.umi/core/devScripts.ts.html +241 -0
- package/coverage/lcov-report/src/.umi/core/history.ts.html +148 -0
- package/coverage/lcov-report/src/.umi/core/index.html +206 -0
- package/coverage/lcov-report/src/.umi/core/plugin.ts.html +109 -0
- package/coverage/lcov-report/src/.umi/core/pluginRegister.ts.html +160 -0
- package/coverage/lcov-report/src/.umi/core/polyfill.ts.html +97 -0
- package/coverage/lcov-report/src/.umi/core/routes.ts.html +26050 -0
- package/coverage/lcov-report/src/.umi/core/umiExports.ts.html +112 -0
- package/coverage/lcov-report/src/.umi/dumi/demos/index.html +116 -0
- package/coverage/lcov-report/src/.umi/dumi/demos/index.ts.html +6340 -0
- package/coverage/lcov-report/src/.umi/dumi/index.html +116 -0
- package/coverage/lcov-report/src/.umi/dumi/layout.tsx.html +109 -0
- package/coverage/lcov-report/src/.umi/index.html +116 -0
- package/coverage/lcov-report/src/.umi/plugin-antd/index.html +116 -0
- package/coverage/lcov-report/src/.umi/plugin-antd/runtime.tsx.html +172 -0
- package/coverage/lcov-report/src/.umi/plugin-helmet/exports.ts.html +94 -0
- package/coverage/lcov-report/src/.umi/plugin-helmet/index.html +116 -0
- package/coverage/lcov-report/src/.umi/plugin-initial-state/Provider.tsx.html +196 -0
- package/coverage/lcov-report/src/.umi/plugin-initial-state/exports.ts.html +106 -0
- package/coverage/lcov-report/src/.umi/plugin-initial-state/index.html +146 -0
- package/coverage/lcov-report/src/.umi/plugin-initial-state/models/index.html +116 -0
- package/coverage/lcov-report/src/.umi/plugin-initial-state/models/initialState.ts.html +88 -0
- package/coverage/lcov-report/src/.umi/plugin-initial-state/runtime.tsx.html +124 -0
- package/coverage/lcov-report/src/.umi/plugin-locale/SelectLang.tsx.html +1246 -0
- package/coverage/lcov-report/src/.umi/plugin-locale/index.html +161 -0
- package/coverage/lcov-report/src/.umi/plugin-locale/locale.tsx.html +268 -0
- package/coverage/lcov-report/src/.umi/plugin-locale/localeExports.ts.html +778 -0
- package/coverage/lcov-report/src/.umi/plugin-locale/runtime.tsx.html +115 -0
- package/coverage/lcov-report/src/.umi/plugin-model/Provider.tsx.html +202 -0
- package/coverage/lcov-report/src/.umi/plugin-model/helpers/constant.tsx.html +97 -0
- package/coverage/lcov-report/src/.umi/plugin-model/helpers/dispatcher.tsx.html +142 -0
- package/coverage/lcov-report/src/.umi/plugin-model/helpers/executor.tsx.html +334 -0
- package/coverage/lcov-report/src/.umi/plugin-model/helpers/index.html +146 -0
- package/coverage/lcov-report/src/.umi/plugin-model/index.html +146 -0
- package/coverage/lcov-report/src/.umi/plugin-model/runtime.tsx.html +121 -0
- package/coverage/lcov-report/src/.umi/plugin-model/useModel.tsx.html +298 -0
- package/coverage/lcov-report/src/.umi/plugin-request/index.html +116 -0
- package/coverage/lcov-report/src/.umi/plugin-request/request.ts.html +919 -0
- package/coverage/lcov-report/src/.umi/umi.ts.html +268 -0
- package/dist/index.esm.css +10 -0
- package/dist/less.esm.css +10 -0
- package/es/ProForm/components/combination/Group/index.js +4 -3
- package/es/ProForm/components/render/ChangedWrapper.js +0 -1
- package/es/ProTable/components/FormatColumn/index.js +34 -25
- package/es/ProTable/components/RenderColumn/index.d.ts +1 -0
- package/es/ProTable/components/RenderColumn/index.js +5 -3
- package/es/ProTable/propsType.d.ts +1 -0
- package/es/ProTable/style/index.less +10 -1
- package/es/ProTree/components/ProTreeSelect/index.js +32 -13
- package/lib/ProForm/components/combination/Group/index.js +4 -3
- package/lib/ProForm/components/render/ChangedWrapper.js +0 -1
- package/lib/ProTable/components/FormatColumn/index.js +34 -25
- package/lib/ProTable/components/RenderColumn/index.d.ts +1 -0
- package/lib/ProTable/components/RenderColumn/index.js +5 -3
- package/lib/ProTable/propsType.d.ts +1 -0
- package/lib/ProTable/style/index.less +10 -1
- package/lib/ProTree/components/ProTreeSelect/index.js +31 -12
- package/package.json +1 -1
- package/.vscode/extensions.json +0 -5
@@ -1,6 +1,8 @@
|
|
1
1
|
import "antd/es/tooltip/style";
|
2
2
|
import _Tooltip from "antd/es/tooltip";
|
3
3
|
import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
|
4
|
+
import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
|
5
|
+
import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
|
4
6
|
import "antd/es/input/style";
|
5
7
|
import _Input from "antd/es/input";
|
6
8
|
import "antd/es/message/style";
|
@@ -18,7 +20,7 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
|
|
18
20
|
import { useDeepCompareEffect, useRequest as useRequestFunc, useSetState } from 'ahooks';
|
19
21
|
import classnames from 'classnames';
|
20
22
|
import { useImperativeHandle, forwardRef } from 'react';
|
21
|
-
import { cloneDeep } from 'lodash';
|
23
|
+
import { cloneDeep, debounce } from 'lodash';
|
22
24
|
import { useProConfig } from '../../../ProConfigProvider';
|
23
25
|
import Container from '../../../ProForm/components/Container';
|
24
26
|
import AdaptiveTooltip from '../AdaptiveTooltip';
|
@@ -398,18 +400,35 @@ export var ProTreeSelect = function ProTreeSelect(props, ref) {
|
|
398
400
|
sourceList = _filterData(sourceList);
|
399
401
|
return sourceList;
|
400
402
|
}
|
401
|
-
var searchTreeEvent = function
|
402
|
-
|
403
|
-
|
404
|
-
|
405
|
-
|
406
|
-
|
407
|
-
|
408
|
-
|
409
|
-
|
410
|
-
|
411
|
-
|
412
|
-
|
403
|
+
var searchTreeEvent = debounce(/*#__PURE__*/function () {
|
404
|
+
var _ref5 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(searchVal) {
|
405
|
+
var result;
|
406
|
+
return _regeneratorRuntime().wrap(function _callee$(_context) {
|
407
|
+
while (1) switch (_context.prev = _context.next) {
|
408
|
+
case 0:
|
409
|
+
if (searchVal) {
|
410
|
+
_context.next = 3;
|
411
|
+
break;
|
412
|
+
}
|
413
|
+
setState({
|
414
|
+
selectList: cloneDeep(origDataSource || [])
|
415
|
+
});
|
416
|
+
return _context.abrupt("return", null);
|
417
|
+
case 3:
|
418
|
+
result = filterTree(cloneDeep(origDataSource || []), searchVal);
|
419
|
+
setState({
|
420
|
+
selectList: result || []
|
421
|
+
});
|
422
|
+
case 5:
|
423
|
+
case "end":
|
424
|
+
return _context.stop();
|
425
|
+
}
|
426
|
+
}, _callee);
|
427
|
+
}));
|
428
|
+
return function (_x) {
|
429
|
+
return _ref5.apply(this, arguments);
|
430
|
+
};
|
431
|
+
}(), 500);
|
413
432
|
function findTreeNode(treeList, nodeValue) {
|
414
433
|
var result = {};
|
415
434
|
var _filterData2 = function filterData(data) {
|
@@ -32,7 +32,8 @@ var Group = function Group(props) {
|
|
32
32
|
value = props.value,
|
33
33
|
onChange = props.onChange,
|
34
34
|
otherProps = props.otherProps,
|
35
|
-
id = props.id
|
35
|
+
id = props.id,
|
36
|
+
isParentView = props.isView;
|
36
37
|
var contextProps = _ProForm.default.useFieldProps() || {};
|
37
38
|
var names = contextProps.names,
|
38
39
|
name = contextProps.name,
|
@@ -77,7 +78,7 @@ var Group = function Group(props) {
|
|
77
78
|
children: columns.map(function (column, index) {
|
78
79
|
return (0, _jsxRuntime.jsx)(_ComRender.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({
|
79
80
|
contextProps: contextProps,
|
80
|
-
isView: isView
|
81
|
+
isView: isParentView || isView
|
81
82
|
}, column), {}, {
|
82
83
|
otherProps: otherProps
|
83
84
|
}), column.name);
|
@@ -88,7 +89,7 @@ var Group = function Group(props) {
|
|
88
89
|
children: columns.map(function (column, index) {
|
89
90
|
return (0, _jsxRuntime.jsx)(_ComRender.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({
|
90
91
|
contextProps: contextProps,
|
91
|
-
isView: isView
|
92
|
+
isView: isParentView || isView
|
92
93
|
}, column), {}, {
|
93
94
|
otherProps: otherProps
|
94
95
|
}), column.name);
|
@@ -34,7 +34,6 @@ var ChangedWrapper = function ChangedWrapper(props) {
|
|
34
34
|
getValueProps = props.getValueProps,
|
35
35
|
viewRender = props.viewRender,
|
36
36
|
rest = (0, _objectWithoutProperties2.default)(props, _excluded);
|
37
|
-
// const contentRef = useRef(null);
|
38
37
|
var _useProConfig = (0, _ProConfigProvider.useProConfig)('ProForm'),
|
39
38
|
isDiffAll = _useProConfig.isDiffAll;
|
40
39
|
var originalValues = diffConfig.originalValues,
|
@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
|
|
6
6
|
});
|
7
7
|
exports.getParentElement = exports.formatColumn = void 0;
|
8
8
|
var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
|
9
|
+
var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
|
9
10
|
var _jsxRuntime = require("react/jsx-runtime");
|
10
11
|
var _react = require("react");
|
11
12
|
var _moment15 = _interopRequireDefault(require("moment"));
|
@@ -17,8 +18,10 @@ var _utils = require("@zat-design/utils");
|
|
17
18
|
var _TooltipTitle = _interopRequireDefault(require("../TooltipTitle"));
|
18
19
|
var _RenderColumn = _interopRequireDefault(require("../RenderColumn"));
|
19
20
|
var _utils2 = require("../../utils");
|
21
|
+
var _utils3 = require("../../../utils");
|
20
22
|
var _getEnumLabel = _interopRequireDefault(require("../../../ProEnum/utils/getEnumLabel"));
|
21
23
|
var _ProForm = _interopRequireDefault(require("../../../ProForm"));
|
24
|
+
var _excluded = ["title", "valueType", "format", "precision", "ellipsis", "code", "copyable", "width", "tooltip", "transform", "prefix", "suffix", "dataIndex", "originalDiffTip", "toolTipProps", "minWidth", "onDiff"];
|
22
25
|
var isReactElement = function isReactElement(element) {
|
23
26
|
return /*#__PURE__*/(0, _react.isValidElement)(element);
|
24
27
|
};
|
@@ -79,7 +82,8 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
|
|
79
82
|
_column$toolTipProps = column.toolTipProps,
|
80
83
|
toolTipProps = _column$toolTipProps === void 0 ? {} : _column$toolTipProps,
|
81
84
|
minWidth = column.minWidth,
|
82
|
-
onDiff = column.onDiff
|
85
|
+
onDiff = column.onDiff,
|
86
|
+
otherProps = (0, _objectWithoutProperties2.default)(column, _excluded);
|
83
87
|
// 仅在 {x: 'max-content', y: 300 } 且 column无指定 width minWidth 情况下 才开启 minWidth的自动计算
|
84
88
|
var isMaxContentOverFlow = (0, _lodash.isObject)(scroll) ? (scroll === null || scroll === void 0 ? void 0 : scroll.x) === 'max-content' && Reflect.ownKeys(scroll).includes('y') : false;
|
85
89
|
calcMinWidth({
|
@@ -142,9 +146,14 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
|
|
142
146
|
extraDiffFlag = true;
|
143
147
|
}
|
144
148
|
}
|
145
|
-
|
149
|
+
// 存在比对
|
150
|
+
if (originalObj && (0, _lodash.isFunction)(otherProps === null || otherProps === void 0 ? void 0 : otherProps.viewRender)) {
|
151
|
+
var _originalObj$record$r2;
|
152
|
+
otherProps.viewRender = otherProps.viewRender(originalValue, (_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 : {}, index);
|
153
|
+
}
|
154
|
+
return (0, _jsxRuntime.jsx)(_RenderColumn.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, otherProps), {}, {
|
146
155
|
valueType: valueType,
|
147
|
-
originalValue:
|
156
|
+
originalValue: (0, _utils3.isEmpty)(originalValue) ? null : extraDiffFlag ? originalRenderValue !== null && originalRenderValue !== void 0 ? originalRenderValue : originalValue : originalRenderValue,
|
148
157
|
ellipsis: ellipsis,
|
149
158
|
width: width,
|
150
159
|
value: _value,
|
@@ -154,7 +163,7 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
|
|
154
163
|
toolTipProps: _toolTipProps,
|
155
164
|
minWidth: minWidth,
|
156
165
|
isInNewRowFlag: isInNewRowFlag
|
157
|
-
});
|
166
|
+
}));
|
158
167
|
};
|
159
168
|
return;
|
160
169
|
}
|
@@ -180,7 +189,7 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
|
|
180
189
|
var originalValue = (0, _utils2.getOriginalValue)(value, record, originalObj, rowKey, dataIndex);
|
181
190
|
var originalRealValue = _utils.tools.calc(Number(originalValue || null), '*', multiple);
|
182
191
|
var originalRenderValue = (0, _utils2.getDecimalDigits)(originalValue) > valueTypePrecision ? originalRealValue : originalRealValue.toFixed(valueTypePrecision);
|
183
|
-
if (
|
192
|
+
if ((0, _utils3.isEmpty)(originalValue)) {
|
184
193
|
originalRenderValue = '-';
|
185
194
|
}
|
186
195
|
if (!value && value !== 0 && renderValue === originalRenderValue) {
|
@@ -196,7 +205,7 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
|
|
196
205
|
children: [prefixNode(value, record, index), renderValue, suffixNode(value, record, index)]
|
197
206
|
});
|
198
207
|
var isInNewRowFlag = isInNewRow(record);
|
199
|
-
return (0, _jsxRuntime.jsx)(_RenderColumn.default, {
|
208
|
+
return (0, _jsxRuntime.jsx)(_RenderColumn.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, otherProps), {}, {
|
200
209
|
valueType: valueType,
|
201
210
|
originalValue: originalValue === undefined ? undefined : originalRenderValue,
|
202
211
|
ellipsis: ellipsis,
|
@@ -208,7 +217,7 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
|
|
208
217
|
toolTipProps: _toolTipProps,
|
209
218
|
minWidth: minWidth,
|
210
219
|
isInNewRowFlag: isInNewRowFlag
|
211
|
-
});
|
220
|
+
}));
|
212
221
|
};
|
213
222
|
// 千分位, 千分位带CNY前缀
|
214
223
|
} else if (['thousandth', 'thousandthCNY'].includes(valueType)) {
|
@@ -218,7 +227,7 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
|
|
218
227
|
var originalValue = (0, _utils2.getOriginalValue)(value, record, originalObj, rowKey, dataIndex);
|
219
228
|
var originalRealValue = valueTypePrecision ? "".concat(Number(originalValue).toFixed(valueTypePrecision)) : "".concat(originalValue);
|
220
229
|
var originalRenderValue = originalRealValue.replace(/\B(?=(\d{3})+(?!\d))/g, ',');
|
221
|
-
if (
|
230
|
+
if ((0, _utils3.isEmpty)(originalValue)) {
|
222
231
|
originalRenderValue = '-';
|
223
232
|
}
|
224
233
|
var node = (0, _jsxRuntime.jsxs)(_antd.Space, {
|
@@ -234,7 +243,7 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
|
|
234
243
|
});
|
235
244
|
}
|
236
245
|
var isInNewRowFlag = isInNewRow(record);
|
237
|
-
return (0, _jsxRuntime.jsx)(_RenderColumn.default, {
|
246
|
+
return (0, _jsxRuntime.jsx)(_RenderColumn.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, otherProps), {}, {
|
238
247
|
valueType: valueType,
|
239
248
|
originalValue: originalValue === undefined ? undefined : originalRenderValue,
|
240
249
|
ellipsis: ellipsis,
|
@@ -246,7 +255,7 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
|
|
246
255
|
toolTipProps: _toolTipProps,
|
247
256
|
minWidth: minWidth,
|
248
257
|
isInNewRowFlag: isInNewRowFlag
|
249
|
-
});
|
258
|
+
}));
|
250
259
|
};
|
251
260
|
} else if (['datePicker', 'date', 'dateTime', 'dateStartTime', 'dateEndTime', 'dateStartEndTime'].includes(valueType)) {
|
252
261
|
column.render = function (value, record, index) {
|
@@ -295,7 +304,7 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
|
|
295
304
|
});
|
296
305
|
}
|
297
306
|
var isInNewRowFlag = isInNewRow(record);
|
298
|
-
return (0, _jsxRuntime.jsx)(_RenderColumn.default, {
|
307
|
+
return (0, _jsxRuntime.jsx)(_RenderColumn.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, otherProps), {}, {
|
299
308
|
valueType: valueType,
|
300
309
|
originalValue: originalValue === undefined ? undefined : originalRenderValue,
|
301
310
|
ellipsis: ellipsis,
|
@@ -307,7 +316,7 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
|
|
307
316
|
toolTipProps: _toolTipProps,
|
308
317
|
minWidth: minWidth,
|
309
318
|
isInNewRowFlag: isInNewRowFlag
|
310
|
-
});
|
319
|
+
}));
|
311
320
|
};
|
312
321
|
} else if (['enumName', 'enumCodeName'].includes(valueType)) {
|
313
322
|
column.render = function (value, record, index) {
|
@@ -336,7 +345,7 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
|
|
336
345
|
children: [prefixNode(value, record, index), renderValue, suffixNode(value, record, index)]
|
337
346
|
});
|
338
347
|
var isInNewRowFlag = isInNewRow(record);
|
339
|
-
return (0, _jsxRuntime.jsx)(_RenderColumn.default, {
|
348
|
+
return (0, _jsxRuntime.jsx)(_RenderColumn.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, otherProps), {}, {
|
340
349
|
valueType: valueType,
|
341
350
|
originalValue: originalValue === undefined ? undefined : originalRenderValue,
|
342
351
|
ellipsis: ellipsis,
|
@@ -348,7 +357,7 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
|
|
348
357
|
toolTipProps: _toolTipProps,
|
349
358
|
minWidth: minWidth,
|
350
359
|
isInNewRowFlag: isInNewRowFlag
|
351
|
-
});
|
360
|
+
}));
|
352
361
|
};
|
353
362
|
} else if (precision || prefix || suffix) {
|
354
363
|
column.render = function (value, record, index) {
|
@@ -359,7 +368,7 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
|
|
359
368
|
size: 8,
|
360
369
|
children: [prefixNode(value, record, index), renderValue, suffixNode(value, record, index)]
|
361
370
|
});
|
362
|
-
if (
|
371
|
+
if ((0, _utils3.isEmpty)(originalValue)) {
|
363
372
|
originalRenderValue = '-';
|
364
373
|
}
|
365
374
|
if (!value && value !== 0 && renderValue === originalRenderValue) {
|
@@ -371,7 +380,7 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
|
|
371
380
|
});
|
372
381
|
}
|
373
382
|
var isInNewRowFlag = isInNewRow(record);
|
374
|
-
return (0, _jsxRuntime.jsx)(_RenderColumn.default, {
|
383
|
+
return (0, _jsxRuntime.jsx)(_RenderColumn.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, otherProps), {}, {
|
375
384
|
valueType: valueType,
|
376
385
|
originalValue: originalValue === undefined ? undefined : originalRenderValue,
|
377
386
|
ellipsis: ellipsis,
|
@@ -383,7 +392,7 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
|
|
383
392
|
toolTipProps: _toolTipProps,
|
384
393
|
minWidth: minWidth,
|
385
394
|
isInNewRowFlag: isInNewRowFlag
|
386
|
-
});
|
395
|
+
}));
|
387
396
|
};
|
388
397
|
} else if (valueType === 'address') {
|
389
398
|
column.render = function (value, record, index) {
|
@@ -426,7 +435,7 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
|
|
426
435
|
tooltip: false
|
427
436
|
});
|
428
437
|
var isInNewRowFlag = isInNewRow(record);
|
429
|
-
return (0, _jsxRuntime.jsx)(_RenderColumn.default, {
|
438
|
+
return (0, _jsxRuntime.jsx)(_RenderColumn.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, otherProps), {}, {
|
430
439
|
valueType: valueType,
|
431
440
|
originalValue: originalValue === undefined ? undefined : originalRenderValue,
|
432
441
|
ellipsis: ellipsis,
|
@@ -438,14 +447,14 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
|
|
438
447
|
toolTipProps: _toolTipProps,
|
439
448
|
minWidth: minWidth,
|
440
449
|
isInNewRowFlag: isInNewRowFlag
|
441
|
-
});
|
450
|
+
}));
|
442
451
|
};
|
443
452
|
} else if (copyable) {
|
444
453
|
column.render = function (value, record, index) {
|
445
454
|
var isInNewRowFlag = isInNewRow(record);
|
446
455
|
return (0, _jsxRuntime.jsxs)(_antd.Space, {
|
447
456
|
size: 8,
|
448
|
-
children: [prefixNode(value, record, index), (0, _jsxRuntime.jsx)(_RenderColumn.default, {
|
457
|
+
children: [prefixNode(value, record, index), (0, _jsxRuntime.jsx)(_RenderColumn.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, otherProps), {}, {
|
449
458
|
valueType: valueType,
|
450
459
|
copyable: copyable,
|
451
460
|
ellipsis: ellipsis,
|
@@ -456,7 +465,7 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
|
|
456
465
|
toolTipProps: _toolTipProps,
|
457
466
|
minWidth: minWidth,
|
458
467
|
isInNewRowFlag: isInNewRowFlag
|
459
|
-
}), suffixNode(value, record, index)]
|
468
|
+
})), suffixNode(value, record, index)]
|
460
469
|
});
|
461
470
|
};
|
462
471
|
} else if (ellipsis) {
|
@@ -473,7 +482,7 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
|
|
473
482
|
var isInNewRowFlag = isInNewRow(record);
|
474
483
|
return (0, _jsxRuntime.jsxs)(_antd.Space, {
|
475
484
|
size: 8,
|
476
|
-
children: [prefixNode(value, record, index), (0, _jsxRuntime.jsx)(_RenderColumn.default, {
|
485
|
+
children: [prefixNode(value, record, index), (0, _jsxRuntime.jsx)(_RenderColumn.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, otherProps), {}, {
|
477
486
|
valueType: valueType,
|
478
487
|
originalValue: originalValue === undefined ? undefined : originalValue || '-',
|
479
488
|
ellipsis: ellipsis,
|
@@ -485,7 +494,7 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
|
|
485
494
|
toolTipProps: _toolTipProps,
|
486
495
|
minWidth: minWidth,
|
487
496
|
isInNewRowFlag: isInNewRowFlag
|
488
|
-
}), suffixNode(value, record, index)]
|
497
|
+
})), suffixNode(value, record, index)]
|
489
498
|
});
|
490
499
|
};
|
491
500
|
} else {
|
@@ -504,7 +513,7 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
|
|
504
513
|
});
|
505
514
|
}
|
506
515
|
var isInNewRowFlag = isInNewRow(record);
|
507
|
-
return (0, _jsxRuntime.jsx)(_RenderColumn.default, {
|
516
|
+
return (0, _jsxRuntime.jsx)(_RenderColumn.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, otherProps), {}, {
|
508
517
|
valueType: valueType,
|
509
518
|
originalValue: originalValue === undefined ? undefined : originalValue || '-',
|
510
519
|
ellipsis: ellipsis,
|
@@ -516,7 +525,7 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
|
|
516
525
|
toolTipProps: _toolTipProps,
|
517
526
|
minWidth: minWidth,
|
518
527
|
isInNewRowFlag: isInNewRowFlag
|
519
|
-
});
|
528
|
+
}));
|
520
529
|
};
|
521
530
|
}
|
522
531
|
};
|
@@ -13,6 +13,7 @@ interface Props {
|
|
13
13
|
toolTipProps?: TooltipProps & React.RefAttributes<unknown>;
|
14
14
|
minWidth?: number;
|
15
15
|
isInNewRowFlag?: boolean;
|
16
|
+
viewRender?: (value: any, record: any, index: number) => any;
|
16
17
|
}
|
17
18
|
declare const RenderColumn: FC<Props>;
|
18
19
|
export default RenderColumn;
|
@@ -12,6 +12,7 @@ var _antd = require("antd");
|
|
12
12
|
var _ahooks = require("ahooks");
|
13
13
|
var _icons = require("@ant-design/icons");
|
14
14
|
var _reactSvg = require("react-svg");
|
15
|
+
var _utils = require("../../../utils");
|
15
16
|
var _copy = _interopRequireDefault(require("../../../assets/copy.svg"));
|
16
17
|
var Paragraph = _antd.Typography.Paragraph,
|
17
18
|
Text = _antd.Typography.Text;
|
@@ -29,14 +30,15 @@ var RenderColumn = function RenderColumn(props) {
|
|
29
30
|
_props$toolTipProps = props.toolTipProps,
|
30
31
|
toolTipProps = _props$toolTipProps === void 0 ? {} : _props$toolTipProps,
|
31
32
|
minWidth = props.minWidth,
|
32
|
-
isInNewRowFlag = props.isInNewRowFlag
|
33
|
+
isInNewRowFlag = props.isInNewRowFlag,
|
34
|
+
viewRender = props.viewRender;
|
33
35
|
var _useSetState = (0, _ahooks.useSetState)({
|
34
36
|
tooltip: false
|
35
37
|
}),
|
36
38
|
_useSetState2 = (0, _slicedToArray2.default)(_useSetState, 2),
|
37
39
|
tooltip = _useSetState2[0].tooltip,
|
38
40
|
setState = _useSetState2[1];
|
39
|
-
if ((
|
41
|
+
if (!(0, _utils.isEmpty)(originalValue) && !isInNewRowFlag) {
|
40
42
|
var renderNode = value ? node : '-';
|
41
43
|
if (ellipsis || originalDiffTip) {
|
42
44
|
renderNode = (0, _jsxRuntime.jsx)(Text, {
|
@@ -65,7 +67,7 @@ var RenderColumn = function RenderColumn(props) {
|
|
65
67
|
children: [(0, _jsxRuntime.jsxs)(_antd.Space, {
|
66
68
|
align: "start",
|
67
69
|
className: "original-value-container",
|
68
|
-
children: ["\u521D\u59CB\u503C\uFF1A", originalValue]
|
70
|
+
children: ["\u521D\u59CB\u503C\uFF1A", viewRender || originalValue]
|
69
71
|
}), (0, _jsxRuntime.jsx)(_antd.Space, {
|
70
72
|
className: "current-value-container",
|
71
73
|
children: ellipsis ? (0, _jsxRuntime.jsxs)(_antd.Space, {
|
@@ -45,6 +45,7 @@ export interface ProTableColumn extends Omit<ColumnType<any>, 'dataIndex'> {
|
|
45
45
|
value: any;
|
46
46
|
originValue: any;
|
47
47
|
}) => boolean;
|
48
|
+
viewRender?: (value: any, record: any, index: number) => any;
|
48
49
|
}
|
49
50
|
export interface CreateTreeFromArrayOptions {
|
50
51
|
itemKey?: string;
|
@@ -261,11 +261,20 @@
|
|
261
261
|
tr.@{ant-prefix}-table-row.new-cell {
|
262
262
|
background: var(--zaui-contract-bg-add; #d2fff4) !important;
|
263
263
|
background-color: var(--zaui-contract-bg-add; #d2fff4) !important;
|
264
|
-
|
265
264
|
td.@{ant-prefix}-table-cell {
|
266
265
|
background: var(--zaui-contract-bg-add; #d2fff4) !important;
|
267
266
|
background-color: var(--zaui-contract-bg-add; #d2fff4) !important;
|
268
267
|
border-bottom: 1px solid var(--zaui-form-control-line, #dcdcdc);
|
268
|
+
&.@{ant-prefix}-table-cell-fix-right {
|
269
|
+
background: var(--zaui-contract-bg-add; #d2fff4) !important;
|
270
|
+
background-color: var(--zaui-contract-bg-add; #d2fff4) !important;
|
271
|
+
border-bottom: 1px solid var(--zaui-form-control-line, #dcdcdc);
|
272
|
+
}
|
273
|
+
&.@{ant-prefix}-table-cell-fix-left {
|
274
|
+
background: var(--zaui-contract-bg-add; #d2fff4) !important;
|
275
|
+
background-color: var(--zaui-contract-bg-add; #d2fff4) !important;
|
276
|
+
border-bottom: 1px solid var(--zaui-form-control-line, #dcdcdc);
|
277
|
+
}
|
269
278
|
}
|
270
279
|
}
|
271
280
|
|
@@ -6,6 +6,8 @@ Object.defineProperty(exports, "__esModule", {
|
|
6
6
|
});
|
7
7
|
exports.default = exports.ProTreeSelect = void 0;
|
8
8
|
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
9
|
+
var _regeneratorRuntime2 = _interopRequireDefault(require("@babel/runtime/helpers/regeneratorRuntime"));
|
10
|
+
var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
|
9
11
|
var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
|
10
12
|
var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
|
11
13
|
var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
|
@@ -398,18 +400,35 @@ var ProTreeSelect = exports.ProTreeSelect = function ProTreeSelect(props, ref) {
|
|
398
400
|
sourceList = _filterData(sourceList);
|
399
401
|
return sourceList;
|
400
402
|
}
|
401
|
-
var searchTreeEvent = function
|
402
|
-
|
403
|
-
|
404
|
-
|
405
|
-
|
406
|
-
|
407
|
-
|
408
|
-
|
409
|
-
|
410
|
-
|
411
|
-
|
412
|
-
|
403
|
+
var searchTreeEvent = (0, _lodash.debounce)(/*#__PURE__*/function () {
|
404
|
+
var _ref5 = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(searchVal) {
|
405
|
+
var result;
|
406
|
+
return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
|
407
|
+
while (1) switch (_context.prev = _context.next) {
|
408
|
+
case 0:
|
409
|
+
if (searchVal) {
|
410
|
+
_context.next = 3;
|
411
|
+
break;
|
412
|
+
}
|
413
|
+
setState({
|
414
|
+
selectList: (0, _lodash.cloneDeep)(origDataSource || [])
|
415
|
+
});
|
416
|
+
return _context.abrupt("return", null);
|
417
|
+
case 3:
|
418
|
+
result = filterTree((0, _lodash.cloneDeep)(origDataSource || []), searchVal);
|
419
|
+
setState({
|
420
|
+
selectList: result || []
|
421
|
+
});
|
422
|
+
case 5:
|
423
|
+
case "end":
|
424
|
+
return _context.stop();
|
425
|
+
}
|
426
|
+
}, _callee);
|
427
|
+
}));
|
428
|
+
return function (_x) {
|
429
|
+
return _ref5.apply(this, arguments);
|
430
|
+
};
|
431
|
+
}(), 500);
|
413
432
|
function findTreeNode(treeList, nodeValue) {
|
414
433
|
var result = {};
|
415
434
|
var _filterData2 = function filterData(data) {
|
package/package.json
CHANGED