@steroidsjs/core 3.0.0-beta.75 → 3.0.0-beta.76
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/package.json +1 -1
- package/ui/form/Form/Form.js +1 -1
- package/ui/nav/Tree/Tree.js +35 -12
package/package.json
CHANGED
package/ui/form/Form/Form.js
CHANGED
|
@@ -270,7 +270,7 @@ function Form(props) {
|
|
|
270
270
|
props.onError(requestError_1);
|
|
271
271
|
}
|
|
272
272
|
else {
|
|
273
|
-
reduxDispatch((0, notifications_1.showNotification)(props.submitErrorMessage || __('Ошибка сервера'), '
|
|
273
|
+
reduxDispatch((0, notifications_1.showNotification)(props.submitErrorMessage || __('Ошибка сервера'), 'error'));
|
|
274
274
|
}
|
|
275
275
|
return [2 /*return*/, null];
|
|
276
276
|
case 9:
|
package/ui/nav/Tree/Tree.js
CHANGED
|
@@ -10,15 +10,38 @@ var __assign = (this && this.__assign) || function () {
|
|
|
10
10
|
};
|
|
11
11
|
return __assign.apply(this, arguments);
|
|
12
12
|
};
|
|
13
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
14
|
+
if (k2 === undefined) k2 = k;
|
|
15
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
16
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
17
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
18
|
+
}
|
|
19
|
+
Object.defineProperty(o, k2, desc);
|
|
20
|
+
}) : (function(o, m, k, k2) {
|
|
21
|
+
if (k2 === undefined) k2 = k;
|
|
22
|
+
o[k2] = m[k];
|
|
23
|
+
}));
|
|
24
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
25
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
26
|
+
}) : function(o, v) {
|
|
27
|
+
o["default"] = v;
|
|
28
|
+
});
|
|
29
|
+
var __importStar = (this && this.__importStar) || function (mod) {
|
|
30
|
+
if (mod && mod.__esModule) return mod;
|
|
31
|
+
var result = {};
|
|
32
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
33
|
+
__setModuleDefault(result, mod);
|
|
34
|
+
return result;
|
|
35
|
+
};
|
|
13
36
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
14
37
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
15
38
|
};
|
|
16
39
|
exports.__esModule = true;
|
|
40
|
+
var React = __importStar(require("react"));
|
|
17
41
|
var isString_1 = __importDefault(require("lodash-es/isString"));
|
|
18
42
|
var omit_1 = __importDefault(require("lodash-es/omit"));
|
|
19
43
|
var isEqual_1 = __importDefault(require("lodash-es/isEqual"));
|
|
20
44
|
var keys_1 = __importDefault(require("lodash-es/keys"));
|
|
21
|
-
var react_use_1 = require("react-use");
|
|
22
45
|
var react_1 = require("react");
|
|
23
46
|
var hooks_1 = require("../../../hooks");
|
|
24
47
|
var router_1 = require("../../../reducers/router");
|
|
@@ -43,7 +66,7 @@ function Tree(props) {
|
|
|
43
66
|
? route.items.map(function (r) { return routeToItem_1(r); })
|
|
44
67
|
: Object.keys(route.items || {}).map(function (id) { return routeToItem_1(route.items[id]); })).filter(function (r) { return r.visible; });
|
|
45
68
|
return {
|
|
46
|
-
id: route.id,
|
|
69
|
+
id: route.id.toLowerCase(),
|
|
47
70
|
label: route.label || route.title,
|
|
48
71
|
visible: route.isNavVisible !== false,
|
|
49
72
|
toRoute: routeItems.length === 0 ? route.id : null,
|
|
@@ -62,20 +85,20 @@ function Tree(props) {
|
|
|
62
85
|
var findChildById = function (sourceItems, itemId, parentId, level) {
|
|
63
86
|
if (parentId === void 0) { parentId = ''; }
|
|
64
87
|
if (level === void 0) { level = 1; }
|
|
65
|
-
var
|
|
88
|
+
var foundItem = null;
|
|
66
89
|
if ((0, isString_1["default"])(sourceItems)) {
|
|
67
90
|
return null;
|
|
68
91
|
}
|
|
69
92
|
(sourceItems || []).forEach(function (item, index) {
|
|
70
93
|
var uniqId = resolveId(item, index, parentId);
|
|
71
|
-
if (!
|
|
72
|
-
|
|
94
|
+
if (!foundItem && (item.id === itemId || uniqId === itemId)) {
|
|
95
|
+
foundItem = __assign(__assign({}, item), { uniqId: uniqId, level: level });
|
|
73
96
|
}
|
|
74
|
-
if (!
|
|
75
|
-
|
|
97
|
+
if (!foundItem) {
|
|
98
|
+
foundItem = findChildById(item[props.itemsKey], itemId, uniqId, level + 1);
|
|
76
99
|
}
|
|
77
100
|
});
|
|
78
|
-
return
|
|
101
|
+
return foundItem;
|
|
79
102
|
};
|
|
80
103
|
var autoOpen = function (sourceItems, parentId, level) {
|
|
81
104
|
if (parentId === void 0) { parentId = ''; }
|
|
@@ -100,17 +123,17 @@ function Tree(props) {
|
|
|
100
123
|
return opened;
|
|
101
124
|
};
|
|
102
125
|
// Initial opened items
|
|
103
|
-
|
|
126
|
+
React.useEffect(function () {
|
|
104
127
|
// TODO add clientStorage
|
|
105
128
|
// const key = STORAGE_KEY_PREFIX + props.id;
|
|
106
129
|
// const opened = !this.state && this.props.clientStorage.get(key) && this.props.autoSave
|
|
107
130
|
// ? JSON.parse(this.props.clientStorage.get(key))
|
|
108
131
|
// : this._autoOpen(this.props._items);
|
|
109
132
|
var opened = autoOpen(items);
|
|
110
|
-
var selectedItem = findChildById(items, selectedItemId);
|
|
111
133
|
setOpenedItems(opened);
|
|
112
|
-
|
|
113
|
-
|
|
134
|
+
var selectedItem = findChildById(items, selectedItemId);
|
|
135
|
+
setSelectedUniqId(selectedItem ? selectedItem.uniqId : null);
|
|
136
|
+
}, [items]);
|
|
114
137
|
var onItemClick = (0, react_1.useCallback)(function (e, uniqId, item) {
|
|
115
138
|
var _a;
|
|
116
139
|
var _b;
|