@zat-design/sisyphus-react 3.7.3-beta.14 → 3.7.3-beta.16
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/es/ProAction/index.js +4 -4
- package/es/ProDownload/index.d.ts +1 -1
- package/es/ProEditTable/components/ActionButton/index.d.ts +1 -1
- package/es/ProEditTable/components/RcTable/BaseTable.d.ts +1 -1
- package/es/ProEditTable/components/RcTable/DraggableTable.d.ts +1 -1
- package/es/ProEditTable/components/RcTable/VirtualTable.d.ts +1 -1
- package/es/ProEditTable/components/RenderField/index.d.ts +1 -1
- package/es/ProEditTable/components/RenderToolbar/index.d.ts +1 -1
- package/es/ProEditTable/components/Summary/index.d.ts +1 -1
- package/es/ProEditTable/utils/config.d.ts +1 -1
- package/es/ProEditTable/utils/tools.js +3 -3
- package/es/ProEnum/components/Group.d.ts +1 -1
- package/es/ProEnum/components/Tag.d.ts +1 -1
- package/es/ProEnum/index.d.ts +2 -2
- package/es/ProEnum/utils/eventCenter.js +1 -2
- package/es/ProEnum/utils/getEnumLabel.d.ts +1 -1
- package/es/ProForm/components/base/Input/index.d.ts +1 -1
- package/es/ProForm/components/combination/ProCascader/index.d.ts +1 -1
- package/es/ProForm/components/combination/ProCascader/index.js +7 -7
- package/es/ProForm/components/old/InputRange/index.d.ts +1 -1
- package/es/ProForm/components/old/InputWithSuffix/index.d.ts +1 -1
- package/es/ProForm/components/old/ProAddress/index.d.ts +1 -2
- package/es/ProForm/components/old/ProRangeBox/index.d.ts +1 -2
- package/es/ProForm/components/render/ChangedWrapper.d.ts +1 -0
- package/es/ProForm/components/render/ChangedWrapper.js +17 -8
- package/es/ProForm/utils/index.js +14 -10
- package/es/ProForm/utils/transformValue.js +17 -11
- package/es/ProIcon/utils/index.js +4 -3
- package/es/ProLayout/components/Layout/Menu/OpenMenu/index.d.ts +1 -1
- package/es/ProLayout/components/Layout/Menu/OpenMenu/index.js +3 -3
- package/es/ProLayout/components/ProCollapse/index.d.ts +1 -1
- package/es/ProLayout/components/ProFooter/index.d.ts +1 -1
- package/es/ProLayout/components/ProHeader/components/Copy/index.d.ts +1 -1
- package/es/ProLayout/components/ProHeader/index.d.ts +1 -1
- package/es/ProLayout/index.d.ts +4 -4
- package/es/ProLayout/utils/index.js +9 -9
- package/es/ProSelect/components/AdaptiveTooltip.d.ts +1 -1
- package/es/ProSelect/index.d.ts +1 -1
- package/es/ProStep/components/Anchor/index.d.ts +1 -1
- package/es/ProStep/components/Item/index.d.ts +1 -1
- package/es/ProStep/components/Step/index.d.ts +1 -1
- package/es/ProStep/index.d.ts +2 -2
- package/es/ProTable/components/FormatColumn/index.js +3 -3
- package/es/ProTable/components/RcTable/components/BaseTable/index.d.ts +1 -1
- package/es/ProTable/components/RcTable/components/DraggableTable/components/DndWrapper/utils/index.js +9 -8
- package/es/ProTable/components/RcTable/components/DraggableTable/index.d.ts +1 -1
- package/es/ProTable/components/RenderFooter/index.d.ts +1 -1
- package/es/ProTable/components/RenderTableHeader/index.d.ts +1 -1
- package/es/ProTable/components/TableResizable/index.d.ts +1 -1
- package/es/ProTable/index.d.ts +1 -1
- package/es/ProTabs/components/Card/index.d.ts +1 -1
- package/es/ProThemeTools/component/ProTools/index.d.ts +1 -1
- package/es/ProThemeTools/index.d.ts +1 -1
- package/es/ProTooltip/index.d.ts +1 -1
- package/es/ProTree/components/AdaptiveTooltip.d.ts +1 -1
- package/es/ProTree/components/CloseIcon.d.ts +1 -2
- package/es/ProTree/components/List.d.ts +1 -1
- package/es/ProTree/components/ProTree.d.ts +1 -1
- package/es/ProTree/components/ProTreeSelect/index.d.ts +1 -1
- package/es/ProTree/components/ProTreeSelect/index.js +18 -18
- package/es/ProTree/components/SearchTitle.d.ts +1 -1
- package/es/ProTree/components/Tree.d.ts +1 -1
- package/es/ProTree/components/Tree.js +3 -3
- package/es/ProTree/index.d.ts +1 -1
- package/es/ProTree/utils.js +12 -11
- package/es/ProTreeModal/components/Cascader.d.ts +1 -1
- package/es/ProTreeModal/components/CloseIcon.d.ts +1 -2
- package/es/ProTreeModal/components/SearchTitle.d.ts +1 -1
- package/es/ProTreeModal/components/Tree.js +6 -6
- package/es/ProTreeModal/components/Trigger.d.ts +1 -1
- package/es/ProTreeModal/index.d.ts +1 -1
- package/es/ProTreeModal/utils.js +12 -11
- package/es/ProUpload/components/DraggableUploadListItem.d.ts +1 -1
- package/lib/ProAction/index.js +4 -4
- package/lib/ProDownload/index.d.ts +1 -1
- package/lib/ProEditTable/components/ActionButton/index.d.ts +1 -1
- package/lib/ProEditTable/components/RcTable/BaseTable.d.ts +1 -1
- package/lib/ProEditTable/components/RcTable/DraggableTable.d.ts +1 -1
- package/lib/ProEditTable/components/RcTable/VirtualTable.d.ts +1 -1
- package/lib/ProEditTable/components/RenderField/index.d.ts +1 -1
- package/lib/ProEditTable/components/RenderToolbar/index.d.ts +1 -1
- package/lib/ProEditTable/components/Summary/index.d.ts +1 -1
- package/lib/ProEditTable/utils/config.d.ts +1 -1
- package/lib/ProEditTable/utils/tools.js +3 -3
- package/lib/ProEnum/components/Group.d.ts +1 -1
- package/lib/ProEnum/components/Tag.d.ts +1 -1
- package/lib/ProEnum/index.d.ts +2 -2
- package/lib/ProEnum/utils/eventCenter.js +1 -2
- package/lib/ProEnum/utils/getEnumLabel.d.ts +1 -1
- package/lib/ProForm/components/base/Input/index.d.ts +1 -1
- package/lib/ProForm/components/combination/ProCascader/index.d.ts +1 -1
- package/lib/ProForm/components/combination/ProCascader/index.js +7 -7
- package/lib/ProForm/components/old/InputRange/index.d.ts +1 -1
- package/lib/ProForm/components/old/InputWithSuffix/index.d.ts +1 -1
- package/lib/ProForm/components/old/ProAddress/index.d.ts +1 -2
- package/lib/ProForm/components/old/ProRangeBox/index.d.ts +1 -2
- package/lib/ProForm/components/render/ChangedWrapper.d.ts +1 -0
- package/lib/ProForm/components/render/ChangedWrapper.js +19 -10
- package/lib/ProForm/utils/index.js +10 -10
- package/lib/ProForm/utils/transformValue.js +17 -11
- package/lib/ProIcon/utils/index.js +3 -3
- package/lib/ProLayout/components/Layout/Menu/OpenMenu/index.d.ts +1 -1
- package/lib/ProLayout/components/Layout/Menu/OpenMenu/index.js +3 -3
- package/lib/ProLayout/components/ProCollapse/index.d.ts +1 -1
- package/lib/ProLayout/components/ProFooter/index.d.ts +1 -1
- package/lib/ProLayout/components/ProHeader/components/Copy/index.d.ts +1 -1
- package/lib/ProLayout/components/ProHeader/index.d.ts +1 -1
- package/lib/ProLayout/index.d.ts +4 -4
- package/lib/ProLayout/utils/index.js +9 -9
- package/lib/ProSelect/components/AdaptiveTooltip.d.ts +1 -1
- package/lib/ProSelect/index.d.ts +1 -1
- package/lib/ProStep/components/Anchor/index.d.ts +1 -1
- package/lib/ProStep/components/Item/index.d.ts +1 -1
- package/lib/ProStep/components/Step/index.d.ts +1 -1
- package/lib/ProStep/index.d.ts +2 -2
- package/lib/ProTable/components/FormatColumn/index.js +3 -3
- package/lib/ProTable/components/RcTable/components/BaseTable/index.d.ts +1 -1
- package/lib/ProTable/components/RcTable/components/DraggableTable/components/DndWrapper/utils/index.js +8 -8
- package/lib/ProTable/components/RcTable/components/DraggableTable/index.d.ts +1 -1
- package/lib/ProTable/components/RenderFooter/index.d.ts +1 -1
- package/lib/ProTable/components/RenderTableHeader/index.d.ts +1 -1
- package/lib/ProTable/components/TableResizable/index.d.ts +1 -1
- package/lib/ProTable/index.d.ts +1 -1
- package/lib/ProTabs/components/Card/index.d.ts +1 -1
- package/lib/ProThemeTools/component/ProTools/index.d.ts +1 -1
- package/lib/ProThemeTools/index.d.ts +1 -1
- package/lib/ProTooltip/index.d.ts +1 -1
- package/lib/ProTree/components/AdaptiveTooltip.d.ts +1 -1
- package/lib/ProTree/components/CloseIcon.d.ts +1 -2
- package/lib/ProTree/components/List.d.ts +1 -1
- package/lib/ProTree/components/ProTree.d.ts +1 -1
- package/lib/ProTree/components/ProTreeSelect/index.d.ts +1 -1
- package/lib/ProTree/components/ProTreeSelect/index.js +18 -18
- package/lib/ProTree/components/SearchTitle.d.ts +1 -1
- package/lib/ProTree/components/Tree.d.ts +1 -1
- package/lib/ProTree/components/Tree.js +3 -3
- package/lib/ProTree/index.d.ts +1 -1
- package/lib/ProTree/utils.js +11 -11
- package/lib/ProTreeModal/components/Cascader.d.ts +1 -1
- package/lib/ProTreeModal/components/CloseIcon.d.ts +1 -2
- package/lib/ProTreeModal/components/SearchTitle.d.ts +1 -1
- package/lib/ProTreeModal/components/Tree.js +6 -6
- package/lib/ProTreeModal/components/Trigger.d.ts +1 -1
- package/lib/ProTreeModal/index.d.ts +1 -1
- package/lib/ProTreeModal/utils.js +11 -11
- package/lib/ProUpload/components/DraggableUploadListItem.d.ts +1 -1
- package/package.json +1 -1
|
@@ -59,7 +59,7 @@ function List(props, ref) {
|
|
|
59
59
|
}, [searchStr]);
|
|
60
60
|
var _treeData = useMemo(function () {
|
|
61
61
|
function fn() {
|
|
62
|
-
var
|
|
62
|
+
var _loop = function loop(data, index) {
|
|
63
63
|
index++;
|
|
64
64
|
return data.map(function (item) {
|
|
65
65
|
var title = showCodeName ? "".concat(item[fieldNameValue], "-").concat(item[fieldNameLabel]) : item[fieldNameLabel];
|
|
@@ -84,7 +84,7 @@ function List(props, ref) {
|
|
|
84
84
|
})]
|
|
85
85
|
}),
|
|
86
86
|
key: item[fieldNameValue],
|
|
87
|
-
children:
|
|
87
|
+
children: _loop(item[fieldNames.children], index)
|
|
88
88
|
});
|
|
89
89
|
}
|
|
90
90
|
return _objectSpread(_objectSpread({}, item), {}, {
|
|
@@ -117,12 +117,12 @@ function List(props, ref) {
|
|
|
117
117
|
if (searchStr) {
|
|
118
118
|
newTreeData = filterCheckedNodes(originalTreeData, [], searchStr, fieldNames);
|
|
119
119
|
}
|
|
120
|
-
return
|
|
120
|
+
return _loop(newTreeData, -1);
|
|
121
121
|
}
|
|
122
122
|
return fn();
|
|
123
123
|
}, [searchStr, expandedKeys, showCodeName]);
|
|
124
124
|
var treeViewData = useMemo(function () {
|
|
125
|
-
var
|
|
125
|
+
var _loop2 = function loop(data, index) {
|
|
126
126
|
index++;
|
|
127
127
|
return data.map(function (item) {
|
|
128
128
|
var title = showCodeName ? "".concat(item[fieldNameValue], "-").concat(item[fieldNameLabel]) : item[fieldNameLabel];
|
|
@@ -151,7 +151,7 @@ function List(props, ref) {
|
|
|
151
151
|
})]
|
|
152
152
|
}),
|
|
153
153
|
key: item[fieldNameValue],
|
|
154
|
-
children:
|
|
154
|
+
children: _loop2(item[fieldNames.children], index)
|
|
155
155
|
});
|
|
156
156
|
}
|
|
157
157
|
return _objectSpread(_objectSpread({}, item), {}, {
|
|
@@ -170,7 +170,7 @@ function List(props, ref) {
|
|
|
170
170
|
});
|
|
171
171
|
});
|
|
172
172
|
};
|
|
173
|
-
return
|
|
173
|
+
return _loop2(treeData, -1);
|
|
174
174
|
}, [treeData]);
|
|
175
175
|
var onExpand = function onExpand(newExpandedKeys) {
|
|
176
176
|
setExpandedKeys(newExpandedKeys);
|
|
@@ -17,5 +17,5 @@ interface TriggerProps {
|
|
|
17
17
|
handleClearAll: () => void;
|
|
18
18
|
appointChange: (appoint?: boolean) => void;
|
|
19
19
|
}
|
|
20
|
-
declare function Trigger(props: TriggerProps): JSX.Element;
|
|
20
|
+
declare function Trigger(props: TriggerProps): import("react/jsx-runtime").JSX.Element;
|
|
21
21
|
export default Trigger;
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { ProTreeModalProps } from './propsType';
|
|
2
2
|
import './style/index.less';
|
|
3
3
|
export declare const CASCADER = "CASCADER";
|
|
4
|
-
declare const ProTreeModal: (props: ProTreeModalProps) => JSX.Element;
|
|
4
|
+
declare const ProTreeModal: (props: ProTreeModalProps) => import("react/jsx-runtime").JSX.Element;
|
|
5
5
|
export default ProTreeModal;
|
package/es/ProTreeModal/utils.js
CHANGED
|
@@ -57,7 +57,7 @@ export function getAllKeys(data, fieldNames) {
|
|
|
57
57
|
* @param fieldNames
|
|
58
58
|
* @returns
|
|
59
59
|
*/
|
|
60
|
-
|
|
60
|
+
var _getParentKey = function getParentKey(key, tree, fieldNames) {
|
|
61
61
|
var parentKey;
|
|
62
62
|
for (var i = 0; i < tree.length; i++) {
|
|
63
63
|
var node = tree[i];
|
|
@@ -66,16 +66,17 @@ export var getParentKey = function getParentKey(key, tree, fieldNames) {
|
|
|
66
66
|
return item[fieldNames.value] === key;
|
|
67
67
|
})) {
|
|
68
68
|
parentKey = node[fieldNames.value];
|
|
69
|
-
} else if (
|
|
70
|
-
parentKey =
|
|
69
|
+
} else if (_getParentKey(key, node[fieldNames.children], fieldNames)) {
|
|
70
|
+
parentKey = _getParentKey(key, node[fieldNames.children], fieldNames);
|
|
71
71
|
}
|
|
72
72
|
}
|
|
73
73
|
}
|
|
74
74
|
return parentKey;
|
|
75
75
|
};
|
|
76
|
+
export { _getParentKey as getParentKey };
|
|
76
77
|
export function findTreeNodeByKey(treeData, key, fieldNames) {
|
|
77
78
|
var result = [];
|
|
78
|
-
var
|
|
79
|
+
var _traverse = function traverse(node, parents) {
|
|
79
80
|
if (node[fieldNames.value] === key) {
|
|
80
81
|
result.push.apply(result, [node].concat(_toConsumableArray(parents)));
|
|
81
82
|
return true;
|
|
@@ -86,7 +87,7 @@ export function findTreeNodeByKey(treeData, key, fieldNames) {
|
|
|
86
87
|
try {
|
|
87
88
|
for (_iterator.s(); !(_step = _iterator.n()).done;) {
|
|
88
89
|
var child = _step.value;
|
|
89
|
-
if (
|
|
90
|
+
if (_traverse(child, [node].concat(_toConsumableArray(parents)))) {
|
|
90
91
|
return true;
|
|
91
92
|
}
|
|
92
93
|
}
|
|
@@ -102,7 +103,7 @@ export function findTreeNodeByKey(treeData, key, fieldNames) {
|
|
|
102
103
|
try {
|
|
103
104
|
for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
|
|
104
105
|
var node = _step2.value;
|
|
105
|
-
|
|
106
|
+
_traverse(node, []);
|
|
106
107
|
}
|
|
107
108
|
} catch (err) {
|
|
108
109
|
_iterator2.e(err);
|
|
@@ -121,23 +122,23 @@ export function filterCheckedNodes(data, checkedKeys) {
|
|
|
121
122
|
var searchStr = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : '';
|
|
122
123
|
var fieldNames = arguments.length > 3 ? arguments[3] : undefined;
|
|
123
124
|
var result = [];
|
|
124
|
-
var
|
|
125
|
+
var _traverse2 = function traverse(node) {
|
|
125
126
|
var _node$fieldNames$chil3;
|
|
126
127
|
var title = node[fieldNames.value] + node[fieldNames.label];
|
|
127
128
|
if (!searchStr) {
|
|
128
129
|
if (checkedKeys.includes(node[fieldNames.value])) {
|
|
129
130
|
var _node$fieldNames$chil;
|
|
130
|
-
var _children = (node === null || node === void 0 ? void 0 : (_node$fieldNames$chil = node[fieldNames.children]) === null || _node$fieldNames$chil === void 0 ? void 0 : _node$fieldNames$chil.map(
|
|
131
|
+
var _children = (node === null || node === void 0 ? void 0 : (_node$fieldNames$chil = node[fieldNames.children]) === null || _node$fieldNames$chil === void 0 ? void 0 : _node$fieldNames$chil.map(_traverse2).filter(Boolean)) || [];
|
|
131
132
|
return _objectSpread(_objectSpread({}, node), {}, _defineProperty({}, fieldNames.children, _children));
|
|
132
133
|
}
|
|
133
134
|
} else if (title.indexOf(searchStr) > -1) {
|
|
134
135
|
var _node$fieldNames$chil2;
|
|
135
|
-
var _children2 = ((_node$fieldNames$chil2 = node[fieldNames.children]) === null || _node$fieldNames$chil2 === void 0 ? void 0 : _node$fieldNames$chil2.map(
|
|
136
|
+
var _children2 = ((_node$fieldNames$chil2 = node[fieldNames.children]) === null || _node$fieldNames$chil2 === void 0 ? void 0 : _node$fieldNames$chil2.map(_traverse2).filter(Boolean)) || [];
|
|
136
137
|
return _objectSpread(_objectSpread({}, node), {}, {
|
|
137
138
|
children: _children2
|
|
138
139
|
});
|
|
139
140
|
}
|
|
140
|
-
var children = (_node$fieldNames$chil3 = node[fieldNames.children]) === null || _node$fieldNames$chil3 === void 0 ? void 0 : _node$fieldNames$chil3.map(
|
|
141
|
+
var children = (_node$fieldNames$chil3 = node[fieldNames.children]) === null || _node$fieldNames$chil3 === void 0 ? void 0 : _node$fieldNames$chil3.map(_traverse2).filter(Boolean);
|
|
141
142
|
if (children && children.length > 0) {
|
|
142
143
|
return _objectSpread(_objectSpread({}, node), {}, _defineProperty({}, fieldNames.children, children));
|
|
143
144
|
}
|
|
@@ -149,7 +150,7 @@ export function filterCheckedNodes(data, checkedKeys) {
|
|
|
149
150
|
try {
|
|
150
151
|
for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
|
|
151
152
|
var node = _step3.value;
|
|
152
|
-
var filtered =
|
|
153
|
+
var filtered = _traverse2(node);
|
|
153
154
|
if (filtered) {
|
|
154
155
|
result.push(filtered);
|
|
155
156
|
}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
import { DraggableUploadListItemProps } from '../propsType';
|
|
2
|
-
export declare const DraggableUploadListItem: ({ file, children }: DraggableUploadListItemProps) => JSX.Element;
|
|
2
|
+
export declare const DraggableUploadListItem: ({ file, children }: DraggableUploadListItemProps) => import("react/jsx-runtime").JSX.Element;
|
package/lib/ProAction/index.js
CHANGED
|
@@ -43,7 +43,7 @@ var ProAction = function ProAction(props) {
|
|
|
43
43
|
var index = state.index,
|
|
44
44
|
servicesArray = state.servicesArray;
|
|
45
45
|
var length = config.length;
|
|
46
|
-
var
|
|
46
|
+
var _onActionRun = /*#__PURE__*/function () {
|
|
47
47
|
var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(currentIndex, array) {
|
|
48
48
|
var _actionProps$useReque, _options$onSuccess, _newServicesArray$cur, _newServicesArray$cur2, _newServicesArray$cur3, _actionProps$onAction, _actionProps$continue;
|
|
49
49
|
var actionProps, newServicesArray, _ref2, service, options, transformResponse, res, data, open, _newServicesArray$cur4, _newServicesArray$cur5, _newServicesArray$cur6, list, errorTitle, isContinue;
|
|
@@ -140,7 +140,7 @@ var ProAction = function ProAction(props) {
|
|
|
140
140
|
return _context.abrupt("return", false);
|
|
141
141
|
case 44:
|
|
142
142
|
if (currentIndex + 1 < length) {
|
|
143
|
-
|
|
143
|
+
_onActionRun(currentIndex + 1, newServicesArray);
|
|
144
144
|
} else {
|
|
145
145
|
setState({
|
|
146
146
|
loading: false
|
|
@@ -158,7 +158,7 @@ var ProAction = function ProAction(props) {
|
|
|
158
158
|
}();
|
|
159
159
|
var ChildContent = /*#__PURE__*/_react.default.cloneElement(children, {
|
|
160
160
|
onClick: function onClick() {
|
|
161
|
-
|
|
161
|
+
_onActionRun(0, []);
|
|
162
162
|
},
|
|
163
163
|
loading: state.loading
|
|
164
164
|
});
|
|
@@ -170,7 +170,7 @@ var ProAction = function ProAction(props) {
|
|
|
170
170
|
return (0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
|
|
171
171
|
children: [((_config$ = config[0]) === null || _config$ === void 0 ? void 0 : _config$.mode) === 'confirm' ? (0, _jsxRuntime.jsx)(_antd.Popconfirm, {
|
|
172
172
|
onConfirm: function onConfirm() {
|
|
173
|
-
return
|
|
173
|
+
return _onActionRun(0, []);
|
|
174
174
|
},
|
|
175
175
|
title: ((_config$2 = config[0]) === null || _config$2 === void 0 ? void 0 : _config$2.title) || (_locale.default === null || _locale.default === void 0 ? void 0 : (_locale$ProAction2 = _locale.default.ProAction) === null || _locale$ProAction2 === void 0 ? void 0 : _locale$ProAction2.defaultTitle),
|
|
176
176
|
children: children
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { IProDownloadProps } from './propsType';
|
|
2
2
|
declare const ProDownload: {
|
|
3
|
-
(props: IProDownloadProps): JSX.Element;
|
|
3
|
+
(props: IProDownloadProps): import("react/jsx-runtime").JSX.Element;
|
|
4
4
|
downLoadRequest: import("./utils").DownloadRequestProps;
|
|
5
5
|
};
|
|
6
6
|
export default ProDownload;
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
declare const ActionButton: ({ record, index, config, btnConfig }: any) => JSX.Element;
|
|
1
|
+
declare const ActionButton: ({ record, index, config, btnConfig }: any) => import("react/jsx-runtime").JSX.Element;
|
|
2
2
|
export default ActionButton;
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
declare const RenderField: ({ text: value, record, index, column, config }: any) => JSX.Element;
|
|
1
|
+
declare const RenderField: ({ text: value, record, index, column, config }: any) => import("react/jsx-runtime").JSX.Element;
|
|
2
2
|
export default RenderField;
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
declare const RenderToolbar: (config: any) => JSX.Element;
|
|
1
|
+
declare const RenderToolbar: (config: any) => import("react/jsx-runtime").JSX.Element;
|
|
2
2
|
export default RenderToolbar;
|
|
@@ -8,5 +8,5 @@ interface SummaryProps<T = any> {
|
|
|
8
8
|
};
|
|
9
9
|
rowSelection: any;
|
|
10
10
|
}
|
|
11
|
-
declare const Summary: ({ data, summary, rowSelection, }: SummaryProps) => JSX.Element;
|
|
11
|
+
declare const Summary: ({ data, summary, rowSelection, }: SummaryProps) => import("react/jsx-runtime").JSX.Element;
|
|
12
12
|
export default Summary;
|
|
@@ -9,7 +9,7 @@ export declare const defaultBtnNameMap: {
|
|
|
9
9
|
custom: any;
|
|
10
10
|
};
|
|
11
11
|
export declare const iconMap: {
|
|
12
|
-
add: JSX.Element;
|
|
12
|
+
add: import("react/jsx-runtime").JSX.Element;
|
|
13
13
|
};
|
|
14
14
|
export declare const defaultSingleActionKeys: string[];
|
|
15
15
|
export declare const defaultMultipleActionKeys: string[];
|
|
@@ -14,14 +14,14 @@ var getRandom = exports.getRandom = function getRandom() {
|
|
|
14
14
|
};
|
|
15
15
|
// 深层次对比两个对象且取出来差异值
|
|
16
16
|
var difference = exports.difference = function difference(object, base) {
|
|
17
|
-
var
|
|
17
|
+
var _changes = function changes(object, base) {
|
|
18
18
|
return (0, _lodash.transform)(object, function (result, value, key) {
|
|
19
19
|
if (!(0, _lodash.isEqual)(value, base[key])) {
|
|
20
|
-
result[key] = (0, _lodash.isObject)(value) && (0, _lodash.isObject)(base[key]) ?
|
|
20
|
+
result[key] = (0, _lodash.isObject)(value) && (0, _lodash.isObject)(base[key]) ? _changes(value, base[key]) : value;
|
|
21
21
|
}
|
|
22
22
|
});
|
|
23
23
|
};
|
|
24
|
-
return
|
|
24
|
+
return _changes(object, base);
|
|
25
25
|
};
|
|
26
26
|
// 数组字段循环校验,解决validateFields无法批量校验的问题
|
|
27
27
|
var customValidate = exports.customValidate = function customValidate(validateKeys, form, rowName) {
|
|
@@ -6,5 +6,5 @@ interface Props extends Pick<ProEnum, 'id' | 'value' | 'onChange' | 'dataSource'
|
|
|
6
6
|
allowClear?: boolean;
|
|
7
7
|
button?: boolean;
|
|
8
8
|
}
|
|
9
|
-
declare const Group: (props: Props) => JSX.Element;
|
|
9
|
+
declare const Group: (props: Props) => import("react/jsx-runtime").JSX.Element;
|
|
10
10
|
export default Group;
|
|
@@ -3,5 +3,5 @@ interface Props extends Pick<ProEnum, 'id' | 'value' | 'onChange' | 'dataSource'
|
|
|
3
3
|
fieldValue: string;
|
|
4
4
|
fieldLabel: string;
|
|
5
5
|
}
|
|
6
|
-
declare const ProEnumTag: (props: Props) => JSX.Element;
|
|
6
|
+
declare const ProEnumTag: (props: Props) => import("react/jsx-runtime").JSX.Element;
|
|
7
7
|
export default ProEnumTag;
|
package/lib/ProEnum/index.d.ts
CHANGED
|
@@ -2,8 +2,8 @@ import useEnum from './hooks/useEnum';
|
|
|
2
2
|
import { ProEnumProps } from './propsType';
|
|
3
3
|
import './style/index.less';
|
|
4
4
|
declare const ProEnum: {
|
|
5
|
-
(props: ProEnumProps): JSX.Element;
|
|
6
|
-
getEnumLabel: (code: string | string[], value: any, compose?: boolean, fieldNameLabel?: string, fieldNameValue?: string) => JSX.Element;
|
|
5
|
+
(props: ProEnumProps): import("react/jsx-runtime").JSX.Element;
|
|
6
|
+
getEnumLabel: (code: string | string[], value: any, compose?: boolean, fieldNameLabel?: string, fieldNameValue?: string) => import("react/jsx-runtime").JSX.Element;
|
|
7
7
|
useEnum: typeof useEnum;
|
|
8
8
|
};
|
|
9
9
|
export default ProEnum;
|
|
@@ -10,7 +10,7 @@ var SimpleEventCenter = /*#__PURE__*/function () {
|
|
|
10
10
|
this.events = void 0;
|
|
11
11
|
this.events = new Map();
|
|
12
12
|
}
|
|
13
|
-
(0, _createClass2.default)(SimpleEventCenter, [{
|
|
13
|
+
return (0, _createClass2.default)(SimpleEventCenter, [{
|
|
14
14
|
key: "subscribe",
|
|
15
15
|
value: function subscribe(eventName, callback) {
|
|
16
16
|
if (!this.events.has(eventName)) {
|
|
@@ -37,6 +37,5 @@ var SimpleEventCenter = /*#__PURE__*/function () {
|
|
|
37
37
|
}
|
|
38
38
|
}
|
|
39
39
|
}]);
|
|
40
|
-
return SimpleEventCenter;
|
|
41
40
|
}(); // 将 eventCenter 实例添加到 window 对象上
|
|
42
41
|
window.eventCenter = new SimpleEventCenter();
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
declare const getEnumLabel: (code: string | string[], value: any, compose?: boolean, fieldNameLabel?: string, fieldNameValue?: string) => JSX.Element;
|
|
1
|
+
declare const getEnumLabel: (code: string | string[], value: any, compose?: boolean, fieldNameLabel?: string, fieldNameValue?: string) => import("react/jsx-runtime").JSX.Element;
|
|
2
2
|
export default getEnumLabel;
|
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
/// <reference types="react" />
|
|
2
2
|
import { ProCascaderProps } from './propsType';
|
|
3
|
-
declare const _default: import("react").MemoExoticComponent<(props: ProCascaderProps) => JSX.Element>;
|
|
3
|
+
declare const _default: import("react").MemoExoticComponent<(props: ProCascaderProps) => import("react/jsx-runtime").JSX.Element>;
|
|
4
4
|
export default _default;
|
|
@@ -29,9 +29,9 @@ var defaultFieldNames = {
|
|
|
29
29
|
value: 'code',
|
|
30
30
|
children: 'children'
|
|
31
31
|
};
|
|
32
|
-
var
|
|
32
|
+
var _filterDataSource = function filterDataSource(dataSource, level, fieldNames) {
|
|
33
33
|
return dataSource === null || dataSource === void 0 ? void 0 : dataSource.map(function (item) {
|
|
34
|
-
return (0, _objectSpread3.default)((0, _objectSpread3.default)({}, item), {}, (0, _defineProperty2.default)({}, (fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children) || 'children', level === 1 ? [] :
|
|
34
|
+
return (0, _objectSpread3.default)((0, _objectSpread3.default)({}, item), {}, (0, _defineProperty2.default)({}, (fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children) || 'children', level === 1 ? [] : _filterDataSource(item === null || item === void 0 ? void 0 : item[(fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children) || 'children'], level - 1, fieldNames)));
|
|
35
35
|
});
|
|
36
36
|
};
|
|
37
37
|
var getViewLabel = function getViewLabel(_ref) {
|
|
@@ -96,7 +96,7 @@ var ProCascader = function ProCascader(props) {
|
|
|
96
96
|
enumDataSource = _ref5$ === void 0 ? [] : _ref5$;
|
|
97
97
|
var realDataSource = (0, _react.useMemo)(function () {
|
|
98
98
|
var innerDataSource = dataSource || (addressCode ? enumDataSource : []);
|
|
99
|
-
var result = isAddressMode && realLevel === 2 ?
|
|
99
|
+
var result = isAddressMode && realLevel === 2 ? _filterDataSource(innerDataSource, level, fieldNames) : innerDataSource;
|
|
100
100
|
return (0, _index.transformDataName)(result, fieldNames);
|
|
101
101
|
}, [isAddressMode, addressCode, realLevel, dataSource, enumDataSource === null || enumDataSource === void 0 ? void 0 : enumDataSource.length]);
|
|
102
102
|
var _useRequest = (0, _objectSpread3.default)({}, useRequest),
|
|
@@ -131,7 +131,7 @@ var ProCascader = function ProCascader(props) {
|
|
|
131
131
|
value: fieldNames.value,
|
|
132
132
|
children: (fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children) || 'children'
|
|
133
133
|
});
|
|
134
|
-
serviceData = isAddressMode && realLevel === 2 ?
|
|
134
|
+
serviceData = isAddressMode && realLevel === 2 ? _filterDataSource(transFormData, level, fieldNames) : transFormData;
|
|
135
135
|
setServiceData(serviceData);
|
|
136
136
|
case 9:
|
|
137
137
|
case "end":
|
|
@@ -196,7 +196,7 @@ var ProCascader = function ProCascader(props) {
|
|
|
196
196
|
})) === null || _ref7$filter === void 0 ? void 0 : _ref7$filter.join(separator)) || '-' : (defaultLabel === null || defaultLabel === void 0 ? void 0 : (_defaultLabel$filter = defaultLabel.filter(function (item) {
|
|
197
197
|
return !!item;
|
|
198
198
|
})) === null || _defaultLabel$filter === void 0 ? void 0 : _defaultLabel$filter.join(separator)) || '-';
|
|
199
|
-
var
|
|
199
|
+
var _findSelectedOptions = function findSelectedOptions(options, value) {
|
|
200
200
|
var path = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : [];
|
|
201
201
|
var _value = value !== null && value !== void 0 ? value : [];
|
|
202
202
|
// 基准情况:如果 value 数组为空,且 path 不为空,说明找到了完整的路径
|
|
@@ -215,7 +215,7 @@ var ProCascader = function ProCascader(props) {
|
|
|
215
215
|
if (foundOption) {
|
|
216
216
|
// 如果找到了匹配的选项,并且还有更多的 value 需要匹配,递归地在子选项中查找
|
|
217
217
|
if (_value.length > 1 && foundOption.children) {
|
|
218
|
-
return
|
|
218
|
+
return _findSelectedOptions(foundOption.children, _value.slice(1), [].concat((0, _toConsumableArray2.default)(path), [foundOption]));
|
|
219
219
|
}
|
|
220
220
|
// 如果没有更多的 value 需要匹配,返回当前选项(以及之前的路径)
|
|
221
221
|
return [].concat((0, _toConsumableArray2.default)(path), [foundOption]);
|
|
@@ -224,7 +224,7 @@ var ProCascader = function ProCascader(props) {
|
|
|
224
224
|
return null;
|
|
225
225
|
};
|
|
226
226
|
var _selectedOptions = (0, _react.useMemo)(function () {
|
|
227
|
-
return
|
|
227
|
+
return _findSelectedOptions(service ? serviceData : realDataSource, addressValue);
|
|
228
228
|
}, [service, serviceData, realDataSource, addressValue]);
|
|
229
229
|
var handleAddressChange = function handleAddressChange(e) {
|
|
230
230
|
var cascaderValue = value === null || value === void 0 ? void 0 : value.slice(0, realLevel);
|
|
@@ -12,5 +12,5 @@ export interface InputRangeProps {
|
|
|
12
12
|
isPositiveInteger?: boolean;
|
|
13
13
|
precision?: number;
|
|
14
14
|
}
|
|
15
|
-
declare const InputRange: ({ value, onChange, min, max, group, disabled, precision, isPositiveInteger, }: InputRangeProps) => JSX.Element;
|
|
15
|
+
declare const InputRange: ({ value, onChange, min, max, group, disabled, precision, isPositiveInteger, }: InputRangeProps) => import("react/jsx-runtime").JSX.Element;
|
|
16
16
|
export default InputRange;
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
/// <reference types="react" />
|
|
2
1
|
import { ProAddressPropsType } from './propsTypes';
|
|
3
2
|
export declare const transferAddressInfoToRegion: () => {
|
|
4
3
|
normalize: (value: any) => {
|
|
@@ -24,5 +23,5 @@ export declare const transferAddressInfoToRegion: () => {
|
|
|
24
23
|
};
|
|
25
24
|
};
|
|
26
25
|
};
|
|
27
|
-
export declare function ProAddress({ ...props }: ProAddressPropsType): JSX.Element;
|
|
26
|
+
export declare function ProAddress({ ...props }: ProAddressPropsType): import("react/jsx-runtime").JSX.Element;
|
|
28
27
|
export default ProAddress;
|
|
@@ -1,3 +1,2 @@
|
|
|
1
|
-
/// <reference types="react" />
|
|
2
1
|
import { ProRangeBoxPropsType } from './propsType';
|
|
3
|
-
export default function ProRangeBox({ configOption }: ProRangeBoxPropsType): JSX.Element;
|
|
2
|
+
export default function ProRangeBox({ configOption }: ProRangeBoxPropsType): import("react/jsx-runtime").JSX.Element;
|
|
@@ -6,7 +6,8 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
6
6
|
value: true
|
|
7
7
|
});
|
|
8
8
|
exports.default = void 0;
|
|
9
|
-
var
|
|
9
|
+
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
10
|
+
var _objectSpread3 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
|
|
10
11
|
var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
|
|
11
12
|
var _jsxRuntime = require("react/jsx-runtime");
|
|
12
13
|
var _antd = require("antd");
|
|
@@ -18,7 +19,7 @@ var _ProConfigProvider = require("../../../ProConfigProvider");
|
|
|
18
19
|
var _utils = require("../../../utils");
|
|
19
20
|
var _excluded = ["name", "names", "namesStr", "form", "equalWith", "children", "type", "diffConfig", "valuePropName"];
|
|
20
21
|
var ChangedWrapper = function ChangedWrapper(props) {
|
|
21
|
-
var _diffConfig$toolTip;
|
|
22
|
+
var _diffConfig$toolTip, _children$props;
|
|
22
23
|
var name = props.name,
|
|
23
24
|
names = props.names,
|
|
24
25
|
namesStr = props.namesStr,
|
|
@@ -56,14 +57,12 @@ var ChangedWrapper = function ChangedWrapper(props) {
|
|
|
56
57
|
var isChanged = diffType === 'changed';
|
|
57
58
|
var tipContent = (0, _react.useMemo)(function () {
|
|
58
59
|
if (!isWatch || noChange) return undefined;
|
|
59
|
-
return /*#__PURE__*/_react.default.isValidElement(children) ? /*#__PURE__*/_react.default.cloneElement(children, (0,
|
|
60
|
-
isView: true
|
|
61
|
-
|
|
62
|
-
checked: type === 'Switch' ? originalValue : undefined
|
|
63
|
-
})) : undefined;
|
|
60
|
+
return /*#__PURE__*/_react.default.isValidElement(children) ? /*#__PURE__*/_react.default.cloneElement(children, (0, _objectSpread3.default)((0, _objectSpread3.default)({}, children.props), {}, (0, _defineProperty2.default)({
|
|
61
|
+
isView: true
|
|
62
|
+
}, valuePropName, originalValue))) : undefined;
|
|
64
63
|
}, [originalValue, children]);
|
|
65
64
|
if (!isWatch || noChange) {
|
|
66
|
-
return /*#__PURE__*/_react.default.isValidElement(children) && /*#__PURE__*/_react.default.cloneElement(children, (0,
|
|
65
|
+
return /*#__PURE__*/_react.default.isValidElement(children) && /*#__PURE__*/_react.default.cloneElement(children, (0, _objectSpread3.default)((0, _objectSpread3.default)({}, children.props), rest));
|
|
67
66
|
}
|
|
68
67
|
var tipOpenCalc = function tipOpenCalc() {
|
|
69
68
|
if (!toolTip) return false;
|
|
@@ -80,17 +79,27 @@ var ChangedWrapper = function ChangedWrapper(props) {
|
|
|
80
79
|
});
|
|
81
80
|
return (0, _jsxRuntime.jsx)(_antd.Tooltip, {
|
|
82
81
|
open: tipOpenCalc(),
|
|
82
|
+
mouseEnterDelay: 1,
|
|
83
83
|
getPopupContainer: function getPopupContainer(target) {
|
|
84
84
|
return target.parentElement;
|
|
85
85
|
},
|
|
86
86
|
title: (0, _jsxRuntime.jsxs)(_antd.Space, {
|
|
87
|
-
|
|
87
|
+
direction: "vertical",
|
|
88
|
+
children: [(0, _jsxRuntime.jsxs)(_antd.Space, {
|
|
89
|
+
children: ["\u521D\u59CB\u503C\uFF1A", tipContent]
|
|
90
|
+
}), ((_children$props = children.props) === null || _children$props === void 0 ? void 0 : _children$props.showEllipse) && (0, _jsxRuntime.jsxs)(_antd.Space, {
|
|
91
|
+
children: ["\u5F53\u524D\u503C\uFF1A", /*#__PURE__*/_react.default.isValidElement(children) ? /*#__PURE__*/_react.default.cloneElement(children, (0, _objectSpread3.default)((0, _objectSpread3.default)((0, _objectSpread3.default)({}, children.props), rest), {}, {
|
|
92
|
+
isView: true
|
|
93
|
+
})) : undefined]
|
|
94
|
+
})]
|
|
88
95
|
}),
|
|
89
96
|
placement: "topLeft",
|
|
90
97
|
children: (0, _jsxRuntime.jsx)("div", {
|
|
91
98
|
className: diffClassName,
|
|
92
99
|
style: style,
|
|
93
|
-
children: /*#__PURE__*/_react.default.isValidElement(children) ? /*#__PURE__*/_react.default.cloneElement(children, (0,
|
|
100
|
+
children: /*#__PURE__*/_react.default.isValidElement(children) ? /*#__PURE__*/_react.default.cloneElement(children, (0, _objectSpread3.default)((0, _objectSpread3.default)((0, _objectSpread3.default)({}, children.props), rest), {}, {
|
|
101
|
+
isDiffChange: isChanged
|
|
102
|
+
})) : undefined
|
|
94
103
|
})
|
|
95
104
|
});
|
|
96
105
|
};
|
|
@@ -136,7 +136,7 @@ var splitNameStr = exports.splitNameStr = function splitNameStr(name) {
|
|
|
136
136
|
});
|
|
137
137
|
};
|
|
138
138
|
// 过滤掉字段名中包含 '-' 的字段
|
|
139
|
-
var
|
|
139
|
+
var _filterInternalFields = exports.filterInternalFields = function filterInternalFields(values, optimize) {
|
|
140
140
|
if (optimize) {
|
|
141
141
|
return values;
|
|
142
142
|
}
|
|
@@ -150,20 +150,20 @@ var filterInternalFields = exports.filterInternalFields = function filterInterna
|
|
|
150
150
|
}
|
|
151
151
|
if (Array.isArray(nextValues)) {
|
|
152
152
|
return nextValues.map(function (item) {
|
|
153
|
-
return
|
|
153
|
+
return _filterInternalFields(item);
|
|
154
154
|
});
|
|
155
155
|
}
|
|
156
156
|
if ((0, _lodash.isObject)(nextValues)) {
|
|
157
157
|
var result = {};
|
|
158
158
|
Object.keys(nextValues).forEach(function (key) {
|
|
159
159
|
if (key.includes('-')) return;
|
|
160
|
-
result[key] =
|
|
160
|
+
result[key] = _filterInternalFields(nextValues[key]);
|
|
161
161
|
});
|
|
162
162
|
return result;
|
|
163
163
|
}
|
|
164
164
|
return nextValues;
|
|
165
165
|
};
|
|
166
|
-
var
|
|
166
|
+
var _getAllNamePath = exports.getAllNamePath = function getAllNamePath(object) {
|
|
167
167
|
var currentPath = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
|
|
168
168
|
var keys = Object.keys(object);
|
|
169
169
|
var resultKeys = [];
|
|
@@ -177,7 +177,7 @@ var getAllNamePath = exports.getAllNamePath = function getAllNamePath(object) {
|
|
|
177
177
|
}
|
|
178
178
|
// 深度获取对象key
|
|
179
179
|
if ((0, _lodash.isObject)(value)) {
|
|
180
|
-
resultKeys.concat(
|
|
180
|
+
resultKeys.concat(_getAllNamePath(value, [].concat((0, _toConsumableArray2.default)(currentPath), [key])));
|
|
181
181
|
}
|
|
182
182
|
resultKeys.push([].concat((0, _toConsumableArray2.default)(currentPath), [key]));
|
|
183
183
|
});
|
|
@@ -320,7 +320,7 @@ var customEqualForFun = exports.customEqualForFun = function customEqualForFun(v
|
|
|
320
320
|
/**
|
|
321
321
|
* 查询数据中是否包含rowKey
|
|
322
322
|
*/
|
|
323
|
-
var
|
|
323
|
+
var _hasRowKey = exports.hasRowKey = function hasRowKey(obj) {
|
|
324
324
|
if ((0, _typeof2.default)(obj) !== 'object' || obj === null) {
|
|
325
325
|
return false;
|
|
326
326
|
}
|
|
@@ -330,7 +330,7 @@ var hasRowKey = exports.hasRowKey = function hasRowKey(obj) {
|
|
|
330
330
|
return true;
|
|
331
331
|
}
|
|
332
332
|
return keys.some(function (key) {
|
|
333
|
-
return
|
|
333
|
+
return _hasRowKey(obj[key]);
|
|
334
334
|
});
|
|
335
335
|
};
|
|
336
336
|
/**
|
|
@@ -346,7 +346,7 @@ var view = exports.view = function view(obj) {
|
|
|
346
346
|
return true;
|
|
347
347
|
}
|
|
348
348
|
return keys.some(function (key) {
|
|
349
|
-
return
|
|
349
|
+
return _hasRowKey(obj[key]);
|
|
350
350
|
});
|
|
351
351
|
};
|
|
352
352
|
/**
|
|
@@ -382,7 +382,7 @@ var deleteForPath = exports.deleteForPath = function deleteForPath(values, nameP
|
|
|
382
382
|
* @param value 选中值
|
|
383
383
|
* @returns {}
|
|
384
384
|
*/
|
|
385
|
-
var
|
|
385
|
+
var _findOptionByValue = exports.findOptionByValue = function findOptionByValue(treeData, value, fieldNames) {
|
|
386
386
|
if ((0, _lodash.isObject)(value)) {
|
|
387
387
|
return value;
|
|
388
388
|
}
|
|
@@ -392,7 +392,7 @@ var findOptionByValue = exports.findOptionByValue = function findOptionByValue(t
|
|
|
392
392
|
return (0, _lodash.omit)(node, ['children', fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children]);
|
|
393
393
|
}
|
|
394
394
|
if (node.children) {
|
|
395
|
-
var foundNode =
|
|
395
|
+
var foundNode = _findOptionByValue(node[(fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children) || 'children'], value, fieldNames);
|
|
396
396
|
if (foundNode) {
|
|
397
397
|
return (0, _lodash.omit)(foundNode, ['children', fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children]);
|
|
398
398
|
}
|