aldehyde 0.2.52 → 0.2.54
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/action/index.d.ts +1 -0
- package/lib/controls/action/index.d.ts.map +1 -1
- package/lib/controls/action/index.js +2 -2
- package/lib/controls/action/index.js.map +1 -1
- package/lib/controls/cascader/index.d.ts.map +1 -1
- package/lib/controls/cascader/index.js +2 -2
- package/lib/controls/cascader/index.js.map +1 -1
- package/lib/controls/chemstruc/graph.js +2 -2
- package/lib/controls/chemstruc/graph.js.map +1 -1
- package/lib/controls/cquery/cquick-button.d.ts +1 -0
- package/lib/controls/cquery/cquick-button.d.ts.map +1 -1
- package/lib/controls/cquery/cquick-button.js +3 -3
- package/lib/controls/cquery/cquick-button.js.map +1 -1
- package/lib/controls/entity-select/entity-select.js +10 -10
- package/lib/controls/entity-select/entity-select.js.map +1 -1
- package/lib/controls/entity-select/lab-tree-select.js +3 -3
- package/lib/controls/entity-select/lab-tree-select.js.map +1 -1
- package/lib/controls/entity-select/popover-entity-select.js +2 -2
- package/lib/controls/entity-select/popover-entity-select.js.map +1 -1
- package/lib/controls/entry-control.d.ts +1 -0
- package/lib/controls/entry-control.d.ts.map +1 -1
- package/lib/controls/entry-control.js.map +1 -1
- package/lib/controls/file-view/drawer-file-view.d.ts +1 -0
- package/lib/controls/file-view/drawer-file-view.d.ts.map +1 -1
- package/lib/controls/file-view/drawer-file-view.js +4 -4
- package/lib/controls/file-view/drawer-file-view.js.map +1 -1
- package/lib/controls/file-view/index.d.ts +2 -1
- package/lib/controls/file-view/index.d.ts.map +1 -1
- package/lib/controls/file-view/index.js +12 -12
- package/lib/controls/file-view/index.js.map +1 -1
- package/lib/controls/relation-existion/index.js +2 -2
- package/lib/controls/relation-existion/index.js.map +1 -1
- package/lib/controls/rfield/index.js +2 -2
- package/lib/controls/rfield/index.js.map +1 -1
- package/lib/controls/signature/index.js +2 -2
- package/lib/controls/signature/index.js.map +1 -1
- package/lib/controls/upload/index.js +2 -2
- package/lib/controls/upload/index.js.map +1 -1
- package/lib/controls/view-control.d.ts +1 -0
- package/lib/controls/view-control.d.ts.map +1 -1
- package/lib/controls/view-control.js +15 -6
- package/lib/controls/view-control.js.map +1 -1
- package/lib/custom-page/dtmpl-custom-edit-modal-page.d.ts +1 -0
- package/lib/custom-page/dtmpl-custom-edit-modal-page.d.ts.map +1 -1
- package/lib/custom-page/dtmpl-custom-edit-modal-page.js.map +1 -1
- package/lib/detail/button/cquery-button-bar.d.ts +1 -0
- package/lib/detail/button/cquery-button-bar.d.ts.map +1 -1
- package/lib/detail/button/cquery-button-bar.js +3 -3
- package/lib/detail/button/cquery-button-bar.js.map +1 -1
- package/lib/detail/button/submit-button-bar.d.ts +1 -0
- package/lib/detail/button/submit-button-bar.d.ts.map +1 -1
- package/lib/detail/button/submit-button-bar.js +3 -3
- package/lib/detail/button/submit-button-bar.js.map +1 -1
- package/lib/detail/edit/dtmpl-edit.js +9 -9
- package/lib/detail/edit/dtmpl-edit.js.map +1 -1
- package/lib/detail/edit/fields-edit-card.d.ts +1 -0
- package/lib/detail/edit/fields-edit-card.d.ts.map +1 -1
- package/lib/detail/edit/fields-edit-card.js +2 -2
- package/lib/detail/edit/fields-edit-card.js.map +1 -1
- package/lib/detail/edit/modal-row-edit.d.ts +1 -0
- package/lib/detail/edit/modal-row-edit.d.ts.map +1 -1
- package/lib/detail/edit/modal-row-edit.js +2 -2
- package/lib/detail/edit/modal-row-edit.js.map +1 -1
- package/lib/detail/edit/row-edit-card.d.ts +1 -0
- package/lib/detail/edit/row-edit-card.d.ts.map +1 -1
- package/lib/detail/edit/row-edit-card.js +2 -2
- package/lib/detail/edit/row-edit-card.js.map +1 -1
- package/lib/detail/edit/row-editor.d.ts +1 -0
- package/lib/detail/edit/row-editor.d.ts.map +1 -1
- package/lib/detail/edit/row-editor.js +2 -2
- package/lib/detail/edit/row-editor.js.map +1 -1
- package/lib/detail/view/act-dtmpl-view.js +5 -5
- package/lib/detail/view/act-dtmpl-view.js.map +1 -1
- package/lib/detail/view/dtmpl-view.js +8 -8
- package/lib/detail/view/dtmpl-view.js.map +1 -1
- package/lib/detail/view/field-view-group.d.ts +1 -0
- package/lib/detail/view/field-view-group.d.ts.map +1 -1
- package/lib/detail/view/field-view-group.js +2 -2
- package/lib/detail/view/field-view-group.js.map +1 -1
- package/lib/detail/view/modal-dtmpl-view.js +2 -2
- package/lib/detail/view/modal-dtmpl-view.js.map +1 -1
- package/lib/detail/view/snapshot-timeline.d.ts +1 -0
- package/lib/detail/view/snapshot-timeline.d.ts.map +1 -1
- package/lib/detail/view/snapshot-timeline.js +4 -4
- package/lib/detail/view/snapshot-timeline.js.map +1 -1
- package/lib/exportor/export-frame.d.ts +1 -0
- package/lib/exportor/export-frame.d.ts.map +1 -1
- package/lib/exportor/export-frame.js +6 -3
- package/lib/exportor/export-frame.js.map +1 -1
- package/lib/form/criteria-form.d.ts +1 -0
- package/lib/form/criteria-form.d.ts.map +1 -1
- package/lib/form/criteria-form.js +6 -5
- package/lib/form/criteria-form.js.map +1 -1
- package/lib/form/dtmpl-form.js +9 -9
- package/lib/form/dtmpl-form.js.map +1 -1
- package/lib/form/field-group-form.d.ts +1 -0
- package/lib/form/field-group-form.d.ts.map +1 -1
- package/lib/form/field-group-form.js +2 -2
- package/lib/form/field-group-form.js.map +1 -1
- package/lib/form/fields-form.d.ts +1 -0
- package/lib/form/fields-form.d.ts.map +1 -1
- package/lib/form/fields-form.js +2 -2
- package/lib/form/fields-form.js.map +1 -1
- package/lib/form/form-Item-group.d.ts +1 -0
- package/lib/form/form-Item-group.d.ts.map +1 -1
- package/lib/form/form-Item-group.js +4 -4
- package/lib/form/form-Item-group.js.map +1 -1
- package/lib/import/excel-import.d.ts +1 -0
- package/lib/import/excel-import.d.ts.map +1 -1
- package/lib/import/excel-import.js +6 -3
- package/lib/import/excel-import.js.map +1 -1
- package/lib/layout/menu/l2menu-message-bar.js +2 -2
- package/lib/layout/menu/l2menu-message-bar.js.map +1 -1
- package/lib/layout/menu/l2menu-quick-bar.js +1 -1
- package/lib/layout/menu/l2menu-quick-bar.js.map +1 -1
- package/lib/layout/menu/userinfo-bar.js +1 -1
- package/lib/layout/menu/userinfo-bar.js.map +1 -1
- package/lib/login/context-setter.d.ts +1 -0
- package/lib/login/context-setter.d.ts.map +1 -1
- package/lib/login/context-setter.js +2 -1
- package/lib/login/context-setter.js.map +1 -1
- package/lib/module/dtmpl-edit-card.d.ts.map +1 -1
- package/lib/module/dtmpl-edit-card.js +9 -8
- package/lib/module/dtmpl-edit-card.js.map +1 -1
- package/lib/module/dtmpl-edit-drawer.js.map +1 -1
- package/lib/module/dtmpl-edit-page.js +11 -11
- package/lib/module/dtmpl-edit-page.js.map +1 -1
- package/lib/module/dtmpl-editor.js +7 -7
- package/lib/module/dtmpl-editor.js.map +1 -1
- package/lib/module/dtmpl-view-card.d.ts +1 -0
- package/lib/module/dtmpl-view-card.d.ts.map +1 -1
- package/lib/module/dtmpl-view-card.js +3 -3
- package/lib/module/dtmpl-view-card.js.map +1 -1
- package/lib/module/dtmpl-view-drawer.js +2 -2
- package/lib/module/dtmpl-view-drawer.js.map +1 -1
- package/lib/module/dtmpl-view-modal.js +2 -2
- package/lib/module/dtmpl-view-modal.js.map +1 -1
- package/lib/module/ltmpl-table.d.ts +1 -0
- package/lib/module/ltmpl-table.d.ts.map +1 -1
- package/lib/module/ltmpl-table.js +8 -8
- package/lib/module/ltmpl-table.js.map +1 -1
- package/lib/routable/dtmpl-route.js +4 -4
- package/lib/routable/dtmpl-route.js.map +1 -1
- package/lib/routable/import-route.d.ts +1 -0
- package/lib/routable/import-route.d.ts.map +1 -1
- package/lib/routable/import-route.js +2 -2
- package/lib/routable/import-route.js.map +1 -1
- package/lib/routable/ltmpl-route.js +2 -2
- package/lib/routable/ltmpl-route.js.map +1 -1
- package/lib/table/act-table.d.ts +0 -2
- package/lib/table/act-table.d.ts.map +1 -1
- package/lib/table/act-table.js +29 -30
- package/lib/table/act-table.js.map +1 -1
- package/lib/table/l2-act-table.js +4 -4
- package/lib/table/l2-act-table.js.map +1 -1
- package/lib/table/modal-select-table.d.ts +1 -0
- package/lib/table/modal-select-table.d.ts.map +1 -1
- package/lib/table/modal-select-table.js +8 -8
- package/lib/table/modal-select-table.js.map +1 -1
- package/lib/table/query-table.d.ts +1 -0
- package/lib/table/query-table.d.ts.map +1 -1
- package/lib/table/query-table.js +6 -5
- package/lib/table/query-table.js.map +1 -1
- package/lib/table/relation-table.d.ts +1 -0
- package/lib/table/relation-table.d.ts.map +1 -1
- package/lib/table/relation-table.js +17 -16
- package/lib/table/relation-table.js.map +1 -1
- package/lib/table/select-table.d.ts +1 -0
- package/lib/table/select-table.d.ts.map +1 -1
- package/lib/table/select-table.js +8 -9
- package/lib/table/select-table.js.map +1 -1
- package/lib/table/stat/restat.d.ts +1 -0
- package/lib/table/stat/restat.d.ts.map +1 -1
- package/lib/table/stat/restat.js +4 -4
- package/lib/table/stat/restat.js.map +1 -1
- package/lib/tmpl/hc-data-source.d.ts +9 -9
- package/lib/tmpl/hc-data-source.js +32 -32
- package/lib/tmpl/hc-data-source.js.map +1 -1
- package/lib/tmpl/hcservice-v3.d.ts +39 -49
- package/lib/tmpl/hcservice-v3.d.ts.map +1 -1
- package/lib/tmpl/hcservice-v3.js +207 -174
- package/lib/tmpl/hcservice-v3.js.map +1 -1
- package/lib/tmpl/interface.d.ts +3 -0
- package/lib/tmpl/interface.d.ts.map +1 -1
- package/lib/tmpl/interface.js.map +1 -1
- package/lib/tmpl/superagent.d.ts +1 -2
- package/lib/tmpl/superagent.d.ts.map +1 -1
- package/lib/tmpl/superagent.js +33 -37
- package/lib/tmpl/superagent.js.map +1 -1
- package/lib/units/index.d.ts +4 -4
- package/lib/units/index.d.ts.map +1 -1
- package/lib/units/index.js +29 -10
- package/lib/units/index.js.map +1 -1
- package/lib/welcome/HCWelcome.js.map +1 -1
- package/lib/welcome/quick-entrance.js +2 -2
- package/lib/welcome/quick-entrance.js.map +1 -1
- package/lib/welcome/workbench.js +2 -2
- package/lib/welcome/workbench.js.map +1 -1
- package/package.json +1 -1
- package/src/aldehyde/controls/action/index.tsx +3 -2
- package/src/aldehyde/controls/cascader/index.tsx +3 -4
- package/src/aldehyde/controls/chemstruc/graph.tsx +2 -2
- package/src/aldehyde/controls/cquery/cquick-button.tsx +4 -3
- package/src/aldehyde/controls/entity-select/entity-select.tsx +10 -10
- package/src/aldehyde/controls/entity-select/lab-tree-select.tsx +3 -3
- package/src/aldehyde/controls/entity-select/popover-entity-select.tsx +2 -2
- package/src/aldehyde/controls/entry-control.tsx +1 -0
- package/src/aldehyde/controls/file-view/drawer-file-view.tsx +5 -4
- package/src/aldehyde/controls/file-view/index.tsx +13 -12
- package/src/aldehyde/controls/relation-existion/index.tsx +2 -2
- package/src/aldehyde/controls/rfield/index.tsx +2 -2
- package/src/aldehyde/controls/signature/index.tsx +2 -2
- package/src/aldehyde/controls/upload/index.tsx +3 -3
- package/src/aldehyde/controls/view-control.tsx +5 -4
- package/src/aldehyde/custom-page/dtmpl-custom-edit-modal-page.tsx +1 -0
- package/src/aldehyde/detail/button/cquery-button-bar.tsx +4 -3
- package/src/aldehyde/detail/button/submit-button-bar.tsx +4 -3
- package/src/aldehyde/detail/edit/dtmpl-edit.tsx +10 -10
- package/src/aldehyde/detail/edit/fields-edit-card.tsx +3 -2
- package/src/aldehyde/detail/edit/modal-row-edit.tsx +3 -2
- package/src/aldehyde/detail/edit/row-edit-card.tsx +3 -2
- package/src/aldehyde/detail/edit/row-editor.tsx +3 -2
- package/src/aldehyde/detail/view/act-dtmpl-view.tsx +5 -5
- package/src/aldehyde/detail/view/dtmpl-view.tsx +8 -8
- package/src/aldehyde/detail/view/field-view-group.tsx +3 -2
- package/src/aldehyde/detail/view/modal-dtmpl-view.tsx +2 -2
- package/src/aldehyde/detail/view/snapshot-timeline.tsx +5 -4
- package/src/aldehyde/exportor/export-frame.tsx +7 -3
- package/src/aldehyde/form/criteria-form.tsx +7 -5
- package/src/aldehyde/form/dtmpl-form.tsx +9 -9
- package/src/aldehyde/form/field-group-form.tsx +3 -2
- package/src/aldehyde/form/fields-form.tsx +3 -2
- package/src/aldehyde/form/form-Item-group.tsx +5 -4
- package/src/aldehyde/import/excel-import.tsx +7 -3
- package/src/aldehyde/layout/menu/l2menu-message-bar.tsx +2 -2
- package/src/aldehyde/layout/menu/l2menu-quick-bar.tsx +1 -1
- package/src/aldehyde/layout/menu/userinfo-bar.tsx +1 -1
- package/src/aldehyde/login/context-setter.tsx +3 -1
- package/src/aldehyde/module/dtmpl-edit-card.tsx +10 -9
- package/src/aldehyde/module/dtmpl-edit-drawer.tsx +1 -1
- package/src/aldehyde/module/dtmpl-edit-page.tsx +11 -11
- package/src/aldehyde/module/dtmpl-editor.tsx +7 -7
- package/src/aldehyde/module/dtmpl-view-card.tsx +4 -3
- package/src/aldehyde/module/dtmpl-view-drawer.tsx +2 -2
- package/src/aldehyde/module/dtmpl-view-modal.tsx +2 -2
- package/src/aldehyde/module/ltmpl-table.tsx +9 -8
- package/src/aldehyde/routable/dtmpl-route.tsx +4 -4
- package/src/aldehyde/routable/import-route.tsx +3 -3
- package/src/aldehyde/routable/ltmpl-route.tsx +2 -2
- package/src/aldehyde/table/act-table.tsx +33 -33
- package/src/aldehyde/table/l2-act-table.tsx +4 -4
- package/src/aldehyde/table/modal-select-table.tsx +9 -9
- package/src/aldehyde/table/query-table.tsx +8 -5
- package/src/aldehyde/table/relation-table.tsx +18 -16
- package/src/aldehyde/table/select-table.tsx +9 -9
- package/src/aldehyde/table/stat/restat.tsx +5 -4
- package/src/aldehyde/tmpl/hc-data-source.tsx +32 -32
- package/src/aldehyde/tmpl/hcservice-v3.tsx +205 -162
- package/src/aldehyde/tmpl/interface.tsx +3 -0
- package/src/aldehyde/tmpl/superagent.js +37 -32
- package/src/aldehyde/units/index.tsx +27 -11
- package/src/aldehyde/welcome/HCWelcome.js +6 -0
- package/src/aldehyde/welcome/quick-entrance.tsx +2 -2
- package/src/aldehyde/welcome/workbench.tsx +2 -2
- package/lib/exportor/index.d.ts +0 -16
- package/lib/exportor/index.d.ts.map +0 -1
- package/lib/exportor/index.js +0 -44
- package/lib/exportor/index.js.map +0 -1
- package/lib/import/template-builder.d.ts +0 -29
- package/lib/import/template-builder.d.ts.map +0 -1
- package/lib/import/template-builder.js +0 -426
- package/lib/import/template-builder.js.map +0 -1
- package/src/aldehyde/exportor/index.tsx +0 -56
- package/src/aldehyde/import/template-builder.js +0 -474
|
@@ -8,6 +8,7 @@ import withRouter from "../routable/withroute";
|
|
|
8
8
|
//以列表为入口的,页面内列表,基本原则是所有交互在页面内完成,不会触发路由。
|
|
9
9
|
|
|
10
10
|
export interface ContextSetterProps {
|
|
11
|
+
serverKey:string,
|
|
11
12
|
// match:any,
|
|
12
13
|
};
|
|
13
14
|
|
|
@@ -73,6 +74,7 @@ class ContextSetter extends React.PureComponent<ContextSetterProps, ContextSette
|
|
|
73
74
|
|
|
74
75
|
render() {
|
|
75
76
|
const {config,loading,context}=this.state;
|
|
77
|
+
const {serverKey}=this.props;
|
|
76
78
|
return <Modal title="全局配置" closable={false} open={true} footer={[]}>
|
|
77
79
|
<Row justify="center" align="middle" >
|
|
78
80
|
<Col>
|
|
@@ -93,7 +95,7 @@ class ContextSetter extends React.PureComponent<ContextSetterProps, ContextSette
|
|
|
93
95
|
return <Form.Item
|
|
94
96
|
name={c.id} initialValue={initialValue} rules={[{required: true, message: '请选择' + c.title}]}
|
|
95
97
|
>
|
|
96
|
-
<EntryControl id={'14'}
|
|
98
|
+
<EntryControl serverKey={serverKey} id={'14'}
|
|
97
99
|
fieldConfig={{
|
|
98
100
|
id: c.groupId,
|
|
99
101
|
title: c.title,
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import React, {ReactNode} from 'react';
|
|
2
|
-
import {Button,
|
|
2
|
+
import {Button, FormInstance, Space,Card} from 'antd'
|
|
3
3
|
import {DtmplBaseProps, DtmplConfig, DtmplData, PageType} from "../tmpl/interface";
|
|
4
4
|
import DtmplForm from '../form/dtmpl-form';
|
|
5
5
|
import HCDataSource from "../tmpl/hc-data-source";
|
|
@@ -63,15 +63,15 @@ export default class DtmplEditCard extends React.PureComponent<DtmplEditCardProp
|
|
|
63
63
|
}
|
|
64
64
|
|
|
65
65
|
loadConfigData = async () => {
|
|
66
|
-
const { sourceId,code} = this.props;
|
|
66
|
+
const { sourceId,code,serverKey} = this.props;
|
|
67
67
|
this.setState({
|
|
68
68
|
loading: true,
|
|
69
69
|
})
|
|
70
70
|
let dtmplConfig=undefined;
|
|
71
71
|
if(code){
|
|
72
|
-
dtmplConfig = await HCDataSource.requestDtmplConfig(sourceId);
|
|
72
|
+
dtmplConfig = await HCDataSource.requestDtmplConfig(serverKey,sourceId);
|
|
73
73
|
}else{
|
|
74
|
-
dtmplConfig = await HCDataSource.requestAddDtmplConfig(sourceId);
|
|
74
|
+
dtmplConfig = await HCDataSource.requestAddDtmplConfig(serverKey,sourceId);
|
|
75
75
|
}
|
|
76
76
|
|
|
77
77
|
if(dtmplConfig.authSaveInterval && dtmplConfig.authSaveInterval>0){
|
|
@@ -96,12 +96,12 @@ export default class DtmplEditCard extends React.PureComponent<DtmplEditCardProp
|
|
|
96
96
|
}
|
|
97
97
|
|
|
98
98
|
loadData = async (dtmplConfig:DtmplConfig ) => {
|
|
99
|
-
const { sourceId, code,defaultDtmplData} = this.props;
|
|
99
|
+
const { sourceId, code,defaultDtmplData,serverKey} = this.props;
|
|
100
100
|
if (code) {
|
|
101
101
|
this.setState({
|
|
102
102
|
loading: true,
|
|
103
103
|
})
|
|
104
|
-
const dtmplData_ = await HcserviceV3.requestDtmplData( sourceId, code, null);
|
|
104
|
+
const dtmplData_ = await HcserviceV3.requestDtmplData(serverKey, sourceId, code, null);
|
|
105
105
|
this.setState({
|
|
106
106
|
dtmplData:dtmplData_,
|
|
107
107
|
id:code,
|
|
@@ -143,6 +143,7 @@ export default class DtmplEditCard extends React.PureComponent<DtmplEditCardProp
|
|
|
143
143
|
}
|
|
144
144
|
|
|
145
145
|
getFooter = () => {
|
|
146
|
+
const {serverKey}=this.props;
|
|
146
147
|
const {dtmplData,serial}=this.state;
|
|
147
148
|
const footerButtons = [];
|
|
148
149
|
footerButtons.unshift(
|
|
@@ -153,14 +154,14 @@ export default class DtmplEditCard extends React.PureComponent<DtmplEditCardProp
|
|
|
153
154
|
//处理action
|
|
154
155
|
if (dtmplConfig) {
|
|
155
156
|
dtmplConfig.actions.forEach((ac, index) => {
|
|
156
|
-
footerButtons.unshift(<Action iconType={'icon-title'} hiddenType={'disabled'} serial={serial} key={ac.id} formRef={this.formRef} actionConfig={ac} doAction={this.doSubmit}></Action>);
|
|
157
|
+
footerButtons.unshift(<Action serverKey={serverKey} iconType={'icon-title'} hiddenType={'disabled'} serial={serial} key={ac.id} formRef={this.formRef} actionConfig={ac} doAction={this.doSubmit}></Action>);
|
|
157
158
|
})
|
|
158
159
|
}
|
|
159
160
|
return footerButtons;
|
|
160
161
|
}
|
|
161
162
|
|
|
162
163
|
render() {
|
|
163
|
-
const { onOk, sourceId,mainCode,style,maxColsOnRow,title} = this.props
|
|
164
|
+
const { onOk, sourceId,mainCode,style,maxColsOnRow,title,serverKey} = this.props
|
|
164
165
|
const {dtmplConfig,id,dtmplData} = this.state;
|
|
165
166
|
|
|
166
167
|
return (<>
|
|
@@ -173,7 +174,7 @@ export default class DtmplEditCard extends React.PureComponent<DtmplEditCardProp
|
|
|
173
174
|
<Space>{this.getFooter()}</Space>
|
|
174
175
|
}
|
|
175
176
|
>
|
|
176
|
-
<DtmplForm showHeader={false} mainCode={mainCode} parentId={id} dtmplConfig={dtmplConfig} formRef={this.formRef} sourceId={sourceId}
|
|
177
|
+
<DtmplForm serverKey={serverKey} showHeader={false} mainCode={mainCode} parentId={id} dtmplConfig={dtmplConfig} formRef={this.formRef} sourceId={sourceId}
|
|
177
178
|
onFinish={onOk} maxColsOnRow={maxColsOnRow}
|
|
178
179
|
showConfirm={false} dtmplData={dtmplData} onValuesChange={this.onValuesChange} />
|
|
179
180
|
</Card>
|
|
@@ -18,7 +18,7 @@ interface DtmplEditDrawerState {
|
|
|
18
18
|
export default class DtmplEditDrawer extends React.PureComponent<DtmplEditDrawerProps, DtmplEditDrawerState> {
|
|
19
19
|
|
|
20
20
|
render() {
|
|
21
|
-
return <DtmplEditPage
|
|
21
|
+
return <DtmplEditPage pageType={'drawer'} {...this.props}></DtmplEditPage>
|
|
22
22
|
}
|
|
23
23
|
|
|
24
24
|
}
|
|
@@ -81,15 +81,15 @@ export default class DtmplEditPage extends React.PureComponent<ModalEditorProps,
|
|
|
81
81
|
}
|
|
82
82
|
|
|
83
83
|
loadConfigData = async () => {
|
|
84
|
-
const { sourceId,open,code} = this.props;
|
|
84
|
+
const { sourceId,open,code,serverKey} = this.props;
|
|
85
85
|
this.setState({
|
|
86
86
|
loading: true,
|
|
87
87
|
})
|
|
88
88
|
let dtmplConfig=undefined;
|
|
89
89
|
if(code){
|
|
90
|
-
dtmplConfig = await HCDataSource.requestDtmplConfig(sourceId);
|
|
90
|
+
dtmplConfig = await HCDataSource.requestDtmplConfig(serverKey,sourceId);
|
|
91
91
|
}else{
|
|
92
|
-
dtmplConfig = await HCDataSource.requestAddDtmplConfig(sourceId);
|
|
92
|
+
dtmplConfig = await HCDataSource.requestAddDtmplConfig(serverKey,sourceId);
|
|
93
93
|
}
|
|
94
94
|
|
|
95
95
|
if(dtmplConfig.authSaveInterval && dtmplConfig.authSaveInterval>0){
|
|
@@ -114,7 +114,7 @@ export default class DtmplEditPage extends React.PureComponent<ModalEditorProps,
|
|
|
114
114
|
}
|
|
115
115
|
|
|
116
116
|
loadData = async (dtmplConfig:DtmplConfig ) => {
|
|
117
|
-
const { sourceId, code,defaultDtmplData,open} = this.props;
|
|
117
|
+
const { sourceId, code,defaultDtmplData,open,serverKey} = this.props;
|
|
118
118
|
if(!open){
|
|
119
119
|
return;
|
|
120
120
|
}
|
|
@@ -122,7 +122,7 @@ export default class DtmplEditPage extends React.PureComponent<ModalEditorProps,
|
|
|
122
122
|
this.setState({
|
|
123
123
|
loading: true,
|
|
124
124
|
})
|
|
125
|
-
const dtmplData_ = await HcserviceV3.requestDtmplData( sourceId, code, null);
|
|
125
|
+
const dtmplData_ = await HcserviceV3.requestDtmplData(serverKey, sourceId, code, null);
|
|
126
126
|
this.setState({
|
|
127
127
|
dtmplData:dtmplData_,
|
|
128
128
|
id:code,
|
|
@@ -164,7 +164,7 @@ export default class DtmplEditPage extends React.PureComponent<ModalEditorProps,
|
|
|
164
164
|
}
|
|
165
165
|
|
|
166
166
|
getFooter = () => {
|
|
167
|
-
const {onCancel} = this.props
|
|
167
|
+
const {onCancel,serverKey} = this.props
|
|
168
168
|
const {dtmplData,serial}=this.state;
|
|
169
169
|
const footerButtons = [];
|
|
170
170
|
const {dtmplConfig} = this.state;
|
|
@@ -177,7 +177,7 @@ export default class DtmplEditPage extends React.PureComponent<ModalEditorProps,
|
|
|
177
177
|
//处理action
|
|
178
178
|
if (dtmplConfig) {
|
|
179
179
|
dtmplConfig.actions.forEach((ac, index) => {
|
|
180
|
-
footerButtons.unshift(<Action iconType={'icon-title'} hiddenType={'disabled'} serial={serial} key={ac.id} formRef={this.formRef} actionConfig={ac} doAction={this.doSubmit}></Action>);
|
|
180
|
+
footerButtons.unshift(<Action serverKey={serverKey} iconType={'icon-title'} hiddenType={'disabled'} serial={serial} key={ac.id} formRef={this.formRef} actionConfig={ac} doAction={this.doSubmit}></Action>);
|
|
181
181
|
})
|
|
182
182
|
}
|
|
183
183
|
footerButtons.unshift(<Popconfirm key="back" placement="topLeft" title={"确定要取消本次修改内容吗?"} onConfirm={onCancel} okText="确定" cancelText="取消">
|
|
@@ -188,7 +188,7 @@ export default class DtmplEditPage extends React.PureComponent<ModalEditorProps,
|
|
|
188
188
|
}
|
|
189
189
|
|
|
190
190
|
render() {
|
|
191
|
-
const {height, onOk, onCancel, code,bodyWidth, sourceId, open,mainCode,width,pageType,placement,maxColsOnRow,title} = this.props
|
|
191
|
+
const {height, onOk, onCancel, code,bodyWidth, sourceId, open,mainCode,width,pageType,placement,maxColsOnRow,title,serverKey} = this.props
|
|
192
192
|
const {dtmplConfig,id,dtmplData} = this.state;
|
|
193
193
|
|
|
194
194
|
let title1=title?title:dtmplConfig ? dtmplConfig.title : "";
|
|
@@ -205,7 +205,7 @@ export default class DtmplEditPage extends React.PureComponent<ModalEditorProps,
|
|
|
205
205
|
footer={this.getFooter()}
|
|
206
206
|
>
|
|
207
207
|
{open} <div onClick={this.onClickBody}>
|
|
208
|
-
<DtmplForm mainCode={mainCode} parentId={id} dtmplConfig={dtmplConfig} formRef={this.formRef} sourceId={sourceId}
|
|
208
|
+
<DtmplForm serverKey={serverKey} mainCode={mainCode} parentId={id} dtmplConfig={dtmplConfig} formRef={this.formRef} sourceId={sourceId}
|
|
209
209
|
onFinish={onOk} maxColsOnRow={maxColsOnRow}
|
|
210
210
|
showConfirm={false} dtmplData={dtmplData} onValuesChange={this.onValuesChange} />
|
|
211
211
|
</div>
|
|
@@ -226,11 +226,11 @@ export default class DtmplEditPage extends React.PureComponent<ModalEditorProps,
|
|
|
226
226
|
<Space>{this.getFooter()}</Space>
|
|
227
227
|
}
|
|
228
228
|
>
|
|
229
|
-
<DtmplForm mainCode={mainCode} parentId={id} dtmplConfig={dtmplConfig} formRef={this.formRef} sourceId={sourceId}
|
|
229
|
+
<DtmplForm serverKey={serverKey} mainCode={mainCode} parentId={id} dtmplConfig={dtmplConfig} formRef={this.formRef} sourceId={sourceId}
|
|
230
230
|
onFinish={onOk} maxColsOnRow={maxColsOnRow}
|
|
231
231
|
showConfirm={false} dtmplData={dtmplData} onValuesChange={this.onValuesChange} />
|
|
232
232
|
</Drawer>:<Card title={title1}>
|
|
233
|
-
<DtmplForm mainCode={mainCode} parentId={id} dtmplConfig={dtmplConfig} formRef={this.formRef} sourceId={sourceId}
|
|
233
|
+
<DtmplForm serverKey={serverKey} mainCode={mainCode} parentId={id} dtmplConfig={dtmplConfig} formRef={this.formRef} sourceId={sourceId}
|
|
234
234
|
onFinish={onOk} maxColsOnRow={maxColsOnRow}
|
|
235
235
|
showConfirm={false} dtmplData={dtmplData} onValuesChange={this.onValuesChange} />
|
|
236
236
|
</Card>
|
|
@@ -62,15 +62,15 @@ export default class DtmplEditPage extends React.PureComponent<ModalEditorProps,
|
|
|
62
62
|
}
|
|
63
63
|
|
|
64
64
|
loadConfigData = async () => {
|
|
65
|
-
const { sourceId,open,code} = this.props;
|
|
65
|
+
const { sourceId,open,code,serverKey} = this.props;
|
|
66
66
|
this.setState({
|
|
67
67
|
loading: true,
|
|
68
68
|
})
|
|
69
69
|
let dtmplConfig=undefined;
|
|
70
70
|
if(code){
|
|
71
|
-
dtmplConfig = await HCDataSource.requestDtmplConfig(sourceId);
|
|
71
|
+
dtmplConfig = await HCDataSource.requestDtmplConfig(serverKey,sourceId);
|
|
72
72
|
}else{
|
|
73
|
-
dtmplConfig = await HCDataSource.requestAddDtmplConfig(sourceId);
|
|
73
|
+
dtmplConfig = await HCDataSource.requestAddDtmplConfig(serverKey,sourceId);
|
|
74
74
|
}
|
|
75
75
|
|
|
76
76
|
if(dtmplConfig.authSaveInterval && dtmplConfig.authSaveInterval>0){
|
|
@@ -95,7 +95,7 @@ export default class DtmplEditPage extends React.PureComponent<ModalEditorProps,
|
|
|
95
95
|
}
|
|
96
96
|
|
|
97
97
|
loadData = async (dtmplConfig:DtmplConfig ) => {
|
|
98
|
-
const { sourceId, code,defaultDtmplData,open} = this.props;
|
|
98
|
+
const { sourceId, code,defaultDtmplData,open,serverKey} = this.props;
|
|
99
99
|
if(!open){
|
|
100
100
|
return;
|
|
101
101
|
}
|
|
@@ -103,7 +103,7 @@ export default class DtmplEditPage extends React.PureComponent<ModalEditorProps,
|
|
|
103
103
|
this.setState({
|
|
104
104
|
loading: true,
|
|
105
105
|
})
|
|
106
|
-
const dtmplData_ = await HcserviceV3.requestDtmplData( sourceId, code, null);
|
|
106
|
+
const dtmplData_ = await HcserviceV3.requestDtmplData( serverKey,sourceId, code, null);
|
|
107
107
|
this.setState({
|
|
108
108
|
dtmplData:dtmplData_,
|
|
109
109
|
id:code,
|
|
@@ -145,9 +145,9 @@ export default class DtmplEditPage extends React.PureComponent<ModalEditorProps,
|
|
|
145
145
|
}
|
|
146
146
|
|
|
147
147
|
render() {
|
|
148
|
-
const {onOk,sourceId,mainCode,maxColsOnRow} = this.props
|
|
148
|
+
const {onOk,sourceId,mainCode,maxColsOnRow,serverKey} = this.props
|
|
149
149
|
const {dtmplConfig,id,dtmplData} = this.state;
|
|
150
|
-
return <DtmplForm mainCode={mainCode} parentId={id} dtmplConfig={dtmplConfig} formRef={this.formRef} sourceId={sourceId}
|
|
150
|
+
return <DtmplForm serverKey={serverKey} mainCode={mainCode} parentId={id} dtmplConfig={dtmplConfig} formRef={this.formRef} sourceId={sourceId}
|
|
151
151
|
onFinish={onOk} maxColsOnRow={maxColsOnRow}
|
|
152
152
|
showConfirm={false} dtmplData={dtmplData} onValuesChange={this.onValuesChange} />
|
|
153
153
|
}
|
|
@@ -5,6 +5,7 @@ import DtmplEditModal from './dtmpl-edit-modal';
|
|
|
5
5
|
//以列表为入口的,页面内列表,基本原则是所有交互在页面内完成,不会触发路由。
|
|
6
6
|
|
|
7
7
|
export interface DtmplViewCardProps {
|
|
8
|
+
serverKey:string,
|
|
8
9
|
sourceId?:string,
|
|
9
10
|
code?:string;
|
|
10
11
|
mainCode?:string;
|
|
@@ -48,10 +49,10 @@ class DtmplViewCard extends React.PureComponent<DtmplViewCardProps, DtmplViewCar
|
|
|
48
49
|
|
|
49
50
|
render() {
|
|
50
51
|
const {showDtmplEdit} = this.state;
|
|
51
|
-
const { sourceId,code,mainCode,editable} = this.props;
|
|
52
|
+
const { sourceId,code,mainCode,editable,serverKey} = this.props;
|
|
52
53
|
return <>
|
|
53
|
-
<ActDtmplView goDtmpl={editable?this.goDtmpl:null} sourceId={sourceId} code={code} mainCode={mainCode}></ActDtmplView>
|
|
54
|
-
{showDtmplEdit? <DtmplEditModal open={showDtmplEdit} onCancel={()=>{
|
|
54
|
+
<ActDtmplView serverKey={serverKey} goDtmpl={editable?this.goDtmpl:null} sourceId={sourceId} code={code} mainCode={mainCode}></ActDtmplView>
|
|
55
|
+
{showDtmplEdit? <DtmplEditModal serverKey={serverKey} open={showDtmplEdit} onCancel={()=>{
|
|
55
56
|
this.setState({
|
|
56
57
|
showDtmplEdit:false,
|
|
57
58
|
})}}
|
|
@@ -38,7 +38,7 @@ class DtmplViewDrawer extends React.PureComponent<DtmplViewDrawerProps, DtmplVie
|
|
|
38
38
|
}
|
|
39
39
|
|
|
40
40
|
render() {
|
|
41
|
-
const {title,sourceId,code,placement,open,onClose,width,cancelText,editable}=this.props;
|
|
41
|
+
const {title,sourceId,code,placement,open,onClose,width,cancelText,editable,serverKey}=this.props;
|
|
42
42
|
return (<Drawer
|
|
43
43
|
placement={placement}
|
|
44
44
|
title={title}
|
|
@@ -56,7 +56,7 @@ class DtmplViewDrawer extends React.PureComponent<DtmplViewDrawerProps, DtmplVie
|
|
|
56
56
|
</Space>
|
|
57
57
|
}
|
|
58
58
|
>
|
|
59
|
-
<DtmplViewCard editable={editable} sourceId={sourceId} code={code}></DtmplViewCard>
|
|
59
|
+
<DtmplViewCard serverKey={serverKey} editable={editable} sourceId={sourceId} code={code}></DtmplViewCard>
|
|
60
60
|
</Drawer>)
|
|
61
61
|
}
|
|
62
62
|
}
|
|
@@ -34,7 +34,7 @@ class DtmplViewModal extends React.PureComponent<DtmplViewModalProps, DtmplViewM
|
|
|
34
34
|
}
|
|
35
35
|
|
|
36
36
|
render() {
|
|
37
|
-
const {title,sourceId,code,open,onClose,width,height}=this.props;
|
|
37
|
+
const {title,sourceId,code,open,onClose,width,height,serverKey}=this.props;
|
|
38
38
|
return <Modal
|
|
39
39
|
open={open}
|
|
40
40
|
width={width}
|
|
@@ -43,7 +43,7 @@ class DtmplViewModal extends React.PureComponent<DtmplViewModalProps, DtmplViewM
|
|
|
43
43
|
destroyOnClose={true}
|
|
44
44
|
centered
|
|
45
45
|
onCancel={onClose}
|
|
46
|
-
><DtmplViewCard sourceId={sourceId} code={code}></DtmplViewCard>
|
|
46
|
+
><DtmplViewCard serverKey={serverKey} sourceId={sourceId} code={code}></DtmplViewCard>
|
|
47
47
|
</Modal>
|
|
48
48
|
}
|
|
49
49
|
}
|
|
@@ -12,6 +12,7 @@ import DtmplCustomEditModalPage from "../custom-page/dtmpl-custom-edit-modal-pag
|
|
|
12
12
|
//以列表为入口的,页面内列表,基本原则是所有交互在页面内完成,不会触发路由。
|
|
13
13
|
|
|
14
14
|
export interface LtmplTableProps {
|
|
15
|
+
serverKey:string,
|
|
15
16
|
sourceId: string,
|
|
16
17
|
mainCode?: string;
|
|
17
18
|
showView?: (code: string, toCustomPage?: boolean) => void,
|
|
@@ -80,8 +81,8 @@ class LtmplTable extends React.PureComponent<LtmplTableProps, LtmplTableState> {
|
|
|
80
81
|
}
|
|
81
82
|
|
|
82
83
|
loadLtmplConfig = async () => {
|
|
83
|
-
const {sourceId} = this.props;
|
|
84
|
-
let ltmplConfigRes: LtmplConfigRes = await HCDataSource.requestLtmplConfig(sourceId);
|
|
84
|
+
const {sourceId,serverKey} = this.props;
|
|
85
|
+
let ltmplConfigRes: LtmplConfigRes = await HCDataSource.requestLtmplConfig(serverKey,sourceId);
|
|
85
86
|
let criteriaData;
|
|
86
87
|
//提取 过滤条件的默认值
|
|
87
88
|
if (ltmplConfigRes) {
|
|
@@ -200,21 +201,21 @@ class LtmplTable extends React.PureComponent<LtmplTableProps, LtmplTableState> {
|
|
|
200
201
|
|
|
201
202
|
render() {
|
|
202
203
|
const {ltmplConfigRes, criteriaData,pageSize,pageNo, showDtmplView, selectedCode, showDtmplEdit, showDtmplCustomEdit, ractionId, showDraw, collapse} = this.state;
|
|
203
|
-
const {sourceId, mainCode, showView, doSearch, doRAction, funcMode, title, collapsible, initCollapse,doCustomEdit,doCustomCreate} = this.props;
|
|
204
|
+
const {sourceId, mainCode, showView, doSearch, doRAction, funcMode, title, collapsible, initCollapse,doCustomEdit,doCustomCreate,serverKey} = this.props;
|
|
204
205
|
|
|
205
206
|
if (!ltmplConfigRes) {
|
|
206
207
|
return <></>;
|
|
207
208
|
} else {
|
|
208
209
|
const {buttons,customEditPagePath} = ltmplConfigRes.ltmplConfig
|
|
209
210
|
return <>
|
|
210
|
-
<ActTable pageSize={pageSize} pageNo={pageNo} onChangePage={this.onChangePage} collapsible={collapsible} initCollapse={initCollapse && collapse} title={title}
|
|
211
|
+
<ActTable serverKey={serverKey} pageSize={pageSize} pageNo={pageNo} onChangePage={this.onChangePage} collapsible={collapsible} initCollapse={initCollapse && collapse} title={title}
|
|
211
212
|
funcMode={funcMode} mainCode={mainCode} showView={showView ? showView : this.showView}
|
|
212
213
|
doRAction={doRAction ? doRAction : this.doRAction}
|
|
213
214
|
doSearch={doSearch ? doSearch : this.doSearch} doEdit={this.doEdit} doCreate={this.doCreate}
|
|
214
215
|
sourceId={sourceId} criteriaData={criteriaData} customEditable={doCustomEdit?true:false} customCreatable={doCustomCreate?true:false}
|
|
215
216
|
ltmplConfig={ltmplConfigRes.ltmplConfig}/>
|
|
216
217
|
{buttons.includes('detail') && showDtmplView ?
|
|
217
|
-
<ModalDtmplView open={showDtmplView} onCancel={() => {
|
|
218
|
+
<ModalDtmplView serverKey={serverKey} open={showDtmplView} onCancel={() => {
|
|
218
219
|
this.setState({
|
|
219
220
|
showDtmplView: false,
|
|
220
221
|
})
|
|
@@ -223,7 +224,7 @@ class LtmplTable extends React.PureComponent<LtmplTableProps, LtmplTableState> {
|
|
|
223
224
|
sourceId={sourceId}
|
|
224
225
|
code={selectedCode}> </ModalDtmplView> : ""}
|
|
225
226
|
{(buttons.includes('dtmplEdit') || buttons.includes('dtmplAdd')) && showDtmplEdit ?
|
|
226
|
-
<DtmplEditPage open={showDtmplEdit} onCancel={() => {
|
|
227
|
+
<DtmplEditPage serverKey={serverKey} open={showDtmplEdit} onCancel={() => {
|
|
227
228
|
this.setState({
|
|
228
229
|
showDtmplEdit: false,
|
|
229
230
|
})
|
|
@@ -234,7 +235,7 @@ class LtmplTable extends React.PureComponent<LtmplTableProps, LtmplTableState> {
|
|
|
234
235
|
onOk={this.handleDtmplEdit}/>
|
|
235
236
|
: ""}
|
|
236
237
|
{showDtmplCustomEdit ?
|
|
237
|
-
<DtmplCustomEditModalPage open={showDtmplCustomEdit} onOk={() => {
|
|
238
|
+
<DtmplCustomEditModalPage serverKey={serverKey} open={showDtmplCustomEdit} onOk={() => {
|
|
238
239
|
this.doSearch(this.state.criteriaData)
|
|
239
240
|
this.setState({
|
|
240
241
|
showDtmplCustomEdit: false,
|
|
@@ -260,7 +261,7 @@ class LtmplTable extends React.PureComponent<LtmplTableProps, LtmplTableState> {
|
|
|
260
261
|
}
|
|
261
262
|
>
|
|
262
263
|
{
|
|
263
|
-
<LtmplTable sourceId={ractionId} mainCode={selectedCode}></LtmplTable>
|
|
264
|
+
<LtmplTable serverKey={serverKey} sourceId={ractionId} mainCode={selectedCode}></LtmplTable>
|
|
264
265
|
}
|
|
265
266
|
</Drawer>
|
|
266
267
|
</>
|
|
@@ -50,12 +50,12 @@ class DtmplRoute extends React.Component<DtmplRouteProps, DtmplRoutePropsStat> {
|
|
|
50
50
|
let queriedCode=undefined;
|
|
51
51
|
if(codeSource){
|
|
52
52
|
if( codeSource=='listop'){
|
|
53
|
-
queriedCode=await HcserviceV3.queryTop1(sourceId);
|
|
53
|
+
queriedCode=await HcserviceV3.queryTop1(null,sourceId);
|
|
54
54
|
if(!queriedCode){
|
|
55
55
|
queriedCode="bad-code";
|
|
56
56
|
}
|
|
57
57
|
}else if( codeSource=='listop-new'){
|
|
58
|
-
queriedCode=await HcserviceV3.queryTop1(sourceId);
|
|
58
|
+
queriedCode=await HcserviceV3.queryTop1(null,sourceId);
|
|
59
59
|
}else if(codeSource=='new'){
|
|
60
60
|
queriedCode=null;
|
|
61
61
|
}
|
|
@@ -152,11 +152,11 @@ class DtmplRoute extends React.Component<DtmplRouteProps, DtmplRoutePropsStat> {
|
|
|
152
152
|
let versionId=params['versionId'];
|
|
153
153
|
if(location.pathname.endsWith("detail-view")){
|
|
154
154
|
return (
|
|
155
|
-
<ActDtmplView goDtmpl={this.goDtmpl} sourceId={sourceId} versionId={versionId} code={code} mainCode={this.getMainCode()} />
|
|
155
|
+
<ActDtmplView serverKey={null} goDtmpl={this.goDtmpl} sourceId={sourceId} versionId={versionId} code={code} mainCode={this.getMainCode()} />
|
|
156
156
|
);
|
|
157
157
|
}else{
|
|
158
158
|
return (
|
|
159
|
-
<DtmplEdit addOrUpdate={this.getMode()} sourceId={sourceId} code={code} mainCode={this.getMainCode()} goBackToLtmpl={codeSource?undefined:this.goBackToLtmpl} goDtmpl={this.goDtmpl}></DtmplEdit>
|
|
159
|
+
<DtmplEdit serverKey={null} addOrUpdate={this.getMode()} sourceId={sourceId} code={code} mainCode={this.getMainCode()} goBackToLtmpl={codeSource?undefined:this.goBackToLtmpl} goDtmpl={this.goDtmpl}></DtmplEdit>
|
|
160
160
|
);
|
|
161
161
|
}
|
|
162
162
|
|
|
@@ -4,7 +4,7 @@ import ExcelImport from '../import/excel-import'
|
|
|
4
4
|
import withRouter from "./withroute";
|
|
5
5
|
|
|
6
6
|
export interface ImportRouteProps extends RouterCompProps {
|
|
7
|
-
|
|
7
|
+
serverKey:string,
|
|
8
8
|
};
|
|
9
9
|
interface ImportRouteStat{
|
|
10
10
|
|
|
@@ -20,9 +20,9 @@ class ExcelImportRoute extends React.PureComponent<ImportRouteProps, ImportRoute
|
|
|
20
20
|
|
|
21
21
|
|
|
22
22
|
render() {
|
|
23
|
-
const { params, } = this.props;
|
|
23
|
+
const { params, serverKey} = this.props;
|
|
24
24
|
const { sourceId} = params;
|
|
25
|
-
return <ExcelImport
|
|
25
|
+
return <ExcelImport serverKey={serverKey} sourceId={sourceId}></ExcelImport>
|
|
26
26
|
}
|
|
27
27
|
}
|
|
28
28
|
export default withRouter(ExcelImportRoute);
|
|
@@ -42,7 +42,7 @@ class LtmplRoute extends React.PureComponent<LtmplRouteProps, LtmplRouteState> {
|
|
|
42
42
|
loadData = async () => {
|
|
43
43
|
const {params} = this.props;
|
|
44
44
|
const {sourceId} = params;
|
|
45
|
-
let ltmplConfigRes:LtmplConfigRes = await HCDataSource.requestLtmplConfig(sourceId);
|
|
45
|
+
let ltmplConfigRes:LtmplConfigRes = await HCDataSource.requestLtmplConfig(null,sourceId);
|
|
46
46
|
this.setState({
|
|
47
47
|
ltmplConfigRes:ltmplConfigRes,
|
|
48
48
|
})
|
|
@@ -191,7 +191,7 @@ class LtmplRoute extends React.PureComponent<LtmplRouteProps, LtmplRouteState> {
|
|
|
191
191
|
if (!ltmplConfigRes) {
|
|
192
192
|
return <></>;
|
|
193
193
|
} else {
|
|
194
|
-
return <ActTable pageSize={pageSize} pageNo={pageNo} onChangePage={this.onChangePage}
|
|
194
|
+
return <ActTable serverKey={null} pageSize={pageSize} pageNo={pageNo} onChangePage={this.onChangePage}
|
|
195
195
|
menuId={this.getMenuId()} mainCode={mainCode} showView={this.showView}
|
|
196
196
|
doSearch={this.onChangeSearch} doEdit={this.doEdit} doCreate={this.doCreate}
|
|
197
197
|
sourceId={sourceId} criteriaData={criteriaData}
|