aldehyde 0.1.27 → 0.1.28
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/custom-page/custom-page-router.d.ts +1 -5
- package/lib/custom-page/custom-page-router.d.ts.map +1 -1
- package/lib/custom-page/custom-page-router.js +2 -2
- package/lib/custom-page/custom-page-router.js.map +1 -1
- package/lib/routable/ltmpl-route.js +1 -1
- package/lib/routable/ltmpl-route.js.map +1 -1
- package/package.json +1 -1
- package/src/aldehyde/custom-page/custom-page-router.tsx +2 -2
- package/src/aldehyde/routable/ltmpl-route.tsx +1 -1
|
@@ -14,11 +14,7 @@ export interface CustomPageRouterStat {
|
|
|
14
14
|
* 自定义页面的路径映射
|
|
15
15
|
*/
|
|
16
16
|
declare class CustomPageRouter extends React.PureComponent<CustomPageRouterProps, CustomPageRouterStat> {
|
|
17
|
-
render(): React.CElement<
|
|
18
|
-
props: any;
|
|
19
|
-
}, React.Component<{
|
|
20
|
-
props: any;
|
|
21
|
-
}, any, any>>;
|
|
17
|
+
render(): React.CElement<any, React.Component<any, any, any>>;
|
|
22
18
|
}
|
|
23
19
|
export default CustomPageRouter;
|
|
24
20
|
//# sourceMappingURL=custom-page-router.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"custom-page-router.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/custom-page/custom-page-router.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAC,aAAa,EAAe,MAAM,UAAU,CAAC;AAGrD,MAAM,WAAW,qBAAsB,SAAQ,aAAa,CAAC,eAAe;CAE3E;AAED,MAAM,WAAW,oBAAoB;CAEpC;AAED;;;;;GAKG;AAQH;;GAEG;AACF,cAAM,gBAAiB,SAAQ,KAAK,CAAC,aAAa,CAAC,qBAAqB,EAAE,oBAAoB,CAAC;IAE5F,MAAM
|
|
1
|
+
{"version":3,"file":"custom-page-router.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/custom-page/custom-page-router.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAC,aAAa,EAAe,MAAM,UAAU,CAAC;AAGrD,MAAM,WAAW,qBAAsB,SAAQ,aAAa,CAAC,eAAe;CAE3E;AAED,MAAM,WAAW,oBAAoB;CAEpC;AAED;;;;;GAKG;AAQH;;GAEG;AACF,cAAM,gBAAiB,SAAQ,KAAK,CAAC,aAAa,CAAC,qBAAqB,EAAE,oBAAoB,CAAC;IAE5F,MAAM;CAST;AAED,eAAe,gBAAgB,CAAC"}
|
|
@@ -23,11 +23,11 @@ class CustomPageRouter extends React.PureComponent {
|
|
|
23
23
|
render() {
|
|
24
24
|
// console.log("CustomPageRouter",this.props);
|
|
25
25
|
let pageName = this.props.match.params.pageName;
|
|
26
|
-
let props = Object.assign({}, this.props.match.params);
|
|
27
26
|
let search = this.props.location.search;
|
|
28
27
|
let criteriaData = Units.transQueryStrToParams(search);
|
|
29
28
|
let Page = ProgramConfig.getCustomPage("/" + pageName) || DefCustomPage;
|
|
30
|
-
|
|
29
|
+
console.log("CustomPageRouter", Object.assign(Object.assign({}, this.props.match.params), criteriaData));
|
|
30
|
+
return React.createElement(Page, Object.assign(Object.assign({}, this.props.match.params), criteriaData));
|
|
31
31
|
}
|
|
32
32
|
}
|
|
33
33
|
export default CustomPageRouter;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"custom-page-router.js","sourceRoot":"","sources":["../../../../src/aldehyde/custom-page/custom-page-router.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,aAAa,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAe,aAAa,EAAC,MAAM,UAAU,CAAC;AACrD,OAAO,KAAK,MAAM,UAAU,CAAC;AAI5B,CAAC;AAID,CAAC;AAEF;;;;;GAKG;AACH,mCAAmC;AACnC,+BAA+B;AAC/B,oCAAoC;AACpC,kCAAkC;AAClC,+BAA+B;AAC/B,IAAI;AAEJ;;GAEG;AACF,MAAM,gBAAiB,SAAQ,KAAK,CAAC,aAA0D;IAE5F,MAAM;QACF,8CAA8C;QAC9C,IAAI,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC;QAChD,IAAI,
|
|
1
|
+
{"version":3,"file":"custom-page-router.js","sourceRoot":"","sources":["../../../../src/aldehyde/custom-page/custom-page-router.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,aAAa,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAe,aAAa,EAAC,MAAM,UAAU,CAAC;AACrD,OAAO,KAAK,MAAM,UAAU,CAAC;AAI5B,CAAC;AAID,CAAC;AAEF;;;;;GAKG;AACH,mCAAmC;AACnC,+BAA+B;AAC/B,oCAAoC;AACpC,kCAAkC;AAClC,+BAA+B;AAC/B,IAAI;AAEJ;;GAEG;AACF,MAAM,gBAAiB,SAAQ,KAAK,CAAC,aAA0D;IAE5F,MAAM;QACF,8CAA8C;QAC9C,IAAI,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC;QAChD,IAAI,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC;QACxC,IAAI,YAAY,GAAG,KAAK,CAAC,qBAAqB,CAAC,MAAM,CAAC,CAAC;QACvD,IAAI,IAAI,GAAG,aAAa,CAAC,aAAa,CAAC,GAAG,GAAG,QAAQ,CAAC,IAAI,aAAa,CAAC;QACxE,OAAO,CAAC,GAAG,CAAC,kBAAkB,kCAAK,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,GAAK,YAAY,EAAE,CAAC;QAC9E,OAAO,KAAK,CAAC,aAAa,CAAC,IAAI,kCAAM,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,GAAK,YAAY,EAAE,CAAC;IACpF,CAAC;CACJ;AAED,eAAe,gBAAgB,CAAC"}
|
|
@@ -57,7 +57,7 @@ class LtmplRoute extends React.PureComponent {
|
|
|
57
57
|
let mainCode = this.getMainCode();
|
|
58
58
|
let path = `${basePath}/${sourceId}/detail-edit?code=${code}&menuId=${this.getMenuId()}&mode=${mode}`;
|
|
59
59
|
if (ltmplConfigRes.ltmplConfig.customEditPagePath) {
|
|
60
|
-
path = `${basePath}/page-${sourceId}${ltmplConfigRes.ltmplConfig.customEditPagePath}?menuId=${this.getMenuId()}`;
|
|
60
|
+
path = `${basePath}/page-${sourceId}${ltmplConfigRes.ltmplConfig.customEditPagePath}?code=${code}&menuId=${this.getMenuId()}`;
|
|
61
61
|
}
|
|
62
62
|
if (mainCode) {
|
|
63
63
|
path = path + `&mainCode=${mainCode}`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ltmpl-route.js","sourceRoot":"","sources":["../../../../src/aldehyde/routable/ltmpl-route.tsx"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"ltmpl-route.js","sourceRoot":"","sources":["../../../../src/aldehyde/routable/ltmpl-route.tsx"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -32,11 +32,11 @@ export interface CustomPageRouterStat {
|
|
|
32
32
|
render() {
|
|
33
33
|
// console.log("CustomPageRouter",this.props);
|
|
34
34
|
let pageName = this.props.match.params.pageName;
|
|
35
|
-
let props = {...this.props.match.params};
|
|
36
35
|
let search = this.props.location.search;
|
|
37
36
|
let criteriaData = Units.transQueryStrToParams(search);
|
|
38
37
|
let Page = ProgramConfig.getCustomPage("/" + pageName) || DefCustomPage;
|
|
39
|
-
|
|
38
|
+
console.log("CustomPageRouter",{...this.props.match.params, ...criteriaData});
|
|
39
|
+
return React.createElement(Page, {...this.props.match.params, ...criteriaData});
|
|
40
40
|
}
|
|
41
41
|
}
|
|
42
42
|
|
|
@@ -83,7 +83,7 @@ class LtmplRoute extends React.PureComponent<LtmplRouteProps, LtmplRouteState> {
|
|
|
83
83
|
let mainCode = this.getMainCode();
|
|
84
84
|
let path = `${basePath}/${sourceId}/detail-edit?code=${code}&menuId=${this.getMenuId()}&mode=${mode}`;
|
|
85
85
|
if(ltmplConfigRes.ltmplConfig.customEditPagePath){
|
|
86
|
-
path=`${basePath}/page-${sourceId}${ltmplConfigRes.ltmplConfig.customEditPagePath}?menuId=${this.getMenuId()}`;
|
|
86
|
+
path=`${basePath}/page-${sourceId}${ltmplConfigRes.ltmplConfig.customEditPagePath}?code=${code}&menuId=${this.getMenuId()}`;
|
|
87
87
|
}
|
|
88
88
|
if (mainCode) {
|
|
89
89
|
path = path + `&mainCode=${mainCode}`;
|