aldehyde 0.1.26 → 0.1.29
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/detail/edit/dtmpl-edit-page.d.ts +2 -0
- package/lib/detail/edit/dtmpl-edit-page.d.ts.map +1 -1
- package/lib/detail/edit/dtmpl-edit-page.js +4 -3
- package/lib/detail/edit/dtmpl-edit-page.js.map +1 -1
- package/lib/form/form-Item-group.js +1 -1
- package/lib/form/form-Item-group.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/detail/edit/dtmpl-edit-page.tsx +5 -4
- package/src/aldehyde/form/form-Item-group.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"}
|
|
@@ -8,6 +8,7 @@ interface ModalEditorProps extends DtmplBaseProps {
|
|
|
8
8
|
onOk: (code: string) => void;
|
|
9
9
|
onCancel: () => void;
|
|
10
10
|
pageType: PageType;
|
|
11
|
+
placement?: 'top' | 'right' | 'bottom' | 'left';
|
|
11
12
|
}
|
|
12
13
|
interface ModalEditorState {
|
|
13
14
|
id: string;
|
|
@@ -33,6 +34,7 @@ export default class DtmplEditPage extends React.PureComponent<ModalEditorProps,
|
|
|
33
34
|
okText: string;
|
|
34
35
|
cancelText: string;
|
|
35
36
|
pageType: string;
|
|
37
|
+
placement: string;
|
|
36
38
|
};
|
|
37
39
|
state: {
|
|
38
40
|
id: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dtmpl-edit-page.d.ts","sourceRoot":"","sources":["../../../../../src/aldehyde/detail/edit/dtmpl-edit-page.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAiB,YAAY,EAA2B,MAAM,MAAM,CAAA;AAC3E,OAAO,EAAC,cAAc,EAAE,WAAW,EAAE,SAAS,EAAE,QAAQ,EAAC,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"dtmpl-edit-page.d.ts","sourceRoot":"","sources":["../../../../../src/aldehyde/detail/edit/dtmpl-edit-page.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAiB,YAAY,EAA2B,MAAM,MAAM,CAAA;AAC3E,OAAO,EAAC,cAAc,EAAE,WAAW,EAAE,SAAS,EAAE,QAAQ,EAAC,MAAM,sBAAsB,CAAC;AAOtF,UAAU,gBAAiB,SAAQ,cAAc;IAC7C,MAAM,CAAC,EAAE,GAAG,CAAC;IACb,KAAK,CAAC,EAAC,MAAM,CAAC;IACd,OAAO,EAAE,OAAO,CAAC;IACjB,IAAI,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IAC7B,QAAQ,EAAE,MAAM,IAAI,CAAC;IACrB,QAAQ,EAAC,QAAQ,CAAC;IAClB,SAAS,CAAC,EAAC,KAAK,GAAG,OAAO,GAAG,QAAQ,GAAG,MAAM,CAAA;CACjD;AAED,UAAU,gBAAgB;IACtB,EAAE,EAAC,MAAM,CAAC;IACV,WAAW,EAAE,WAAW,CAAC;IACzB,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,EAAC,MAAM,CAAC;IACd,SAAS,EAAC,SAAS,CAAC;CACvB;AAED,MAAM,CAAC,OAAO,OAAO,aAAc,SAAQ,KAAK,CAAC,aAAa,CAAC,gBAAgB,EAAE,gBAAgB,CAAC;IAC9F,OAAO,qCAAmC;IAC1C,aAAa,SAAqB;IAClC,gBAAgB,MAAW;IAC3B,WAAW,mBAIV;IACD,MAAM,CAAC,YAAY;;;;;;;;;;;;;MAWlB;IACD,KAAK;;;;;;MAMJ;IAEK,iBAAiB;IAKjB,kBAAkB,CAAC,SAAS,KAAA;IAUlC,oBAAoB,IAAI,IAAI;IAM5B,cAAc,sBA0Bb;IAED,QAAQ,gBAAsB,WAAW,mBA2BxC;IAED,cAAc,aAIb;IAED,QAAQ,cAAe,MAAM,UAAQ,MAAM,EAAE,WAAS,MAAM,UAY3D;IAED,SAAS,cAoBR;IAED,MAAM;CA6CT"}
|
|
@@ -147,7 +147,7 @@ export default class DtmplEditPage extends React.PureComponent {
|
|
|
147
147
|
}
|
|
148
148
|
}
|
|
149
149
|
render() {
|
|
150
|
-
const { height, onOk, onCancel, code, sourceId, visible, mainCode, width, pageType } = this.props;
|
|
150
|
+
const { height, onOk, onCancel, code, sourceId, visible, mainCode, width, pageType, placement } = this.props;
|
|
151
151
|
const { dtmplConfig, id, dtmplData } = this.state;
|
|
152
152
|
return (React.createElement(React.Fragment, null,
|
|
153
153
|
" ",
|
|
@@ -157,7 +157,7 @@ export default class DtmplEditPage extends React.PureComponent {
|
|
|
157
157
|
React.createElement("div", { onClick: this.onClickBody },
|
|
158
158
|
React.createElement(DtmplForm, { parentId: id, dtmplConfig: dtmplConfig, formRef: this.formRef, sourceId: sourceId, onFinish: onOk, showConfirm: false, dtmplData: dtmplData, onValuesChange: this.onValuesChange })))
|
|
159
159
|
:
|
|
160
|
-
React.createElement(Drawer, { placement:
|
|
160
|
+
React.createElement(Drawer, { placement: placement, closable: true, mask: false, onClose: onCancel, visible: visible, width: width, style: {
|
|
161
161
|
maxWidth: 1960,
|
|
162
162
|
}, extra: React.createElement(Space, null, this.getFooter()) },
|
|
163
163
|
React.createElement(DtmplForm, { parentId: id, dtmplConfig: dtmplConfig, formRef: this.formRef, sourceId: sourceId, onFinish: onOk, showConfirm: false, dtmplData: dtmplData, onValuesChange: this.onValuesChange }))));
|
|
@@ -172,6 +172,7 @@ DtmplEditPage.defaultProps = {
|
|
|
172
172
|
style: { maxWidth: 'calc(100vw - 60px)', maxHeight: 'calc(100vh - 50px)' },
|
|
173
173
|
okText: "确定",
|
|
174
174
|
cancelText: "取消",
|
|
175
|
-
pageType: 'modal'
|
|
175
|
+
pageType: 'modal',
|
|
176
|
+
placement: 'left'
|
|
176
177
|
};
|
|
177
178
|
//# sourceMappingURL=dtmpl-edit-page.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dtmpl-edit-page.js","sourceRoot":"","sources":["../../../../../src/aldehyde/detail/edit/dtmpl-edit-page.tsx"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAC,MAAM,EAAE,MAAM,EAAgB,KAAK,EAAE,UAAU,EAAE,KAAK,EAAC,MAAM,MAAM,CAAA;AAE3E,OAAO,SAAS,MAAM,uBAAuB,CAAC;AAC9C,OAAO,YAAY,MAAM,2BAA2B,CAAC;AACrD,OAAO,KAAK,MAAM,aAAa,CAAC;AAChC,OAAO,WAAW,MAAM,yBAAyB,CAAC;AAClD,OAAO,MAAM,MAAM,uBAAuB,CAAC;AAoB3C,MAAM,CAAC,OAAO,OAAO,aAAc,SAAQ,KAAK,CAAC,aAAiD;IAAlG;;QACI,YAAO,GAAG,KAAK,CAAC,SAAS,EAAgB,CAAC;QAC1C,kBAAa,GAAG,CAAC,gBAAgB,CAAC;QAClC,qBAAgB,GAAC,SAAS,CAAC;QAC3B,gBAAW,GAAG,CAAC,CAAC,EAAE,EAAE;YAChB,mBAAmB;YACnB,OAAO,CAAC,GAAG,CAAC,MAAM,GAAG,IAAI,CAAC,aAAa,CAAC,CAAC;YACzC,IAAI,CAAC,aAAa,GAAG,CAAC,CAAC;QAC3B,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"dtmpl-edit-page.js","sourceRoot":"","sources":["../../../../../src/aldehyde/detail/edit/dtmpl-edit-page.tsx"],"names":[],"mappings":"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"}
|
|
@@ -26,7 +26,7 @@ export default class FormItemGroup extends React.PureComponent {
|
|
|
26
26
|
React.createElement(EntryControl, { value: fieldValue, fieldConfig: item }));
|
|
27
27
|
}
|
|
28
28
|
else {
|
|
29
|
-
formItem = React.createElement(FormItem, { label: item.title, name: item[nameAttr], key: item.id, labelCol: item.colNum == 1 ? { span: 6 } : { span: 3 }, wrapperCol: item.colNum == 1 ? { span: 15 } : { span: 19 }, tooltip: item.tip, initialValue: fieldValue, style: { margin: 4 }, rules: item.required ? [{
|
|
29
|
+
formItem = React.createElement(FormItem, { label: item.title, name: item[nameAttr], key: item.id, labelCol: item.colNum == 1 ? { span: 6 } : { xs: { span: 6 }, sm: { span: 6 }, md: { span: 5 }, lg: { span: 5 }, xl: { span: 3 }, xxl: { span: 3 } }, wrapperCol: item.colNum == 1 ? { span: 15 } : { xs: { span: 18 }, sm: { span: 18 }, md: { span: 18 }, lg: { span: 18 }, xl: { span: 19 }, xxl: { span: 19 } }, tooltip: item.tip, initialValue: fieldValue, style: { margin: 4 }, rules: item.required ? [{
|
|
30
30
|
required: true, message: `请选择${title}`,
|
|
31
31
|
}] : undefined },
|
|
32
32
|
React.createElement(EntryControl, { value: fieldValue, fieldConfig: item }));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"form-Item-group.js","sourceRoot":"","sources":["../../../../src/aldehyde/form/form-Item-group.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,EAAC,GAAG,EAAE,IAAI,EAAE,GAAG,EAAC,MAAM,MAAM,CAAA;AACnC,OAAO,qBAAqB,CAAC;AAE7B,OAAO,YAAY,MAAM,2BAA2B,CAAC;AACrD,OAAO,KAAK,MAAM,UAAU,CAAA;AAI5B,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAA;AAQzB,CAAC;AAID,CAAC;AAEF,MAAM,CAAC,OAAO,OAAO,aAAc,SAAQ,KAAK,CAAC,aAA+C;IAO5F,YAAY,KAAK;QACb,KAAK,CAAC,KAAK,CAAC,CAAC;QAMjB,iBAAY,GAAG,GAAG,EAAE;YAChB,MAAM,EAAC,MAAM,EAAE,QAAQ,EAAC,QAAQ,EAAC,YAAY,EAAC,GAAG,IAAI,CAAC,KAAK,CAAA;YAC3D,MAAM,YAAY,GAAG,EAAE,CAAC;YAExB,IAAK,MAAM,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE;gBAC9B,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE;oBAC3B,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC;oBACzB,IAAI,UAAU,GAAG,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;oBAC1D,mDAAmD;oBACnD,UAAU,GAAG,CAAC,UAAU,IAAI,UAAU,IAAE,CAAC,CAAE,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,KAAK,CAAC,gBAAgB,CAAC,IAAI,CAAC,YAAY,CAAC,CAAA,CAAC,CAAC,SAAS,CAAC;oBAEpI,OAAO,CAAC,GAAG,CAAC,MAAM,EAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,EAAC,UAAU,CAAC,CAAC;oBAEjD,MAAM,QAAQ,GAAG,IAAI,CAAC,EAAE,GAAG,IAAI,CAAC,MAAM,EAAE,GAAG,GAAG,CAAC;oBAC/C,IAAI,QAAQ,GAAC,IAAI,CAAC;oBAClB,IAAG,IAAI,CAAC,cAAc,IAAE,QAAQ,EAAC;wBAC7B,QAAQ,GAAE,oBAAC,QAAQ,IAAC,MAAM,EAAE,IAAI,EACZ,YAAY,EAAE,UAAU,EACxB,IAAI,EAAE,IAAI,CAAC,QAAQ,CAAC,EAAE,GAAG,EAAE,IAAI,CAAC,EAAE;4BAClD,oBAAC,YAAY,IAAC,KAAK,EAAE,UAAU,EAAE,WAAW,EAAE,IAAI,GAAI,CAC/C,CAAA;qBACd;yBAAI;wBACA,QAAQ,GAAG,oBAAC,QAAQ,IAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,IAAI,EAAE,IAAI,CAAC,QAAQ,CAAC,EAAE,GAAG,EAAE,IAAI,CAAC,EAAE,EACjD,QAAQ,EAAE,IAAI,CAAC,MAAM,IAAI,CAAC,CAAC,CAAC,CAAC,EAAC,IAAI,EAAE,CAAC,EAAC,CAAC,CAAC,CAAC,EAAC,IAAI,EAAE,CAAC,EAAC,
|
|
1
|
+
{"version":3,"file":"form-Item-group.js","sourceRoot":"","sources":["../../../../src/aldehyde/form/form-Item-group.tsx"],"names":[],"mappings":"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"}
|
|
@@ -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}${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
|
|
|
@@ -6,7 +6,6 @@ import HCDataSource from "../../tmpl/hc-data-source";
|
|
|
6
6
|
import Units from "../../units";
|
|
7
7
|
import HcserviceV3 from "../../tmpl/hcservice-v3";
|
|
8
8
|
import Action from "../../controls/action";
|
|
9
|
-
import DtmplEdit from "./dtmpl-edit";
|
|
10
9
|
|
|
11
10
|
interface ModalEditorProps extends DtmplBaseProps {
|
|
12
11
|
height?: any,
|
|
@@ -15,6 +14,7 @@ interface ModalEditorProps extends DtmplBaseProps {
|
|
|
15
14
|
onOk: (code: string) => void,
|
|
16
15
|
onCancel: () => void,
|
|
17
16
|
pageType:PageType;
|
|
17
|
+
placement?:'top' | 'right' | 'bottom' | 'left'
|
|
18
18
|
}
|
|
19
19
|
|
|
20
20
|
interface ModalEditorState {
|
|
@@ -43,7 +43,8 @@ export default class DtmplEditPage extends React.PureComponent<ModalEditorProps,
|
|
|
43
43
|
style: {maxWidth: 'calc(100vw - 60px)', maxHeight: 'calc(100vh - 50px)'},
|
|
44
44
|
okText: "确定",
|
|
45
45
|
cancelText: "取消",
|
|
46
|
-
pageType:'modal'
|
|
46
|
+
pageType:'modal',
|
|
47
|
+
placement:'left'
|
|
47
48
|
}
|
|
48
49
|
state = {
|
|
49
50
|
id:'modelDtmplEdit'+Units.getRandomNum(6),
|
|
@@ -174,7 +175,7 @@ export default class DtmplEditPage extends React.PureComponent<ModalEditorProps,
|
|
|
174
175
|
}
|
|
175
176
|
|
|
176
177
|
render() {
|
|
177
|
-
const {height, onOk, onCancel, code, sourceId, visible,mainCode,width,pageType} = this.props
|
|
178
|
+
const {height, onOk, onCancel, code, sourceId, visible,mainCode,width,pageType,placement} = this.props
|
|
178
179
|
const {dtmplConfig,id,dtmplData} = this.state;
|
|
179
180
|
|
|
180
181
|
return (<> {pageType=='modal'? <Modal
|
|
@@ -195,7 +196,7 @@ export default class DtmplEditPage extends React.PureComponent<ModalEditorProps,
|
|
|
195
196
|
</Modal>
|
|
196
197
|
:
|
|
197
198
|
<Drawer
|
|
198
|
-
placement={
|
|
199
|
+
placement={placement}
|
|
199
200
|
closable={true}
|
|
200
201
|
mask={false}
|
|
201
202
|
onClose={onCancel}
|
|
@@ -58,8 +58,8 @@ export default class FormItemGroup extends React.PureComponent<FieldGroupProps,
|
|
|
58
58
|
</FormItem>
|
|
59
59
|
}else{
|
|
60
60
|
formItem = <FormItem label={item.title} name={item[nameAttr]} key={item.id}
|
|
61
|
-
labelCol={item.colNum == 1 ? {span: 6} : {span: 3}}
|
|
62
|
-
wrapperCol={item.colNum == 1 ? {span: 15} : {span: 19}}
|
|
61
|
+
labelCol={item.colNum == 1 ? {span: 6} : { xs: {span: 6}, sm: {span: 6}, md: {span: 5},lg: {span: 5},xl: {span: 3},xxl: {span: 3}} }
|
|
62
|
+
wrapperCol={item.colNum == 1 ? {span: 15} : { xs: {span: 18}, sm: {span: 18}, md: {span: 18},lg: {span: 18},xl: {span: 19},xxl: {span: 19}}}
|
|
63
63
|
tooltip={item.tip}
|
|
64
64
|
initialValue={fieldValue}
|
|
65
65
|
style={{ margin: 4}}
|
|
@@ -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}${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}`;
|