aldehyde 0.2.152 → 0.2.153
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.
|
@@ -14,7 +14,6 @@ interface DtmplEditCardState {
|
|
|
14
14
|
loading?: boolean;
|
|
15
15
|
serial?: number;
|
|
16
16
|
dtmplData?: DtmplData;
|
|
17
|
-
codeSourceCode?: string;
|
|
18
17
|
}
|
|
19
18
|
export default class DtmplEditCard extends React.PureComponent<DtmplEditCardProps, DtmplEditCardState> {
|
|
20
19
|
formRef: React.RefObject<FormInstance<any>>;
|
|
@@ -42,13 +41,13 @@ export default class DtmplEditCard extends React.PureComponent<DtmplEditCardProp
|
|
|
42
41
|
loading: boolean;
|
|
43
42
|
serial: number;
|
|
44
43
|
dtmplData: any;
|
|
45
|
-
codeSourceCode: any;
|
|
46
44
|
};
|
|
47
45
|
componentDidMount(): Promise<void>;
|
|
48
46
|
componentDidUpdate(prevProps: any): Promise<void>;
|
|
49
47
|
componentWillUnmount(): void;
|
|
50
48
|
loadConfigData: () => Promise<void>;
|
|
51
49
|
loadData: (dtmplConfig: DtmplConfig) => Promise<void>;
|
|
50
|
+
reloadData: () => Promise<void>;
|
|
52
51
|
loadCodeData: (dtmplConfig: DtmplConfig, code: string) => Promise<void>;
|
|
53
52
|
onValuesChange: () => void;
|
|
54
53
|
doSubmit: (actionId?: number, codes?: string[], params?: object) => void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dtmpl-edit-card.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/module/dtmpl-edit-card.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AACzC,OAAO,EAAU,YAAY,EAAe,MAAM,MAAM,CAAC;AACzD,OAAO,EACL,cAAc,EACd,WAAW,EACX,SAAS,EAEV,MAAM,mBAAmB,CAAC;AAM3B,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAEzD,UAAU,kBAAmB,SAAQ,cAAc;IACjD,IAAI,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IAC9B,KAAK,CAAC,EAAE,EAAE,CAAC;IACX,KAAK,CAAC,EAAE,SAAS,CAAC;CACnB;AAED,UAAU,kBAAkB;IAC1B,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,YAAY,CAAC,EAAC,MAAM,CAAC;IACrB,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"dtmpl-edit-card.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/module/dtmpl-edit-card.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AACzC,OAAO,EAAU,YAAY,EAAe,MAAM,MAAM,CAAC;AACzD,OAAO,EACL,cAAc,EACd,WAAW,EACX,SAAS,EAEV,MAAM,mBAAmB,CAAC;AAM3B,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAEzD,UAAU,kBAAmB,SAAQ,cAAc;IACjD,IAAI,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IAC9B,KAAK,CAAC,EAAE,EAAE,CAAC;IACX,KAAK,CAAC,EAAE,SAAS,CAAC;CACnB;AAED,UAAU,kBAAkB;IAC1B,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,YAAY,CAAC,EAAC,MAAM,CAAC;IACrB,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,SAAS,CAAC;CACvB;AAED,MAAM,CAAC,OAAO,OAAO,aAAc,SAAQ,KAAK,CAAC,aAAa,CAC5D,kBAAkB,EAClB,kBAAkB,CACnB;IACC,OAAO,qCAAmC;IAC1C,aAAa,SAAqB;IAClC,gBAAgB,MAAa;IAC7B,MAAM,CAAC,WAAW;;;;;;;;OAAiB;IACnC,OAAO,EAAE,KAAK,CAAC,WAAW,CAAC,OAAO,aAAa,CAAC,CAAC;IACjD,WAAW,mBAGT;IACF,MAAM,CAAC,YAAY;;;MAGjB;IACF,KAAK;;;;;;;MAOH;IAEI,iBAAiB;IAIjB,kBAAkB,CAAC,SAAS,KAAA;IAmBlC,oBAAoB,IAAI,IAAI;IAM5B,cAAc,sBAmCZ;IAEF,QAAQ,gBAAuB,WAAW,mBAaxC;IACF,UAAU,sBAcR;IAGF,YAAY,gBAAuB,WAAW,QAAM,MAAM,mBA+DxD;IAEF,cAAc,aAIZ;IAEF,QAAQ,cAAe,MAAM,UAAU,MAAM,EAAE,WAAW,MAAM,UAY9D;IAEF,SAAS,cAkCP;IAEF,MAAM;CAwCP"}
|
|
@@ -32,7 +32,6 @@ class DtmplEditCard extends React.PureComponent {
|
|
|
32
32
|
loading: true,
|
|
33
33
|
serial: 1,
|
|
34
34
|
dtmplData: undefined,
|
|
35
|
-
codeSourceCode: undefined,
|
|
36
35
|
};
|
|
37
36
|
this.loadConfigData = () => __awaiter(this, void 0, void 0, function* () {
|
|
38
37
|
const { sourceId, code, serverKey, addTmplId } = this.props;
|
|
@@ -46,11 +45,23 @@ class DtmplEditCard extends React.PureComponent {
|
|
|
46
45
|
else {
|
|
47
46
|
dtmplConfig = yield HCDataSource.requestAddDtmplConfig(serverKey, sourceId, addTmplId);
|
|
48
47
|
}
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
dtmplConfig
|
|
52
|
-
|
|
53
|
-
|
|
48
|
+
if (dtmplConfig.entity) {
|
|
49
|
+
let dtmplData = dtmplConfig.entity;
|
|
50
|
+
dtmplConfig.entity = undefined;
|
|
51
|
+
this.setState({
|
|
52
|
+
queryingCode: code,
|
|
53
|
+
dtmplData,
|
|
54
|
+
dtmplConfig,
|
|
55
|
+
loading: false,
|
|
56
|
+
});
|
|
57
|
+
}
|
|
58
|
+
else {
|
|
59
|
+
yield this.loadData(dtmplConfig);
|
|
60
|
+
this.setState({
|
|
61
|
+
dtmplConfig,
|
|
62
|
+
loading: false,
|
|
63
|
+
});
|
|
64
|
+
}
|
|
54
65
|
});
|
|
55
66
|
this.loadData = (dtmplConfig) => __awaiter(this, void 0, void 0, function* () {
|
|
56
67
|
const { sourceId, serverKey, code: propsCode, codeSource } = this.props;
|
|
@@ -60,6 +71,15 @@ class DtmplEditCard extends React.PureComponent {
|
|
|
60
71
|
}
|
|
61
72
|
yield this.loadCodeData(dtmplConfig, code);
|
|
62
73
|
});
|
|
74
|
+
this.reloadData = () => __awaiter(this, void 0, void 0, function* () {
|
|
75
|
+
const { queryingCode, dtmplConfig } = this.state;
|
|
76
|
+
const { sourceId, serverKey, code: propsCode, codeSource } = this.props;
|
|
77
|
+
let code = propsCode ? propsCode : queryingCode;
|
|
78
|
+
if (!code && codeSource) {
|
|
79
|
+
code = yield HcserviceV3.queryCode(sourceId, codeSource, serverKey);
|
|
80
|
+
}
|
|
81
|
+
yield this.loadCodeData(dtmplConfig, code);
|
|
82
|
+
});
|
|
63
83
|
this.loadCodeData = (dtmplConfig, code) => __awaiter(this, void 0, void 0, function* () {
|
|
64
84
|
const { sourceId, defaultDtmplData, serverKey, codeSource, } = this.props;
|
|
65
85
|
//重设定时器
|
|
@@ -83,7 +103,6 @@ class DtmplEditCard extends React.PureComponent {
|
|
|
83
103
|
loading: true,
|
|
84
104
|
queryingCode: code,
|
|
85
105
|
dtmplData: undefined,
|
|
86
|
-
codeSourceCode: codeSource ? code : undefined,
|
|
87
106
|
});
|
|
88
107
|
const dtmplData_ = yield HcserviceV3.getDtmplData(dtmplConfig, serverKey, sourceId, code);
|
|
89
108
|
if ((!this.state.queryingCode || this.state.queryingCode == dtmplData_.code) &&
|
|
@@ -139,6 +158,7 @@ class DtmplEditCard extends React.PureComponent {
|
|
|
139
158
|
const { dtmplData, serial } = this.state;
|
|
140
159
|
const { translate } = this.context;
|
|
141
160
|
const footerButtons = [];
|
|
161
|
+
footerButtons.unshift(React.createElement(Button, { onClick: () => this.reloadData() }, translate("${刷新}")));
|
|
142
162
|
footerButtons.unshift(React.createElement(Button, { onClick: () => this.doSubmit(), type: "primary" }, translate("${保存}")));
|
|
143
163
|
const { dtmplConfig } = this.state;
|
|
144
164
|
//处理action
|
|
@@ -157,14 +177,14 @@ class DtmplEditCard extends React.PureComponent {
|
|
|
157
177
|
}
|
|
158
178
|
componentDidUpdate(prevProps) {
|
|
159
179
|
return __awaiter(this, void 0, void 0, function* () {
|
|
160
|
-
const { dtmplConfig,
|
|
180
|
+
const { dtmplConfig, dtmplData, queryingCode } = this.state;
|
|
161
181
|
if (prevProps && prevProps != this.props) {
|
|
182
|
+
let code = this.props.code ? this.props.code : queryingCode;
|
|
162
183
|
if (prevProps.sourceId != this.props.sourceId || dtmplConfig == null) {
|
|
163
184
|
yield this.loadConfigData();
|
|
164
185
|
}
|
|
165
|
-
else {
|
|
186
|
+
else if (prevProps.sourceId != this.props.sourceId || queryingCode != code || !dtmplData) {
|
|
166
187
|
//防止反复请求 code
|
|
167
|
-
let code = this.props.code ? this.props.code : codeSourceCode;
|
|
168
188
|
if (code) {
|
|
169
189
|
yield this.loadCodeData(dtmplConfig, code);
|
|
170
190
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dtmpl-edit-card.js","sourceRoot":"","sources":["../../../../src/aldehyde/module/dtmpl-edit-card.tsx"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,KAAoB,MAAM,OAAO,CAAC;AACzC,OAAO,EAAE,MAAM,EAAgB,KAAK,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAOzD,OAAO,SAAS,MAAM,oBAAoB,CAAC;AAC3C,OAAO,YAAY,MAAM,wBAAwB,CAAC;AAClD,OAAO,KAAK,MAAM,UAAU,CAAC;AAC7B,OAAO,WAAW,MAAM,sBAAsB,CAAC;AAC/C,OAAO,MAAM,MAAM,oBAAoB,CAAC;AACxC,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;
|
|
1
|
+
{"version":3,"file":"dtmpl-edit-card.js","sourceRoot":"","sources":["../../../../src/aldehyde/module/dtmpl-edit-card.tsx"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -26,7 +26,6 @@ interface DtmplEditCardState {
|
|
|
26
26
|
loading?: boolean;
|
|
27
27
|
serial?: number;
|
|
28
28
|
dtmplData?: DtmplData;
|
|
29
|
-
codeSourceCode?:string;
|
|
30
29
|
}
|
|
31
30
|
|
|
32
31
|
export default class DtmplEditCard extends React.PureComponent<
|
|
@@ -53,7 +52,6 @@ export default class DtmplEditCard extends React.PureComponent<
|
|
|
53
52
|
loading: true,
|
|
54
53
|
serial: 1,
|
|
55
54
|
dtmplData: undefined,
|
|
56
|
-
codeSourceCode:undefined,
|
|
57
55
|
};
|
|
58
56
|
|
|
59
57
|
async componentDidMount() {
|
|
@@ -61,19 +59,20 @@ export default class DtmplEditCard extends React.PureComponent<
|
|
|
61
59
|
}
|
|
62
60
|
|
|
63
61
|
async componentDidUpdate(prevProps) {
|
|
64
|
-
const { dtmplConfig,
|
|
62
|
+
const { dtmplConfig,dtmplData,queryingCode } = this.state;
|
|
65
63
|
if (prevProps && prevProps != this.props) {
|
|
64
|
+
|
|
65
|
+
let code=this.props.code?this.props.code:queryingCode;
|
|
66
|
+
|
|
66
67
|
if (prevProps.sourceId != this.props.sourceId || dtmplConfig == null) {
|
|
67
68
|
await this.loadConfigData();
|
|
68
|
-
} else {
|
|
69
|
+
} else if(prevProps.sourceId != this.props.sourceId || queryingCode!=code || !dtmplData ){
|
|
69
70
|
//防止反复请求 code
|
|
70
|
-
let code=this.props.code?this.props.code:codeSourceCode;
|
|
71
71
|
if(code){
|
|
72
72
|
await this.loadCodeData(dtmplConfig,code);
|
|
73
73
|
}else{
|
|
74
74
|
await this.loadData(dtmplConfig);
|
|
75
75
|
}
|
|
76
|
-
|
|
77
76
|
}
|
|
78
77
|
}
|
|
79
78
|
}
|
|
@@ -89,7 +88,7 @@ export default class DtmplEditCard extends React.PureComponent<
|
|
|
89
88
|
this.setState({
|
|
90
89
|
loading: true,
|
|
91
90
|
});
|
|
92
|
-
let dtmplConfig = undefined;
|
|
91
|
+
let dtmplConfig:DtmplConfig = undefined;
|
|
93
92
|
if (code) {
|
|
94
93
|
dtmplConfig = await HCDataSource.requestDtmplConfig(
|
|
95
94
|
serverKey,
|
|
@@ -103,11 +102,22 @@ export default class DtmplEditCard extends React.PureComponent<
|
|
|
103
102
|
addTmplId
|
|
104
103
|
);
|
|
105
104
|
}
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
dtmplConfig
|
|
109
|
-
|
|
110
|
-
|
|
105
|
+
if(dtmplConfig.entity){
|
|
106
|
+
let dtmplData=dtmplConfig.entity;
|
|
107
|
+
dtmplConfig.entity=undefined;
|
|
108
|
+
this.setState({
|
|
109
|
+
queryingCode:code,
|
|
110
|
+
dtmplData,
|
|
111
|
+
dtmplConfig,
|
|
112
|
+
loading: false,
|
|
113
|
+
});
|
|
114
|
+
}else{
|
|
115
|
+
await this.loadData(dtmplConfig);
|
|
116
|
+
this.setState({
|
|
117
|
+
dtmplConfig,
|
|
118
|
+
loading: false,
|
|
119
|
+
});
|
|
120
|
+
}
|
|
111
121
|
};
|
|
112
122
|
|
|
113
123
|
loadData = async (dtmplConfig: DtmplConfig) => {
|
|
@@ -124,6 +134,22 @@ export default class DtmplEditCard extends React.PureComponent<
|
|
|
124
134
|
await this.loadCodeData(dtmplConfig,code)
|
|
125
135
|
|
|
126
136
|
};
|
|
137
|
+
reloadData = async () => {
|
|
138
|
+
const {queryingCode,dtmplConfig}=this.state;
|
|
139
|
+
const {
|
|
140
|
+
sourceId,
|
|
141
|
+
serverKey,
|
|
142
|
+
code: propsCode,
|
|
143
|
+
codeSource
|
|
144
|
+
} = this.props;
|
|
145
|
+
let code = propsCode?propsCode:queryingCode;
|
|
146
|
+
if (!code && codeSource) {
|
|
147
|
+
code = await HcserviceV3.queryCode(sourceId, codeSource, serverKey);
|
|
148
|
+
}
|
|
149
|
+
await this.loadCodeData(dtmplConfig,code)
|
|
150
|
+
|
|
151
|
+
};
|
|
152
|
+
|
|
127
153
|
|
|
128
154
|
loadCodeData = async (dtmplConfig: DtmplConfig,code:string) => {
|
|
129
155
|
const {
|
|
@@ -154,7 +180,6 @@ export default class DtmplEditCard extends React.PureComponent<
|
|
|
154
180
|
loading: true,
|
|
155
181
|
queryingCode:code,
|
|
156
182
|
dtmplData:undefined,
|
|
157
|
-
codeSourceCode:codeSource?code:undefined,
|
|
158
183
|
});
|
|
159
184
|
const dtmplData_: DtmplData = await HcserviceV3.getDtmplData(
|
|
160
185
|
dtmplConfig,
|
|
@@ -216,6 +241,11 @@ export default class DtmplEditCard extends React.PureComponent<
|
|
|
216
241
|
const { dtmplData, serial } = this.state;
|
|
217
242
|
const { translate } = this.context;
|
|
218
243
|
const footerButtons = [];
|
|
244
|
+
footerButtons.unshift(
|
|
245
|
+
<Button onClick={() => this.reloadData()} >
|
|
246
|
+
{translate("${刷新}")}
|
|
247
|
+
</Button>
|
|
248
|
+
);
|
|
219
249
|
footerButtons.unshift(
|
|
220
250
|
<Button onClick={() => this.doSubmit()} type={"primary"}>
|
|
221
251
|
{translate("${保存}")}
|