@tsingroc/tsingroc-components 4.5.1 → 4.6.0
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/dist/components/Auth.d.ts +6 -4
- package/dist/components/Auth.js +2 -1
- package/dist/components/Auth.js.map +1 -1
- package/dist/components/UserButton.js +4 -5
- package/dist/components/UserButton.js.map +1 -1
- package/dist/echarts/coordinateSystems/grid.js +1 -1
- package/dist/echarts/coordinateSystems/grid.js.map +1 -1
- package/dist/echarts/coordinateSystems/polar.js +1 -1
- package/dist/echarts/coordinateSystems/polar.js.map +1 -1
- package/dist/echarts/index.d.ts +1 -1
- package/package.json +23 -18
- package/src/components/Auth.tsx +10 -5
- package/src/components/UserButton.tsx +4 -7
- package/src/echarts/coordinateSystems/grid.ts +3 -3
- package/src/echarts/coordinateSystems/polar.ts +5 -5
- package/src/echarts/index.ts +1 -1
|
@@ -130,14 +130,16 @@ interface CasdoorUserInfo {
|
|
|
130
130
|
roles: string[];
|
|
131
131
|
}
|
|
132
132
|
interface LocalUserInfo {
|
|
133
|
-
/** 注册时间。*/
|
|
134
|
-
createTime?: string;
|
|
135
133
|
/** 用户的 UUID。*/
|
|
136
134
|
id?: string;
|
|
137
135
|
/** 用户名。*/
|
|
138
136
|
username?: string;
|
|
139
|
-
/**
|
|
140
|
-
|
|
137
|
+
/** 显示名。*/
|
|
138
|
+
displayName?: string;
|
|
139
|
+
/** 创建时间。*/
|
|
140
|
+
createdAt: string;
|
|
141
|
+
/** 更新时间。*/
|
|
142
|
+
updatedAt: string;
|
|
141
143
|
}
|
|
142
144
|
export type Auth = CasdoorAuth | LocalAuth;
|
|
143
145
|
interface CommonAuth {
|
package/dist/components/Auth.js
CHANGED
|
@@ -215,7 +215,8 @@ export function AuthCheck(props) {
|
|
|
215
215
|
// eslint-disable-next-line react-hooks/exhaustive-deps
|
|
216
216
|
}, []);
|
|
217
217
|
if (userInfo) {
|
|
218
|
-
if ((
|
|
218
|
+
if (!("roles" in userInfo) ||
|
|
219
|
+
(props.roles ?? []).every((role) => userInfo.roles.includes(role))) {
|
|
219
220
|
return props.children;
|
|
220
221
|
}
|
|
221
222
|
else {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Auth.js","sourceRoot":"","sources":["../../src/components/Auth.tsx"],"names":[],"mappings":";AAAA,OAAO,GAAG,MAAM,gBAAgB,CAAC;AAEjC,OAAO,EAAE,SAAS,EAAmB,MAAM,YAAY,CAAC;AACxD,OAAO,EACL,aAAa,EACb,UAAU,EACV,SAAS,EACT,OAAO,EACP,MAAM,EACN,QAAQ,GAET,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"Auth.js","sourceRoot":"","sources":["../../src/components/Auth.tsx"],"names":[],"mappings":"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"}
|
|
@@ -16,7 +16,6 @@ useAuth, } from "./Auth";
|
|
|
16
16
|
function UserButton(props) {
|
|
17
17
|
const { token } = theme.useToken();
|
|
18
18
|
const auth = useAuth("UserButton");
|
|
19
|
-
const userInfo = auth.userInfo;
|
|
20
19
|
const { compact, layout = "sidebar", onOpenProfile = auth.mode === "casdoor"
|
|
21
20
|
? () => {
|
|
22
21
|
const account = auth.accessToken === undefined
|
|
@@ -52,7 +51,7 @@ function UserButton(props) {
|
|
|
52
51
|
minWidth: "100%",
|
|
53
52
|
...dropdownProps?.menu?.style,
|
|
54
53
|
},
|
|
55
|
-
}, children: _jsx(Button, { type: "text", icon: _jsx(Avatar, { alt: "\u5934\u50CF", src: userInfo?.picture
|
|
54
|
+
}, children: _jsx(Button, { type: "text", icon: _jsx(Avatar, { alt: "\u5934\u50CF", src: auth.mode === "casdoor" ? auth.userInfo?.picture : undefined, icon: _jsx(UserOutlined, {}) }), ...rest, styles: {
|
|
56
55
|
icon: {
|
|
57
56
|
display: "inline-flex",
|
|
58
57
|
alignItems: "center",
|
|
@@ -69,9 +68,9 @@ function UserButton(props) {
|
|
|
69
68
|
paddingBlock: token.padding + token.paddingXS,
|
|
70
69
|
}),
|
|
71
70
|
...rest.style,
|
|
72
|
-
}, children: !compact && (_jsxs(_Fragment, { children: [_jsx("span", { style: { marginRight: token.marginXXS }, children:
|
|
73
|
-
userInfo?.
|
|
74
|
-
auth.userInfo?.username ??
|
|
71
|
+
}, children: !compact && (_jsxs(_Fragment, { children: [_jsx("span", { style: { marginRight: token.marginXXS }, children: (auth.mode === "casdoor"
|
|
72
|
+
? (auth.userInfo?.name ?? auth.userInfo?.prefered_username)
|
|
73
|
+
: (auth.userInfo?.displayName ?? auth.userInfo?.username)) ??
|
|
75
74
|
"平台用户" }), layout === "sidebar" ? _jsx(UpOutlined, {}) : _jsx(DownOutlined, {})] })) }) }));
|
|
76
75
|
}
|
|
77
76
|
export default UserButton;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"UserButton.js","sourceRoot":"","sources":["../../src/components/UserButton.tsx"],"names":[],"mappings":";AAAA,OAAO,EACL,MAAM,EACN,MAAM,EACN,QAAQ,EACR,KAAK,GAGN,MAAM,MAAM,CAAC;AAEd,OAAO,EACL,YAAY,EACZ,cAAc,EACd,UAAU,EACV,YAAY,GACb,MAAM,mBAAmB,CAAC;AAE3B,OAAO,EACL,SAAS,EAAE,wDAAwD;AACnE,YAAY,EAAE,wDAAwD;AACtE,OAAO,
|
|
1
|
+
{"version":3,"file":"UserButton.js","sourceRoot":"","sources":["../../src/components/UserButton.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"grid.js","sourceRoot":"","sources":["../../../src/echarts/coordinateSystems/grid.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,KAAK,EAAE,MAAM,OAAO,CAAC;AA4C9B;;;;GAIG;AACH,MAAM,UAAU,OAAO,CAAC,MAAkB;IACxC,MAAM,IAAI,GAAwB;QAChC,EAAE,EAAE,KAAK,EAAE;QACX,IAAI,EAAE,CAAC;QACP,KAAK,EAAE,CAAC;QACR,GAAG,EAAE,EAAE;QACP,MAAM,EAAE,CAAC;QACT,YAAY,EAAE,IAAI;QAClB,GAAG,MAAM,CAAC,MAAM;KACjB,CAAC;IACF,MAAM,MAAM,GAAG,IAAI,CAAC,EAAY,CAAC;IACjC,MAAM,KAAK,GAAyB;QAClC,EAAE,EAAE,MAAM,GAAG,GAAG;QAChB,MAAM;QACN,OAAO,EAAE,CAAC;QACV,GAAG,MAAM,CAAC,KAAK;QACf,aAAa,EAAE,EAAE,UAAU,EAAE,MAAM,EAAE,GAAG,MAAM,CAAC,KAAK,EAAE,aAAa,EAAE;QACrE,QAAQ,EAAE;YACR,cAAc,EAAE,IAAI;YACpB,GAAG,MAAM,CAAC,KAAK,EAAE,QAAQ;YACzB,8DAA8D;SAC3B;KACtC,CAAC;IACF,MAAM,OAAO,GAAG,KAAK,CAAC,EAAY,CAAC;IACnC,MAAM,KAAK,
|
|
1
|
+
{"version":3,"file":"grid.js","sourceRoot":"","sources":["../../../src/echarts/coordinateSystems/grid.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,KAAK,EAAE,MAAM,OAAO,CAAC;AA4C9B;;;;GAIG;AACH,MAAM,UAAU,OAAO,CAAC,MAAkB;IACxC,MAAM,IAAI,GAAwB;QAChC,EAAE,EAAE,KAAK,EAAE;QACX,IAAI,EAAE,CAAC;QACP,KAAK,EAAE,CAAC;QACR,GAAG,EAAE,EAAE;QACP,MAAM,EAAE,CAAC;QACT,YAAY,EAAE,IAAI;QAClB,GAAG,MAAM,CAAC,MAAM;KACjB,CAAC;IACF,MAAM,MAAM,GAAG,IAAI,CAAC,EAAY,CAAC;IACjC,MAAM,KAAK,GAAyB;QAClC,EAAE,EAAE,MAAM,GAAG,GAAG;QAChB,MAAM;QACN,OAAO,EAAE,CAAC;QACV,GAAG,MAAM,CAAC,KAAK;QACf,aAAa,EAAE,EAAE,UAAU,EAAE,MAAM,EAAE,GAAG,MAAM,CAAC,KAAK,EAAE,aAAa,EAAE;QACrE,QAAQ,EAAE;YACR,cAAc,EAAE,IAAI;YACpB,GAAG,MAAM,CAAC,KAAK,EAAE,QAAQ;YACzB,8DAA8D;SAC3B;KACtC,CAAC;IACF,MAAM,OAAO,GAAG,KAAK,CAAC,EAAY,CAAC;IACnC,MAAM,KAAK,GAAG;QACZ,EAAE,EAAE,MAAM,GAAG,GAAG;QAChB,IAAI,EAAE,OAAO;QACb,MAAM;QACN,OAAO,EAAE,EAAE;QACX,GAAG,MAAM,CAAC,KAAK;QACf,aAAa,EAAE;YACb,KAAK,EAAE,MAAM;YACb,UAAU,EAAE,MAAM;YAClB,GAAG,MAAM,CAAC,KAAK,EAAE,aAAa;SAC/B;KACsB,CAAC;IAC1B,MAAM,OAAO,GAAG,KAAK,CAAC,EAAY,CAAC;IACnC,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC;IAChE,OAAO;QACL,IAAI,EAAE,CAAC,IAAI,CAAC;QACZ,KAAK,EAAE,CAAC,KAAK,CAAC;QACd,KAAK,EAAE,CAAC,KAAK,CAAC;QACd,MAAM,EAAE,MAAM,CAAC,MAAM;YACnB,EAAE,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC;aAC/B,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;YAChB,GAAG,MAAM;YACT,gBAAgB,EAAE,aAAa;YAC/B,OAAO;YACP,OAAO;SACR,CAAC,CAAC;KACN,CAAC;AACJ,CAAC;AAED,MAAM,YAAY,GAAe,CAAC,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE;IACtD,IAAI,CAAC,GAAG,GAAG,CAAC,CAAC;IACb,KAAK,CAAC,IAAI,GAAG,KAAK,CAAC;IACnB,IACE,CAAC,KAAK,CAAC,IAAI,KAAK,SAAS,IAAK,KAAuB,CAAC,IAAI,KAAK,SAAS,CAAC;QACzE,KAAK,CAAC,IAAI,KAAK,UAAU,EACzB,CAAC;QACA,KAAkC,CAAC,WAAW,GAAG,KAAK,CAAC;IAC1D,CAAC;SAAM,CAAC;QACN,KAAK,CAAC,GAAG,GAAG,SAAS,CAAC;QACtB,KAAK,CAAC,GAAG,GAAG,SAAS,CAAC;IACxB,CAAC;IACD,KAAK,CAAC,SAAS,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;IACnC,KAAK,CAAC,IAAI,GAAG,KAAK,CAAC;IACnB,KAAK,CAAC,SAAS,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;AACrC,CAAC,CAAC;AAEF,gDAAgD;AAChD,MAAM,UAAU,WAAW;IACzB,OAAO,YAAY,CAAC;AACtB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"polar.js","sourceRoot":"","sources":["../../../src/echarts/coordinateSystems/polar.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,KAAK,EAAE,MAAM,OAAO,CAAC;AAuC9B;;;;GAIG;AACH,MAAM,UAAU,QAAQ,CAAC,MAAmB;IAC1C,MAAM,KAAK,GAAyB;QAClC,EAAE,EAAE,KAAK,EAAE;QACX,GAAG,MAAM,CAAC,MAAM;KACjB,CAAC;IACF,MAAM,OAAO,GAAG,KAAK,CAAC,EAAY,CAAC;IACnC,MAAM,SAAS,
|
|
1
|
+
{"version":3,"file":"polar.js","sourceRoot":"","sources":["../../../src/echarts/coordinateSystems/polar.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,KAAK,EAAE,MAAM,OAAO,CAAC;AAuC9B;;;;GAIG;AACH,MAAM,UAAU,QAAQ,CAAC,MAAmB;IAC1C,MAAM,KAAK,GAAyB;QAClC,EAAE,EAAE,KAAK,EAAE;QACX,GAAG,MAAM,CAAC,MAAM;KACjB,CAAC;IACF,MAAM,OAAO,GAAG,KAAK,CAAC,EAAY,CAAC;IACnC,MAAM,SAAS,GAAG;QAChB,EAAE,EAAE,OAAO,GAAG,OAAO;QACrB,OAAO;QACP,GAAG,MAAM,CAAC,SAAS;QACnB,SAAS,EAAE;YACT,MAAM,EAAE,CAAC;YACT,QAAQ,EAAE,EAAE;YACZ,GAAG,MAAM,CAAC,SAAS,EAAE,SAAS;SAC/B;QACD,QAAQ,EAAE;YACR,IAAI,EAAE,KAAK;YACX,GAAG,MAAM,CAAC,SAAS,EAAE,QAAQ;SAC9B;QACD,SAAS,EAAE;YACT,IAAI,EAAE,IAAI;YACV,GAAG,MAAM,CAAC,SAAS,EAAE,SAAS;SAC/B;KAC0B,CAAC;IAC9B,MAAM,WAAW,GAAG,SAAS,CAAC,EAAY,CAAC;IAC3C,MAAM,UAAU,GAAG;QACjB,EAAE,EAAE,OAAO,GAAG,QAAQ;QACtB,IAAI,EAAE,OAAO;QACb,OAAO;QACP,GAAG,MAAM,CAAC,UAAU;QACpB,QAAQ,EAAE;YACR,IAAI,EAAE,KAAK;YACX,GAAG,MAAM,CAAC,UAAU,EAAE,QAAQ;SAC/B;KAC2B,CAAC;IAC/B,MAAM,YAAY,GAAG,UAAU,CAAC,EAAY,CAAC;IAC7C,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,EAAE,SAAS,EAAE,UAAU,CAAC,CAAC,CAAC;IAC1E,OAAO;QACL,KAAK,EAAE,CAAC,KAAK,CAAC;QACd,SAAS,EAAE,CAAC,SAAS,CAAC;QACtB,UAAU,EAAE,CAAC,UAAU,CAAC;QACxB,MAAM,EAAE,MAAM,CAAC,MAAM;YACnB,EAAE,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC;aAC/B,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;YAChB,GAAG,MAAM;YACT,gBAAgB,EAAE,OAAO;YACzB,WAAW;YACX,YAAY;SACb,CAAC,CAAC;KACN,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,GAAgB,CAAC,CAAC,EAAE,SAAS,EAAE,UAAU,EAAE,EAAE;IAC3D,SAAS,CAAC,IAAI,GAAG,UAAU,CAAC;IAC3B,SAAoE,CAAC,IAAI;QACxE,oBAAoB,CAAC;IACvB,SAAS,CAAC,UAAU,GAAG,MAAM,CAAC;IAC9B,UAAU,CAAC,SAAS,GAAG;QACrB,GAAG,UAAU,CAAC,SAAS;QACvB,aAAa,EAAE,KAAK;KACrB,CAAC;AACJ,CAAC,CAAC;AAEF;;GAEG;AACH,MAAM,UAAU,SAAS;IACvB,OAAO,UAAU,CAAC;AACpB,CAAC;AAED,MAAM,oBAAoB,GAAG;IAC3B,GAAG;IACH,KAAK;IACL,IAAI;IACJ,KAAK;IACL,GAAG;IACH,KAAK;IACL,IAAI;IACJ,KAAK;IACL,GAAG;IACH,KAAK;IACL,IAAI;IACJ,KAAK;IACL,GAAG;IACH,KAAK;IACL,IAAI;IACJ,KAAK;CACG,CAAC"}
|
package/dist/echarts/index.d.ts
CHANGED
|
@@ -29,7 +29,7 @@ export interface EChartsNonComposableOption {
|
|
|
29
29
|
color?: Color[];
|
|
30
30
|
backgroundColor?: string;
|
|
31
31
|
}
|
|
32
|
-
export type DataItem = number | string | undefined;
|
|
32
|
+
export type DataItem = number | string | Date | undefined;
|
|
33
33
|
/**
|
|
34
34
|
* 第一个参数 `base` 中可以填入不可组合的 ECharts 配置项，例如 `color`。
|
|
35
35
|
* 剩余的参数就是需要组合的各个 ECharts 组件。
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@tsingroc/tsingroc-components",
|
|
3
|
-
"version": "4.
|
|
3
|
+
"version": "4.6.0",
|
|
4
4
|
"author": "",
|
|
5
5
|
"license": "ISC",
|
|
6
6
|
"description": "",
|
|
@@ -31,39 +31,39 @@
|
|
|
31
31
|
},
|
|
32
32
|
"dependencies": {
|
|
33
33
|
"casdoor-js-sdk": "^0.16.0",
|
|
34
|
-
"dayjs": "^1.11.
|
|
35
|
-
"deck.gl": "^9.1.
|
|
34
|
+
"dayjs": "^1.11.18",
|
|
35
|
+
"deck.gl": "^9.1.14",
|
|
36
36
|
"geotiff": "^2.1.3",
|
|
37
37
|
"jwt-decode": "^4.0.0",
|
|
38
38
|
"react-icons": "^5.5.0",
|
|
39
39
|
"rollup-plugin-worker-factory": "^0.5.7",
|
|
40
|
-
"weatherlayers-gl": "^2025.
|
|
40
|
+
"weatherlayers-gl": "^2025.8.0"
|
|
41
41
|
},
|
|
42
42
|
"peerDependencies": {
|
|
43
43
|
"@ant-design/icons": "^6.0.0",
|
|
44
|
-
"antd": "^5.
|
|
44
|
+
"antd": "^5.27.1",
|
|
45
45
|
"antd-style": "^3.7.1",
|
|
46
|
-
"echarts": "^5.6.0",
|
|
46
|
+
"echarts": "^5.6.0 || ^6.0.0",
|
|
47
47
|
"echarts-for-react": "^3.0.2",
|
|
48
48
|
"echarts-gl": "^2.0.9",
|
|
49
|
-
"react": "^18
|
|
50
|
-
"react-dom": "^18
|
|
49
|
+
"react": "^18 || ^19",
|
|
50
|
+
"react-dom": "^18 || ^19"
|
|
51
51
|
},
|
|
52
52
|
"devDependencies": {
|
|
53
53
|
"@ant-design/icons": "^6.0.0",
|
|
54
54
|
"@eslint/js": "^9.21.0",
|
|
55
|
-
"@ianvs/prettier-plugin-sort-imports": "^4.
|
|
55
|
+
"@ianvs/prettier-plugin-sort-imports": "^4.7.0",
|
|
56
56
|
"@rspress/plugin-preview": "2.0.0-beta.2",
|
|
57
|
-
"@types/node": "^22.
|
|
58
|
-
"@types/react": "^18.3.
|
|
57
|
+
"@types/node": "^22.18.0",
|
|
58
|
+
"@types/react": "^18.3.24",
|
|
59
59
|
"@types/react-dom": "^18.3.7",
|
|
60
|
-
"antd": "^5.
|
|
60
|
+
"antd": "^5.27.1",
|
|
61
61
|
"antd-style": "^3.7.1",
|
|
62
62
|
"copyfiles": "^2.4.1",
|
|
63
|
-
"echarts": "^
|
|
64
|
-
"echarts-for-react": "^3.0.
|
|
63
|
+
"echarts": "^6.0.0",
|
|
64
|
+
"echarts-for-react": "^3.0.4",
|
|
65
65
|
"echarts-gl": "^2.0.9",
|
|
66
|
-
"eslint": "^9.
|
|
66
|
+
"eslint": "^9.34.0",
|
|
67
67
|
"eslint-plugin-react-hooks": "^5.2.0",
|
|
68
68
|
"globals": "^16.3.0",
|
|
69
69
|
"prettier": "^3.6.2",
|
|
@@ -72,9 +72,14 @@
|
|
|
72
72
|
"react-markdown": "^10.1.0",
|
|
73
73
|
"remark-gfm": "^4.0.1",
|
|
74
74
|
"rspress": "2.0.0-beta.2",
|
|
75
|
-
"typedoc": "^0.28.
|
|
76
|
-
"typescript": "^5.
|
|
77
|
-
"typescript-eslint": "^8.
|
|
75
|
+
"typedoc": "^0.28.12",
|
|
76
|
+
"typescript": "^5.9.2",
|
|
77
|
+
"typescript-eslint": "^8.41.0"
|
|
78
|
+
},
|
|
79
|
+
"overrides": {
|
|
80
|
+
"echarts-gl": {
|
|
81
|
+
"echarts": "^6.0.0"
|
|
82
|
+
}
|
|
78
83
|
},
|
|
79
84
|
"prettier": {
|
|
80
85
|
"trailingComma": "all",
|
package/src/components/Auth.tsx
CHANGED
|
@@ -148,14 +148,16 @@ interface CasdoorUserInfo {
|
|
|
148
148
|
}
|
|
149
149
|
|
|
150
150
|
interface LocalUserInfo {
|
|
151
|
-
/** 注册时间。*/
|
|
152
|
-
createTime?: string;
|
|
153
151
|
/** 用户的 UUID。*/
|
|
154
152
|
id?: string;
|
|
155
153
|
/** 用户名。*/
|
|
156
154
|
username?: string;
|
|
157
|
-
/**
|
|
158
|
-
|
|
155
|
+
/** 显示名。*/
|
|
156
|
+
displayName?: string;
|
|
157
|
+
/** 创建时间。*/
|
|
158
|
+
createdAt: string;
|
|
159
|
+
/** 更新时间。*/
|
|
160
|
+
updatedAt: string;
|
|
159
161
|
}
|
|
160
162
|
|
|
161
163
|
export type Auth = CasdoorAuth | LocalAuth;
|
|
@@ -548,7 +550,10 @@ export function AuthCheck(props: AuthCheckProps): ReactNode {
|
|
|
548
550
|
// eslint-disable-next-line react-hooks/exhaustive-deps
|
|
549
551
|
}, []);
|
|
550
552
|
if (userInfo) {
|
|
551
|
-
if (
|
|
553
|
+
if (
|
|
554
|
+
!("roles" in userInfo) ||
|
|
555
|
+
(props.roles ?? []).every((role) => userInfo.roles.includes(role))
|
|
556
|
+
) {
|
|
552
557
|
return props.children;
|
|
553
558
|
} else {
|
|
554
559
|
return props.forbidden ?? "您无权访问此页面！";
|
|
@@ -18,8 +18,6 @@ import {
|
|
|
18
18
|
AuthCheck, // eslint-disable-line @typescript-eslint/no-unused-vars
|
|
19
19
|
AuthProvider, // eslint-disable-line @typescript-eslint/no-unused-vars
|
|
20
20
|
useAuth,
|
|
21
|
-
type CasdoorAuth,
|
|
22
|
-
type LocalAuth,
|
|
23
21
|
} from "./Auth";
|
|
24
22
|
|
|
25
23
|
export interface UserButtonProps extends ButtonProps {
|
|
@@ -65,7 +63,6 @@ export interface UserButtonProps extends ButtonProps {
|
|
|
65
63
|
function UserButton(props: UserButtonProps) {
|
|
66
64
|
const { token } = theme.useToken();
|
|
67
65
|
const auth = useAuth("UserButton");
|
|
68
|
-
const userInfo = (auth as CasdoorAuth).userInfo;
|
|
69
66
|
const {
|
|
70
67
|
compact,
|
|
71
68
|
layout = "sidebar",
|
|
@@ -124,7 +121,7 @@ function UserButton(props: UserButtonProps) {
|
|
|
124
121
|
icon={
|
|
125
122
|
<Avatar
|
|
126
123
|
alt="头像"
|
|
127
|
-
src={userInfo?.picture
|
|
124
|
+
src={auth.mode === "casdoor" ? auth.userInfo?.picture : undefined}
|
|
128
125
|
icon={<UserOutlined />}
|
|
129
126
|
/>
|
|
130
127
|
}
|
|
@@ -152,9 +149,9 @@ function UserButton(props: UserButtonProps) {
|
|
|
152
149
|
{!compact && (
|
|
153
150
|
<>
|
|
154
151
|
<span style={{ marginRight: token.marginXXS }}>
|
|
155
|
-
{
|
|
156
|
-
userInfo?.
|
|
157
|
-
(auth
|
|
152
|
+
{(auth.mode === "casdoor"
|
|
153
|
+
? (auth.userInfo?.name ?? auth.userInfo?.prefered_username)
|
|
154
|
+
: (auth.userInfo?.displayName ?? auth.userInfo?.username)) ??
|
|
158
155
|
"平台用户"}
|
|
159
156
|
</span>
|
|
160
157
|
{layout === "sidebar" ? <UpOutlined /> : <DownOutlined />}
|
|
@@ -80,9 +80,9 @@ export function useGrid(option: GridOption): EChartsComponent {
|
|
|
80
80
|
} as XAXisComponentOption["axisTick"],
|
|
81
81
|
};
|
|
82
82
|
const xAxisId = xAxis.id as string;
|
|
83
|
-
const yAxis
|
|
83
|
+
const yAxis = {
|
|
84
84
|
id: gridId + "y",
|
|
85
|
-
type:
|
|
85
|
+
type: "value",
|
|
86
86
|
gridId,
|
|
87
87
|
nameGap: 10,
|
|
88
88
|
...option.yAxis,
|
|
@@ -91,7 +91,7 @@ export function useGrid(option: GridOption): EChartsComponent {
|
|
|
91
91
|
fontWeight: "bold",
|
|
92
92
|
...option.yAxis?.nameTextStyle,
|
|
93
93
|
},
|
|
94
|
-
};
|
|
94
|
+
} as YAXisComponentOption;
|
|
95
95
|
const yAxisId = yAxis.id as string;
|
|
96
96
|
option.presets?.forEach((preset) => preset(grid, xAxis, yAxis));
|
|
97
97
|
return {
|
|
@@ -55,7 +55,7 @@ export function usePolar(option: PolarOption): EChartsComponent {
|
|
|
55
55
|
...option.option,
|
|
56
56
|
};
|
|
57
57
|
const polarId = polar.id as string;
|
|
58
|
-
const angleAxis
|
|
58
|
+
const angleAxis = {
|
|
59
59
|
id: polarId + "angle",
|
|
60
60
|
polarId,
|
|
61
61
|
...option.angleAxis,
|
|
@@ -72,18 +72,18 @@ export function usePolar(option: PolarOption): EChartsComponent {
|
|
|
72
72
|
show: true,
|
|
73
73
|
...option.angleAxis?.splitLine,
|
|
74
74
|
},
|
|
75
|
-
};
|
|
75
|
+
} as AngleAxisComponentOption;
|
|
76
76
|
const angleAxisId = angleAxis.id as string;
|
|
77
|
-
const radiusAxis
|
|
77
|
+
const radiusAxis = {
|
|
78
78
|
id: polarId + "radius",
|
|
79
|
-
type:
|
|
79
|
+
type: "value",
|
|
80
80
|
polarId,
|
|
81
81
|
...option.radiusAxis,
|
|
82
82
|
axisLine: {
|
|
83
83
|
show: false,
|
|
84
84
|
...option.radiusAxis?.axisLine,
|
|
85
85
|
},
|
|
86
|
-
};
|
|
86
|
+
} as RadiusAxisComponentOption;
|
|
87
87
|
const radiusAxisId = radiusAxis.id as string;
|
|
88
88
|
option.presets?.forEach((preset) => preset(polar, angleAxis, radiusAxis));
|
|
89
89
|
return {
|
package/src/echarts/index.ts
CHANGED
|
@@ -51,7 +51,7 @@ export interface EChartsNonComposableOption {
|
|
|
51
51
|
backgroundColor?: string;
|
|
52
52
|
}
|
|
53
53
|
|
|
54
|
-
export type DataItem = number | string | undefined;
|
|
54
|
+
export type DataItem = number | string | Date | undefined;
|
|
55
55
|
|
|
56
56
|
/**
|
|
57
57
|
* 第一个参数 `base` 中可以填入不可组合的 ECharts 配置项，例如 `color`。
|