@lemon-fe/kits 1.0.6 → 1.0.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.
|
@@ -1273,10 +1273,12 @@ var DataGrid = /*#__PURE__*/function (_Component) {
|
|
|
1273
1273
|
if (code) {
|
|
1274
1274
|
try {
|
|
1275
1275
|
var scope = Object.fromEntries(Object.entries(scopeMap).map(function (_ref5) {
|
|
1276
|
+
var _getValue;
|
|
1277
|
+
|
|
1276
1278
|
var _ref6 = _slicedToArray(_ref5, 1),
|
|
1277
1279
|
k = _ref6[0];
|
|
1278
1280
|
|
|
1279
|
-
return [k, getValue(scopeMap[k])
|
|
1281
|
+
return [k, (_getValue = getValue(scopeMap[k])) !== null && _getValue !== void 0 ? _getValue : ''];
|
|
1280
1282
|
}));
|
|
1281
1283
|
return code.evaluate(scope);
|
|
1282
1284
|
} catch (err) {
|
|
@@ -36,7 +36,8 @@ function MicroLayout(props) {
|
|
|
36
36
|
routes = _props$routes === void 0 ? [] : _props$routes,
|
|
37
37
|
authorities = props.authorities,
|
|
38
38
|
tabs = props.tabs,
|
|
39
|
-
active = props.active
|
|
39
|
+
active = props.active,
|
|
40
|
+
basenameProp = props.basename;
|
|
40
41
|
var history = useHistory();
|
|
41
42
|
var auth = useMemo(function () {
|
|
42
43
|
if (authorities === undefined || authorities === null) {
|
|
@@ -46,7 +47,7 @@ function MicroLayout(props) {
|
|
|
46
47
|
return new Set(authorities);
|
|
47
48
|
}, [authorities]);
|
|
48
49
|
var basename = useMemo(function () {
|
|
49
|
-
return window.routerBase;
|
|
50
|
+
return basenameProp || window.routerBase;
|
|
50
51
|
}, []);
|
|
51
52
|
var key = (_tabs$active = tabs[active]) === null || _tabs$active === void 0 ? void 0 : _tabs$active.rootPath;
|
|
52
53
|
var routeTabs = useMemo(function () {
|