aldehyde 0.2.499 → 0.2.501
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/lib/controls/direct-file-view/index.d.ts.map +1 -1
- package/lib/controls/direct-file-view/index.js +35 -5
- package/lib/controls/direct-file-view/index.js.map +1 -1
- package/lib/layout2/components/search-menu.d.ts.map +1 -1
- package/lib/layout2/components/search-menu.js +6 -2
- package/lib/layout2/components/search-menu.js.map +1 -1
- package/lib/layout2/header.d.ts.map +1 -1
- package/lib/layout2/header.js +8 -4
- package/lib/layout2/header.js.map +1 -1
- package/lib/layout2/sider.d.ts.map +1 -1
- package/lib/layout2/sider.js +7 -3
- package/lib/layout2/sider.js.map +1 -1
- package/lib/layout3/header.d.ts.map +1 -1
- package/lib/layout3/header.js +8 -4
- package/lib/layout3/header.js.map +1 -1
- package/lib/layout3/sider.d.ts.map +1 -1
- package/lib/layout3/sider.js +7 -3
- package/lib/layout3/sider.js.map +1 -1
- package/lib/layout4/header.d.ts.map +1 -1
- package/lib/layout4/header.js +8 -4
- package/lib/layout4/header.js.map +1 -1
- package/lib/layout4/sider.d.ts.map +1 -1
- package/lib/layout4/sider.js +7 -3
- package/lib/layout4/sider.js.map +1 -1
- package/lib/layout5/header.d.ts.map +1 -1
- package/lib/layout5/header.js +8 -4
- package/lib/layout5/header.js.map +1 -1
- package/lib/layout5/sider.d.ts.map +1 -1
- package/lib/layout5/sider.js +7 -3
- package/lib/layout5/sider.js.map +1 -1
- package/lib/lowcode-components/assets/utils.d.ts +2 -0
- package/lib/lowcode-components/assets/utils.d.ts.map +1 -0
- package/lib/lowcode-components/assets/utils.js +13 -0
- package/lib/lowcode-components/assets/utils.js.map +1 -0
- package/lib/lowcode-components/base-text/index.d.ts +1 -0
- package/lib/lowcode-components/base-text/index.d.ts.map +1 -1
- package/lib/lowcode-components/base-text/index.js +12 -6
- package/lib/lowcode-components/base-text/index.js.map +1 -1
- package/lib/lowcode-components/base-text/index.less +19 -19
- package/lib/lowcode-components/lowcode-view/component/component-container.d.ts.map +1 -1
- package/lib/lowcode-components/lowcode-view/component/component-container.js +50 -15
- package/lib/lowcode-components/lowcode-view/component/component-container.js.map +1 -1
- package/lib/lowcode-components/lowcode-view/interface.d.ts +6 -0
- package/lib/lowcode-components/lowcode-view/interface.d.ts.map +1 -1
- package/lib/table/act-table.d.ts +2 -0
- package/lib/table/act-table.d.ts.map +1 -1
- package/lib/table/act-table.js +32 -19
- package/lib/table/act-table.js.map +1 -1
- package/lib/table/column/column-builder.d.ts +1 -1
- package/lib/table/column/column-builder.d.ts.map +1 -1
- package/lib/table/column/column-builder.js +8 -5
- package/lib/table/column/column-builder.js.map +1 -1
- package/lib/table/index.css +28 -12
- package/lib/table/query-table.d.ts.map +1 -1
- package/lib/table/query-table.js +20 -6
- package/lib/table/query-table.js.map +1 -1
- package/lib/table/resizable-table.js +3 -3
- package/lib/table/resizable-table.js.map +1 -1
- package/lib/tmpl/interface.d.ts +7 -0
- package/lib/tmpl/interface.d.ts.map +1 -1
- package/lib/tmpl/interface.js.map +1 -1
- package/lib/welcome/HCWelcome.js +9 -7
- package/lib/welcome/HCWelcome.js.map +1 -1
- package/lib/welcome/components/page-card.d.ts +1 -0
- package/lib/welcome/components/page-card.d.ts.map +1 -1
- package/lib/welcome/components/page-card.js +4 -1
- package/lib/welcome/components/page-card.js.map +1 -1
- package/package.json +1 -1
- package/src/aldehyde/controls/direct-file-view/index.tsx +40 -8
- package/src/aldehyde/layout2/components/search-menu.tsx +6 -2
- package/src/aldehyde/layout2/header.tsx +8 -4
- package/src/aldehyde/layout2/sider.tsx +8 -3
- package/src/aldehyde/layout3/header.tsx +8 -4
- package/src/aldehyde/layout3/sider.tsx +7 -3
- package/src/aldehyde/layout4/header.tsx +8 -4
- package/src/aldehyde/layout4/sider.tsx +7 -3
- package/src/aldehyde/layout5/header.tsx +8 -4
- package/src/aldehyde/layout5/sider.tsx +7 -3
- package/src/aldehyde/lowcode-components/assets/utils.ts +11 -0
- package/src/aldehyde/lowcode-components/base-text/index.less +19 -19
- package/src/aldehyde/lowcode-components/base-text/index.tsx +14 -12
- package/src/aldehyde/lowcode-components/lowcode-view/component/component-container.tsx +60 -7
- package/src/aldehyde/lowcode-components/lowcode-view/interface.ts +6 -0
- package/src/aldehyde/table/act-table.tsx +37 -23
- package/src/aldehyde/table/column/column-builder.tsx +6 -5
- package/src/aldehyde/table/index.css +28 -12
- package/src/aldehyde/table/query-table.tsx +19 -5
- package/src/aldehyde/table/resizable-table.tsx +2 -2
- package/src/aldehyde/tmpl/interface.tsx +8 -1
- package/src/aldehyde/welcome/HCWelcome.js +9 -7
- package/src/aldehyde/welcome/components/page-card.tsx +5 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"HCWelcome.js","sourceRoot":"","sources":["../../../../src/aldehyde/welcome/HCWelcome.js"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"HCWelcome.js","sourceRoot":"","sources":["../../../../src/aldehyde/welcome/HCWelcome.js"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"page-card.d.ts","sourceRoot":"","sources":["../../../../../src/aldehyde/welcome/components/page-card.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA8B,MAAM,OAAO,CAAC;AAInD,OAAO,qBAAqB,CAAC;AAE7B,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAIlD,OAAO,kBAAkB,CAAC;AAkC1B,UAAU,QAAS,SAAQ,UAAU;IACjC,GAAG,EAAE,MAAM,CAAC;CACf;AAED,UAAU,KAAK;IACX,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,QAAQ,EAAE,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"page-card.d.ts","sourceRoot":"","sources":["../../../../../src/aldehyde/welcome/components/page-card.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA8B,MAAM,OAAO,CAAC;AAInD,OAAO,qBAAqB,CAAC;AAE7B,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAIlD,OAAO,kBAAkB,CAAC;AAkC1B,UAAU,QAAS,SAAQ,UAAU;IACjC,GAAG,EAAE,MAAM,CAAC;CACf;AAED,UAAU,KAAK;IACX,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,QAAQ,EAAE,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,mBAAmB,CAAC,EAAE,CAAC,GAAG,EAAE,OAAO,KAAK,IAAI,CAAC;CAChD;AAED,QAAA,MAAM,KAAK,GAAI,OAAO,KAAK,2BA0C1B,CAAA;AAED,eAAe,KAAK,CAAC"}
|
|
@@ -49,13 +49,16 @@ const findNthLeaf = (tree, n = 1) => {
|
|
|
49
49
|
};
|
|
50
50
|
const { useToken } = theme;
|
|
51
51
|
const Index = (props) => {
|
|
52
|
-
const { layoutRootPath, fastMenu, menus, menuOrder } = props;
|
|
52
|
+
const { layoutRootPath, fastMenu, menus, menuOrder, setShowRightSidebar } = props;
|
|
53
53
|
const [l2Menu, setL2Menu] = useState();
|
|
54
54
|
const navigate = useNavigate();
|
|
55
55
|
const { translate } = useLocale();
|
|
56
56
|
const { token } = useToken();
|
|
57
57
|
const getL2Menu = () => __awaiter(void 0, void 0, void 0, function* () {
|
|
58
58
|
let temData = yield HCDataSource.fastMenu(fastMenu);
|
|
59
|
+
if (!temData && setShowRightSidebar && fastMenu === "RightSidebar01") {
|
|
60
|
+
setShowRightSidebar(false);
|
|
61
|
+
}
|
|
59
62
|
const itemMenu = temData === null || temData === void 0 ? void 0 : temData[0];
|
|
60
63
|
if (itemMenu && !itemMenu.disabled) {
|
|
61
64
|
const { id, pageType, defaultCriteriaValue, customPath, dragDropPageId, fullScreen } = itemMenu;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"page-card.js","sourceRoot":"","sources":["../../../../../src/aldehyde/welcome/components/page-card.tsx"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,KAAK,EAAE,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AACnD,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,MAAM,CAAC;AACpC,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAClD,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,qBAAqB,CAAC;AAC7B,OAAO,YAAY,MAAM,2BAA2B,CAAC;AAErD,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AACvD,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACnD,OAAO,UAAU,MAAM,0BAA0B,CAAC;AAClD,OAAO,kBAAkB,CAAC;AAE1B,WAAW;AACX,MAAM,WAAW,GAAG,CAAC,IAAI,EAAE,CAAC,GAAG,CAAC,EAAE,EAAE;IAChC,gBAAgB;IAChB,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;QACxD,OAAO,IAAI,CAAC;IAChB,CAAC;IACD,IAAI,KAAK,GAAG,CAAC,CAAC,CAAC,oBAAoB;IACnC,MAAM,GAAG,GAAG,CAAC,KAAK,EAAE,EAAE;QAClB,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;YACvB,qBAAqB;YACrB,IAAI,IAAI,CAAC,cAAc,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;gBACzC,SAAS,CAAC,eAAe;YAC7B,CAAC;YACD,MAAM,MAAM,GAAG,CAAC,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,KAAK,CAAC,CAAC;YAC5D,IAAI,MAAM,EAAE,CAAC;gBACT,KAAK,EAAE,CAAC;gBACR,IAAI,KAAK,KAAK,CAAC,EAAE,CAAC;oBACd,OAAO,IAAI,CAAC,CAAC,YAAY;gBAC7B,CAAC;YACL,CAAC;iBAAM,CAAC;gBACJ,MAAM,MAAM,GAAG,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;gBAClC,IAAI,MAAM;oBAAE,OAAO,MAAM,CAAC,CAAC,OAAO;YACtC,CAAC;QACL,CAAC;QACD,OAAO,IAAI,CAAC;IAChB,CAAC,CAAA;IACD,OAAO,GAAG,CAAC,IAAI,CAAC,CAAC;AACrB,CAAC,CAAA;AAGD,MAAM,EAAE,QAAQ,EAAE,GAAG,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"page-card.js","sourceRoot":"","sources":["../../../../../src/aldehyde/welcome/components/page-card.tsx"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
|
-
import React, { useEffect, useState } from 'react'
|
|
2
|
-
import { Button, Col, Image, Row, Space } from 'antd'
|
|
3
|
-
import
|
|
1
|
+
import React, { useEffect, useState } from 'react';
|
|
2
|
+
import { Button, Col, Image, Row, Space } from 'antd';
|
|
3
|
+
import dayjs from 'dayjs';
|
|
4
|
+
import DrawerFileView from './drawer-file-view';
|
|
4
5
|
import { FieldConfig, CommonFilePath } from "../../tmpl/interface";
|
|
5
6
|
import { DownloadOutlined, PlayCircleOutlined } from '@ant-design/icons';
|
|
6
7
|
import HCService from "../../tmpl/hcservice-v3";
|
|
@@ -22,21 +23,51 @@ interface OssConfig {
|
|
|
22
23
|
bucket: string;
|
|
23
24
|
endpoint: string;
|
|
24
25
|
protocol: string;
|
|
26
|
+
beginDate?: string;
|
|
27
|
+
endDate?: string;
|
|
25
28
|
}
|
|
26
29
|
|
|
27
30
|
const Index = (props: FileViewProps) => {
|
|
28
31
|
const { downloadable = true, fieldConfig: { serverKey }, value } = props;
|
|
29
32
|
const [filePaths, setFilePaths] = useState<CommonFilePath[]>([]);
|
|
30
33
|
const [playing, setPlaying] = useState<boolean>(false);
|
|
31
|
-
const [
|
|
34
|
+
const [ossConfigs, setOssConfigs] = useState<OssConfig[]>([]);
|
|
32
35
|
|
|
33
36
|
useEffect(() => {
|
|
34
37
|
if (serverKey) {
|
|
35
|
-
const { accessKeySecret, bucket, endpoint, protocol } = Units.getExtendServers(serverKey) || {};
|
|
36
|
-
bucket && endpoint
|
|
38
|
+
const { accessKeySecret, bucket, endpoint, protocol, beginDate, endDate, otherConfig = [] } = Units.getExtendServers(serverKey) || {};
|
|
39
|
+
const temConfig = bucket && endpoint ? [{ accessKeySecret, bucket, endpoint, protocol, beginDate, endDate }] : [];
|
|
40
|
+
otherConfig.forEach(r => {
|
|
41
|
+
if (r.bucket && r.endpoint) temConfig.push(r);
|
|
42
|
+
});
|
|
43
|
+
setOssConfigs(temConfig);
|
|
37
44
|
}
|
|
38
45
|
}, [serverKey]);
|
|
39
46
|
|
|
47
|
+
// 根据时间使用对应的oss配置
|
|
48
|
+
const getOssConfig = (url: string) => {
|
|
49
|
+
// 截取地址中的日期
|
|
50
|
+
const match = url.match(/\/(\d{4})\/(\d{1,2})\/(\d{1,2})\//);
|
|
51
|
+
if (!match || ossConfigs.length === 1) {
|
|
52
|
+
return ossConfigs[0];
|
|
53
|
+
}
|
|
54
|
+
const date = dayjs(`${match[1]}-${match[2]}-${match[3]}`);
|
|
55
|
+
const temConfig = ossConfigs.find(r => {
|
|
56
|
+
const { beginDate, endDate } = r;
|
|
57
|
+
if (!beginDate && !endDate) {
|
|
58
|
+
return true;
|
|
59
|
+
}
|
|
60
|
+
if (!beginDate) { // 没有开始日期,则只判断结束日期,包含结束日期
|
|
61
|
+
return date.isBefore(endDate) || date.isSame(endDate);
|
|
62
|
+
}
|
|
63
|
+
if (!endDate) { // 不包含开始日期
|
|
64
|
+
return dayjs(beginDate).isBefore(date);
|
|
65
|
+
}
|
|
66
|
+
return dayjs(beginDate).isBefore(date) && (date.isBefore(endDate) || date.isSame(endDate));
|
|
67
|
+
});
|
|
68
|
+
return temConfig || ossConfigs[0];
|
|
69
|
+
}
|
|
70
|
+
|
|
40
71
|
// 处理文件路径,多文件使用,分割
|
|
41
72
|
const handleFilePaths = (val: string) => {
|
|
42
73
|
if (!val) {
|
|
@@ -48,7 +79,8 @@ const Index = (props: FileViewProps) => {
|
|
|
48
79
|
let temUrl = lastIndex !== -1 ? url.substring(lastIndex + 3) : url;
|
|
49
80
|
if (url.startsWith("http")) {
|
|
50
81
|
temUrl = url;
|
|
51
|
-
} else if (
|
|
82
|
+
} else if (ossConfigs?.length) {
|
|
83
|
+
const ossConfig = getOssConfig(url);
|
|
52
84
|
temUrl = `${ossConfig.protocol || "http"}://${ossConfig.bucket}.${ossConfig.endpoint}/${temUrl}`;
|
|
53
85
|
} else { // 无oss配置时,使用本地地址
|
|
54
86
|
temUrl = Units.joinPath(Units.api(serverKey), `/v3/local-files?path=${temUrl}`);
|
|
@@ -78,7 +110,7 @@ const Index = (props: FileViewProps) => {
|
|
|
78
110
|
|
|
79
111
|
useEffect(() => {
|
|
80
112
|
handleValue(value);
|
|
81
|
-
}, [value,
|
|
113
|
+
}, [value, ossConfigs]);
|
|
82
114
|
|
|
83
115
|
const download = (filePath: CommonFilePath) => {
|
|
84
116
|
const time = new Date().getTime(); // 音视频等文件下载时需要加上时间戳,(音视频播放会占用oss网络通道,导致下载失败)
|
|
@@ -1,9 +1,10 @@
|
|
|
1
|
-
import React, { useEffect, useState } from "react";
|
|
1
|
+
import React, { useContext, useEffect, useState } from "react";
|
|
2
2
|
import { Button, ButtonProps, Popover, TreeSelect } from "antd";
|
|
3
3
|
import { SearchOutlined } from "@ant-design/icons";
|
|
4
4
|
import { useNavigate } from "react-router-dom";
|
|
5
5
|
import { MenuType } from "../type/layout-type";
|
|
6
6
|
import { useLocale } from "../../locale/useLocale";
|
|
7
|
+
import { KeepAliveTabContext } from "../tabs/tabs-context";
|
|
7
8
|
|
|
8
9
|
const handleMenu = (arr: MenuType[], translate: any) => {
|
|
9
10
|
return arr.map(item => {
|
|
@@ -31,6 +32,7 @@ const Index = (props: Props) => {
|
|
|
31
32
|
const [searchValue, setSearchValue] = useState<string>();
|
|
32
33
|
const [selectInit, setSelectInit] = useState<boolean>(true); // 解决搜索框初始化设置searchValue,onSearch返回空value的问题
|
|
33
34
|
const navigate = useNavigate();
|
|
35
|
+
const { tabs } = useContext(KeepAliveTabContext);
|
|
34
36
|
|
|
35
37
|
useEffect(() => {
|
|
36
38
|
const newMenu = handleMenu(menuList, translate);
|
|
@@ -42,7 +44,9 @@ const Index = (props: Props) => {
|
|
|
42
44
|
if (node.linkTarget === "_blank") {
|
|
43
45
|
window.open(`${window.location.origin}/#/${node.url}`, '_blank', 'noopener,noreferrer');
|
|
44
46
|
} else {
|
|
45
|
-
|
|
47
|
+
// 判断当前菜单是否保持在tab页激活页中
|
|
48
|
+
const isTab = tabs.find(tab => tab.routePath === `/${node.url?.split("?")[0]}`);
|
|
49
|
+
navigate(isTab ? isTab.pathname : `/${node.url}`);
|
|
46
50
|
}
|
|
47
51
|
}
|
|
48
52
|
}
|
|
@@ -6,7 +6,7 @@ import {
|
|
|
6
6
|
theme,
|
|
7
7
|
Tooltip,
|
|
8
8
|
} from "antd";
|
|
9
|
-
import React, { useEffect, useState, CSSProperties } from "react";
|
|
9
|
+
import React, { useContext, useEffect, useState, CSSProperties } from "react";
|
|
10
10
|
import "./css/header.css";
|
|
11
11
|
import L2MenuQuickBar from "../layout/menu/l2menu-quick-bar";
|
|
12
12
|
import L2MenuMessageBar from "../layout/menu/l2menu-message-bar";
|
|
@@ -28,6 +28,7 @@ import ScreenfullButton from "./components/screenfull-button";
|
|
|
28
28
|
import SystemMessages from "./components/system-messages";
|
|
29
29
|
import UserNotification from "./components/user-notification";
|
|
30
30
|
import { ThemeConfig } from "../tmpl/interface";
|
|
31
|
+
import { KeepAliveTabContext } from "./tabs/tabs-context";
|
|
31
32
|
|
|
32
33
|
const toolbarStyle: CSSProperties = {
|
|
33
34
|
width: "100%",
|
|
@@ -55,6 +56,7 @@ const { useToken } = theme;
|
|
|
55
56
|
|
|
56
57
|
const Header: React.FC<HeaderPropsType> = ({ systemName, menuList, style, logoImg, themeConfig, customHome }) => {
|
|
57
58
|
const { setDocumentTitle, menuItemIdToFirstFloorIdxMap } = useLayoutContext();
|
|
59
|
+
const { tabs } = useContext(KeepAliveTabContext);
|
|
58
60
|
|
|
59
61
|
// token
|
|
60
62
|
const { token: { colorPrimary } } = useToken();
|
|
@@ -85,6 +87,8 @@ const Header: React.FC<HeaderPropsType> = ({ systemName, menuList, style, logoIm
|
|
|
85
87
|
</div>
|
|
86
88
|
);
|
|
87
89
|
const { path, target } = getLeftMostRouteInfo(menuItem);
|
|
90
|
+
// 判断当前菜单是否保持在tab页激活页中
|
|
91
|
+
const isTab = tabs.find(tab => tab.routePath === `/${path?.split("?")[0]}`);
|
|
88
92
|
if (floor === 0)
|
|
89
93
|
return path === null ? (
|
|
90
94
|
<div
|
|
@@ -99,7 +103,7 @@ const Header: React.FC<HeaderPropsType> = ({ systemName, menuList, style, logoIm
|
|
|
99
103
|
</div>
|
|
100
104
|
) : (
|
|
101
105
|
<NavLink
|
|
102
|
-
to={`/${path}`}
|
|
106
|
+
to={isTab ? isTab.pathname : `/${path}`}
|
|
103
107
|
target={target}
|
|
104
108
|
style={{
|
|
105
109
|
color: "inherit",
|
|
@@ -113,7 +117,7 @@ const Header: React.FC<HeaderPropsType> = ({ systemName, menuList, style, logoIm
|
|
|
113
117
|
if (Array.isArray(children) && !children.length)
|
|
114
118
|
return (
|
|
115
119
|
<NavLink
|
|
116
|
-
to={`/${path}`}
|
|
120
|
+
to={isTab ? isTab.pathname : `/${path}`}
|
|
117
121
|
target={target}
|
|
118
122
|
style={{
|
|
119
123
|
color: "inherit",
|
|
@@ -131,7 +135,7 @@ const Header: React.FC<HeaderPropsType> = ({ systemName, menuList, style, logoIm
|
|
|
131
135
|
"layout2-header-menu-item"
|
|
132
136
|
)
|
|
133
137
|
);
|
|
134
|
-
}, [menuList, getLocale()]);
|
|
138
|
+
}, [menuList, getLocale(), tabs]);
|
|
135
139
|
|
|
136
140
|
// menu select
|
|
137
141
|
const [selectedKeys, setSelectedKeys] = useState([]);
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { ConfigProvider, Layout, Menu, MenuProps, Space, theme, Tooltip } from "antd";
|
|
2
|
-
import
|
|
2
|
+
import { KeepAliveTabContext } from "./tabs/tabs-context";
|
|
3
|
+
import React, { useContext, useEffect, useRef, useState } from "react";
|
|
3
4
|
|
|
4
5
|
import { MenuType } from "./type/layout-type";
|
|
5
6
|
import { NavLink, useParams, useSearchParams } from "react-router-dom";
|
|
@@ -58,6 +59,7 @@ const { useToken } = theme;
|
|
|
58
59
|
const Sider: React.FC<SiderPropsType> = ({ menuList, collapsed, themeConfig }) => {
|
|
59
60
|
const { setDocumentTitle, menuItemIdToFirstFloorIdxMap } = useLayoutContext();
|
|
60
61
|
const [orgName, setOrgName] = useState<string>(""); // 组织名称
|
|
62
|
+
const { tabs } = useContext(KeepAliveTabContext);
|
|
61
63
|
|
|
62
64
|
const initUserConfig = async () => {
|
|
63
65
|
let userInfo: UserInfo = await Units.getCurrentUserInfo();
|
|
@@ -110,9 +112,12 @@ const Sider: React.FC<SiderPropsType> = ({ menuList, collapsed, themeConfig }) =
|
|
|
110
112
|
|
|
111
113
|
const { path, target } = getLeftMostRouteInfo(menuItem);
|
|
112
114
|
|
|
115
|
+
// 判断当前菜单是否保持在tab页激活页中
|
|
116
|
+
const isTab = tabs.find(tab => tab.routePath === `/${path?.split("?")[0]}`);
|
|
117
|
+
|
|
113
118
|
if (Array.isArray(children) && !children.length) {
|
|
114
119
|
const navLink = <NavLink
|
|
115
|
-
to={`/${path}`}
|
|
120
|
+
to={isTab ? isTab.pathname : `/${path}`}
|
|
116
121
|
target={target}
|
|
117
122
|
style={{
|
|
118
123
|
color: "inherit",
|
|
@@ -158,7 +163,7 @@ const Sider: React.FC<SiderPropsType> = ({ menuList, collapsed, themeConfig }) =
|
|
|
158
163
|
setMenu(getMenuWithSecoundFloor(curSiderMenuList));
|
|
159
164
|
setSelectedKeys(getTargetMenuItemIdRouteList(curSiderMenuList, targetId));
|
|
160
165
|
}
|
|
161
|
-
}, [sourceId, menuId, menuList, getLocale()]);
|
|
166
|
+
}, [sourceId, menuId, menuList, getLocale(), tabs]);
|
|
162
167
|
|
|
163
168
|
// default select keys
|
|
164
169
|
useEffect(() => {
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { Layout, Menu, MenuProps, Space } from "antd";
|
|
2
|
-
import React, { useEffect, useState, CSSProperties } from "react";
|
|
2
|
+
import React, { useContext, useEffect, useState, CSSProperties } from "react";
|
|
3
3
|
import { NavLink, useParams, useSearchParams } from "react-router-dom";
|
|
4
4
|
import { HomeFilled } from '@ant-design/icons';
|
|
5
5
|
import L2MenuQuickBar from "../layout/menu/l2menu-quick-bar";
|
|
@@ -9,6 +9,7 @@ import L2MenuMessageBar from "../layout/menu/l2menu-message-bar";
|
|
|
9
9
|
import { getLeftMostRouteInfo, handlePropsMenuToAntdMenu } from "../layout2/util/menu-util";
|
|
10
10
|
import { MenuType } from "../layout2/type/layout-type";
|
|
11
11
|
import { useLocale } from "../locale/useLocale";
|
|
12
|
+
import { KeepAliveTabContext } from "../layout2/tabs/tabs-context";
|
|
12
13
|
import { useLayoutContext } from "../layout2/layout-context";
|
|
13
14
|
import UserButton from "../layout2/components/user-button";
|
|
14
15
|
import SearchMenu from "../layout2/components/search-menu";
|
|
@@ -74,6 +75,7 @@ const Header: React.FC<HeaderPropsType> = ({ systemName, menuList, themeConfig,
|
|
|
74
75
|
const [selParentId, setSelParentId] = useState<string>();
|
|
75
76
|
const { sourceId } = useParams();
|
|
76
77
|
const [search] = useSearchParams();
|
|
78
|
+
const { tabs } = useContext(KeepAliveTabContext);
|
|
77
79
|
const menuId: string = search.get("menuId");
|
|
78
80
|
|
|
79
81
|
const renderMenuItem = (menuItem) => {
|
|
@@ -89,12 +91,14 @@ const Header: React.FC<HeaderPropsType> = ({ systemName, menuList, themeConfig,
|
|
|
89
91
|
}
|
|
90
92
|
const renderIcon = (themeConfig?.showTopMenuIcon && icon) ? <IconFont type={icon} /> : "";
|
|
91
93
|
const { path, target } = getLeftMostRouteInfo(menuItem);
|
|
94
|
+
// 判断当前菜单是否保持在tab页激活页中
|
|
95
|
+
const isTab = tabs.find(tab => tab.routePath === `/${path?.split("?")[0]}`);
|
|
92
96
|
if (floor === 0) {
|
|
93
97
|
return path === null ? (
|
|
94
98
|
renderMenuItem(menuItem)
|
|
95
99
|
) : (
|
|
96
100
|
<NavLink
|
|
97
|
-
to={`/${path}`}
|
|
101
|
+
to={isTab ? isTab.pathname : `/${path}`}
|
|
98
102
|
target={target}
|
|
99
103
|
>
|
|
100
104
|
{renderMenuItem(menuItem)}
|
|
@@ -103,7 +107,7 @@ const Header: React.FC<HeaderPropsType> = ({ systemName, menuList, themeConfig,
|
|
|
103
107
|
}
|
|
104
108
|
if (Array.isArray(children) && !children.length) {
|
|
105
109
|
return (
|
|
106
|
-
<NavLink to={`/${path}`} target={target} >
|
|
110
|
+
<NavLink to={isTab ? isTab.pathname : `/${path}`} target={target} >
|
|
107
111
|
<Space size={"small"}>{renderIcon}{translate("${" + label + "}")}</Space>
|
|
108
112
|
</NavLink>
|
|
109
113
|
);
|
|
@@ -119,7 +123,7 @@ const Header: React.FC<HeaderPropsType> = ({ systemName, menuList, themeConfig,
|
|
|
119
123
|
if (menuList.length && selParentId) {
|
|
120
124
|
setMenu(handlePropsMenuToAntdMenu(menuList, handleMenu));
|
|
121
125
|
}
|
|
122
|
-
}, [menuList, getLocale(), selParentId]);
|
|
126
|
+
}, [menuList, getLocale(), selParentId, tabs]);
|
|
123
127
|
|
|
124
128
|
useEffect(() => {
|
|
125
129
|
if (sourceId === undefined) {
|
|
@@ -1,11 +1,12 @@
|
|
|
1
1
|
import { ConfigProvider, Layout, Menu, MenuProps, Space, Tooltip } from "antd";
|
|
2
|
-
import React, { useEffect, useRef, useState } from "react";
|
|
2
|
+
import React, { useContext, useEffect, useRef, useState } from "react";
|
|
3
3
|
import { NavLink, useParams, useSearchParams } from "react-router-dom";
|
|
4
4
|
import {
|
|
5
5
|
getLeftMostRouteInfo,
|
|
6
6
|
getTargetMenuItemIdRouteList,
|
|
7
7
|
handlePropsMenuToAntdMenu,
|
|
8
8
|
} from "../layout2/util/menu-util";
|
|
9
|
+
import { KeepAliveTabContext } from "../layout2/tabs/tabs-context";
|
|
9
10
|
import { useLayoutContext } from "../layout2/layout-context";
|
|
10
11
|
import { MenuType } from "../layout2/type/layout-type";
|
|
11
12
|
import { useLocale } from "../locale/useLocale";
|
|
@@ -55,6 +56,7 @@ const Sider: React.FC<SiderPropsType> = ({ menuList, collapsed, themeConfig }) =
|
|
|
55
56
|
const { sourceId } = useParams();
|
|
56
57
|
const [search] = useSearchParams();
|
|
57
58
|
const menuId: string = search.get("menuId");
|
|
59
|
+
const { tabs } = useContext(KeepAliveTabContext);
|
|
58
60
|
|
|
59
61
|
const initUserConfig = async () => {
|
|
60
62
|
let userInfo: UserInfo = await Units.getCurrentUserInfo();
|
|
@@ -92,9 +94,11 @@ const Sider: React.FC<SiderPropsType> = ({ menuList, collapsed, themeConfig }) =
|
|
|
92
94
|
</div>
|
|
93
95
|
);
|
|
94
96
|
const { path, target } = getLeftMostRouteInfo(menuItem);
|
|
97
|
+
// 判断当前菜单是否保持在tab页激活页中
|
|
98
|
+
const isTab = tabs.find(tab => tab.routePath === `/${path?.split("?")[0]}`);
|
|
95
99
|
if (Array.isArray(children) && !children.length) {
|
|
96
100
|
const navLink = <NavLink
|
|
97
|
-
to={`/${path}`}
|
|
101
|
+
to={isTab ? isTab.pathname : `/${path}`}
|
|
98
102
|
target={target}
|
|
99
103
|
style={{
|
|
100
104
|
color: "inherit",
|
|
@@ -135,7 +139,7 @@ const Sider: React.FC<SiderPropsType> = ({ menuList, collapsed, themeConfig }) =
|
|
|
135
139
|
setOpenKeys(temIds);
|
|
136
140
|
}, 10);
|
|
137
141
|
}
|
|
138
|
-
}, [sourceId, menuId, menuList, getLocale()]);
|
|
142
|
+
}, [sourceId, menuId, menuList, getLocale(), tabs]);
|
|
139
143
|
|
|
140
144
|
// default select keys
|
|
141
145
|
useEffect(() => {
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { Layout, Menu, MenuProps, Space, theme } from "antd";
|
|
2
|
-
import React, { useEffect, useState, CSSProperties } from "react";
|
|
2
|
+
import React, { useContext, useEffect, useState, CSSProperties } from "react";
|
|
3
3
|
import { NavLink, useParams, useSearchParams } from "react-router-dom";
|
|
4
4
|
import L2MenuQuickBar from "../layout/menu/l2menu-quick-bar";
|
|
5
5
|
import L2MenuMessageBar from "../layout/menu/l2menu-message-bar";
|
|
@@ -8,6 +8,7 @@ import L2MenuMessageBar from "../layout/menu/l2menu-message-bar";
|
|
|
8
8
|
import { getLeftMostRouteInfo, handlePropsMenuToAntdMenu } from "../layout2/util/menu-util";
|
|
9
9
|
import { MenuType } from "../layout2/type/layout-type";
|
|
10
10
|
import { useLocale } from "../locale/useLocale";
|
|
11
|
+
import { KeepAliveTabContext } from "../layout2/tabs/tabs-context";
|
|
11
12
|
import { useLayoutContext } from "../layout2/layout-context";
|
|
12
13
|
import UserButton from "../layout2/components/user-button";
|
|
13
14
|
import SearchMenu from "../layout2/components/search-menu";
|
|
@@ -66,6 +67,7 @@ const Header: React.FC<HeaderPropsType> = ({ systemName, menuList, logoImg, them
|
|
|
66
67
|
const [selParentId, setSelParentId] = useState<string>();
|
|
67
68
|
const { sourceId } = useParams();
|
|
68
69
|
const [search] = useSearchParams();
|
|
70
|
+
const { tabs } = useContext(KeepAliveTabContext);
|
|
69
71
|
const menuId: string = search.get("menuId");
|
|
70
72
|
const { token: { colorPrimary } } = useToken();
|
|
71
73
|
|
|
@@ -93,12 +95,14 @@ const Header: React.FC<HeaderPropsType> = ({ systemName, menuList, logoImg, them
|
|
|
93
95
|
}
|
|
94
96
|
const renderIcon = (themeConfig?.showTopMenuIcon && icon) ? <IconFont type={icon} /> : "";
|
|
95
97
|
const { path, target } = getLeftMostRouteInfo(menuItem);
|
|
98
|
+
// 判断当前菜单是否保持在tab页激活页中
|
|
99
|
+
const isTab = tabs.find(tab => tab.routePath === `/${path?.split("?")[0]}`);
|
|
96
100
|
if (floor === 0) {
|
|
97
101
|
return path === null ? (
|
|
98
102
|
renderMenuItem(menuItem)
|
|
99
103
|
) : (
|
|
100
104
|
<NavLink
|
|
101
|
-
to={`/${path}`}
|
|
105
|
+
to={isTab ? isTab.pathname : `/${path}`}
|
|
102
106
|
target={target}
|
|
103
107
|
>
|
|
104
108
|
{renderMenuItem(menuItem)}
|
|
@@ -107,7 +111,7 @@ const Header: React.FC<HeaderPropsType> = ({ systemName, menuList, logoImg, them
|
|
|
107
111
|
}
|
|
108
112
|
if (Array.isArray(children) && !children.length) {
|
|
109
113
|
return (
|
|
110
|
-
<NavLink to={`/${path}`} target={target} >
|
|
114
|
+
<NavLink to={isTab ? isTab.pathname : `/${path}`} target={target} >
|
|
111
115
|
<Space size={"small"}>{renderIcon}{translate("${" + label + "}")}</Space>
|
|
112
116
|
</NavLink>
|
|
113
117
|
);
|
|
@@ -123,7 +127,7 @@ const Header: React.FC<HeaderPropsType> = ({ systemName, menuList, logoImg, them
|
|
|
123
127
|
if (menuList.length && selParentId) {
|
|
124
128
|
setMenu(handlePropsMenuToAntdMenu(menuList, handleMenu));
|
|
125
129
|
}
|
|
126
|
-
}, [menuList, getLocale(), selParentId]);
|
|
130
|
+
}, [menuList, getLocale(), selParentId, tabs]);
|
|
127
131
|
|
|
128
132
|
useEffect(() => {
|
|
129
133
|
if (sourceId === undefined) {
|
|
@@ -1,11 +1,12 @@
|
|
|
1
1
|
import { ConfigProvider, Layout, Menu, MenuProps, Space, Tooltip, theme } from "antd";
|
|
2
|
-
import React, { useEffect, useRef, useState } from "react";
|
|
2
|
+
import React, { useContext, useEffect, useRef, useState } from "react";
|
|
3
3
|
import { NavLink, useParams, useSearchParams } from "react-router-dom";
|
|
4
4
|
import {
|
|
5
5
|
getLeftMostRouteInfo,
|
|
6
6
|
getTargetMenuItemIdRouteList,
|
|
7
7
|
handlePropsMenuToAntdMenu,
|
|
8
8
|
} from "../layout2/util/menu-util";
|
|
9
|
+
import { KeepAliveTabContext } from "../layout2/tabs/tabs-context";
|
|
9
10
|
import { useLayoutContext } from "../layout2/layout-context";
|
|
10
11
|
import { MenuType } from "../layout2/type/layout-type";
|
|
11
12
|
import { useLocale } from "../locale/useLocale";
|
|
@@ -56,6 +57,7 @@ const Sider: React.FC<SiderPropsType> = ({ menuList, collapsed, themeConfig }) =
|
|
|
56
57
|
const [openKeys, setOpenKeys] = useState([]);
|
|
57
58
|
const { sourceId } = useParams();
|
|
58
59
|
const [search] = useSearchParams();
|
|
60
|
+
const { tabs } = useContext(KeepAliveTabContext);
|
|
59
61
|
const menuId: string = search.get("menuId");
|
|
60
62
|
const { token: { colorPrimary } } = useToken();
|
|
61
63
|
|
|
@@ -95,9 +97,11 @@ const Sider: React.FC<SiderPropsType> = ({ menuList, collapsed, themeConfig }) =
|
|
|
95
97
|
</div>
|
|
96
98
|
);
|
|
97
99
|
const { path, target } = getLeftMostRouteInfo(menuItem);
|
|
100
|
+
// 判断当前菜单是否保持在tab页激活页中
|
|
101
|
+
const isTab = tabs.find(tab => tab.routePath === `/${path?.split("?")[0]}`);
|
|
98
102
|
if (Array.isArray(children) && !children.length) {
|
|
99
103
|
const navLink = <NavLink
|
|
100
|
-
to={`/${path}`}
|
|
104
|
+
to={isTab ? isTab.pathname : `/${path}`}
|
|
101
105
|
target={target}
|
|
102
106
|
style={{
|
|
103
107
|
color: "inherit",
|
|
@@ -138,7 +142,7 @@ const Sider: React.FC<SiderPropsType> = ({ menuList, collapsed, themeConfig }) =
|
|
|
138
142
|
setOpenKeys(temIds);
|
|
139
143
|
}, 10);
|
|
140
144
|
}
|
|
141
|
-
}, [sourceId, menuId, menuList, getLocale()]);
|
|
145
|
+
}, [sourceId, menuId, menuList, getLocale(), tabs]);
|
|
142
146
|
|
|
143
147
|
// default select keys
|
|
144
148
|
useEffect(() => {
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import React, { useState, useEffect, useMemo, CSSProperties } from "react";
|
|
1
|
+
import React, { useContext, useState, useEffect, useMemo, CSSProperties } from "react";
|
|
2
2
|
import { Layout, Space, theme, Button, MenuProps, Dropdown, Breadcrumb, ConfigProvider } from "antd";
|
|
3
3
|
import { NavLink, useParams, useSearchParams, useLocation } from "react-router-dom";
|
|
4
4
|
import { LeftOutlined, RightOutlined, UnorderedListOutlined } from '@ant-design/icons';
|
|
@@ -13,6 +13,7 @@ import SystemMessages from "../layout2/components/system-messages";
|
|
|
13
13
|
import UserNotification from "../layout2/components/user-notification";
|
|
14
14
|
import { MenuType } from "../layout2/type/layout-type";
|
|
15
15
|
import { useLocale } from "../locale/useLocale";
|
|
16
|
+
import { KeepAliveTabContext } from "../layout2/tabs/tabs-context";
|
|
16
17
|
import { getLeftMostRouteInfo, handlePropsMenuToAntdMenu } from "../layout2/util/menu-util";
|
|
17
18
|
import IconFont from "../layout2/components/icon-font";
|
|
18
19
|
import { ThemeConfig } from "../tmpl/interface";
|
|
@@ -61,6 +62,7 @@ const Header: React.FC<HeaderPropsType> = ({ menuList, themeConfig }) => {
|
|
|
61
62
|
const { pathname } = useLocation();
|
|
62
63
|
const { sourceId } = useParams();
|
|
63
64
|
const [search] = useSearchParams();
|
|
65
|
+
const { tabs } = useContext(KeepAliveTabContext);
|
|
64
66
|
const menuId: string = search.get("menuId");
|
|
65
67
|
|
|
66
68
|
const handleMenu = (menuItem, floor) => {
|
|
@@ -71,12 +73,14 @@ const Header: React.FC<HeaderPropsType> = ({ menuList, themeConfig }) => {
|
|
|
71
73
|
return <div style={{ cursor: "not-allowed" }}>{renderItem}</div>;
|
|
72
74
|
}
|
|
73
75
|
const { path, target } = getLeftMostRouteInfo(menuItem);
|
|
76
|
+
// 判断当前菜单是否保持在tab页激活页中
|
|
77
|
+
const isTab = tabs.find(tab => tab.routePath === `/${path?.split("?")[0]}`);
|
|
74
78
|
if (floor === 0) {
|
|
75
79
|
return path === null ? (
|
|
76
80
|
renderItem
|
|
77
81
|
) : (
|
|
78
82
|
<NavLink
|
|
79
|
-
to={`/${path}`}
|
|
83
|
+
to={isTab ? isTab.pathname : `/${path}`}
|
|
80
84
|
target={target}
|
|
81
85
|
>
|
|
82
86
|
{renderItem}
|
|
@@ -85,7 +89,7 @@ const Header: React.FC<HeaderPropsType> = ({ menuList, themeConfig }) => {
|
|
|
85
89
|
}
|
|
86
90
|
if (Array.isArray(children) && !children.length) {
|
|
87
91
|
return (
|
|
88
|
-
<NavLink to={`/${path}`} target={target} >
|
|
92
|
+
<NavLink to={isTab ? isTab.pathname : `/${path}`} target={target} >
|
|
89
93
|
{renderItem}
|
|
90
94
|
</NavLink>
|
|
91
95
|
);
|
|
@@ -101,7 +105,7 @@ const Header: React.FC<HeaderPropsType> = ({ menuList, themeConfig }) => {
|
|
|
101
105
|
if (menuList?.length && selParentId) {
|
|
102
106
|
setMenu(handlePropsMenuToAntdMenu(menuList, handleMenu));
|
|
103
107
|
}
|
|
104
|
-
}, [menuList, getLocale(), selParentId]);
|
|
108
|
+
}, [menuList, getLocale(), selParentId, tabs]);
|
|
105
109
|
|
|
106
110
|
useEffect(() => {
|
|
107
111
|
if (sourceId === undefined) {
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { ConfigProvider, Layout, Menu, MenuProps, Space, Tooltip, theme } from "antd";
|
|
2
|
-
import React, { useEffect, useRef, useState } from "react";
|
|
2
|
+
import React, { useContext, useEffect, useRef, useState } from "react";
|
|
3
3
|
import { NavLink, useParams, useSearchParams } from "react-router-dom";
|
|
4
4
|
import { generate } from "@ant-design/colors";
|
|
5
5
|
import {
|
|
@@ -7,6 +7,7 @@ import {
|
|
|
7
7
|
getTargetMenuItemIdRouteList,
|
|
8
8
|
handlePropsMenuToAntdMenu,
|
|
9
9
|
} from "../layout2/util/menu-util";
|
|
10
|
+
import { KeepAliveTabContext } from "../layout2/tabs/tabs-context";
|
|
10
11
|
import { useLayoutContext } from "../layout2/layout-context";
|
|
11
12
|
import { MenuType } from "../layout2/type/layout-type";
|
|
12
13
|
import { useLocale } from "../locale/useLocale";
|
|
@@ -60,6 +61,7 @@ const Sider: React.FC<SiderPropsType> = ({ menuList, collapsed, systemName, logo
|
|
|
60
61
|
const [openKeys, setOpenKeys] = useState([]);
|
|
61
62
|
const { sourceId } = useParams();
|
|
62
63
|
const [search] = useSearchParams();
|
|
64
|
+
const { tabs } = useContext(KeepAliveTabContext);
|
|
63
65
|
const menuId: string = search.get("menuId");
|
|
64
66
|
const { token: { colorPrimary } } = useToken();
|
|
65
67
|
const colors = generate(colorPrimary);
|
|
@@ -100,9 +102,11 @@ const Sider: React.FC<SiderPropsType> = ({ menuList, collapsed, systemName, logo
|
|
|
100
102
|
</div>
|
|
101
103
|
);
|
|
102
104
|
const { path, target } = getLeftMostRouteInfo(menuItem);
|
|
105
|
+
// 判断当前菜单是否保持在tab页激活页中
|
|
106
|
+
const isTab = tabs.find(tab => tab.routePath === `/${path?.split("?")[0]}`);
|
|
103
107
|
if (Array.isArray(children) && !children.length) {
|
|
104
108
|
const navLink = <NavLink
|
|
105
|
-
to={`/${path}`}
|
|
109
|
+
to={isTab ? isTab.pathname : `/${path}`}
|
|
106
110
|
target={target}
|
|
107
111
|
style={{
|
|
108
112
|
color: "inherit",
|
|
@@ -143,7 +147,7 @@ const Sider: React.FC<SiderPropsType> = ({ menuList, collapsed, systemName, logo
|
|
|
143
147
|
setOpenKeys(temIds);
|
|
144
148
|
}, 10);
|
|
145
149
|
}
|
|
146
|
-
}, [sourceId, menuId, menuList, getLocale()]);
|
|
150
|
+
}, [sourceId, menuId, menuList, getLocale(), tabs]);
|
|
147
151
|
|
|
148
152
|
// default select keys
|
|
149
153
|
useEffect(() => {
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
// 处理扩展样式
|
|
2
|
+
export const handleExpandStyle = (expandStyle: string) => {
|
|
3
|
+
const arrStyle = expandStyle?.split(";")?.map(item => item.split(":")) || [];
|
|
4
|
+
const temStyle = arrStyle.reduce((total, cur) => {
|
|
5
|
+
if (cur[0] && cur[1]) {
|
|
6
|
+
return { ...total, [cur[0].trim()]: cur[1].trim() };
|
|
7
|
+
}
|
|
8
|
+
return total;
|
|
9
|
+
}, {});
|
|
10
|
+
return temStyle || {};
|
|
11
|
+
}
|