aldehyde 0.2.237 → 0.2.238
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/layout2/components/userButton.d.ts.map +1 -1
- package/lib/layout2/components/userButton.js +5 -0
- package/lib/layout2/components/userButton.js.map +1 -1
- package/lib/login2/login.d.ts.map +1 -1
- package/lib/login2/login.js +5 -0
- package/lib/login2/login.js.map +1 -1
- package/lib/table/report-table.d.ts.map +1 -1
- package/lib/table/report-table.js +4 -2
- package/lib/table/report-table.js.map +1 -1
- package/package.json +1 -1
- package/src/aldehyde/layout2/components/userButton.tsx +6 -2
- package/src/aldehyde/login2/login.tsx +6 -1
- package/src/aldehyde/table/report-table.tsx +9 -7
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"userButton.d.ts","sourceRoot":"","sources":["../../../../../src/aldehyde/layout2/components/userButton.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAyC,MAAM,OAAO,CAAC;AAU9D,OAAO,EAAU,WAAW,EAAgC,MAAM,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"userButton.d.ts","sourceRoot":"","sources":["../../../../../src/aldehyde/layout2/components/userButton.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAyC,MAAM,OAAO,CAAC;AAU9D,OAAO,EAAU,WAAW,EAAgC,MAAM,MAAM,CAAC;AAkBzE,QAAA,MAAM,UAAU,EAAE,KAAK,CAAC,EAAE,CAAC,WAAW,CA6JrC,CAAC;AAEF,eAAe,UAAU,CAAC"}
|
|
@@ -16,9 +16,13 @@ import { useLocale } from "../../locale/useLocale";
|
|
|
16
16
|
import { NavLink, useNavigate } from "react-router-dom";
|
|
17
17
|
import ResetPassword from "../../layout/menu/reset-password";
|
|
18
18
|
import HCDataSource from "../../tmpl/hc-data-source";
|
|
19
|
+
import { useSessionStorageState } from 'ahooks';
|
|
19
20
|
const UserButton = (props) => {
|
|
20
21
|
// translate
|
|
21
22
|
const { translate, changeSiderCollapsed, getSiderCollapsed } = useLocale();
|
|
23
|
+
const [keepAliveTabs, setKeepAliveTabs] = useSessionStorageState('keepAliveTabs', {
|
|
24
|
+
defaultValue: [],
|
|
25
|
+
});
|
|
22
26
|
// navigation
|
|
23
27
|
const navigate = useNavigate();
|
|
24
28
|
// 用户配置信息
|
|
@@ -53,6 +57,7 @@ const UserButton = (props) => {
|
|
|
53
57
|
}, []);
|
|
54
58
|
// logout
|
|
55
59
|
const logout = () => __awaiter(void 0, void 0, void 0, function* () {
|
|
60
|
+
setKeepAliveTabs([]);
|
|
56
61
|
yield HcserviceV3.logout2();
|
|
57
62
|
navigate("/login2");
|
|
58
63
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"userButton.js","sourceRoot":"","sources":["../../../../../src/aldehyde/layout2/components/userButton.tsx"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,KAAK,EAAE,EAAa,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAC9D,OAAO,EACL,iBAAiB,EACjB,aAAa,EACb,aAAa,EACb,cAAc,EAAE,gBAAgB,EAAE,kBAAkB,EACpD,eAAe,EACf,cAAc,EACd,YAAY,GACb,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,MAAM,EAAe,QAAQ,EAAsB,MAAM,MAAM,CAAC;AACzE,OAAO,WAAW,MAAM,yBAAyB,CAAC;AAElD,OAAO,WAAW,MAAM,gCAAgC,CAAC;AACzD,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACnD,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AACxD,OAAO,aAAa,MAAM,kCAAkC,CAAC;AAC7D,OAAO,YAAY,MAAM,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"userButton.js","sourceRoot":"","sources":["../../../../../src/aldehyde/layout2/components/userButton.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"login.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/login2/login.tsx"],"names":[],"mappings":"AACA,OAAO,KAA8B,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"login.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/login2/login.tsx"],"names":[],"mappings":"AACA,OAAO,KAA8B,MAAM,OAAO,CAAC;AAQnD,KAAK,aAAa,GAAG;IACnB,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IACnC,KAAK,CAAC,EAAE,GAAG,CAAC;IACZ,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB,CAAC;AAQF,QAAA,MAAM,KAAK,GAAI,OAAO,aAAa,sBAuLlC,CAAC;AAEF,eAAe,KAAK,CAAC"}
|
package/lib/login2/login.js
CHANGED
|
@@ -14,9 +14,13 @@ import { useLocale } from "../locale/useLocale";
|
|
|
14
14
|
import { useParams } from "react-router-dom";
|
|
15
15
|
import Units from "../units";
|
|
16
16
|
import { SafetyCertificateOutlined } from "@ant-design/icons";
|
|
17
|
+
import { useSessionStorageState } from 'ahooks';
|
|
17
18
|
const Login = (props) => {
|
|
18
19
|
// locale
|
|
19
20
|
const { translate } = useLocale();
|
|
21
|
+
const [keepAliveTabs, setKeepAliveTabs] = useSessionStorageState('keepAliveTabs', {
|
|
22
|
+
defaultValue: [],
|
|
23
|
+
});
|
|
20
24
|
useEffect(() => {
|
|
21
25
|
localStorage.setItem("version", "v2");
|
|
22
26
|
}, []);
|
|
@@ -33,6 +37,7 @@ const Login = (props) => {
|
|
|
33
37
|
// form
|
|
34
38
|
const [form] = Form.useForm();
|
|
35
39
|
const submit = () => __awaiter(void 0, void 0, void 0, function* () {
|
|
40
|
+
setKeepAliveTabs([]);
|
|
36
41
|
try {
|
|
37
42
|
const { username, password, kaptchaText } = yield form.validateFields();
|
|
38
43
|
setLoading(true);
|
package/lib/login2/login.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"login.js","sourceRoot":"","sources":["../../../../src/aldehyde/login2/login.tsx"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAC,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,EAAC,MAAM,MAAM,CAAC;AACnD,OAAO,KAAK,EAAE,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AACnD,OAAO,WAAW,MAAM,sBAAsB,CAAC;AAC/C,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,KAAK,MAAM,UAAU,CAAC;AAC7B,OAAO,EAAC,yBAAyB,EAAC,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"login.js","sourceRoot":"","sources":["../../../../src/aldehyde/login2/login.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"report-table.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/table/report-table.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA4B,MAAM,OAAO,CAAA;AAChD,OAAO,aAAa,CAAA;AACpB,OAAO,EAAc,gBAAgB,EAAC,MAAM,mBAAmB,CAAC;AAgBhE,QAAA,MAAM,WAAW,GAAE,OAAM,gBAAgB,
|
|
1
|
+
{"version":3,"file":"report-table.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/table/report-table.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA4B,MAAM,OAAO,CAAA;AAChD,OAAO,aAAa,CAAA;AACpB,OAAO,EAAc,gBAAgB,EAAC,MAAM,mBAAmB,CAAC;AAgBhE,QAAA,MAAM,WAAW,GAAE,OAAM,gBAAgB,sBAoGxC,CAAA;AAED,eAAe,WAAW,CAAC"}
|
|
@@ -42,8 +42,10 @@ const ReportTable = (props) => {
|
|
|
42
42
|
let dataSource = [];
|
|
43
43
|
if (reportData.entities) {
|
|
44
44
|
reportData.entities.forEach((item, index) => {
|
|
45
|
-
|
|
46
|
-
|
|
45
|
+
if (item) {
|
|
46
|
+
let row = Object.assign(Object.assign({ key: item.code, code: item.code }, item.fieldMap), { index });
|
|
47
|
+
dataSource.push(row);
|
|
48
|
+
}
|
|
47
49
|
});
|
|
48
50
|
}
|
|
49
51
|
setDataSource(dataSource);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"report-table.js","sourceRoot":"","sources":["../../../../src/aldehyde/table/report-table.tsx"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,KAAK,EAAE,EAAC,SAAS,EAAE,QAAQ,EAAC,MAAM,OAAO,CAAA;AAChD,OAAO,aAAa,CAAA;AAGpB,OAAO,EAAC,KAAK,EAAC,MAAM,MAAM,CAAC;AAC3B,OAAO,WAAW,MAAM,sBAAsB,CAAC;AAC/C,OAAO,EAAC,SAAS,EAAC,MAAM,qBAAqB,CAAC;AAC9C,OAAO,aAAa,MAAM,yBAAyB,CAAC;AAIpD,+BAA+B;AAC/B,4BAA4B;AAC5B,qCAAqC;AACrC,yBAAyB;AACzB,KAAK;AAGL,MAAM,WAAW,GAAC,CAAC,KAAsB,EAAC,EAAE;IAExC,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,QAAQ,CAAU,KAAK,CAAC,CAAC;IACvD,MAAM,CAAC,UAAU,EAAE,aAAa,CAAC,GAAG,QAAQ,CAAW,SAAS,CAAC,CAAC;IAClE,MAAM,CAAC,UAAU,EAAE,aAAa,CAAC,GAAG,QAAQ,CAAa,SAAS,CAAC,CAAC;IAEpE,MAAM,EAAE,iBAAiB,EAAE,SAAS,EAAC,GAAG,SAAS,EAAE,CAAC;IACpD,MAAM,EAAC,UAAU,EAAC,OAAO,EAAC,QAAQ,EAAC,SAAS,EAAC,aAAa,EAAC,YAAY,EAAC,GAAC,KAAK,CAAA;IAE9E,SAAS,CAAE,GAAG,EAAE;QACZ,MAAM,SAAS,GAAG,GAAS,EAAE;YACzB,IAAI,QAAQ,EAAE,CAAC;gBACX,MAAM,QAAQ,CAAC,QAAQ,CAAC,GAAG,EAAC,SAAS,CAAC,CAAC;YAC3C,CAAC;QACL,CAAC,CAAA,CAAC;QACF,SAAS,EAAE,CAAA;IACf,CAAC,EAAE,CAAC,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,GAAG,CAAC,CAAC,CAAC;IAIpB,MAAM,QAAQ,GAAG,CACb,QAAgB,EAAC,SAAgB,EACnC,EAAE;QACA,UAAU,CAAC,IAAI,CAAC,CAAC;QACjB,IAAI,UAAU,GAAe,MAAM,WAAW,CAAC,sBAAsB,CAC7D,SAAS,EACT,QAAQ,EAAC,iBAAiB,EAAE,CAC/B,CAAC;QACF,IAAI,CAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,GAAG,KAAI,QAAQ,EAAE,CAAC;YAC9B,OAAO;QACX,CAAC;aAAM,CAAC;YACJ,IAAI,UAAU,GAAa,EAAE,CAAC;YAC9B,IAAI,UAAU,CAAC,QAAQ,EAAE,CAAC;gBACtB,UAAU,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE;oBACxC,IAAI,GAAG,iCACH,GAAG,EAAE,IAAI,CAAC,IAAI,EACd,IAAI,EAAE,IAAI,CAAC,IAAI,IACZ,IAAI,CAAC,QAAQ,KAChB,KAAK,GACR,CAAC;
|
|
1
|
+
{"version":3,"file":"report-table.js","sourceRoot":"","sources":["../../../../src/aldehyde/table/report-table.tsx"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -16,7 +16,8 @@ import { useLocale } from "../../locale/useLocale";
|
|
|
16
16
|
import { NavLink, useNavigate } from "react-router-dom";
|
|
17
17
|
import ResetPassword from "../../layout/menu/reset-password";
|
|
18
18
|
import HCDataSource from "../../tmpl/hc-data-source";
|
|
19
|
-
import
|
|
19
|
+
import { useSessionStorageState } from 'ahooks';
|
|
20
|
+
import {KeepAliveTab} from "../../hooks/use-tabs";
|
|
20
21
|
|
|
21
22
|
type DropDownMenuType = {
|
|
22
23
|
label: string | number | ReactNode;
|
|
@@ -28,7 +29,9 @@ type DropDownMenuType = {
|
|
|
28
29
|
const UserButton: React.FC<ButtonProps> = (props) => {
|
|
29
30
|
// translate
|
|
30
31
|
const { translate,changeSiderCollapsed,getSiderCollapsed } = useLocale();
|
|
31
|
-
|
|
32
|
+
const [keepAliveTabs, setKeepAliveTabs] = useSessionStorageState<KeepAliveTab[]>('keepAliveTabs', {
|
|
33
|
+
defaultValue: [],
|
|
34
|
+
});
|
|
32
35
|
// navigation
|
|
33
36
|
const navigate = useNavigate();
|
|
34
37
|
|
|
@@ -66,6 +69,7 @@ const UserButton: React.FC<ButtonProps> = (props) => {
|
|
|
66
69
|
|
|
67
70
|
// logout
|
|
68
71
|
const logout = async () => {
|
|
72
|
+
setKeepAliveTabs([]);
|
|
69
73
|
await HcserviceV3.logout2();
|
|
70
74
|
navigate("/login2");
|
|
71
75
|
};
|
|
@@ -5,7 +5,8 @@ import { useLocale } from "../locale/useLocale";
|
|
|
5
5
|
import { useParams } from "react-router-dom";
|
|
6
6
|
import Units from "../units";
|
|
7
7
|
import {SafetyCertificateOutlined} from "@ant-design/icons";
|
|
8
|
-
|
|
8
|
+
import { useSessionStorageState } from 'ahooks';
|
|
9
|
+
import {KeepAliveTab} from "../hooks/use-tabs";
|
|
9
10
|
type LoginPropType = {
|
|
10
11
|
onFinish?: (token: string) => void;
|
|
11
12
|
title?: any;
|
|
@@ -22,6 +23,9 @@ type FormType = {
|
|
|
22
23
|
const Login = (props: LoginPropType) => {
|
|
23
24
|
// locale
|
|
24
25
|
const { translate } = useLocale();
|
|
26
|
+
const [keepAliveTabs, setKeepAliveTabs] = useSessionStorageState<KeepAliveTab[]>('keepAliveTabs', {
|
|
27
|
+
defaultValue: [],
|
|
28
|
+
});
|
|
25
29
|
|
|
26
30
|
useEffect(() => {
|
|
27
31
|
localStorage.setItem("version", "v2");
|
|
@@ -40,6 +44,7 @@ const Login = (props: LoginPropType) => {
|
|
|
40
44
|
// form
|
|
41
45
|
const [form] = Form.useForm<FormType>();
|
|
42
46
|
const submit = async () => {
|
|
47
|
+
setKeepAliveTabs([]);
|
|
43
48
|
try {
|
|
44
49
|
const { username, password,kaptchaText } = await form.validateFields();
|
|
45
50
|
|
|
@@ -50,13 +50,15 @@ const ReportTable=(props:ReportTableProps)=> {
|
|
|
50
50
|
let dataSource: object[] = [];
|
|
51
51
|
if (reportData.entities) {
|
|
52
52
|
reportData.entities.forEach((item, index) => {
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
53
|
+
if (item) {
|
|
54
|
+
let row = {
|
|
55
|
+
key: item.code,
|
|
56
|
+
code: item.code, //增加code,为了删除操作
|
|
57
|
+
...item.fieldMap,
|
|
58
|
+
index,
|
|
59
|
+
};
|
|
60
|
+
dataSource.push(row);
|
|
61
|
+
}
|
|
60
62
|
});
|
|
61
63
|
}
|
|
62
64
|
|