aldehyde 0.2.161 → 0.2.163
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/steps/index.d.ts.map +1 -1
- package/lib/controls/steps/index.js +4 -1
- package/lib/controls/steps/index.js.map +1 -1
- package/lib/detail/button/edit-button.d.ts.map +1 -1
- package/lib/detail/button/edit-button.js +12 -6
- package/lib/detail/button/edit-button.js.map +1 -1
- package/lib/detail/button/view-button.d.ts +11 -0
- package/lib/detail/button/view-button.d.ts.map +1 -0
- package/lib/detail/button/view-button.js +28 -0
- package/lib/detail/button/view-button.js.map +1 -0
- package/lib/layout2/header.d.ts.map +1 -1
- package/lib/layout2/header.js +9 -2
- package/lib/layout2/header.js.map +1 -1
- package/lib/login/login.d.ts.map +1 -1
- package/lib/login/login.js +3 -0
- package/lib/login/login.js.map +1 -1
- package/lib/login2/Login.d.ts.map +1 -1
- package/lib/login2/Login.js +11 -3
- package/lib/login2/Login.js.map +1 -1
- package/lib/login2/LoginPage.d.ts.map +1 -1
- package/lib/login2/LoginPage.js +3 -2
- package/lib/login2/LoginPage.js.map +1 -1
- package/lib/login2/img/login-bg.png +0 -0
- package/lib/module/ltmpl-table.d.ts +3 -3
- package/lib/module/ltmpl-table.d.ts.map +1 -1
- package/lib/module/ltmpl-table.js +5 -3
- package/lib/module/ltmpl-table.js.map +1 -1
- package/lib/routable/ltmpl-route.d.ts.map +1 -1
- package/lib/routable/ltmpl-route.js +4 -3
- package/lib/routable/ltmpl-route.js.map +1 -1
- package/lib/table/act-table.d.ts +2 -2
- package/lib/table/act-table.d.ts.map +1 -1
- package/lib/table/act-table.js +4 -2
- package/lib/table/act-table.js.map +1 -1
- package/lib/tmpl/interface.d.ts +7 -2
- package/lib/tmpl/interface.d.ts.map +1 -1
- package/lib/welcome/HCWelcome.d.ts.map +1 -1
- package/lib/welcome/HCWelcome.js +248 -229
- package/lib/welcome/HCWelcome.js.map +1 -1
- package/package.json +1 -1
- package/src/aldehyde/controls/steps/index.tsx +6 -1
- package/src/aldehyde/detail/button/edit-button.tsx +48 -37
- package/src/aldehyde/detail/button/view-button.tsx +61 -0
- package/src/aldehyde/layout2/header.tsx +22 -8
- package/src/aldehyde/login/login.tsx +2 -0
- package/src/aldehyde/login2/Login.tsx +15 -3
- package/src/aldehyde/login2/LoginPage.tsx +3 -2
- package/src/aldehyde/login2/img/login-bg.png +0 -0
- package/src/aldehyde/module/ltmpl-table.tsx +7 -5
- package/src/aldehyde/routable/ltmpl-route.tsx +5 -4
- package/src/aldehyde/table/act-table.tsx +6 -12
- package/src/aldehyde/tmpl/interface.tsx +12 -2
- package/src/aldehyde/welcome/HCWelcome.js +251 -233
- package/lib/layout2/imgs/1.png +0 -0
- package/lib/layout2/imgs/2.png +0 -0
- package/lib/layout2/imgs/3.png +0 -0
- package/lib/layout2/imgs/4.png +0 -0
- package/lib/layout2/imgs/5.png +0 -0
- package/lib/layout2/imgs/6.png +0 -0
- package/src/aldehyde/layout2/imgs/1.png +0 -0
- package/src/aldehyde/layout2/imgs/2.png +0 -0
- package/src/aldehyde/layout2/imgs/3.png +0 -0
- package/src/aldehyde/layout2/imgs/4.png +0 -0
- package/src/aldehyde/layout2/imgs/5.png +0 -0
- package/src/aldehyde/layout2/imgs/6.png +0 -0
- package/src/aldehyde/layout2/imgs/s.svg +0 -3
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/aldehyde/controls/steps/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAItD,UAAU,UAAW,SAAQ,cAAc;IACzC,OAAO,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;CACzB;AAED,QAAA,MAAM,KAAK,EAAE,KAAK,CAAC,EAAE,CAAC,UAAU,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/aldehyde/controls/steps/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAItD,UAAU,UAAW,SAAQ,cAAc;IACzC,OAAO,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;CACzB;AAED,QAAA,MAAM,KAAK,EAAE,KAAK,CAAC,EAAE,CAAC,UAAU,CA8C/B,CAAC;AAEF,eAAe,KAAK,CAAC"}
|
|
@@ -24,6 +24,8 @@ const Steps = (_a) => {
|
|
|
24
24
|
}
|
|
25
25
|
};
|
|
26
26
|
let enumItems = HCDataSource.getEnums(fieldConfig.mstrucId);
|
|
27
|
+
if (enumItems === undefined)
|
|
28
|
+
console.error(`${fieldConfig.mstrucId} 枚举未找到`);
|
|
27
29
|
let currentIndex = undefined;
|
|
28
30
|
for (let i in enumItems) {
|
|
29
31
|
if (value == enumItems[i].value) {
|
|
@@ -31,7 +33,8 @@ const Steps = (_a) => {
|
|
|
31
33
|
}
|
|
32
34
|
}
|
|
33
35
|
let items = [];
|
|
34
|
-
|
|
36
|
+
Array.isArray(enumItems) &&
|
|
37
|
+
enumItems.map((item) => items.push({ title: item.title }));
|
|
35
38
|
if (fieldConfig.disabled || viewOrEdit == "view") {
|
|
36
39
|
entryControl = (React.createElement(AntdSteps, { items: items, current: currentIndex, size: "small" }));
|
|
37
40
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/aldehyde/controls/steps/index.tsx"],"names":[],"mappings":";;;;;;;;;;;AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,MAAM,EAAE,KAAK,IAAI,SAAS,EAAE,MAAM,MAAM,CAAC;AAElD,OAAO,YAAY,MAAM,2BAA2B,CAAC;AACrD,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAMnD,MAAM,KAAK,GAAyB,CAAC,EAAiC,EAAE,EAAE;QAArC,EAAE,UAAU,GAAG,MAAM,OAAY,EAAP,KAAK,cAA/B,cAAiC,CAAF;IAClE,MAAM,EAAE,KAAK,EAAE,WAAW,EAAE,QAAQ,EAAE,OAAO,EAAE,GAAG,KAAK,CAAC;IACxD,MAAM,EAAE,SAAS,EAAE,GAAG,SAAS,EAAE,CAAC;IAElC,IAAI,YAAY,GAAG,SAAS,CAAC;IAE7B,MAAM,WAAW,GAAG,CAAC,KAAK,EAAE,EAAE;QAC5B,IAAI,QAAQ,EAAE,CAAC;YACb,QAAQ,CAAC,KAAK,CAAC,CAAC;QAClB,CAAC;IACH,CAAC,CAAC;IAEF,IAAI,SAAS,GAAG,YAAY,CAAC,QAAQ,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/aldehyde/controls/steps/index.tsx"],"names":[],"mappings":";;;;;;;;;;;AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,MAAM,EAAE,KAAK,IAAI,SAAS,EAAE,MAAM,MAAM,CAAC;AAElD,OAAO,YAAY,MAAM,2BAA2B,CAAC;AACrD,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAMnD,MAAM,KAAK,GAAyB,CAAC,EAAiC,EAAE,EAAE;QAArC,EAAE,UAAU,GAAG,MAAM,OAAY,EAAP,KAAK,cAA/B,cAAiC,CAAF;IAClE,MAAM,EAAE,KAAK,EAAE,WAAW,EAAE,QAAQ,EAAE,OAAO,EAAE,GAAG,KAAK,CAAC;IACxD,MAAM,EAAE,SAAS,EAAE,GAAG,SAAS,EAAE,CAAC;IAElC,IAAI,YAAY,GAAG,SAAS,CAAC;IAE7B,MAAM,WAAW,GAAG,CAAC,KAAK,EAAE,EAAE;QAC5B,IAAI,QAAQ,EAAE,CAAC;YACb,QAAQ,CAAC,KAAK,CAAC,CAAC;QAClB,CAAC;IACH,CAAC,CAAC;IAEF,IAAI,SAAS,GAAG,YAAY,CAAC,QAAQ,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;IAE5D,IAAI,SAAS,KAAK,SAAS;QACzB,OAAO,CAAC,KAAK,CAAC,GAAG,WAAW,CAAC,QAAQ,QAAQ,CAAC,CAAC;IAEjD,IAAI,YAAY,GAAG,SAAS,CAAC;IAC7B,KAAK,IAAI,CAAC,IAAI,SAAS,EAAE,CAAC;QACxB,IAAI,KAAK,IAAI,SAAS,CAAC,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC;YAChC,YAAY,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;QAC7B,CAAC;IACH,CAAC;IACD,IAAI,KAAK,GAAG,EAAE,CAAC;IACf,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC;QACtB,SAAS,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;IAE7D,IAAI,WAAW,CAAC,QAAQ,IAAI,UAAU,IAAI,MAAM,EAAE,CAAC;QACjD,YAAY,GAAG,CACb,oBAAC,SAAS,IAAC,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,YAAY,EAAE,IAAI,EAAC,OAAO,GAAa,CAC1E,CAAC;IACJ,CAAC;SAAM,CAAC;QACN,YAAY,GAAG,CACb,oBAAC,MAAM,IACL,WAAW,EAAE,SAAS,CAAC,UAAU,GAAG,WAAW,CAAC,KAAK,GAAG,GAAG,CAAC,EAC5D,eAAe,EAAE,SAAS,CAAC,SAAS,CAAC,EACrC,UAAU,EAAE,IAAI,EAChB,UAAU,QACV,KAAK,EAAE,KAAK,EACZ,QAAQ,EAAE,WAAW,EACrB,OAAO,EAAE,OAAO,GAChB,CACH,CAAC;IACJ,CAAC;IAED,OAAO,YAAY,CAAC;AACtB,CAAC,CAAC;AAEF,eAAe,KAAK,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"edit-button.d.ts","sourceRoot":"","sources":["../../../../../src/aldehyde/detail/button/edit-button.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,WAAW,
|
|
1
|
+
{"version":3,"file":"edit-button.d.ts","sourceRoot":"","sources":["../../../../../src/aldehyde/detail/button/edit-button.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAI3E,UAAU,eAAe;IACvB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,CAAC,WAAW,EAAE,WAAW,KAAK,IAAI,CAAC;IAC3C,IAAI,EAAE,SAAS,CAAC;IAChB,WAAW,EAAE,WAAW,CAAC;CAC1B;AAED,QAAA,MAAM,UAAU,EAAE,KAAK,CAAC,EAAE,CAAC,eAAe,CA+CzC,CAAC;AACF,eAAe,UAAU,CAAC"}
|
|
@@ -7,15 +7,21 @@ const EditButton = (props) => {
|
|
|
7
7
|
const { doEdit, data, ltmplConfig } = props;
|
|
8
8
|
let button = undefined;
|
|
9
9
|
if (ltmplConfig.classEditConfigs) {
|
|
10
|
-
ltmplConfig.classEditConfigs.forEach(classEditConfig => {
|
|
11
|
-
if (!button &&
|
|
12
|
-
|
|
10
|
+
ltmplConfig.classEditConfigs.forEach((classEditConfig) => {
|
|
11
|
+
if (!button &&
|
|
12
|
+
ActionUtils.isShow(classEditConfig.preposes, [data], undefined)) {
|
|
13
|
+
button = (React.createElement(Button, { size: "small", type: "dashed", icon: React.createElement(EditOutlined, null), onClick: () => doEdit({
|
|
14
|
+
code: data.code,
|
|
15
|
+
mode: "update",
|
|
16
|
+
dtmplSourceId: classEditConfig.id,
|
|
17
|
+
}) }));
|
|
13
18
|
}
|
|
14
19
|
});
|
|
15
20
|
}
|
|
16
|
-
debugger
|
|
17
|
-
if (!button &&
|
|
18
|
-
|
|
21
|
+
// debugger
|
|
22
|
+
if (!button &&
|
|
23
|
+
ActionUtils.isShow((_a = ltmplConfig.buttonEditAction) === null || _a === void 0 ? void 0 : _a.preposes, [data], undefined)) {
|
|
24
|
+
button = (React.createElement(Button, { size: "small", type: "dashed", icon: React.createElement(EditOutlined, null), onClick: () => doEdit({ code: data.code, mode: "update" }) }));
|
|
19
25
|
}
|
|
20
26
|
return button ? button : React.createElement(React.Fragment, null);
|
|
21
27
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"edit-button.js","sourceRoot":"","sources":["../../../../../src/aldehyde/detail/button/edit-button.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAE9B,OAAO,
|
|
1
|
+
{"version":3,"file":"edit-button.js","sourceRoot":"","sources":["../../../../../src/aldehyde/detail/button/edit-button.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAE9B,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,WAAW,MAAM,6BAA6B,CAAC;AAStD,MAAM,UAAU,GAA8B,CAAC,KAAK,EAAE,EAAE;;IACtD,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,GAAG,KAAK,CAAC;IAC5C,IAAI,MAAM,GAAG,SAAS,CAAC;IACvB,IAAI,WAAW,CAAC,gBAAgB,EAAE,CAAC;QACjC,WAAW,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC,eAAe,EAAE,EAAE;YACvD,IACE,CAAC,MAAM;gBACP,WAAW,CAAC,MAAM,CAAC,eAAe,CAAC,QAAQ,EAAE,CAAC,IAAI,CAAC,EAAE,SAAS,CAAC,EAC/D,CAAC;gBACD,MAAM,GAAG,CACP,oBAAC,MAAM,IACL,IAAI,EAAC,OAAO,EACZ,IAAI,EAAC,QAAQ,EACb,IAAI,EAAE,oBAAC,YAAY,OAAG,EACtB,OAAO,EAAE,GAAG,EAAE,CACZ,MAAM,CAAC;wBACL,IAAI,EAAE,IAAI,CAAC,IAAI;wBACf,IAAI,EAAE,QAAQ;wBACd,aAAa,EAAE,eAAe,CAAC,EAAE;qBAClC,CAAC,GAEI,CACX,CAAC;YACJ,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC;IAED,aAAa;IACb,IACE,CAAC,MAAM;QACP,WAAW,CAAC,MAAM,CAChB,MAAA,WAAW,CAAC,gBAAgB,0CAAE,QAAQ,EACtC,CAAC,IAAI,CAAC,EACN,SAAS,CACV,EACD,CAAC;QACD,MAAM,GAAG,CACP,oBAAC,MAAM,IACL,IAAI,EAAC,OAAO,EACZ,IAAI,EAAC,QAAQ,EACb,IAAI,EAAE,oBAAC,YAAY,OAAG,EACtB,OAAO,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,GAClD,CACX,CAAC;IACJ,CAAC;IAED,OAAO,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,yCAAK,CAAC;AACjC,CAAC,CAAC;AACF,eAAe,UAAU,CAAC"}
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
import React from "react";
|
|
2
|
+
import { DtmplData, LtmplConfig, ShowViewParam } from "../../tmpl/interface";
|
|
3
|
+
interface ViewButtonProps {
|
|
4
|
+
serverKey?: string;
|
|
5
|
+
showView: (showViewParam: ShowViewParam) => void;
|
|
6
|
+
data: DtmplData;
|
|
7
|
+
ltmplConfig: LtmplConfig;
|
|
8
|
+
}
|
|
9
|
+
declare const EditButton: React.FC<ViewButtonProps>;
|
|
10
|
+
export default EditButton;
|
|
11
|
+
//# sourceMappingURL=view-button.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"view-button.d.ts","sourceRoot":"","sources":["../../../../../src/aldehyde/detail/button/view-button.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAC,SAAS,EAAE,WAAW,EAAE,aAAa,EAAC,MAAM,sBAAsB,CAAC;AAI3E,UAAU,eAAe;IACvB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,CAAC,aAAa,EAAE,aAAa,KAAK,IAAI,CAAC;IACjD,IAAI,EAAE,SAAS,CAAC;IAChB,WAAW,EAAE,WAAW,CAAC;CAC1B;AAED,QAAA,MAAM,UAAU,EAAE,KAAK,CAAC,EAAE,CAAC,eAAe,CA8CzC,CAAC;AACF,eAAe,UAAU,CAAC"}
|
|
@@ -0,0 +1,28 @@
|
|
|
1
|
+
import React from "react";
|
|
2
|
+
import { Button } from "antd";
|
|
3
|
+
import { AlignCenterOutlined } from "@ant-design/icons";
|
|
4
|
+
import ActionUtils from "../../controls/action/utils";
|
|
5
|
+
const EditButton = (props) => {
|
|
6
|
+
var _a;
|
|
7
|
+
const { showView, data, ltmplConfig } = props;
|
|
8
|
+
let button = undefined;
|
|
9
|
+
if (ltmplConfig.classViewConfigs) {
|
|
10
|
+
ltmplConfig.classViewConfigs.forEach((classViewConfig) => {
|
|
11
|
+
if (!button &&
|
|
12
|
+
ActionUtils.isShow(classViewConfig.preposes, [data], undefined)) {
|
|
13
|
+
button = (React.createElement(Button, { size: "small", type: "dashed", icon: React.createElement(AlignCenterOutlined, null), onClick: () => showView({
|
|
14
|
+
code: data.code,
|
|
15
|
+
dtmplSourceId: classViewConfig.id,
|
|
16
|
+
}) }));
|
|
17
|
+
}
|
|
18
|
+
});
|
|
19
|
+
}
|
|
20
|
+
// debugger
|
|
21
|
+
if (!button &&
|
|
22
|
+
ActionUtils.isShow((_a = ltmplConfig.buttonViewAction) === null || _a === void 0 ? void 0 : _a.preposes, [data], undefined)) {
|
|
23
|
+
button = (React.createElement(Button, { size: "small", type: "dashed", icon: React.createElement(AlignCenterOutlined, null), onClick: () => showView({ code: data.code }) }));
|
|
24
|
+
}
|
|
25
|
+
return button ? button : React.createElement(React.Fragment, null);
|
|
26
|
+
};
|
|
27
|
+
export default EditButton;
|
|
28
|
+
//# sourceMappingURL=view-button.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"view-button.js","sourceRoot":"","sources":["../../../../../src/aldehyde/detail/button/view-button.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAE9B,OAAO,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AACxD,OAAO,WAAW,MAAM,6BAA6B,CAAC;AAStD,MAAM,UAAU,GAA8B,CAAC,KAAK,EAAE,EAAE;;IACtD,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,WAAW,EAAE,GAAG,KAAK,CAAC;IAC9C,IAAI,MAAM,GAAG,SAAS,CAAC;IACvB,IAAI,WAAW,CAAC,gBAAgB,EAAE,CAAC;QACjC,WAAW,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC,eAAe,EAAE,EAAE;YACvD,IACE,CAAC,MAAM;gBACP,WAAW,CAAC,MAAM,CAAC,eAAe,CAAC,QAAQ,EAAE,CAAC,IAAI,CAAC,EAAE,SAAS,CAAC,EAC/D,CAAC;gBACD,MAAM,GAAG,CACP,oBAAC,MAAM,IACL,IAAI,EAAC,OAAO,EACZ,IAAI,EAAC,QAAQ,EACb,IAAI,EAAE,oBAAC,mBAAmB,OAAG,EAC7B,OAAO,EAAE,GAAG,EAAE,CACV,QAAQ,CAAC;wBACT,IAAI,EAAE,IAAI,CAAC,IAAI;wBACf,aAAa,EAAE,eAAe,CAAC,EAAE;qBAClC,CAAC,GAEI,CACX,CAAC;YACJ,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC;IAED,aAAa;IACb,IACE,CAAC,MAAM;QACP,WAAW,CAAC,MAAM,CAChB,MAAA,WAAW,CAAC,gBAAgB,0CAAE,QAAQ,EACtC,CAAC,IAAI,CAAC,EACN,SAAS,CACV,EACD,CAAC;QACD,MAAM,GAAG,CACP,oBAAC,MAAM,IACL,IAAI,EAAC,OAAO,EACZ,IAAI,EAAC,QAAQ,EACb,IAAI,EAAE,oBAAC,mBAAmB,OAAG,EAC7B,OAAO,EAAE,GAAG,EAAE,CAAC,QAAQ,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAC,CAAC,GACnC,CACX,CAAC;IACJ,CAAC;IAED,OAAO,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,yCAAK,CAAC;AACjC,CAAC,CAAC;AACF,eAAe,UAAU,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"header.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/layout2/header.tsx"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"header.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/layout2/header.tsx"],"names":[],"mappings":"AAAA,OAAO,EAGL,MAAM,EAKP,MAAM,MAAM,CAAC;AACd,OAAO,KAA8B,MAAM,OAAO,CAAC;AACnD,OAAO,kBAAkB,CAAC;AAO1B,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAS9C,KAAK,eAAe,GAAG;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,QAAQ,EAAE,CAAC;IACrB,KAAK,CAAC,EAAE,OAAO,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,KAAK,CAAC;CACjD,CAAC;AAsEF,QAAA,MAAM,MAAM,EAAE,KAAK,CAAC,EAAE,CAAC,eAAe,CAqPrC,CAAC;AAEF,eAAe,MAAM,CAAC"}
|
package/lib/layout2/header.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { ConfigProvider, Layout, Menu, theme } from "antd";
|
|
1
|
+
import { ConfigProvider, Layout, Menu, theme, Tooltip, } from "antd";
|
|
2
2
|
import React, { useEffect, useState } from "react";
|
|
3
3
|
import "./css/header.css";
|
|
4
4
|
import L2MenuQuickBar from "../layout/menu/l2menu-quick-bar";
|
|
@@ -140,7 +140,14 @@ const Header = ({ systemName, menuList, style }) => {
|
|
|
140
140
|
React.createElement("img", { src: homePng, alt: "home", width: 35, height: 35, style: {
|
|
141
141
|
marginRight: 5,
|
|
142
142
|
} }),
|
|
143
|
-
systemName
|
|
143
|
+
React.createElement(Tooltip, { title: systemName },
|
|
144
|
+
React.createElement("span", { style: {
|
|
145
|
+
width: "100%",
|
|
146
|
+
height: "100%",
|
|
147
|
+
overflow: "hidden",
|
|
148
|
+
textOverflow: "ellipsis",
|
|
149
|
+
whiteSpace: "nowrap",
|
|
150
|
+
} }, systemName))),
|
|
144
151
|
React.createElement("div", { style: {
|
|
145
152
|
display: "flex",
|
|
146
153
|
flexDirection: "row",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"header.js","sourceRoot":"","sources":["../../../../src/aldehyde/layout2/header.tsx"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"header.js","sourceRoot":"","sources":["../../../../src/aldehyde/layout2/header.tsx"],"names":[],"mappings":"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"}
|
package/lib/login/login.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"login.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/login/login.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAwB,MAAM,OAAO,CAAC;AAC7C,OAAO,aAAa,CAAC;AACrB,OAAO,EAAiC,YAAY,EAAE,MAAM,MAAM,CAAC;AAOnE,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;
|
|
1
|
+
{"version":3,"file":"login.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/login/login.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAwB,MAAM,OAAO,CAAC;AAC7C,OAAO,aAAa,CAAC;AACrB,OAAO,EAAiC,YAAY,EAAE,MAAM,MAAM,CAAC;AAOnE,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAIzD,UAAU,UAAU;IAClB,QAAQ,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IAClC,KAAK,CAAC,EAAE,GAAG,CAAC;IACZ,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB;AAED,UAAU,UAAU;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,OAAO,CAAC;IACjB,gBAAgB,EAAE,OAAO,CAAC;CAC3B;AAED,cAAM,KAAM,SAAQ,KAAK,CAAC,aAAa,CAAC,UAAU,EAAE,UAAU,CAAC;IAC7D,KAAK;;;;;;;;;;MAUH;IACF,OAAO,qCAAmC;IAC1C,MAAM,CAAC,WAAW;;;;;;;;OAAiB;IACnC,OAAO,EAAE,KAAK,CAAC,WAAW,CAAC,OAAO,aAAa,CAAC,CAAC;IAEjD,iBAAiB,sBASf;IAEF,eAAe,sBAgBb;IAEF,YAAY,sBAgCV;IAEF,aAAa,uBASX;IAEF,aAAa,gCAGX;IAEF,MAAM;CAoHP;AAED,eAAe,KAAK,CAAC"}
|
package/lib/login/login.js
CHANGED
|
@@ -14,6 +14,7 @@ import { LockOutlined, UserOutlined, } from "@ant-design/icons";
|
|
|
14
14
|
import HCserviceV3 from "../tmpl/hcservice-v3";
|
|
15
15
|
import { LocaleContext } from "../locale/LocaleProvider";
|
|
16
16
|
import Vertify from "./vertify/index";
|
|
17
|
+
import Units from "../units";
|
|
17
18
|
class Login extends React.PureComponent {
|
|
18
19
|
constructor() {
|
|
19
20
|
super(...arguments);
|
|
@@ -31,6 +32,8 @@ class Login extends React.PureComponent {
|
|
|
31
32
|
this.formRef = React.createRef();
|
|
32
33
|
this.componentDidMount = () => __awaiter(this, void 0, void 0, function* () {
|
|
33
34
|
const { programCode } = this.props;
|
|
35
|
+
if (programCode)
|
|
36
|
+
Units.setProgramCode(programCode);
|
|
34
37
|
window.removeEventListener("keydown", this.handleKeyDown);
|
|
35
38
|
let pubkey = yield HCserviceV3.getRasPubkey(null, programCode);
|
|
36
39
|
this.setState({
|
package/lib/login/login.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"login.js","sourceRoot":"","sources":["../../../../src/aldehyde/login/login.tsx"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,KAAwB,MAAM,OAAO,CAAC;AAC7C,OAAO,aAAa,CAAC;AACrB,OAAO,EAAE,MAAM,EAAO,IAAI,EAAE,KAAK,EAAqB,MAAM,MAAM,CAAC;AACnE,OAAO,EACL,YAAY,EAEZ,YAAY,GACb,MAAM,mBAAmB,CAAC;AAC3B,OAAO,WAAW,MAAM,sBAAsB,CAAC;AAC/C,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AACzD,OAAO,OAAO,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"login.js","sourceRoot":"","sources":["../../../../src/aldehyde/login/login.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,
|
|
1
|
+
{"version":3,"file":"Login.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/login2/Login.tsx"],"names":[],"mappings":"AACA,OAAO,KAA8B,MAAM,OAAO,CAAC;AAMnD,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;AAOF,QAAA,MAAM,KAAK,UAAW,aAAa,sBAoGlC,CAAC;AAEF,eAAe,KAAK,CAAC"}
|
package/lib/login2/Login.js
CHANGED
|
@@ -8,12 +8,20 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
8
8
|
});
|
|
9
9
|
};
|
|
10
10
|
import { Button, Form, Input } from "antd";
|
|
11
|
-
import React, { useState } from "react";
|
|
11
|
+
import React, { useEffect, useState } from "react";
|
|
12
12
|
import HCserviceV3 from "../tmpl/hcservice-v3";
|
|
13
13
|
import { useLocale } from "../locale/useLocale";
|
|
14
|
+
import { useParams } from "react-router-dom";
|
|
15
|
+
import Units from "../units";
|
|
14
16
|
const Login = (props) => {
|
|
15
17
|
// locale
|
|
16
18
|
const { translate } = useLocale();
|
|
19
|
+
const { programCode: routeProgramCode } = useParams();
|
|
20
|
+
useEffect(() => {
|
|
21
|
+
if (routeProgramCode === undefined)
|
|
22
|
+
return;
|
|
23
|
+
Units.setProgramCode(routeProgramCode);
|
|
24
|
+
}, [routeProgramCode]);
|
|
17
25
|
// form
|
|
18
26
|
const [form] = Form.useForm();
|
|
19
27
|
const submit = () => __awaiter(void 0, void 0, void 0, function* () {
|
|
@@ -21,8 +29,8 @@ const Login = (props) => {
|
|
|
21
29
|
const { username, password } = yield form.validateFields();
|
|
22
30
|
setLoading(true);
|
|
23
31
|
const { programCode, onFinish } = props;
|
|
24
|
-
const pubkey = yield HCserviceV3.getRasPubkey(null, programCode);
|
|
25
|
-
const res = yield HCserviceV3.login({ username, password }, "", "", pubkey, programCode);
|
|
32
|
+
const pubkey = yield HCserviceV3.getRasPubkey(null, programCode ? programCode : routeProgramCode);
|
|
33
|
+
const res = yield HCserviceV3.login({ username, password }, "", "", pubkey, programCode ? programCode : routeProgramCode);
|
|
26
34
|
if (res.status === "success") {
|
|
27
35
|
onFinish(res.token);
|
|
28
36
|
}
|
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,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,MAAM,CAAC;AAC3C,OAAO,KAAK,EAAE,EAAE,QAAQ,EAAE,MAAM,OAAO,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":"LoginPage.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/login2/LoginPage.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAO1B,QAAA,MAAM,SAAS,
|
|
1
|
+
{"version":3,"file":"LoginPage.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/login2/LoginPage.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAO1B,QAAA,MAAM,SAAS,yBAiDd,CAAC;AAEF,eAAe,SAAS,CAAC"}
|
package/lib/login2/LoginPage.js
CHANGED
|
@@ -9,7 +9,7 @@ const LoginPage = () => {
|
|
|
9
9
|
return (React.createElement("div", { style: {
|
|
10
10
|
width: "100%",
|
|
11
11
|
height: "100%",
|
|
12
|
-
minWidth: "1600px",
|
|
12
|
+
// minWidth: "1600px",
|
|
13
13
|
position: "absolute",
|
|
14
14
|
background: `url(${LoginBgPng})`,
|
|
15
15
|
backgroundSize: "cover",
|
|
@@ -20,11 +20,12 @@ const LoginPage = () => {
|
|
|
20
20
|
} },
|
|
21
21
|
React.createElement("div", { style: {
|
|
22
22
|
width: "500px",
|
|
23
|
-
height: "500px",
|
|
23
|
+
// height: "500px",
|
|
24
24
|
background: "linear-gradient(0deg, #FFFFFF 65%, #DFEDFF)",
|
|
25
25
|
boxShadow: "0px 10px 15px -3px rgba(0,0,0,0.1)",
|
|
26
26
|
marginRight: "10%",
|
|
27
27
|
padding: "60px",
|
|
28
|
+
aspectRatio: "1/1",
|
|
28
29
|
} },
|
|
29
30
|
React.createElement("div", { style: {
|
|
30
31
|
fontWeight: 600,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LoginPage.js","sourceRoot":"","sources":["../../../../src/aldehyde/login2/LoginPage.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,KAAK,MAAM,SAAS,CAAC;AAC5B,OAAO,UAAU,MAAM,oBAAoB,CAAC;AAC5C,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,YAAY,MAAM,wBAAwB,CAAC;AAClD,OAAO,KAAK,MAAM,UAAU,CAAC;AAE7B,MAAM,SAAS,GAAG,GAAG,EAAE;IACrB,MAAM,EAAE,SAAS,EAAE,GAAG,SAAS,EAAE,CAAC;IAElC,OAAO,CACL,6BACE,KAAK,EAAE;YACL,KAAK,EAAE,MAAM;YACb,MAAM,EAAE,MAAM;YACd,
|
|
1
|
+
{"version":3,"file":"LoginPage.js","sourceRoot":"","sources":["../../../../src/aldehyde/login2/LoginPage.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,KAAK,MAAM,SAAS,CAAC;AAC5B,OAAO,UAAU,MAAM,oBAAoB,CAAC;AAC5C,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,YAAY,MAAM,wBAAwB,CAAC;AAClD,OAAO,KAAK,MAAM,UAAU,CAAC;AAE7B,MAAM,SAAS,GAAG,GAAG,EAAE;IACrB,MAAM,EAAE,SAAS,EAAE,GAAG,SAAS,EAAE,CAAC;IAElC,OAAO,CACL,6BACE,KAAK,EAAE;YACL,KAAK,EAAE,MAAM;YACb,MAAM,EAAE,MAAM;YACd,sBAAsB;YACtB,QAAQ,EAAE,UAAU;YACpB,UAAU,EAAE,OAAO,UAAU,GAAG;YAChC,cAAc,EAAE,OAAO;YACvB,OAAO,EAAE,MAAM;YACf,aAAa,EAAE,aAAa;YAC5B,cAAc,EAAE,YAAY;YAC5B,UAAU,EAAE,QAAQ;SACrB;QAED,6BACE,KAAK,EAAE;gBACL,KAAK,EAAE,OAAO;gBACd,mBAAmB;gBACnB,UAAU,EAAE,6CAA6C;gBACzD,SAAS,EAAE,oCAAoC;gBAC/C,WAAW,EAAE,KAAK;gBAClB,OAAO,EAAE,MAAM;gBACf,WAAW,EAAE,KAAK;aACnB;YAED,6BACE,KAAK,EAAE;oBACL,UAAU,EAAE,GAAG;oBACf,QAAQ,EAAE,MAAM;oBAChB,KAAK,EAAE,SAAS;oBAChB,YAAY,EAAE,EAAE;iBACjB,IAEA,SAAS,CAAC,QAAQ,CAAC,CAChB;YACN,oBAAC,KAAK,IACJ,QAAQ,EAAE,CAAC,KAAK,EAAE,EAAE;oBAClB,YAAY,CAAC,KAAK,EAAE,CAAC;oBACrB,MAAM,CAAC,QAAQ,CAAC,IAAI,GAAG,KAAK,CAAC;oBAC7B,KAAK,CAAC,mBAAmB,CAAC,KAAK,CAAC,CAAC;gBACnC,CAAC,GACM,CACL,CACF,CACP,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,SAAS,CAAC"}
|
|
Binary file
|
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
import React, { ReactNode } from "react";
|
|
2
|
-
import { AddOrUpdate, LtmplConfigRes, ActTableMode, DoEditParam } from "../tmpl/interface";
|
|
2
|
+
import { AddOrUpdate, LtmplConfigRes, ActTableMode, DoEditParam, ShowViewParam } from "../tmpl/interface";
|
|
3
3
|
import { LocaleContext } from "../locale/LocaleProvider";
|
|
4
4
|
export interface LtmplTableProps {
|
|
5
5
|
serverKey?: string;
|
|
6
6
|
sourceId: string;
|
|
7
7
|
mainCode?: string;
|
|
8
|
-
showView?: (
|
|
8
|
+
showView?: (showViewParam: ShowViewParam) => void;
|
|
9
9
|
doCustomCreate?: (handleOk: () => void) => void;
|
|
10
10
|
doCustomEdit?: (code: string, mode: AddOrUpdate, handleOk: () => void) => void;
|
|
11
11
|
doSearch?: (params: object) => void;
|
|
@@ -67,7 +67,7 @@ declare class LtmplTable extends React.PureComponent<LtmplTableProps, LtmplTable
|
|
|
67
67
|
componentDidUpdate(prevProps: any): Promise<void>;
|
|
68
68
|
loadLtmplConfig: () => Promise<void>;
|
|
69
69
|
toCriteriaData: (values: object) => {};
|
|
70
|
-
showView: (
|
|
70
|
+
showView: (showViewParam: ShowViewParam) => void;
|
|
71
71
|
doEdit: (param: DoEditParam) => void;
|
|
72
72
|
doRAction: (ractionId: string, mainCode: string) => void;
|
|
73
73
|
doCreate: (addTmplId: string, toCustomPage?: boolean) => void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ltmpl-table.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/module/ltmpl-table.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AACzC,OAAO,EAAC,WAAW,EAAE,cAAc,EAAE,YAAY,EAAE,WAAW,EAAC,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"ltmpl-table.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/module/ltmpl-table.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AACzC,OAAO,EAAC,WAAW,EAAE,cAAc,EAAE,YAAY,EAAE,WAAW,EAAE,aAAa,EAAC,MAAM,mBAAmB,CAAC;AASxG,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAIzD,MAAM,WAAW,eAAe;IAC9B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,CAAC,aAAa,EAAE,aAAa,KAAK,IAAI,CAAC;IAClD,cAAc,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,IAAI,KAAK,IAAI,CAAC;IAChD,YAAY,CAAC,EAAE,CACb,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,WAAW,EACjB,QAAQ,EAAE,MAAM,IAAI,KACjB,IAAI,CAAC;IACV,QAAQ,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,CAAC;IACpC,SAAS,CAAC,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,KAAK,IAAI,CAAC;IAC1D,QAAQ,CAAC,EAAE,YAAY,CAAC;IACxB,KAAK,CAAC,EAAE,SAAS,CAAC;IAClB,GAAG,CAAC,EAAE,GAAG,CAAC;IACV,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAED,MAAM,WAAW,eAAe;IAC9B,cAAc,CAAC,EAAE,cAAc,CAAC;IAChC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAC,MAAM,CAAC;CACvB;AAED,cAAM,UAAW,SAAQ,KAAK,CAAC,aAAa,CAAC,eAAe,EAAE,eAAe,CAAC;IAC5E,KAAK;;;;;;;;;;;;;;MAcH;IACF,MAAM,CAAC,WAAW;;;;;;;;OAAiB;IACnC,OAAO,EAAE,KAAK,CAAC,WAAW,CAAC,OAAO,aAAa,CAAC,CAAC;IAEjD,MAAM,CAAC,YAAY;;;;MAIjB;IAEI,iBAAiB;IAUjB,kBAAkB,CAAC,SAAS,KAAA;IAUlC,eAAe,sBAmBb;IACF,cAAc,WAAY,MAAM,QAS9B;IAEF,QAAQ,kBAAmB,aAAa,UAOtC;IAEF,MAAM,UAAU,WAAW,UAoBzB;IACF,SAAS,cAAe,MAAM,YAAY,MAAM,UAM9C;IACF,QAAQ,cAAe,MAAM,iBAAiB,OAAO,UAoBnD;IACF,WAAW,aAIT;IAEF,QAAQ,yBAgBN;IAEF,YAAY,uCAKV;IAEF,eAAe,SAAU,MAAM,UAK7B;IAEF,MAAM;CAqJP;AAED,eAAe,UAAU,CAAC"}
|
|
@@ -61,9 +61,11 @@ class LtmplTable extends React.PureComponent {
|
|
|
61
61
|
criteriaData["sequence"] = Units.getRandomNum(6);
|
|
62
62
|
return criteriaData;
|
|
63
63
|
};
|
|
64
|
-
this.showView = (
|
|
64
|
+
this.showView = (showViewParam) => {
|
|
65
|
+
const { sourceId } = this.props;
|
|
65
66
|
this.setState({
|
|
66
|
-
selectedCode: code,
|
|
67
|
+
selectedCode: showViewParam.code,
|
|
68
|
+
dtmplSourceId: showViewParam.dtmplSourceId ? showViewParam.dtmplSourceId : sourceId,
|
|
67
69
|
showDtmplView: true,
|
|
68
70
|
});
|
|
69
71
|
};
|
|
@@ -193,7 +195,7 @@ class LtmplTable extends React.PureComponent {
|
|
|
193
195
|
this.setState({
|
|
194
196
|
showDtmplView: false,
|
|
195
197
|
});
|
|
196
|
-
}, mainCode: mainCode, sourceId: sourceId, code: selectedCode }, " ")) : (""),
|
|
198
|
+
}, mainCode: mainCode, sourceId: dtmplSourceId ? dtmplSourceId : sourceId, code: selectedCode }, " ")) : (""),
|
|
197
199
|
(buttons.includes("dtmplEdit") || buttons.includes("dtmplAdd")) &&
|
|
198
200
|
showDtmplEdit ? (React.createElement(DtmplEditPage, { addTmplId: addTmplId, serverKey: serverKey, open: showDtmplEdit, onCancel: () => {
|
|
199
201
|
this.setState({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ltmpl-table.js","sourceRoot":"","sources":["../../../../src/aldehyde/module/ltmpl-table.tsx"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,KAAoB,MAAM,OAAO,CAAC;AAEzC,OAAO,KAAK,MAAM,UAAU,CAAC;AAC7B,OAAO,QAAQ,MAAM,oBAAoB,CAAC;AAC1C,qDAAqD;AACrD,OAAO,YAAY,MAAM,wBAAwB,CAAC;AAClD,OAAO,cAAc,MAAM,iCAAiC,CAAC;AAC7D,OAAO,aAAa,MAAM,mBAAmB,CAAC;AAC9C,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,MAAM,CAAC;AAC7C,OAAO,wBAAwB,MAAM,6CAA6C,CAAC;AACnF,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAyCzD,MAAM,UAAW,SAAQ,KAAK,CAAC,aAA+C;IAA9E;;QACE,UAAK,GAAG;YACN,cAAc,EAAE,SAAS;YACzB,MAAM,EAAE,SAAS;YACjB,QAAQ,EAAE,SAAS;YACnB,YAAY,EAAE,SAAS;YACvB,aAAa,EAAE,KAAK;YACpB,aAAa,EAAE,KAAK;YACpB,mBAAmB,EAAE,KAAK;YAC1B,YAAY,EAAE,SAAS;YACvB,QAAQ,EAAE,KAAK;YACf,SAAS,EAAE,SAAS;YACpB,QAAQ,EAAE,KAAK;YACf,SAAS,EAAE,SAAS;YACpB,aAAa,EAAC,SAAS;SACxB,CAAC;QA8BF,oBAAe,GAAG,GAAS,EAAE;YAC3B,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;YAC3C,IAAI,cAAc,GAAmB,MAAM,YAAY,CAAC,kBAAkB,CACxE,SAAS,EACT,QAAQ,CACT,CAAC;YACF,IAAI,YAAY,CAAC;YACjB,aAAa;YACb,IAAI,cAAc,EAAE,CAAC;gBACnB,IAAI,oBAAoB,GACtB,cAAc,CAAC,WAAW,CAAC,oBAAoB,CAAC;gBAClD,IAAI,oBAAoB,EAAE,CAAC;oBACzB,YAAY,GAAG,IAAI,CAAC,cAAc,CAAC,oBAAoB,CAAC,CAAC;gBAC3D,CAAC;YACH,CAAC;YACD,IAAI,CAAC,QAAQ,CAAC;gBACZ,cAAc;gBACd,YAAY;aACb,CAAC,CAAC;QACL,CAAC,CAAA,CAAC;QACF,mBAAc,GAAG,CAAC,MAAc,EAAE,EAAE;YAClC,IAAI,YAAY,GAAG,EAAE,CAAC;YACtB,IAAI,MAAM,EAAE,CAAC;gBACX,KAAK,IAAI,GAAG,IAAI,MAAM,EAAE,CAAC;oBACvB,YAAY,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,gBAAgB,CAAC,MAAM,CAAC,GAAG,CAAC,EAAC,IAAI,CAAC,CAAC;gBAC/D,CAAC;YACH,CAAC;YACD,YAAY,CAAC,UAAU,CAAC,GAAG,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;YACjD,OAAO,YAAY,CAAC;QACtB,CAAC,CAAC;QAEF,aAAQ,GAAG,CAAC,
|
|
1
|
+
{"version":3,"file":"ltmpl-table.js","sourceRoot":"","sources":["../../../../src/aldehyde/module/ltmpl-table.tsx"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,KAAoB,MAAM,OAAO,CAAC;AAEzC,OAAO,KAAK,MAAM,UAAU,CAAC;AAC7B,OAAO,QAAQ,MAAM,oBAAoB,CAAC;AAC1C,qDAAqD;AACrD,OAAO,YAAY,MAAM,wBAAwB,CAAC;AAClD,OAAO,cAAc,MAAM,iCAAiC,CAAC;AAC7D,OAAO,aAAa,MAAM,mBAAmB,CAAC;AAC9C,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,MAAM,CAAC;AAC7C,OAAO,wBAAwB,MAAM,6CAA6C,CAAC;AACnF,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAyCzD,MAAM,UAAW,SAAQ,KAAK,CAAC,aAA+C;IAA9E;;QACE,UAAK,GAAG;YACN,cAAc,EAAE,SAAS;YACzB,MAAM,EAAE,SAAS;YACjB,QAAQ,EAAE,SAAS;YACnB,YAAY,EAAE,SAAS;YACvB,aAAa,EAAE,KAAK;YACpB,aAAa,EAAE,KAAK;YACpB,mBAAmB,EAAE,KAAK;YAC1B,YAAY,EAAE,SAAS;YACvB,QAAQ,EAAE,KAAK;YACf,SAAS,EAAE,SAAS;YACpB,QAAQ,EAAE,KAAK;YACf,SAAS,EAAE,SAAS;YACpB,aAAa,EAAC,SAAS;SACxB,CAAC;QA8BF,oBAAe,GAAG,GAAS,EAAE;YAC3B,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;YAC3C,IAAI,cAAc,GAAmB,MAAM,YAAY,CAAC,kBAAkB,CACxE,SAAS,EACT,QAAQ,CACT,CAAC;YACF,IAAI,YAAY,CAAC;YACjB,aAAa;YACb,IAAI,cAAc,EAAE,CAAC;gBACnB,IAAI,oBAAoB,GACtB,cAAc,CAAC,WAAW,CAAC,oBAAoB,CAAC;gBAClD,IAAI,oBAAoB,EAAE,CAAC;oBACzB,YAAY,GAAG,IAAI,CAAC,cAAc,CAAC,oBAAoB,CAAC,CAAC;gBAC3D,CAAC;YACH,CAAC;YACD,IAAI,CAAC,QAAQ,CAAC;gBACZ,cAAc;gBACd,YAAY;aACb,CAAC,CAAC;QACL,CAAC,CAAA,CAAC;QACF,mBAAc,GAAG,CAAC,MAAc,EAAE,EAAE;YAClC,IAAI,YAAY,GAAG,EAAE,CAAC;YACtB,IAAI,MAAM,EAAE,CAAC;gBACX,KAAK,IAAI,GAAG,IAAI,MAAM,EAAE,CAAC;oBACvB,YAAY,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,gBAAgB,CAAC,MAAM,CAAC,GAAG,CAAC,EAAC,IAAI,CAAC,CAAC;gBAC/D,CAAC;YACH,CAAC;YACD,YAAY,CAAC,UAAU,CAAC,GAAG,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;YACjD,OAAO,YAAY,CAAC;QACtB,CAAC,CAAC;QAEF,aAAQ,GAAG,CAAC,aAA4B,EAAE,EAAE;YAC1C,MAAM,EAAC,QAAQ,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;YAC/B,IAAI,CAAC,QAAQ,CAAC;gBACZ,YAAY,EAAE,aAAa,CAAC,IAAI;gBAChC,aAAa,EAAC,aAAa,CAAC,aAAa,CAAA,CAAC,CAAA,aAAa,CAAC,aAAa,CAAA,CAAC,CAAA,QAAQ;gBAC9E,aAAa,EAAE,IAAI;aACpB,CAAC,CAAC;QACL,CAAC,CAAC;QAEF,WAAM,GAAG,CAAC,KAAiB,EAAE,EAAE;YAC7B,MAAM,EAAE,YAAY,EAAC,QAAQ,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;YAC7C,IAAI,KAAK,CAAC,YAAY,EAAE,CAAC;gBACvB,IAAI,YAAY,EAAE,CAAC;oBACjB,YAAY,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,GAAG,EAAE;wBACxC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;oBACzC,CAAC,CAAC,CAAC;gBACL,CAAC;qBAAM,CAAC;oBACN,IAAI,CAAC,QAAQ,CAAC;wBACZ,YAAY,EAAE,KAAK,CAAC,IAAI;wBACxB,aAAa,EAAC,KAAK,CAAC,aAAa,CAAA,CAAC,CAAA,KAAK,CAAC,aAAa,CAAA,CAAC,CAAA,QAAQ;wBAC9D,mBAAmB,EAAE,IAAI;qBAC1B,CAAC,CAAC;gBACL,CAAC;YACH,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,QAAQ,CAAC;oBACZ,YAAY,EAAE,KAAK,CAAC,IAAI;oBACxB,aAAa,EAAE,IAAI;iBACpB,CAAC,CAAC;YACL,CAAC;QACH,CAAC,CAAC;QACF,cAAS,GAAG,CAAC,SAAiB,EAAE,QAAgB,EAAE,EAAE;YAClD,IAAI,CAAC,QAAQ,CAAC;gBACZ,YAAY,EAAE,QAAQ;gBACtB,QAAQ,EAAE,IAAI;gBACd,SAAS;aACV,CAAC,CAAC;QACL,CAAC,CAAC;QACF,aAAQ,GAAG,CAAC,SAAiB,EAAE,YAAsB,EAAE,EAAE;YACvD,MAAM,EAAE,cAAc,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;YACtC,IAAI,YAAY,EAAE,CAAC;gBACjB,IAAI,cAAc,EAAE,CAAC;oBACnB,cAAc,CAAC,GAAG,EAAE;wBAClB,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;oBACzC,CAAC,CAAC,CAAC;gBACL,CAAC;qBAAM,CAAC;oBACN,IAAI,CAAC,QAAQ,CAAC;wBACZ,YAAY,EAAE,IAAI;wBAClB,mBAAmB,EAAE,IAAI;qBAC1B,CAAC,CAAC;gBACL,CAAC;YACH,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,QAAQ,CAAC;oBACZ,YAAY,EAAE,IAAI;oBAClB,aAAa,EAAE,IAAI;oBACnB,SAAS;iBACV,CAAC,CAAC;YACL,CAAC;QACH,CAAC,CAAC;QACF,gBAAW,GAAG,GAAG,EAAE;YACjB,IAAI,CAAC,QAAQ,CAAC;gBACZ,QAAQ,EAAE,KAAK;aAChB,CAAC,CAAC;QACL,CAAC,CAAC;QAEF,aAAQ,GAAG,CAAC,OAAO,EAAE,EAAE;YACrB,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,WAAW,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;YACvD,IAAI,MAAM,qBAAQ,OAAO,CAAE,CAAC;YAC5B,mCAAmC;YACnC,IAAI,QAAQ,EAAE,CAAC;gBACb,MAAM,CAAC,UAAU,CAAC,GAAG,QAAQ,CAAC;YAChC,CAAC;YACD,MAAM,CAAC,UAAU,CAAC,GAAG,QAAQ,CAAC;YAC9B,IAAI,WAAW,EAAE,CAAC;gBAChB,IAAI,CAAC,QAAQ,CAAC;oBACZ,QAAQ,EAAE,KAAK;iBAChB,CAAC,CAAC;YACL,CAAC;YACD,IAAI,CAAC,QAAQ,CAAC;gBACZ,YAAY,EAAE,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC;aAC1C,CAAC,CAAC;QACL,CAAC,CAAC;QAEF,iBAAY,GAAG,CAAC,MAAM,EAAE,QAAQ,EAAE,EAAE;YAClC,IAAI,CAAC,QAAQ,CAAC;gBACZ,MAAM;gBACN,QAAQ;aACT,CAAC,CAAC;QACL,CAAC,CAAC;QAEF,oBAAe,GAAG,CAAC,IAAY,EAAE,EAAE;YACjC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;YACvC,IAAI,CAAC,QAAQ,CAAC;gBACZ,aAAa,EAAE,KAAK;aACrB,CAAC,CAAC;QACL,CAAC,CAAC;IAuJJ,CAAC;IAxSO,iBAAiB;;YACrB,IAAI,CAAC,eAAe,EAAE,CAAC;YACvB,MAAM,EAAE,WAAW,EAAE,YAAY,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;YACjD,IAAI,WAAW,EAAE,CAAC;gBAChB,IAAI,CAAC,QAAQ,CAAC;oBACZ,QAAQ,EAAE,YAAY;iBACvB,CAAC,CAAC;YACL,CAAC;QACH,CAAC;KAAA;IAEK,kBAAkB,CAAC,SAAS;;YAChC,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;YAC1C,IAAI,CAAC,SAAS,IAAI,SAAS,CAAC,QAAQ,IAAI,QAAQ,EAAE,CAAC;gBACjD,IAAI,CAAC,eAAe,EAAE,CAAC;YACzB,CAAC;iBAAM,IAAI,QAAQ,IAAI,SAAS,CAAC,QAAQ,IAAI,QAAQ,EAAE,CAAC;gBACtD,aAAa;gBACb,IAAI,CAAC,eAAe,EAAE,CAAC;YACzB,CAAC;QACH,CAAC;KAAA;IAiID,MAAM;QACJ,MAAM,EACJ,cAAc,EACd,YAAY,EACZ,QAAQ,EACR,MAAM,EACN,aAAa,EACb,YAAY,EACZ,aAAa,EACb,mBAAmB,EACnB,SAAS,EACT,QAAQ,EACR,QAAQ,EACR,SAAS,EAAC,aAAa,GACxB,GAAG,IAAI,CAAC,KAAK,CAAC;QACf,MAAM,EACJ,QAAQ,EACR,QAAQ,EACR,QAAQ,EACR,QAAQ,EACR,SAAS,EACT,QAAQ,EACR,GAAG,EACH,KAAK,EACL,WAAW,EACX,YAAY,EACZ,YAAY,EACZ,cAAc,EACd,SAAS,EACT,QAAQ,GACT,GAAG,IAAI,CAAC,KAAK,CAAC;QACf,MAAM,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC,OAAO,CAAC;QAEnC,IAAI,CAAC,cAAc,EAAE,CAAC;YACpB,OAAO,yCAAK,CAAC;QACf,CAAC;aAAM,CAAC;YACN,MAAM,EAAE,OAAO,EAAE,kBAAkB,EAAE,GAAG,cAAc,CAAC,WAAW,CAAC;YACnE,OAAO,CACL;gBACE,oBAAC,QAAQ,IACP,QAAQ,EAAE,QAAQ,EAClB,GAAG,EAAE,GAAG,EACR,SAAS,EAAE,SAAS,EACpB,QAAQ,EAAE,QAAQ,EAClB,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,IAAI,CAAC,YAAY,EAC/B,WAAW,EAAE,WAAW,EACxB,YAAY,EAAE,YAAY,IAAI,QAAQ,EACtC,KAAK,EAAE,KAAK,EACZ,QAAQ,EAAE,QAAQ,EAClB,QAAQ,EAAE,QAAQ,EAClB,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,EAC7C,SAAS,EAAE,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,EACjD,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,EAC7C,MAAM,EAAE,IAAI,CAAC,MAAM,EACnB,QAAQ,EAAE,IAAI,CAAC,QAAQ,EACvB,QAAQ,EAAE,QAAQ,EAClB,YAAY,EAAE,YAAY,EAC1B,cAAc,EAAE,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,EAC3C,eAAe,EAAE,cAAc,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,EAC9C,WAAW,EAAE,cAAc,CAAC,WAAW,GACvC;gBACD,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,aAAa,CAAC,CAAC,CAAC,CAC7C,oBAAC,cAAc,IACb,SAAS,EAAE,SAAS,EACpB,IAAI,EAAE,aAAa,EACnB,QAAQ,EAAE,GAAG,EAAE;wBACb,IAAI,CAAC,QAAQ,CAAC;4BACZ,aAAa,EAAE,KAAK;yBACrB,CAAC,CAAC;oBACL,CAAC,EACD,QAAQ,EAAE,QAAQ,EAClB,QAAQ,EAAE,aAAa,CAAA,CAAC,CAAA,aAAa,CAAA,CAAC,CAAA,QAAQ,EAC9C,IAAI,EAAE,YAAY,IAEjB,GAAG,CACW,CAClB,CAAC,CAAC,CAAC,CACF,EAAE,CACH;gBACA,CAAC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC,IAAI,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;oBAChE,aAAa,CAAC,CAAC,CAAC,CACd,oBAAC,aAAa,IACZ,SAAS,EAAE,SAAS,EACpB,SAAS,EAAE,SAAS,EACpB,IAAI,EAAE,aAAa,EACnB,QAAQ,EAAE,GAAG,EAAE;wBACb,IAAI,CAAC,QAAQ,CAAC;4BACZ,aAAa,EAAE,KAAK;yBACrB,CAAC,CAAC;oBACL,CAAC,EACD,QAAQ,EAAE,aAAa,CAAA,CAAC,CAAA,aAAa,CAAA,CAAC,CAAA,QAAQ,EAC9C,QAAQ,EAAE,QAAQ,EAClB,IAAI,EAAE,YAAY,EAClB,IAAI,EAAE,IAAI,CAAC,eAAe,GAC1B,CACH,CAAC,CAAC,CAAC,CACF,EAAE,CACH;gBACA,mBAAmB,CAAC,CAAC,CAAC,CACrB,oBAAC,wBAAwB,IACvB,SAAS,EAAE,SAAS,EACpB,IAAI,EAAE,mBAAmB,EACzB,IAAI,EAAE,GAAG,EAAE;wBACT,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;wBACvC,IAAI,CAAC,QAAQ,CAAC;4BACZ,mBAAmB,EAAE,KAAK;yBAC3B,CAAC,CAAC;oBACL,CAAC,EACD,UAAU,EAAE,kBAAkB,EAC9B,QAAQ,EAAE,QAAQ,EAClB,QAAQ,EAAE,QAAQ,EAClB,IAAI,EAAE,YAAY,GAClB,CACH,CAAC,CAAC,CAAC,CACF,EAAE,CACH;gBACA,QAAQ,CAAA,CAAC;oBACV,oBAAC,MAAM,IACL,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,SAAS,CAAC,SAAS,CAAC,EAC3B,QAAQ,EAAE,IAAI,EACd,IAAI,EAAE,KAAK,EACX,OAAO,EAAE,IAAI,CAAC,WAAW,EACzB,IAAI,EAAE,QAAQ,EACd,KAAK,EAAE,oBAAoB,EAC3B,KAAK,EAAE;4BACL,QAAQ,EAAE,IAAI;yBACf,EACD,KAAK,EACH,oBAAC,KAAK;4BACJ,oBAAC,MAAM,IAAC,OAAO,EAAE,IAAI,CAAC,WAAW,IAC9B,SAAS,CAAC,OAAO,CAAC,CACZ,CACH,IAIR,oBAAC,UAAU,IACT,SAAS,EAAE,SAAS,EACpB,QAAQ,EAAE,SAAS,EACnB,QAAQ,EAAE,YAAY,GACV,CAET,CAAA,CAAC,CAAA,IAAI,CACb,CACJ,CAAC;QACJ,CAAC;IACH,CAAC;;AAhTM,sBAAW,GAAG,aAAa,AAAhB,CAAiB;AAG5B,uBAAY,GAAG;IACpB,WAAW,EAAE,KAAK;IAClB,YAAY,EAAE,KAAK;IACnB,QAAQ,EAAE,KAAK;CAChB,AAJkB,CAIjB;AA4SJ,eAAe,UAAU,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ltmpl-route.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/routable/ltmpl-route.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAoB,MAAM,OAAO,CAAC;AACzC,OAAO,EAGL,cAAc,EACd,eAAe,EAChB,MAAM,mBAAmB,CAAC;AAU3B,MAAM,WAAW,eAAgB,SAAQ,eAAe;IACtD,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AAED,MAAM,WAAW,eAAe;IAC9B,cAAc,CAAC,EAAE,cAAc,CAAC;IAChC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;;
|
|
1
|
+
{"version":3,"file":"ltmpl-route.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/routable/ltmpl-route.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAoB,MAAM,OAAO,CAAC;AACzC,OAAO,EAGL,cAAc,EACd,eAAe,EAChB,MAAM,mBAAmB,CAAC;AAU3B,MAAM,WAAW,eAAgB,SAAQ,eAAe;IACtD,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AAED,MAAM,WAAW,eAAe;IAC9B,cAAc,CAAC,EAAE,cAAc,CAAC;IAChC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;;AA2RD,wBAAsC"}
|
|
@@ -43,12 +43,13 @@ class LtmplRoute extends React.PureComponent {
|
|
|
43
43
|
ltmplConfigRes: ltmplConfigRes,
|
|
44
44
|
});
|
|
45
45
|
});
|
|
46
|
-
this.showView = (
|
|
46
|
+
this.showView = (showViewParam) => {
|
|
47
47
|
const { basePath } = this.props;
|
|
48
48
|
const { sourceId } = this.props.params;
|
|
49
49
|
const { ltmplConfigRes } = this.state;
|
|
50
|
-
let
|
|
51
|
-
|
|
50
|
+
let dtmplSourceId = showViewParam.dtmplSourceId ? showViewParam.dtmplSourceId : sourceId;
|
|
51
|
+
let path = `${basePath}${this.computedLayoutPath}/${dtmplSourceId}/detail-view?code=${showViewParam.code}&menuId=${this.getMenuId()}`;
|
|
52
|
+
if (showViewParam.toCustomPage && ltmplConfigRes.ltmplConfig.customViewPagePath) {
|
|
52
53
|
path = `${basePath}${this.computedLayoutPath}${ltmplConfigRes.ltmplConfig.customViewPagePath}?menuId=${this.getMenuId()}&sourceId=${sourceId}`;
|
|
53
54
|
}
|
|
54
55
|
this.onRoute(path);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ltmpl-route.js","sourceRoot":"","sources":["../../../../src/aldehyde/routable/ltmpl-route.tsx"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,KAAoB,MAAM,OAAO,CAAC;AAOzC,OAAO,KAAK,MAAM,UAAU,CAAC;AAC7B,OAAO,QAAQ,MAAM,oBAAoB,CAAC;AAC1C,qDAAqD;AACrD,OAAO,YAAY,MAAM,wBAAwB,CAAC;AAClD,OAAO,UAAU,MAAM,uBAAuB,CAAC;AAC/C,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,MAAM,CAAC;AAC7C,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AACzD,OAAO,UAAU,MAAM,uBAAuB,CAAC;AAe/C,MAAM,UAAW,SAAQ,KAAK,CAAC,aAA+C;IAA9E;;QAOE,UAAK,GAAG;YACN,cAAc,EAAE,SAAS;YACzB,MAAM,EAAE,SAAS;YACjB,QAAQ,EAAE,SAAS;YACnB,YAAY,EAAE,SAAS;YACvB,QAAQ,EAAE,KAAK;YACf,SAAS,EAAE,SAAS;SACrB,CAAC;QAYF,YAAO,GAAG,CAAC,IAAI,EAAE,EAAE;YACjB,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QAC5B,CAAC,CAAC;QAEF,cAAS,GAAG,GAAG,EAAE;YACf,MAAM,EAAE,YAAY,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;YACpC,IAAI,MAAM,GAAG,YAAY,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;YACxC,OAAO,MAAM,CAAC;QAChB,CAAC,CAAC;QAEF,aAAQ,GAAG,GAAS,EAAE;YACpB,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;YAC9B,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,CAAC;YAC5B,IAAI,cAAc,GAAmB,MAAM,YAAY,CAAC,kBAAkB,CACxE,IAAI,EACJ,QAAQ,CACT,CAAC;YAEF,IAAI,CAAC,QAAQ,CAAC;gBACZ,cAAc,EAAE,cAAc;aAC/B,CAAC,CAAC;QACL,CAAC,CAAA,CAAC;QAkBF,aAAQ,GAAG,CAAC,
|
|
1
|
+
{"version":3,"file":"ltmpl-route.js","sourceRoot":"","sources":["../../../../src/aldehyde/routable/ltmpl-route.tsx"],"names":[],"mappings":"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"}
|
package/lib/table/act-table.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import React, { ReactNode } from "react";
|
|
2
2
|
import "./index.css";
|
|
3
|
-
import { ActTableMode, ActTableViewModel, ClassAddConfig, ColumnConfig, DoEditParam, DtmplData, JumpConfig, LtmplConfig, QueryKey, SelectedRow, TmplBaseProps } from "../tmpl/interface";
|
|
3
|
+
import { ActTableMode, ActTableViewModel, ClassAddConfig, ColumnConfig, DoEditParam, DtmplData, JumpConfig, LtmplConfig, QueryKey, SelectedRow, ShowViewParam, TmplBaseProps } from "../tmpl/interface";
|
|
4
4
|
import { ExportType } from "../export/export-frame";
|
|
5
5
|
import { LocaleContext } from "../locale/LocaleProvider";
|
|
6
6
|
type Level = "l1" | "l2";
|
|
@@ -11,7 +11,7 @@ interface ActTableProps extends TmplBaseProps {
|
|
|
11
11
|
onChangePage: (pageNo: number, pageSize: number) => void;
|
|
12
12
|
ltmplConfig: LtmplConfig;
|
|
13
13
|
menuId?: string;
|
|
14
|
-
showView?: (
|
|
14
|
+
showView?: (showVievParam: ShowViewParam) => void;
|
|
15
15
|
doCreate?: (addtmplId: string, toCustomPage: boolean) => void;
|
|
16
16
|
customCreatable?: boolean;
|
|
17
17
|
doEdit?: (doEditParam: DoEditParam) => void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"act-table.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/table/act-table.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAqCzC,OAAO,aAAa,CAAC;AACrB,OAAO,EACL,YAAY,EACZ,iBAAiB,EAGjB,cAAc,EACd,YAAY,EAAE,WAAW,EACzB,SAAS,EACT,UAAU,EACV,WAAW,EACX,QAAQ,EACR,WAAW,
|
|
1
|
+
{"version":3,"file":"act-table.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/table/act-table.tsx"],"names":[],"mappings":"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"}
|
package/lib/table/act-table.js
CHANGED
|
@@ -10,7 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
10
10
|
import React from "react";
|
|
11
11
|
import { Button, Card, Checkbox, Col, Collapse, Divider, Popconfirm, Popover, Row, Space, Tooltip, } from "antd";
|
|
12
12
|
import Table from "./control-table-x-axis-wrapper";
|
|
13
|
-
import {
|
|
13
|
+
import { AlignLeftOutlined, CopyOutlined, DeleteOutlined, DownloadOutlined, EyeInvisibleOutlined, EyeOutlined, FormOutlined, FundOutlined, KeyOutlined, LineChartOutlined, MenuOutlined, PlusCircleOutlined, PlusOutlined, ReloadOutlined, RetweetOutlined, SearchOutlined, TableOutlined, UploadOutlined, } from "@ant-design/icons";
|
|
14
14
|
import "./index.css";
|
|
15
15
|
import TableUnits from "./table-util";
|
|
16
16
|
import SupportInputTypes from "../tmpl/control-type-supportor";
|
|
@@ -32,6 +32,7 @@ import ToolTipBar from "../detail/tooltipbar";
|
|
|
32
32
|
import { LocaleContext } from "../locale/LocaleProvider";
|
|
33
33
|
import BlockMenuTreeDrawer from "../module/block-menu-tree-drawer";
|
|
34
34
|
import EditButton from "../detail/button/edit-button";
|
|
35
|
+
import ViewButton from "../detail/button/view-button";
|
|
35
36
|
const DragHandle = SortableHandle(() => (React.createElement(MenuOutlined, { style: { cursor: "grab", color: "#999" } })));
|
|
36
37
|
const { Panel } = Collapse;
|
|
37
38
|
const defaultDisabledColIds = ["20000", "10000"];
|
|
@@ -194,7 +195,8 @@ class ActTable extends React.PureComponent {
|
|
|
194
195
|
return (React.createElement(Space, { size: [0, 4], wrap: true },
|
|
195
196
|
buttons.includes("detail") && showView && (ActionUtils.isShow((_a = ltmplConfig.buttonViewAction) === null || _a === void 0 ? void 0 : _a.preposes, [record], undefined)) ? (React.createElement(Button, { size: "small", type: "primary", icon: React.createElement(AlignLeftOutlined, null), onClick: () => showView(record.code) })) : (""),
|
|
196
197
|
buttons.includes("customDetail") && showView &&
|
|
197
|
-
(ActionUtils.isShow((_b = ltmplConfig.buttonViewAction) === null || _b === void 0 ? void 0 : _b.preposes, [record], undefined)) ?
|
|
198
|
+
(ActionUtils.isShow((_b = ltmplConfig.buttonViewAction) === null || _b === void 0 ? void 0 : _b.preposes, [record], undefined)) ?
|
|
199
|
+
(React.createElement(ViewButton, { showView: showView, data: record, ltmplConfig: ltmplConfig })) : (""),
|
|
198
200
|
buttons.includes("dtmplEdit") &&
|
|
199
201
|
doEdit &&
|
|
200
202
|
!readOnly ?
|