@zat-design/sisyphus-react 3.8.0-beat.5 → 3.8.0-beat.7
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 +5 -5
- package/es/ProDownload/index.d.ts +1 -1
- package/es/ProDownload/index.js +3 -3
- package/es/ProDownload/utils.js +3 -3
- package/es/ProDrawerForm/components/ProDrawer/index.js +4 -4
- package/es/ProDrawerForm/components/ProModal/index.js +3 -3
- package/es/ProEditLabel/index.js +3 -3
- package/es/ProEditTable/components/ActionButton/index.d.ts +1 -1
- package/es/ProEditTable/components/ActionButton/index.js +3 -3
- 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/RenderField/index.js +5 -5
- package/es/ProEditTable/components/RenderToolbar/index.d.ts +1 -1
- package/es/ProEditTable/components/RenderToolbar/index.js +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/config.js +2 -2
- package/es/ProEditTable/utils/index.js +5 -5
- package/es/ProEditTable/utils/tools.js +4 -4
- package/es/ProEnum/components/Group.d.ts +1 -1
- package/es/ProEnum/components/Tag.d.ts +1 -1
- package/es/ProEnum/hooks/useEnumRequest.js +2 -2
- package/es/ProEnum/index.d.ts +2 -2
- package/es/ProEnum/index.js +1 -1
- package/es/ProEnum/utils/eventCenter.js +2 -1
- 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/FormList/components/ActionButton.js +2 -2
- package/es/ProForm/components/combination/FormList/components/BlockTitle.js +1 -1
- package/es/ProForm/components/combination/FormList/components/ToolbarButton.js +1 -1
- package/es/ProForm/components/combination/FormList/utils.js +1 -1
- package/es/ProForm/components/combination/Group/component/ComRender.js +1 -1
- package/es/ProForm/components/combination/ProCascader/index.d.ts +1 -1
- package/es/ProForm/components/combination/ProCascader/index.js +8 -9
- package/es/ProForm/components/combination/ProModalSelect/hooks/useRequestList.js +1 -1
- package/es/ProForm/components/combination/ProModalSelect/index.js +12 -6
- package/es/ProForm/components/combination/ProModalSelect/propsType.d.ts +1 -0
- 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 +2 -1
- package/es/ProForm/components/old/ProAddress/index.js +1 -1
- package/es/ProForm/components/old/ProRangeBox/index.d.ts +2 -1
- package/es/ProForm/components/render/ConfirmWrapper.js +1 -1
- package/es/ProForm/components/render/Render.js +3 -3
- package/es/ProForm/index.js +1 -1
- package/es/ProForm/utils/index.js +10 -14
- package/es/ProForm/utils/useForm.js +1 -1
- package/es/ProIcon/utils/index.js +3 -4
- 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/Listener/index.js +1 -1
- package/es/ProStep/components/Step/index.d.ts +1 -1
- package/es/ProStep/index.d.ts +2 -2
- package/es/ProStep/index.js +3 -3
- 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/index.js +2 -2
- package/es/ProTable/components/RcTable/components/DraggableTable/components/DndWrapper/utils/index.js +8 -9
- 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/hooks/useAntdTable.js +3 -3
- package/es/ProTable/index.d.ts +1 -1
- package/es/ProTable/index.js +2 -2
- 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 +2 -1
- package/es/ProTree/components/List.d.ts +1 -1
- package/es/ProTree/components/ProTree.d.ts +1 -1
- package/es/ProTree/components/ProTree.js +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 +4 -4
- package/es/ProTree/index.d.ts +1 -1
- package/es/ProTree/utils.js +11 -12
- package/es/ProTreeModal/components/Cascader.d.ts +1 -1
- package/es/ProTreeModal/components/CloseIcon.d.ts +2 -1
- 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/index.js +3 -3
- package/es/ProTreeModal/utils.js +14 -16
- package/es/ProUpload/components/DraggableUploadListItem.d.ts +1 -1
- package/es/ProUpload/components/ImageRender.js +1 -1
- package/es/ProViewer/index.js +2 -2
- package/es/old/ProEditableTable/index.js +4 -4
- package/lib/ProAction/index.js +5 -5
- package/lib/ProDownload/index.d.ts +1 -1
- package/lib/ProDownload/index.js +3 -3
- package/lib/ProDownload/utils.js +3 -3
- package/lib/ProDrawerForm/components/ProDrawer/index.js +4 -4
- package/lib/ProDrawerForm/components/ProModal/index.js +3 -3
- package/lib/ProEditLabel/index.js +3 -3
- package/lib/ProEditTable/components/ActionButton/index.d.ts +1 -1
- package/lib/ProEditTable/components/ActionButton/index.js +3 -3
- 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/RenderField/index.js +5 -5
- package/lib/ProEditTable/components/RenderToolbar/index.d.ts +1 -1
- package/lib/ProEditTable/components/RenderToolbar/index.js +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/config.js +2 -2
- package/lib/ProEditTable/utils/index.js +5 -5
- package/lib/ProEditTable/utils/tools.js +4 -4
- package/lib/ProEnum/components/Group.d.ts +1 -1
- package/lib/ProEnum/components/Tag.d.ts +1 -1
- package/lib/ProEnum/hooks/useEnumRequest.js +2 -2
- package/lib/ProEnum/index.d.ts +2 -2
- package/lib/ProEnum/index.js +1 -1
- package/lib/ProEnum/utils/eventCenter.js +2 -1
- 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/FormList/components/ActionButton.js +2 -2
- package/lib/ProForm/components/combination/FormList/components/BlockTitle.js +1 -1
- package/lib/ProForm/components/combination/FormList/components/ToolbarButton.js +1 -1
- package/lib/ProForm/components/combination/FormList/utils.js +1 -1
- package/lib/ProForm/components/combination/Group/component/ComRender.js +1 -1
- package/lib/ProForm/components/combination/ProCascader/index.d.ts +1 -1
- package/lib/ProForm/components/combination/ProCascader/index.js +8 -9
- package/lib/ProForm/components/combination/ProModalSelect/hooks/useRequestList.js +1 -1
- package/lib/ProForm/components/combination/ProModalSelect/index.js +12 -6
- package/lib/ProForm/components/combination/ProModalSelect/propsType.d.ts +1 -0
- 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 +2 -1
- package/lib/ProForm/components/old/ProAddress/index.js +1 -1
- package/lib/ProForm/components/old/ProRangeBox/index.d.ts +2 -1
- package/lib/ProForm/components/render/ConfirmWrapper.js +1 -1
- package/lib/ProForm/components/render/Render.js +3 -3
- package/lib/ProForm/index.js +1 -1
- package/lib/ProForm/utils/index.js +10 -10
- package/lib/ProForm/utils/useForm.js +1 -1
- 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/Listener/index.js +1 -1
- package/lib/ProStep/components/Step/index.d.ts +1 -1
- package/lib/ProStep/index.d.ts +2 -2
- package/lib/ProStep/index.js +3 -3
- 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/index.js +2 -2
- 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/hooks/useAntdTable.js +3 -3
- package/lib/ProTable/index.d.ts +1 -1
- package/lib/ProTable/index.js +2 -2
- 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 +2 -1
- package/lib/ProTree/components/List.d.ts +1 -1
- package/lib/ProTree/components/ProTree.d.ts +1 -1
- package/lib/ProTree/components/ProTree.js +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 +4 -4
- 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 +2 -1
- 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/index.js +3 -3
- package/lib/ProTreeModal/utils.js +13 -13
- package/lib/ProUpload/components/DraggableUploadListItem.d.ts +1 -1
- package/lib/ProUpload/components/ImageRender.js +1 -1
- package/lib/ProViewer/index.js +2 -2
- package/lib/old/ProEditableTable/index.js +4 -4
- package/package.json +1 -1
- package/.vscode/extensions.json +0 -5
|
@@ -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 _objectSpread(_objectSpread({}, item), {}, _defineProperty({}, (fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children) || 'children', level === 1 ? [] :
|
|
34
|
+
return _objectSpread(_objectSpread({}, item), {}, _defineProperty({}, (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 = useMemo(function () {
|
|
98
98
|
var innerDataSource = dataSource || (addressCode ? enumDataSource : []);
|
|
99
|
-
var result = transformDataName(isAddressMode && realLevel === 2 ?
|
|
99
|
+
var result = transformDataName(isAddressMode && realLevel === 2 ? filterDataSource(innerDataSource, level, fieldNames) : innerDataSource, fieldNames);
|
|
100
100
|
if (transformResponse) {
|
|
101
101
|
return transformResponse(result);
|
|
102
102
|
}
|
|
@@ -115,7 +115,7 @@ var ProCascader = function ProCascader(props) {
|
|
|
115
115
|
defaultLabel = _useState4[0],
|
|
116
116
|
setDefaultLabel = _useState4[1];
|
|
117
117
|
var getFirstLevelOptions = /*#__PURE__*/function () {
|
|
118
|
-
var _ref6 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
|
|
118
|
+
var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
|
|
119
119
|
var _yield$service, data, newData, transFormData, serviceData;
|
|
120
120
|
return _regeneratorRuntime().wrap(function _callee$(_context) {
|
|
121
121
|
while (1) switch (_context.prev = _context.next) {
|
|
@@ -134,7 +134,7 @@ var ProCascader = function ProCascader(props) {
|
|
|
134
134
|
value: fieldNames.value,
|
|
135
135
|
children: (fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children) || 'children'
|
|
136
136
|
});
|
|
137
|
-
serviceData = isAddressMode && realLevel === 2 ?
|
|
137
|
+
serviceData = isAddressMode && realLevel === 2 ? filterDataSource(transFormData, level, fieldNames) : transFormData;
|
|
138
138
|
setServiceData(serviceData);
|
|
139
139
|
case 9:
|
|
140
140
|
case "end":
|
|
@@ -199,7 +199,7 @@ var ProCascader = function ProCascader(props) {
|
|
|
199
199
|
})) === null || _ref7$filter === void 0 ? void 0 : _ref7$filter.join(separator)) || '-' : (defaultLabel === null || defaultLabel === void 0 ? void 0 : (_defaultLabel$filter = defaultLabel.filter(function (item) {
|
|
200
200
|
return !!item;
|
|
201
201
|
})) === null || _defaultLabel$filter === void 0 ? void 0 : _defaultLabel$filter.join(separator)) || '-';
|
|
202
|
-
var
|
|
202
|
+
var findSelectedOptions = function findSelectedOptions(options, value) {
|
|
203
203
|
var path = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : [];
|
|
204
204
|
var _value = value !== null && value !== void 0 ? value : [];
|
|
205
205
|
// 基准情况:如果 value 数组为空,且 path 不为空,说明找到了完整的路径
|
|
@@ -218,7 +218,7 @@ var ProCascader = function ProCascader(props) {
|
|
|
218
218
|
if (foundOption) {
|
|
219
219
|
// 如果找到了匹配的选项,并且还有更多的 value 需要匹配,递归地在子选项中查找
|
|
220
220
|
if (_value.length > 1 && foundOption.children) {
|
|
221
|
-
return
|
|
221
|
+
return findSelectedOptions(foundOption.children, _value.slice(1), [].concat(_toConsumableArray(path), [foundOption]));
|
|
222
222
|
}
|
|
223
223
|
// 如果没有更多的 value 需要匹配,返回当前选项(以及之前的路径)
|
|
224
224
|
return [].concat(_toConsumableArray(path), [foundOption]);
|
|
@@ -227,7 +227,7 @@ var ProCascader = function ProCascader(props) {
|
|
|
227
227
|
return null;
|
|
228
228
|
};
|
|
229
229
|
var _selectedOptions = useMemo(function () {
|
|
230
|
-
return
|
|
230
|
+
return findSelectedOptions(service ? serviceData : realDataSource, addressValue);
|
|
231
231
|
}, [service, serviceData, realDataSource, addressValue]);
|
|
232
232
|
var handleAddressChange = function handleAddressChange(e) {
|
|
233
233
|
var cascaderValue = value === null || value === void 0 ? void 0 : value.slice(0, realLevel);
|
|
@@ -243,7 +243,6 @@ var ProCascader = function ProCascader(props) {
|
|
|
243
243
|
}
|
|
244
244
|
}
|
|
245
245
|
};
|
|
246
|
-
console.log(service, serviceData, realDataSource);
|
|
247
246
|
return realIsView ? _jsx(Container, {
|
|
248
247
|
tooltip: !!tooltip,
|
|
249
248
|
viewEmpty: viewEmpty,
|
|
@@ -24,7 +24,7 @@ var useDefaultOptions = function useDefaultOptions(options) {
|
|
|
24
24
|
});
|
|
25
25
|
};
|
|
26
26
|
var defaultService = /*#__PURE__*/function () {
|
|
27
|
-
var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
|
|
27
|
+
var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
|
|
28
28
|
return _regeneratorRuntime().wrap(function _callee$(_context) {
|
|
29
29
|
while (1) switch (_context.prev = _context.next) {
|
|
30
30
|
case 0:
|
|
@@ -19,7 +19,7 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
|
|
|
19
19
|
import "antd/es/form/style";
|
|
20
20
|
import _Form from "antd/es/form";
|
|
21
21
|
import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
|
|
22
|
-
var _excluded = ["value", "onChange", "disabled", "labelInValue", "fieldNames", "readOnly", "addonAfter", "configOption", "title", "onFormat", "showCodeName", "optionRender", "customRender", "style", "className", "beforeOpen", "isTooltip", "searchForm", "searchKey", "defaultOne"],
|
|
22
|
+
var _excluded = ["value", "onChange", "disabled", "labelInValue", "fieldNames", "readOnly", "addonAfter", "configOption", "title", "onFormat", "showCodeName", "optionRender", "customRender", "style", "className", "beforeOpen", "afterOpen", "isTooltip", "searchForm", "searchKey", "defaultOne"],
|
|
23
23
|
_excluded2 = ["onOk"],
|
|
24
24
|
_excluded3 = ["rowKey", "columns", "rowSelection"];
|
|
25
25
|
import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
|
|
@@ -53,6 +53,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
|
|
|
53
53
|
style = props.style,
|
|
54
54
|
className = props.className,
|
|
55
55
|
beforeOpen = props.beforeOpen,
|
|
56
|
+
afterOpen = props.afterOpen,
|
|
56
57
|
isTooltip = props.isTooltip,
|
|
57
58
|
searchForm = props.searchForm,
|
|
58
59
|
searchKey = props.searchKey,
|
|
@@ -237,7 +238,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
|
|
|
237
238
|
onChange(val, option);
|
|
238
239
|
};
|
|
239
240
|
var handleClick = /*#__PURE__*/function () {
|
|
240
|
-
var _ref7 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
|
|
241
|
+
var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
|
|
241
242
|
var _yield$beforeOpen, res;
|
|
242
243
|
return _regeneratorRuntime().wrap(function _callee$(_context) {
|
|
243
244
|
while (1) switch (_context.prev = _context.next) {
|
|
@@ -272,6 +273,11 @@ var ProModalSelect = function ProModalSelect(props, ref) {
|
|
|
272
273
|
setState({
|
|
273
274
|
onOff: true
|
|
274
275
|
});
|
|
276
|
+
setTimeout(function () {
|
|
277
|
+
afterOpen === null || afterOpen === void 0 ? void 0 : afterOpen({
|
|
278
|
+
setInnerState: setState
|
|
279
|
+
});
|
|
280
|
+
}, 100);
|
|
275
281
|
}
|
|
276
282
|
case 14:
|
|
277
283
|
case "end":
|
|
@@ -299,7 +305,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
|
|
|
299
305
|
}
|
|
300
306
|
};
|
|
301
307
|
var handleFinish = /*#__PURE__*/function () {
|
|
302
|
-
var _ref8 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
|
|
308
|
+
var _ref8 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
|
|
303
309
|
var _nextSelectedRows, _nextSelectedRows2, nextSelectedRows, record, flag, res;
|
|
304
310
|
return _regeneratorRuntime().wrap(function _callee2$(_context2) {
|
|
305
311
|
while (1) switch (_context2.prev = _context2.next) {
|
|
@@ -364,7 +370,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
|
|
|
364
370
|
};
|
|
365
371
|
}();
|
|
366
372
|
var handleSearch = /*#__PURE__*/function () {
|
|
367
|
-
var _ref9 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
|
|
373
|
+
var _ref9 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
|
|
368
374
|
var values;
|
|
369
375
|
return _regeneratorRuntime().wrap(function _callee3$(_context3) {
|
|
370
376
|
while (1) switch (_context3.prev = _context3.next) {
|
|
@@ -437,7 +443,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
|
|
|
437
443
|
};
|
|
438
444
|
// 初始化回显,当传入initParams时,前端用来回险
|
|
439
445
|
var getInitValues = /*#__PURE__*/function () {
|
|
440
|
-
var _ref10 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
|
|
446
|
+
var _ref10 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
|
|
441
447
|
var _contentForm$getField, _useRequest$options2, _useRequest$options3, queryBean, page, params, res, _res$data2, _list, list, _data, nextSelectRowKeys;
|
|
442
448
|
return _regeneratorRuntime().wrap(function _callee4$(_context4) {
|
|
443
449
|
while (1) switch (_context4.prev = _context4.next) {
|
|
@@ -500,7 +506,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
|
|
|
500
506
|
}();
|
|
501
507
|
// 初始化回显,当传入initParams时,前端用来回险
|
|
502
508
|
var getDefaultOneValues = /*#__PURE__*/function () {
|
|
503
|
-
var _ref11 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee5() {
|
|
509
|
+
var _ref11 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5() {
|
|
504
510
|
var _useRequest$options4, _useRequest$options5;
|
|
505
511
|
var queryBean, page, params, res, _res$data3, _list2, list, _data2, nextSelectRowKeys;
|
|
506
512
|
return _regeneratorRuntime().wrap(function _callee5$(_context5) {
|
|
@@ -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) =>
|
|
15
|
+
declare const InputRange: ({ value, onChange, min, max, group, disabled, precision, isPositiveInteger, }: InputRangeProps) => JSX.Element;
|
|
16
16
|
export default InputRange;
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
/// <reference types="react" />
|
|
1
2
|
import { ProAddressPropsType } from './propsTypes';
|
|
2
3
|
export declare const transferAddressInfoToRegion: () => {
|
|
3
4
|
normalize: (value: any) => {
|
|
@@ -23,5 +24,5 @@ export declare const transferAddressInfoToRegion: () => {
|
|
|
23
24
|
};
|
|
24
25
|
};
|
|
25
26
|
};
|
|
26
|
-
export declare function ProAddress({ ...props }: ProAddressPropsType):
|
|
27
|
+
export declare function ProAddress({ ...props }: ProAddressPropsType): JSX.Element;
|
|
27
28
|
export default ProAddress;
|
|
@@ -92,7 +92,7 @@ export function ProAddress(_ref3) {
|
|
|
92
92
|
secondCitys = _useState6[0],
|
|
93
93
|
setSecondCitys = _useState6[1];
|
|
94
94
|
var queryCity = /*#__PURE__*/function () {
|
|
95
|
-
var _ref5 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(code, type) {
|
|
95
|
+
var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(code, type) {
|
|
96
96
|
var cityList, _cityList, newList, _secondCitys;
|
|
97
97
|
return _regeneratorRuntime().wrap(function _callee$(_context) {
|
|
98
98
|
while (1) switch (_context.prev = _context.next) {
|
|
@@ -1,2 +1,3 @@
|
|
|
1
|
+
/// <reference types="react" />
|
|
1
2
|
import { ProRangeBoxPropsType } from './propsType';
|
|
2
|
-
export default function ProRangeBox({ configOption }: ProRangeBoxPropsType):
|
|
3
|
+
export default function ProRangeBox({ configOption }: ProRangeBoxPropsType): JSX.Element;
|
|
@@ -22,7 +22,7 @@ var ConfirmWrapper = function ConfirmWrapper(props) {
|
|
|
22
22
|
var _ProForm$useFieldProp = ProForm.useFieldProps(),
|
|
23
23
|
form = _ProForm$useFieldProp.form;
|
|
24
24
|
var handleChange = /*#__PURE__*/function () {
|
|
25
|
-
var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(value) {
|
|
25
|
+
var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(value) {
|
|
26
26
|
var _len,
|
|
27
27
|
other,
|
|
28
28
|
_key,
|
|
@@ -240,7 +240,7 @@ var Render = function Render(props) {
|
|
|
240
240
|
_args = functionArgs([].concat(args));
|
|
241
241
|
}
|
|
242
242
|
var inList = _otherFormItemProps === null || _otherFormItemProps === void 0 ? void 0 : (_otherFormItemProps$n3 = _otherFormItemProps.namePath) === null || _otherFormItemProps$n3 === void 0 ? void 0 : _otherFormItemProps$n3.length;
|
|
243
|
-
if (/*#__PURE__*/React.isValidElement(AutoComponent)) {
|
|
243
|
+
if ( /*#__PURE__*/React.isValidElement(AutoComponent)) {
|
|
244
244
|
var _AutoComponent$props$, _AutoComponent$props, _lastComponentProps$c;
|
|
245
245
|
((_AutoComponent$props$ = (_AutoComponent$props = AutoComponent === null || AutoComponent === void 0 ? void 0 : AutoComponent.props)[changeKey]) === null || _AutoComponent$props$ === void 0 ? void 0 : _AutoComponent$props$.call.apply(_AutoComponent$props$, [_AutoComponent$props].concat(_toConsumableArray(_args)))) || ((_lastComponentProps$c = lastComponentProps[changeKey]) === null || _lastComponentProps$c === void 0 ? void 0 : _lastComponentProps$c.call.apply(_lastComponentProps$c, [lastComponentProps].concat(_toConsumableArray(_args))));
|
|
246
246
|
return false;
|
|
@@ -290,7 +290,7 @@ var Render = function Render(props) {
|
|
|
290
290
|
* onBlur参数重置 (value, record, { form, index, namePath, option }) => void
|
|
291
291
|
*/
|
|
292
292
|
var handleBlur = /*#__PURE__*/function () {
|
|
293
|
-
var _ref7 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
|
|
293
|
+
var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
|
|
294
294
|
var _len3,
|
|
295
295
|
args,
|
|
296
296
|
_key3,
|
|
@@ -373,7 +373,7 @@ var Render = function Render(props) {
|
|
|
373
373
|
if (originComponent) {
|
|
374
374
|
delete childProps.otherProps;
|
|
375
375
|
}
|
|
376
|
-
var child = /*#__PURE__*/React.isValidElement(AutoComponent) ? (/*#__PURE__*/React.cloneElement(AutoComponent, childProps)) : _jsx(AutoComponent, _objectSpread(_objectSpread({}, omit(lastComponentProps, [].concat(lastComponentPropsFilter, ['debounceWait']))), {}, {
|
|
376
|
+
var child = /*#__PURE__*/React.isValidElement(AutoComponent) ? ( /*#__PURE__*/React.cloneElement(AutoComponent, childProps)) : _jsx(AutoComponent, _objectSpread(_objectSpread({}, omit(lastComponentProps, [].concat(lastComponentPropsFilter, ['debounceWait']))), {}, {
|
|
377
377
|
otherProps: _objectSpread(_objectSpread({}, otherProps), {}, {
|
|
378
378
|
show: show,
|
|
379
379
|
disabled: lastDisabled,
|
package/es/ProForm/index.js
CHANGED
|
@@ -200,7 +200,7 @@ var ProForm = function ProForm(props, ref) {
|
|
|
200
200
|
if (isView || disabled) {
|
|
201
201
|
// 查看或禁用模式
|
|
202
202
|
footerEle = null;
|
|
203
|
-
} else if (/*#__PURE__*/React.isValidElement(footer)) {
|
|
203
|
+
} else if ( /*#__PURE__*/React.isValidElement(footer)) {
|
|
204
204
|
// 传入组件渲染组件
|
|
205
205
|
footerEle = footer;
|
|
206
206
|
} else if (footer === undefined || footer || isObject(footer)) {
|
|
@@ -120,7 +120,7 @@ export var splitNameStr = function splitNameStr(name) {
|
|
|
120
120
|
});
|
|
121
121
|
};
|
|
122
122
|
// 过滤掉字段名中包含 '-' 的字段
|
|
123
|
-
var
|
|
123
|
+
export var filterInternalFields = function filterInternalFields(values, optimize) {
|
|
124
124
|
if (optimize) {
|
|
125
125
|
return values;
|
|
126
126
|
}
|
|
@@ -134,21 +134,20 @@ var _filterInternalFields = function filterInternalFields(values, optimize) {
|
|
|
134
134
|
}
|
|
135
135
|
if (Array.isArray(nextValues)) {
|
|
136
136
|
return nextValues.map(function (item) {
|
|
137
|
-
return
|
|
137
|
+
return filterInternalFields(item);
|
|
138
138
|
});
|
|
139
139
|
}
|
|
140
140
|
if (isObject(nextValues)) {
|
|
141
141
|
var result = {};
|
|
142
142
|
Object.keys(nextValues).forEach(function (key) {
|
|
143
143
|
if (key.includes('-')) return;
|
|
144
|
-
result[key] =
|
|
144
|
+
result[key] = filterInternalFields(nextValues[key]);
|
|
145
145
|
});
|
|
146
146
|
return result;
|
|
147
147
|
}
|
|
148
148
|
return nextValues;
|
|
149
149
|
};
|
|
150
|
-
export
|
|
151
|
-
var _getAllNamePath = function getAllNamePath(object) {
|
|
150
|
+
export var getAllNamePath = function getAllNamePath(object) {
|
|
152
151
|
var currentPath = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
|
|
153
152
|
var keys = Object.keys(object);
|
|
154
153
|
var resultKeys = [];
|
|
@@ -162,14 +161,13 @@ var _getAllNamePath = function getAllNamePath(object) {
|
|
|
162
161
|
}
|
|
163
162
|
// 深度获取对象key
|
|
164
163
|
if (isObject(value)) {
|
|
165
|
-
resultKeys.concat(
|
|
164
|
+
resultKeys.concat(getAllNamePath(value, [].concat(_toConsumableArray(currentPath), [key])));
|
|
166
165
|
}
|
|
167
166
|
resultKeys.push([].concat(_toConsumableArray(currentPath), [key]));
|
|
168
167
|
});
|
|
169
168
|
return resultKeys;
|
|
170
169
|
};
|
|
171
170
|
// 判断一个字段值是否算空
|
|
172
|
-
export { _getAllNamePath as getAllNamePath };
|
|
173
171
|
var nullList = [undefined, 'null', '""', '[]'];
|
|
174
172
|
export var isNullValue = function isNullValue(value) {
|
|
175
173
|
return nullList.includes(JSON.stringify(value));
|
|
@@ -306,7 +304,7 @@ export var customEqualForFun = function customEqualForFun(value, other) {
|
|
|
306
304
|
/**
|
|
307
305
|
* 查询数据中是否包含rowKey
|
|
308
306
|
*/
|
|
309
|
-
var
|
|
307
|
+
export var hasRowKey = function hasRowKey(obj) {
|
|
310
308
|
if (_typeof(obj) !== 'object' || obj === null) {
|
|
311
309
|
return false;
|
|
312
310
|
}
|
|
@@ -316,13 +314,12 @@ var _hasRowKey = function hasRowKey(obj) {
|
|
|
316
314
|
return true;
|
|
317
315
|
}
|
|
318
316
|
return keys.some(function (key) {
|
|
319
|
-
return
|
|
317
|
+
return hasRowKey(obj[key]);
|
|
320
318
|
});
|
|
321
319
|
};
|
|
322
320
|
/**
|
|
323
321
|
* 查询数据中是否包含rowKey
|
|
324
322
|
*/
|
|
325
|
-
export { _hasRowKey as hasRowKey };
|
|
326
323
|
export var view = function view(obj) {
|
|
327
324
|
if (_typeof(obj) !== 'object' || obj === null) {
|
|
328
325
|
return false;
|
|
@@ -333,7 +330,7 @@ export var view = function view(obj) {
|
|
|
333
330
|
return true;
|
|
334
331
|
}
|
|
335
332
|
return keys.some(function (key) {
|
|
336
|
-
return
|
|
333
|
+
return hasRowKey(obj[key]);
|
|
337
334
|
});
|
|
338
335
|
};
|
|
339
336
|
/**
|
|
@@ -369,7 +366,7 @@ export var deleteForPath = function deleteForPath(values, namePath) {
|
|
|
369
366
|
* @param value 选中值
|
|
370
367
|
* @returns {}
|
|
371
368
|
*/
|
|
372
|
-
var
|
|
369
|
+
export var findOptionByValue = function findOptionByValue(treeData, value, fieldNames) {
|
|
373
370
|
if (isObject(value)) {
|
|
374
371
|
return value;
|
|
375
372
|
}
|
|
@@ -379,7 +376,7 @@ var _findOptionByValue = function findOptionByValue(treeData, value, fieldNames)
|
|
|
379
376
|
return omit(node, ['children', fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children]);
|
|
380
377
|
}
|
|
381
378
|
if (node.children) {
|
|
382
|
-
var foundNode =
|
|
379
|
+
var foundNode = findOptionByValue(node[(fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children) || 'children'], value, fieldNames);
|
|
383
380
|
if (foundNode) {
|
|
384
381
|
return omit(foundNode, ['children', fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children]);
|
|
385
382
|
}
|
|
@@ -389,7 +386,6 @@ var _findOptionByValue = function findOptionByValue(treeData, value, fieldNames)
|
|
|
389
386
|
/**
|
|
390
387
|
* 对比依赖列表中的 值是否变更
|
|
391
388
|
*/
|
|
392
|
-
export { _findOptionByValue as findOptionByValue };
|
|
393
389
|
export var equalDependencies = function equalDependencies(dependencies, prevValues, currentValues) {
|
|
394
390
|
if (dependencies === null || dependencies === void 0 ? void 0 : dependencies.length) {
|
|
395
391
|
return dependencies.some(function (namePath) {
|
|
@@ -38,7 +38,7 @@ export var useForm = function useForm(originForm, options) {
|
|
|
38
38
|
return getFieldsValue(nameList, filterFunc);
|
|
39
39
|
};
|
|
40
40
|
var _validateFields = /*#__PURE__*/function () {
|
|
41
|
-
var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(nameList) {
|
|
41
|
+
var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(nameList) {
|
|
42
42
|
var _rest$,
|
|
43
43
|
_len,
|
|
44
44
|
rest,
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
|
|
2
2
|
import { themeMap, themeFillMap } from '../config';
|
|
3
|
-
var
|
|
3
|
+
export var recurseGetNodes = function recurseGetNodes(type, node, queue) {
|
|
4
4
|
switch (type) {
|
|
5
5
|
// 渐变
|
|
6
6
|
case 'gradation':
|
|
@@ -19,11 +19,10 @@ var _recurseGetNodes = function recurseGetNodes(type, node, queue) {
|
|
|
19
19
|
}
|
|
20
20
|
if (node.childNodes) {
|
|
21
21
|
for (var i = 0; i < node.childNodes.length; i++) {
|
|
22
|
-
|
|
22
|
+
recurseGetNodes(type, node.childNodes[i], queue);
|
|
23
23
|
}
|
|
24
24
|
}
|
|
25
25
|
};
|
|
26
|
-
export { _recurseGetNodes as recurseGetNodes };
|
|
27
26
|
export var onBeforeInjection = function onBeforeInjection(_ref) {
|
|
28
27
|
var svg = _ref.svg,
|
|
29
28
|
actionMap = _ref.actionMap,
|
|
@@ -50,7 +49,7 @@ export var onBeforeInjection = function onBeforeInjection(_ref) {
|
|
|
50
49
|
// 目前只支持处理渐变及fill填充
|
|
51
50
|
var types = Reflect.ownKeys(nodeMap !== null && nodeMap !== void 0 ? nodeMap : {});
|
|
52
51
|
types.forEach(function (typeKey) {
|
|
53
|
-
|
|
52
|
+
recurseGetNodes(typeKey, svg, nodeMap[typeKey]);
|
|
54
53
|
});
|
|
55
54
|
if ((gradList === null || gradList === void 0 ? void 0 : gradList.length) > 0) {
|
|
56
55
|
nodeMap.gradation.forEach(function (item, index) {
|
|
@@ -50,7 +50,7 @@ var OpenMenu = function OpenMenu(props) {
|
|
|
50
50
|
if (!Array.isArray(result) || !result.length) {
|
|
51
51
|
return [];
|
|
52
52
|
}
|
|
53
|
-
var
|
|
53
|
+
var menuDeep = function menuDeep(data) {
|
|
54
54
|
data.forEach(function (item) {
|
|
55
55
|
var _item$keyIdPath, _item$keyIdPath2, _item$children;
|
|
56
56
|
// 是否是第一级菜单,展开模式一级菜单有icon, 收起模式二级菜单有icon
|
|
@@ -91,7 +91,7 @@ var OpenMenu = function OpenMenu(props) {
|
|
|
91
91
|
if ((_item === null || _item === void 0 ? void 0 : _item.hideInMenu) || ['TAB', 'QUERY', 'BUTTON'].includes(_item === null || _item === void 0 ? void 0 : _item.type)) {
|
|
92
92
|
delete item.children;
|
|
93
93
|
} else {
|
|
94
|
-
|
|
94
|
+
menuDeep(item.children);
|
|
95
95
|
}
|
|
96
96
|
} else {
|
|
97
97
|
delete item.children;
|
|
@@ -99,7 +99,7 @@ var OpenMenu = function OpenMenu(props) {
|
|
|
99
99
|
});
|
|
100
100
|
return data;
|
|
101
101
|
};
|
|
102
|
-
|
|
102
|
+
menuDeep(result);
|
|
103
103
|
return result;
|
|
104
104
|
}, [dataSource]);
|
|
105
105
|
useDeepCompareEffect(function () {
|
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
/// <reference types="react" />
|
|
2
2
|
import { ProFooterProps } from './PropTypes';
|
|
3
|
-
declare const _default: import("react").MemoExoticComponent<(props: ProFooterProps) =>
|
|
3
|
+
declare const _default: import("react").MemoExoticComponent<(props: ProFooterProps) => JSX.Element>;
|
|
4
4
|
export default _default;
|
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
2
|
import type { ProHeaderProps } from './PropTypes';
|
|
3
|
-
declare const _default: React.MemoExoticComponent<(props: ProHeaderProps) =>
|
|
3
|
+
declare const _default: React.MemoExoticComponent<(props: ProHeaderProps) => JSX.Element>;
|
|
4
4
|
export default _default;
|
package/es/ProLayout/index.d.ts
CHANGED
|
@@ -5,7 +5,7 @@ export declare const LayoutContext: import("react").Context<{
|
|
|
5
5
|
onSelected: (params: any) => void;
|
|
6
6
|
}>;
|
|
7
7
|
declare const ProLayout: {
|
|
8
|
-
(props: ProLayoutProps):
|
|
8
|
+
(props: ProLayoutProps): JSX.Element;
|
|
9
9
|
defaultProps: {
|
|
10
10
|
menus: any[];
|
|
11
11
|
iconfontUrl: string;
|
|
@@ -17,8 +17,8 @@ declare const ProLayout: {
|
|
|
17
17
|
headerHeight: number;
|
|
18
18
|
contentStyle: {};
|
|
19
19
|
};
|
|
20
|
-
ProCollapse: (props: import("./components/ProCollapse/PropTypes").ProCollapseProps) =>
|
|
21
|
-
ProFooter: import("react").MemoExoticComponent<(props: import("./components/ProFooter/PropTypes").ProFooterProps) =>
|
|
22
|
-
ProHeader: import("react").MemoExoticComponent<(props: import("./components/ProHeader/PropTypes").ProHeaderProps) =>
|
|
20
|
+
ProCollapse: (props: import("./components/ProCollapse/PropTypes").ProCollapseProps) => JSX.Element;
|
|
21
|
+
ProFooter: import("react").MemoExoticComponent<(props: import("./components/ProFooter/PropTypes").ProFooterProps) => JSX.Element>;
|
|
22
|
+
ProHeader: import("react").MemoExoticComponent<(props: import("./components/ProHeader/PropTypes").ProHeaderProps) => JSX.Element>;
|
|
23
23
|
};
|
|
24
24
|
export default ProLayout;
|
|
@@ -15,7 +15,7 @@ export var getIdsByPathName = function getIdsByPathName(menus, activeMenu) {
|
|
|
15
15
|
_pathName = activeMenu;
|
|
16
16
|
}
|
|
17
17
|
var result;
|
|
18
|
-
var
|
|
18
|
+
var menuDeep = function menuDeep(menuDeepItem) {
|
|
19
19
|
for (var i = 0; i <= menuDeepItem.length - 1; i++) {
|
|
20
20
|
var item = menuDeepItem[i];
|
|
21
21
|
// 只包含一级菜单时,解决URL:/endorsement/demo/123无法选中问题
|
|
@@ -24,7 +24,7 @@ export var getIdsByPathName = function getIdsByPathName(menus, activeMenu) {
|
|
|
24
24
|
break;
|
|
25
25
|
}
|
|
26
26
|
if (Array.isArray(item.children) && item.children.length) {
|
|
27
|
-
|
|
27
|
+
menuDeep(item.children);
|
|
28
28
|
} else if (((item === null || item === void 0 ? void 0 : item.url) && _pathName.includes(item.url.split('?')[0]) || (item === null || item === void 0 ? void 0 : item.redirectUrl) && _pathName.includes(item.redirectUrl.split('?')[0])) && !result) {
|
|
29
29
|
// 当循环到最后一层时判断URL是否包含最后一层的URL,解决URL在URL中不存在的场景
|
|
30
30
|
result = item.keyIdPath;
|
|
@@ -32,7 +32,7 @@ export var getIdsByPathName = function getIdsByPathName(menus, activeMenu) {
|
|
|
32
32
|
}
|
|
33
33
|
}
|
|
34
34
|
};
|
|
35
|
-
|
|
35
|
+
menuDeep(menus);
|
|
36
36
|
return result || [];
|
|
37
37
|
};
|
|
38
38
|
/**
|
|
@@ -42,7 +42,7 @@ export var getIdsByPathName = function getIdsByPathName(menus, activeMenu) {
|
|
|
42
42
|
*/
|
|
43
43
|
export var transformMenu = function transformMenu(menuData, pathPrefix) {
|
|
44
44
|
var data = _toConsumableArray(menuData);
|
|
45
|
-
var
|
|
45
|
+
var menuDeep = function menuDeep(menuDeepItem) {
|
|
46
46
|
if (!Array.isArray(menuDeepItem) || !menuDeepItem.length) {
|
|
47
47
|
return [];
|
|
48
48
|
}
|
|
@@ -75,11 +75,11 @@ export var transformMenu = function transformMenu(menuData, pathPrefix) {
|
|
|
75
75
|
childrenItem.keyUrlPath = _toConsumableArray(item.keyUrlPath);
|
|
76
76
|
childrenItem.keyIdPath = _toConsumableArray(item.keyIdPath);
|
|
77
77
|
});
|
|
78
|
-
|
|
78
|
+
menuDeep(item.children);
|
|
79
79
|
}
|
|
80
80
|
});
|
|
81
81
|
};
|
|
82
|
-
|
|
82
|
+
menuDeep(data);
|
|
83
83
|
return data;
|
|
84
84
|
};
|
|
85
85
|
/**
|
|
@@ -134,7 +134,7 @@ export var getPathNameKey = function getPathNameKey(_ref) {
|
|
|
134
134
|
var menus = _ref.menus,
|
|
135
135
|
pathName = _ref.pathName;
|
|
136
136
|
var result;
|
|
137
|
-
var
|
|
137
|
+
var menuDeep = function menuDeep(menuDeepItem) {
|
|
138
138
|
if (!Array.isArray(menuDeepItem) || !menuDeepItem.length) {
|
|
139
139
|
return [];
|
|
140
140
|
}
|
|
@@ -148,7 +148,7 @@ export var getPathNameKey = function getPathNameKey(_ref) {
|
|
|
148
148
|
break;
|
|
149
149
|
}
|
|
150
150
|
if (Array.isArray(item.children) && item.children.length) {
|
|
151
|
-
|
|
151
|
+
menuDeep(item.children);
|
|
152
152
|
} else if (((item === null || item === void 0 ? void 0 : item.url) && pathName.includes(item.url.split('?')[0]) || (item === null || item === void 0 ? void 0 : item.redirectUrl) && pathName.includes(item.redirectUrl.split('?')[0])) && !result) {
|
|
153
153
|
// URL未匹配时,循环到最后一层时判断URL是否包含最后一层的URL,解决URL在URL中不存在的场景
|
|
154
154
|
result = item.keyIdPath;
|
|
@@ -156,6 +156,6 @@ export var getPathNameKey = function getPathNameKey(_ref) {
|
|
|
156
156
|
}
|
|
157
157
|
}
|
|
158
158
|
};
|
|
159
|
-
|
|
159
|
+
menuDeep(menus);
|
|
160
160
|
return result;
|
|
161
161
|
};
|
package/es/ProSelect/index.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
2
|
import { PropSelectProps, ProSelectAction } from './propsType';
|
|
3
3
|
import './index.less';
|
|
4
|
-
export declare const ProSelect: (props: PropSelectProps, ref: React.Ref<ProSelectAction> | undefined) =>
|
|
4
|
+
export declare const ProSelect: (props: PropSelectProps, ref: React.Ref<ProSelectAction> | undefined) => JSX.Element;
|
|
5
5
|
declare const _default: React.ForwardRefExoticComponent<PropSelectProps & React.RefAttributes<ProSelectAction>>;
|
|
6
6
|
export default _default;
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export declare const MenuItem: (props: any) =>
|
|
1
|
+
export declare const MenuItem: (props: any) => JSX.Element;
|
|
2
2
|
export default MenuItem;
|
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
import { ProStepItem } from '../../propsType';
|
|
2
|
-
declare const _default: ({ id, title, collapse: collapseItem, children, ...restProps }: ProStepItem) =>
|
|
2
|
+
declare const _default: ({ id, title, collapse: collapseItem, children, ...restProps }: ProStepItem) => JSX.Element;
|
|
3
3
|
export default _default;
|
|
@@ -14,7 +14,7 @@ export default (function (_ref) {
|
|
|
14
14
|
var _useStep = useStep(),
|
|
15
15
|
notify = _useStep.notify;
|
|
16
16
|
return /*#__PURE__*/React.cloneElement(children, _objectSpread(_objectSpread({}, props), {}, {
|
|
17
|
-
onClick: throttle(/*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
|
|
17
|
+
onClick: throttle( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
|
|
18
18
|
var values;
|
|
19
19
|
return _regeneratorRuntime().wrap(function _callee$(_context) {
|
|
20
20
|
while (1) switch (_context.prev = _context.next) {
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { ProStepPropsType } from '../../propsType';
|
|
2
2
|
export declare const Step: ({ fixedTop, dataSource, activeKey, errorCollection, style, targetOffset, scrollToError, }: ProStepPropsType & {
|
|
3
3
|
errorCollection: object;
|
|
4
|
-
}) =>
|
|
4
|
+
}) => JSX.Element;
|
|
5
5
|
export default Step;
|
package/es/ProStep/index.d.ts
CHANGED
|
@@ -4,9 +4,9 @@ import './style/index.less';
|
|
|
4
4
|
export declare const ProStepContext: import("react").Context<any>;
|
|
5
5
|
export declare const useStep: () => any;
|
|
6
6
|
declare const ProStep: {
|
|
7
|
-
({ children, ...resetProps }: ProStepPropsType):
|
|
7
|
+
({ children, ...resetProps }: ProStepPropsType): JSX.Element;
|
|
8
8
|
useStep: () => any;
|
|
9
|
-
Item: ({ id, title, collapse: collapseItem, children, ...restProps }: import("./propsType").ProStepItem) =>
|
|
9
|
+
Item: ({ id, title, collapse: collapseItem, children, ...restProps }: import("./propsType").ProStepItem) => JSX.Element;
|
|
10
10
|
Listener: ({ children, delayTime, excludes, ...props }: any) => import("react").DetailedReactHTMLElement<any, HTMLElement>;
|
|
11
11
|
};
|
|
12
12
|
export default ProStep;
|