ngx-rs-ant 2.3.6 → 2.3.8
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/esm2020/form/form.component.mjs +12 -5
- package/esm2020/form/form.service.mjs +7 -4
- package/esm2020/word/word-designer/word-designer.component.mjs +3 -3
- package/esm2020/word/word-editor/word-editor.component.mjs +33 -14
- package/esm2020/word/word-editor/word-editor.service.mjs +6 -4
- package/fesm2015/ngx-rs-ant.mjs +52 -27
- package/fesm2015/ngx-rs-ant.mjs.map +1 -1
- package/fesm2020/ngx-rs-ant.mjs +56 -25
- package/fesm2020/ngx-rs-ant.mjs.map +1 -1
- package/form/form.component.d.ts +1 -0
- package/form/form.service.d.ts +1 -1
- package/package.json +2 -8
- package/word/word-editor/word-editor.component.d.ts +7 -4
- package/word/word-editor/word-editor.service.d.ts +2 -2
|
@@ -25,7 +25,7 @@ export class WordEditorService {
|
|
|
25
25
|
}
|
|
26
26
|
});
|
|
27
27
|
}
|
|
28
|
-
reloadTemplate(tenant, className, oid, templateClassName, templateNumberAttribute, templateFileAttribute, templateConfigAttribute) {
|
|
28
|
+
reloadTemplate(tenant, className, oid, templateClassName, defaultTemplateNumber, templateNumberAttribute, templateFileAttribute, templateConfigAttribute) {
|
|
29
29
|
return this.http.get('api/data/custom', {
|
|
30
30
|
params: {
|
|
31
31
|
executor: 'com.cs.system.word.editor.ReloadTemplate',
|
|
@@ -33,6 +33,7 @@ export class WordEditorService {
|
|
|
33
33
|
className,
|
|
34
34
|
oid,
|
|
35
35
|
templateClassName,
|
|
36
|
+
defaultTemplateNumber,
|
|
36
37
|
templateNumberAttribute,
|
|
37
38
|
templateFileAttribute,
|
|
38
39
|
templateConfigAttribute
|
|
@@ -49,7 +50,7 @@ export class WordEditorService {
|
|
|
49
50
|
}
|
|
50
51
|
});
|
|
51
52
|
}
|
|
52
|
-
generateFile(tenant, className, oid, generateFileAttribute, templateFileAttribute, templateConfigAttribute, model) {
|
|
53
|
+
generateFile(tenant, className, oid, generateFileAttribute, templateFileAttribute, templateConfigAttribute, model, generateToTemp) {
|
|
53
54
|
return this.http.post('api/data/custom', model, {
|
|
54
55
|
params: {
|
|
55
56
|
executor: 'com.cs.system.word.editor.GenerateFile',
|
|
@@ -58,7 +59,8 @@ export class WordEditorService {
|
|
|
58
59
|
oid,
|
|
59
60
|
generateFileAttribute,
|
|
60
61
|
templateFileAttribute,
|
|
61
|
-
templateConfigAttribute
|
|
62
|
+
templateConfigAttribute,
|
|
63
|
+
generateToTemp
|
|
62
64
|
}
|
|
63
65
|
});
|
|
64
66
|
}
|
|
@@ -68,4 +70,4 @@ WordEditorService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", ve
|
|
|
68
70
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.10", ngImport: i0, type: WordEditorService, decorators: [{
|
|
69
71
|
type: Injectable
|
|
70
72
|
}], ctorParameters: function () { return [{ type: i1.HttpClient }]; } });
|
|
71
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
73
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoid29yZC1lZGl0b3Iuc2VydmljZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uL3Byb2plY3RzL25neC1ycy1hbnQvc3JjL3dvcmQvd29yZC1lZGl0b3Ivd29yZC1lZGl0b3Iuc2VydmljZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUMsVUFBVSxFQUFDLE1BQU0sZUFBZSxDQUFDO0FBRXpDLE9BQU8sRUFBQyxHQUFHLEVBQWEsTUFBTSxNQUFNLENBQUM7OztBQUdyQyxNQUFNLE9BQU8saUJBQWlCO0lBQzVCLFlBQW9CLElBQWdCO1FBQWhCLFNBQUksR0FBSixJQUFJLENBQVk7SUFDcEMsQ0FBQztJQUVELFlBQVksQ0FBQyxNQUFXLEVBQUUsU0FBYyxFQUFFLEdBQVEsRUFBRSx1QkFBNEI7UUFDOUUsT0FBTyxJQUFJLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBTSxXQUFXLEdBQUcsU0FBUyxHQUFHLEdBQUcsR0FBRyxHQUFHLEVBQUU7WUFDN0QsTUFBTSxFQUFFO2dCQUNOLE1BQU07YUFDUDtTQUNGLENBQUMsQ0FBQyxJQUFJLENBQ0wsR0FBRyxDQUFDLFFBQVEsQ0FBQyxFQUFFO1lBQ2IsSUFBSSxRQUFRLENBQUMsSUFBSSxFQUFFLENBQUMsdUJBQXVCLENBQUMsRUFBRTtnQkFDNUMsT0FBTyxJQUFJLENBQUMsS0FBSyxDQUFDLFFBQVEsQ0FBQyxJQUFJLENBQUMsdUJBQXVCLENBQUMsQ0FBQyxDQUFDO2FBQzNEO1lBQ0QsT0FBTyxFQUFFLENBQUM7UUFDWixDQUFDLENBQUMsQ0FDSCxDQUFDO0lBQ0osQ0FBQztJQUVELElBQUksQ0FBQyxNQUFXLEVBQUUsU0FBYyxFQUFFLEdBQVEsRUFBRSxLQUFVO1FBQ3BELE9BQU8sSUFBSSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQU0sV0FBVyxHQUFHLFNBQVMsR0FBRyxHQUFHLEdBQUcsR0FBRyxFQUFFLEtBQUssRUFBRTtZQUNyRSxNQUFNLEVBQUU7Z0JBQ04sTUFBTTthQUNQO1NBQ0YsQ0FBQyxDQUFDO0lBQ0wsQ0FBQztJQUVELGNBQWMsQ0FBQyxNQUFXLEVBQ1gsU0FBYyxFQUNkLEdBQVEsRUFDUixpQkFBc0IsRUFDdEIscUJBQTBCLEVBQzFCLHVCQUE0QixFQUM1QixxQkFBMEIsRUFDMUIsdUJBQTRCO1FBQ3pDLE9BQU8sSUFBSSxDQUFDLElBQUksQ0FBQyxHQUFHLENBQU0saUJBQWlCLEVBQUU7WUFDM0MsTUFBTSxFQUFFO2dCQUNOLFFBQVEsRUFBRSwwQ0FBMEM7Z0JBQ3BELE1BQU07Z0JBQ04sU0FBUztnQkFDVCxHQUFHO2dCQUNILGlCQUFpQjtnQkFDakIscUJBQXFCO2dCQUNyQix1QkFBdUI7Z0JBQ3ZCLHFCQUFxQjtnQkFDckIsdUJBQXVCO2FBQ3hCO1NBQ0YsQ0FBQyxDQUFDO0lBQ0wsQ0FBQztJQUVELFFBQVEsQ0FBQyxNQUFXLEVBQUUsU0FBYyxFQUFFLEdBQVEsRUFBRSxLQUFVO1FBQ3hELE9BQU8sSUFBSSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQU0saUJBQWlCLEVBQUUsS0FBSyxFQUFFO1lBQ25ELE1BQU0sRUFBRTtnQkFDTixRQUFRLEVBQUUsb0NBQW9DO2dCQUM5QyxNQUFNO2dCQUNOLFNBQVM7Z0JBQ1QsR0FBRzthQUNKO1NBQ0YsQ0FBQyxDQUFDO0lBQ0wsQ0FBQztJQUVELFlBQVksQ0FBQyxNQUFXLEVBQ1gsU0FBYyxFQUNkLEdBQVEsRUFDUixxQkFBMEIsRUFDMUIscUJBQTBCLEVBQzFCLHVCQUE0QixFQUM1QixLQUFVLEVBQ1YsY0FBdUI7UUFDbEMsT0FBTyxJQUFJLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBTSxpQkFBaUIsRUFBRSxLQUFLLEVBQUU7WUFDbkQsTUFBTSxFQUFFO2dCQUNOLFFBQVEsRUFBRSx3Q0FBd0M7Z0JBQ2xELE1BQU07Z0JBQ04sU0FBUztnQkFDVCxHQUFHO2dCQUNILHFCQUFxQjtnQkFDckIscUJBQXFCO2dCQUNyQix1QkFBdUI7Z0JBQ3ZCLGNBQWM7YUFDZjtTQUNGLENBQUMsQ0FBQztJQUNMLENBQUM7OytHQWpGVSxpQkFBaUI7bUhBQWpCLGlCQUFpQjs0RkFBakIsaUJBQWlCO2tCQUQ3QixVQUFVIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHtJbmplY3RhYmxlfSBmcm9tICdAYW5ndWxhci9jb3JlJztcbmltcG9ydCB7SHR0cENsaWVudH0gZnJvbSBcIkBhbmd1bGFyL2NvbW1vbi9odHRwXCI7XG5pbXBvcnQge21hcCwgT2JzZXJ2YWJsZX0gZnJvbSBcInJ4anNcIjtcblxuQEluamVjdGFibGUoKVxuZXhwb3J0IGNsYXNzIFdvcmRFZGl0b3JTZXJ2aWNlIHtcbiAgY29uc3RydWN0b3IocHJpdmF0ZSBodHRwOiBIdHRwQ2xpZW50KSB7XG4gIH1cblxuICBsb2FkVGVtcGxhdGUodGVuYW50OiBhbnksIGNsYXNzTmFtZTogYW55LCBvaWQ6IGFueSwgdGVtcGxhdGVDb25maWdBdHRyaWJ1dGU6IGFueSk6IE9ic2VydmFibGU8YW55PiB7XG4gICAgcmV0dXJuIHRoaXMuaHR0cC5nZXQ8YW55PignYXBpL2RhdGEvJyArIGNsYXNzTmFtZSArICcvJyArIG9pZCwge1xuICAgICAgcGFyYW1zOiB7XG4gICAgICAgIHRlbmFudFxuICAgICAgfVxuICAgIH0pLnBpcGUoXG4gICAgICBtYXAocmVzcG9uc2UgPT4ge1xuICAgICAgICBpZiAocmVzcG9uc2UuZGF0YT8uW3RlbXBsYXRlQ29uZmlnQXR0cmlidXRlXSkge1xuICAgICAgICAgIHJldHVybiBKU09OLnBhcnNlKHJlc3BvbnNlLmRhdGFbdGVtcGxhdGVDb25maWdBdHRyaWJ1dGVdKTtcbiAgICAgICAgfVxuICAgICAgICByZXR1cm4ge307XG4gICAgICB9KVxuICAgICk7XG4gIH1cblxuICBzYXZlKHRlbmFudDogYW55LCBjbGFzc05hbWU6IGFueSwgb2lkOiBhbnksIG1vZGVsOiBhbnkpIHtcbiAgICByZXR1cm4gdGhpcy5odHRwLnBvc3Q8YW55PignYXBpL2RhdGEvJyArIGNsYXNzTmFtZSArICcvJyArIG9pZCwgbW9kZWwsIHtcbiAgICAgIHBhcmFtczoge1xuICAgICAgICB0ZW5hbnRcbiAgICAgIH1cbiAgICB9KTtcbiAgfVxuXG4gIHJlbG9hZFRlbXBsYXRlKHRlbmFudDogYW55LFxuICAgICAgICAgICAgICAgICBjbGFzc05hbWU6IGFueSxcbiAgICAgICAgICAgICAgICAgb2lkOiBhbnksXG4gICAgICAgICAgICAgICAgIHRlbXBsYXRlQ2xhc3NOYW1lOiBhbnksXG4gICAgICAgICAgICAgICAgIGRlZmF1bHRUZW1wbGF0ZU51bWJlcjogYW55LFxuICAgICAgICAgICAgICAgICB0ZW1wbGF0ZU51bWJlckF0dHJpYnV0ZTogYW55LFxuICAgICAgICAgICAgICAgICB0ZW1wbGF0ZUZpbGVBdHRyaWJ1dGU6IGFueSxcbiAgICAgICAgICAgICAgICAgdGVtcGxhdGVDb25maWdBdHRyaWJ1dGU6IGFueSk6IE9ic2VydmFibGU8YW55PiB7XG4gICAgcmV0dXJuIHRoaXMuaHR0cC5nZXQ8YW55PignYXBpL2RhdGEvY3VzdG9tJywge1xuICAgICAgcGFyYW1zOiB7XG4gICAgICAgIGV4ZWN1dG9yOiAnY29tLmNzLnN5c3RlbS53b3JkLmVkaXRvci5SZWxvYWRUZW1wbGF0ZScsXG4gICAgICAgIHRlbmFudCxcbiAgICAgICAgY2xhc3NOYW1lLFxuICAgICAgICBvaWQsXG4gICAgICAgIHRlbXBsYXRlQ2xhc3NOYW1lLFxuICAgICAgICBkZWZhdWx0VGVtcGxhdGVOdW1iZXIsXG4gICAgICAgIHRlbXBsYXRlTnVtYmVyQXR0cmlidXRlLFxuICAgICAgICB0ZW1wbGF0ZUZpbGVBdHRyaWJ1dGUsXG4gICAgICAgIHRlbXBsYXRlQ29uZmlnQXR0cmlidXRlXG4gICAgICB9XG4gICAgfSk7XG4gIH1cblxuICBwdWxsRGF0YSh0ZW5hbnQ6IGFueSwgY2xhc3NOYW1lOiBhbnksIG9pZDogYW55LCBtYXJrczogYW55KSB7XG4gICAgcmV0dXJuIHRoaXMuaHR0cC5wb3N0PGFueT4oJ2FwaS9kYXRhL2N1c3RvbScsIG1hcmtzLCB7XG4gICAgICBwYXJhbXM6IHtcbiAgICAgICAgZXhlY3V0b3I6ICdjb20uY3Muc3lzdGVtLndvcmQuZWRpdG9yLlB1bGxEYXRhJyxcbiAgICAgICAgdGVuYW50LFxuICAgICAgICBjbGFzc05hbWUsXG4gICAgICAgIG9pZFxuICAgICAgfVxuICAgIH0pO1xuICB9XG5cbiAgZ2VuZXJhdGVGaWxlKHRlbmFudDogYW55LFxuICAgICAgICAgICAgICAgY2xhc3NOYW1lOiBhbnksXG4gICAgICAgICAgICAgICBvaWQ6IGFueSxcbiAgICAgICAgICAgICAgIGdlbmVyYXRlRmlsZUF0dHJpYnV0ZTogYW55LFxuICAgICAgICAgICAgICAgdGVtcGxhdGVGaWxlQXR0cmlidXRlOiBhbnksXG4gICAgICAgICAgICAgICB0ZW1wbGF0ZUNvbmZpZ0F0dHJpYnV0ZTogYW55LFxuICAgICAgICAgICAgICAgbW9kZWw6IGFueSxcbiAgICAgICAgICAgICAgIGdlbmVyYXRlVG9UZW1wOiBib29sZWFuKSB7XG4gICAgcmV0dXJuIHRoaXMuaHR0cC5wb3N0PGFueT4oJ2FwaS9kYXRhL2N1c3RvbScsIG1vZGVsLCB7XG4gICAgICBwYXJhbXM6IHtcbiAgICAgICAgZXhlY3V0b3I6ICdjb20uY3Muc3lzdGVtLndvcmQuZWRpdG9yLkdlbmVyYXRlRmlsZScsXG4gICAgICAgIHRlbmFudCxcbiAgICAgICAgY2xhc3NOYW1lLFxuICAgICAgICBvaWQsXG4gICAgICAgIGdlbmVyYXRlRmlsZUF0dHJpYnV0ZSxcbiAgICAgICAgdGVtcGxhdGVGaWxlQXR0cmlidXRlLFxuICAgICAgICB0ZW1wbGF0ZUNvbmZpZ0F0dHJpYnV0ZSxcbiAgICAgICAgZ2VuZXJhdGVUb1RlbXBcbiAgICAgIH1cbiAgICB9KTtcbiAgfVxufVxuIl19
|
package/fesm2015/ngx-rs-ant.mjs
CHANGED
|
@@ -2635,9 +2635,12 @@ class FormService {
|
|
|
2635
2635
|
}
|
|
2636
2636
|
});
|
|
2637
2637
|
}
|
|
2638
|
-
extraValidate(model, params
|
|
2639
|
-
return this.http.post('api/validate/form',
|
|
2640
|
-
|
|
2638
|
+
extraValidate(extraValidator, pathParam, model, params) {
|
|
2639
|
+
return this.http.post('api/validate/form', {
|
|
2640
|
+
model,
|
|
2641
|
+
params
|
|
2642
|
+
}, {
|
|
2643
|
+
params: Object.assign({ validator: extraValidator }, pathParam)
|
|
2641
2644
|
}).pipe(map(response => {
|
|
2642
2645
|
if (response.success) {
|
|
2643
2646
|
return response.data;
|
|
@@ -2730,6 +2733,12 @@ class FormComponent extends UniqueId {
|
|
|
2730
2733
|
this.service.getFormTemplateConfig(this.tenant, this.className, this.template).subscribe(response => {
|
|
2731
2734
|
this.config = response.data.template;
|
|
2732
2735
|
this.extraValidator = this.config.extraValidator;
|
|
2736
|
+
this.extraValidatorParams = {};
|
|
2737
|
+
if (this.config.extraValidatorParams) {
|
|
2738
|
+
for (let param of this.config.extraValidatorParams) {
|
|
2739
|
+
this.extraValidatorParams[param.name] = param.value;
|
|
2740
|
+
}
|
|
2741
|
+
}
|
|
2733
2742
|
if (this.onlyFrontEnd) {
|
|
2734
2743
|
this.loading = false;
|
|
2735
2744
|
this.onDataLoaded.emit({
|
|
@@ -2766,12 +2775,7 @@ class FormComponent extends UniqueId {
|
|
|
2766
2775
|
});
|
|
2767
2776
|
}
|
|
2768
2777
|
extraValidate() {
|
|
2769
|
-
return lastValueFrom(this.service.extraValidate(this.
|
|
2770
|
-
tenant: this.tenant,
|
|
2771
|
-
className: this.className,
|
|
2772
|
-
oid: this.oid,
|
|
2773
|
-
template: this.template
|
|
2774
|
-
}), this.extraValidator).pipe(map(response => {
|
|
2778
|
+
return lastValueFrom(this.service.extraValidate(this.extraValidator, Object.assign(Object.assign({}, this.params), { tenant: this.tenant, className: this.className, oid: this.oid || '', template: this.template || '' }), this.model, this.extraValidatorParams).pipe(map(response => {
|
|
2775
2779
|
if (!response.isValid) {
|
|
2776
2780
|
this.extraValidateMessage = response.message;
|
|
2777
2781
|
return response;
|
|
@@ -4786,8 +4790,8 @@ class WordDesignerComponent {
|
|
|
4786
4790
|
});
|
|
4787
4791
|
}
|
|
4788
4792
|
ngOnDestroy() {
|
|
4789
|
-
this.service.valueUpdated.unsubscribe();
|
|
4790
|
-
this.service.valueChanged.unsubscribe();
|
|
4793
|
+
// this.service.valueUpdated.unsubscribe();
|
|
4794
|
+
// this.service.valueChanged.unsubscribe();
|
|
4791
4795
|
}
|
|
4792
4796
|
loadTemplateAndConfig(response) {
|
|
4793
4797
|
this.sections = response.sections || [];
|
|
@@ -4981,7 +4985,7 @@ class WordEditorService {
|
|
|
4981
4985
|
}
|
|
4982
4986
|
});
|
|
4983
4987
|
}
|
|
4984
|
-
reloadTemplate(tenant, className, oid, templateClassName, templateNumberAttribute, templateFileAttribute, templateConfigAttribute) {
|
|
4988
|
+
reloadTemplate(tenant, className, oid, templateClassName, defaultTemplateNumber, templateNumberAttribute, templateFileAttribute, templateConfigAttribute) {
|
|
4985
4989
|
return this.http.get('api/data/custom', {
|
|
4986
4990
|
params: {
|
|
4987
4991
|
executor: 'com.cs.system.word.editor.ReloadTemplate',
|
|
@@ -4989,6 +4993,7 @@ class WordEditorService {
|
|
|
4989
4993
|
className,
|
|
4990
4994
|
oid,
|
|
4991
4995
|
templateClassName,
|
|
4996
|
+
defaultTemplateNumber,
|
|
4992
4997
|
templateNumberAttribute,
|
|
4993
4998
|
templateFileAttribute,
|
|
4994
4999
|
templateConfigAttribute
|
|
@@ -5005,7 +5010,7 @@ class WordEditorService {
|
|
|
5005
5010
|
}
|
|
5006
5011
|
});
|
|
5007
5012
|
}
|
|
5008
|
-
generateFile(tenant, className, oid, generateFileAttribute, templateFileAttribute, templateConfigAttribute, model) {
|
|
5013
|
+
generateFile(tenant, className, oid, generateFileAttribute, templateFileAttribute, templateConfigAttribute, model, generateToTemp) {
|
|
5009
5014
|
return this.http.post('api/data/custom', model, {
|
|
5010
5015
|
params: {
|
|
5011
5016
|
executor: 'com.cs.system.word.editor.GenerateFile',
|
|
@@ -5014,7 +5019,8 @@ class WordEditorService {
|
|
|
5014
5019
|
oid,
|
|
5015
5020
|
generateFileAttribute,
|
|
5016
5021
|
templateFileAttribute,
|
|
5017
|
-
templateConfigAttribute
|
|
5022
|
+
templateConfigAttribute,
|
|
5023
|
+
generateToTemp
|
|
5018
5024
|
}
|
|
5019
5025
|
});
|
|
5020
5026
|
}
|
|
@@ -5033,13 +5039,15 @@ class WordEditorComponent {
|
|
|
5033
5039
|
this.templateNumberAttribute = 'templateNumber';
|
|
5034
5040
|
this.templateFileAttribute = 'templateFile';
|
|
5035
5041
|
this.templateConfigAttribute = 'templateConfig';
|
|
5042
|
+
this.generateFileAttribute = 'file';
|
|
5036
5043
|
this.showPullTemplateButton = true;
|
|
5037
5044
|
this.showPullDataButton = true;
|
|
5038
|
-
this.showCalcButton =
|
|
5045
|
+
this.showCalcButton = false;
|
|
5039
5046
|
this.showValidateButton = true;
|
|
5047
|
+
this.showSaveButton = true;
|
|
5040
5048
|
this.showGenerateFileButton = true;
|
|
5041
|
-
this.generateFileAttribute = 'file';
|
|
5042
5049
|
this.showCloseButton = true;
|
|
5050
|
+
this.generateToTemp = false;
|
|
5043
5051
|
this.readonly = false;
|
|
5044
5052
|
this.onSaved = new EventEmitter();
|
|
5045
5053
|
this.onGenerated = new EventEmitter();
|
|
@@ -5065,13 +5073,13 @@ class WordEditorComponent {
|
|
|
5065
5073
|
});
|
|
5066
5074
|
}
|
|
5067
5075
|
ngOnDestroy() {
|
|
5068
|
-
this.service.valueUpdated.unsubscribe();
|
|
5069
|
-
this.service.valueChanged.unsubscribe();
|
|
5076
|
+
// this.service.valueUpdated.unsubscribe();
|
|
5077
|
+
// this.service.valueChanged.unsubscribe();
|
|
5070
5078
|
}
|
|
5071
5079
|
pullTemplate() {
|
|
5072
5080
|
if (confirm('该操作会清除已录入的数据，确定重新拉取模板配置？')) {
|
|
5073
5081
|
this.loading = true;
|
|
5074
|
-
this.wordEditorService.reloadTemplate(this.tenant, this.className, this.oid, this.templateClassName, this.templateNumberAttribute, this.templateFileAttribute, this.templateConfigAttribute).subscribe(response => {
|
|
5082
|
+
this.wordEditorService.reloadTemplate(this.tenant, this.className, this.oid, this.templateClassName, this.defaultTemplateNumber, this.templateNumberAttribute, this.templateFileAttribute, this.templateConfigAttribute).subscribe(response => {
|
|
5075
5083
|
var _a;
|
|
5076
5084
|
this.sections = ((_a = response.data) === null || _a === void 0 ? void 0 : _a.sections) || [];
|
|
5077
5085
|
this.service.marks = response.data.marks;
|
|
@@ -5102,12 +5110,18 @@ class WordEditorComponent {
|
|
|
5102
5110
|
}
|
|
5103
5111
|
save() {
|
|
5104
5112
|
this.loading = true;
|
|
5105
|
-
|
|
5113
|
+
const model = {
|
|
5106
5114
|
[this.templateConfigAttribute]: JSON.stringify({
|
|
5107
5115
|
sections: this.sections,
|
|
5108
5116
|
marks: this.service.marks
|
|
5109
5117
|
})
|
|
5110
|
-
}
|
|
5118
|
+
};
|
|
5119
|
+
if (this.generateToTemp) {
|
|
5120
|
+
notifySuccess('保存成功');
|
|
5121
|
+
this.onSaved.emit(model);
|
|
5122
|
+
return;
|
|
5123
|
+
}
|
|
5124
|
+
this.wordEditorService.save(this.tenant, this.className, this.oid, model).subscribe(response => {
|
|
5111
5125
|
this.loading = false;
|
|
5112
5126
|
if (response.success) {
|
|
5113
5127
|
notifySuccess('保存成功');
|
|
@@ -5122,20 +5136,25 @@ class WordEditorComponent {
|
|
|
5122
5136
|
sections: this.sections,
|
|
5123
5137
|
marks: this.service.marks
|
|
5124
5138
|
})
|
|
5125
|
-
}).subscribe(response => {
|
|
5139
|
+
}, this.generateToTemp).subscribe(response => {
|
|
5126
5140
|
this.loading = false;
|
|
5127
5141
|
if (response.success) {
|
|
5128
5142
|
notifySuccess('生成附件成功');
|
|
5129
|
-
this.
|
|
5143
|
+
if (this.generateToTemp) {
|
|
5144
|
+
this.onGenerated.emit(response.data);
|
|
5145
|
+
}
|
|
5146
|
+
else {
|
|
5147
|
+
this.onGenerated.emit();
|
|
5148
|
+
}
|
|
5130
5149
|
}
|
|
5131
5150
|
});
|
|
5132
5151
|
}
|
|
5133
5152
|
}
|
|
5134
5153
|
WordEditorComponent.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.10", ngImport: i0, type: WordEditorComponent, deps: [{ token: SectionService }, { token: WordEditorService }, { token: i0.ViewContainerRef }], target: i0.ɵɵFactoryTarget.Component });
|
|
5135
|
-
WordEditorComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "15.2.10", type: WordEditorComponent, selector: "rs-word-editor", inputs: { tenant: "tenant", className: "className", oid: "oid", templateClassName: "templateClassName", templateNumberAttribute: "templateNumberAttribute", templateFileAttribute: "templateFileAttribute", templateConfigAttribute: "templateConfigAttribute", params: "params", tabViewContainerRef: "tabViewContainerRef", showPullTemplateButton: "showPullTemplateButton", showPullDataButton: "showPullDataButton", showCalcButton: "showCalcButton", showValidateButton: "showValidateButton",
|
|
5154
|
+
WordEditorComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "15.2.10", type: WordEditorComponent, selector: "rs-word-editor", inputs: { tenant: "tenant", className: "className", oid: "oid", templateClassName: "templateClassName", defaultTemplateNumber: "defaultTemplateNumber", templateNumberAttribute: "templateNumberAttribute", templateFileAttribute: "templateFileAttribute", templateConfigAttribute: "templateConfigAttribute", generateFileAttribute: "generateFileAttribute", params: "params", tabViewContainerRef: "tabViewContainerRef", showPullTemplateButton: "showPullTemplateButton", showPullDataButton: "showPullDataButton", showCalcButton: "showCalcButton", showValidateButton: "showValidateButton", showSaveButton: "showSaveButton", showGenerateFileButton: "showGenerateFileButton", showCloseButton: "showCloseButton", generateToTemp: "generateToTemp", readonly: "readonly" }, outputs: { onSaved: "onSaved", onGenerated: "onGenerated", onClosed: "onClosed" }, providers: [WordEditorService], viewQueries: [{ propertyName: "validator", first: true, predicate: ["validator"], descendants: true }], ngImport: i0, template: "<dx-load-panel [container]=\"viewContainerRef.element.nativeElement\" [showPane]=\"false\" [visible]=\"loading\">\r\n <dxo-position [of]=\"viewContainerRef.element.nativeElement\"></dxo-position>\r\n</dx-load-panel>\r\n<div *ngIf=\"!readonly\" class=\"bar header\">\r\n <dx-button *ngIf=\"showPullTemplateButton\" type=\"success\" text=\"\u66F4\u65B0\u6A21\u677F\" (onClick)=\"pullTemplate()\"\r\n [disabled]=\"loading\"></dx-button>\r\n <dx-button *ngIf=\"showPullDataButton\" type=\"success\" text=\"\u586B\u5145\u6570\u636E\" (onClick)=\"pullData()\"\r\n [disabled]=\"loading\"></dx-button>\r\n <dx-button *ngIf=\"showCalcButton\" type=\"default\" text=\"\u6267\u884C\u8BA1\u7B97\" (onClick)=\"calc()\"\r\n [disabled]=\"loading\"></dx-button>\r\n <dx-button *ngIf=\"showValidateButton\" type=\"default\" text=\"\u6267\u884C\u6821\u9A8C\" (onClick)=\"validate()\"\r\n [disabled]=\"loading\"></dx-button>\r\n</div>\r\n<dx-validation-group [class.validation-group]=\"true\" #validator>\r\n <div class=\"viewer-container\">\r\n <div class=\"viewer\">\r\n <ng-container *ngFor=\"let section of sections\">\r\n <rs-section [section]=\"section\"></rs-section>\r\n </ng-container>\r\n </div>\r\n </div>\r\n</dx-validation-group>\r\n<div *ngIf=\"!readonly || showCloseButton\" class=\"bar footer\">\r\n <dx-button *ngIf=\"!readonly && showSaveButton\" type=\"default\" text=\"\u4FDD\u5B58\" (onClick)=\"save()\"\r\n [disabled]=\"loading\"></dx-button>\r\n <dx-button *ngIf=\"!readonly && showGenerateFileButton\" type=\"success\" text=\"\u751F\u6210\u9644\u4EF6\" (onClick)=\"generateFile()\"\r\n [disabled]=\"loading\"></dx-button>\r\n <dx-button *ngIf=\"showCloseButton\" type=\"normal\" text=\"\u5173\u95ED\" (onClick)=\"onClosed.emit()\"></dx-button>\r\n</div>\r\n", styles: [":host{flex:1;display:flex;flex-flow:column nowrap;background-color:#f5f5f5}:host .bar{flex:none;padding:12px 24px;background-color:var(--coast-base-bg-color, rgb(255, 255, 255));z-index:1;display:flex;flex-flow:row nowrap}:host .bar>dx-button{width:80px}:host .bar>dx-button:not(:last-child){margin-right:8px}:host .header{border-bottom:1px solid var(--coast-border-color, rgb(221, 221, 221));position:sticky;top:0}:host .validation-group{flex:auto;height:0;overflow-y:auto;background-color:var(--coast-empty-color, rgb(229, 229, 229));display:flex;flex-flow:column nowrap}:host .validation-group .viewer-container{flex:auto;height:0;overflow-x:auto;padding:8px 16px 0;display:flex;flex-flow:row nowrap}:host .validation-group .viewer-container .viewer{margin:auto;display:flex;flex-flow:column nowrap;align-items:center;z-index:0}:host .footer{justify-content:flex-end;border-top:1px solid var(--coast-border-color, rgb(221, 221, 221));position:sticky;bottom:0}\n"], dependencies: [{ kind: "directive", type: i1.NgForOf, selector: "[ngFor][ngForOf]", inputs: ["ngForOf", "ngForTrackBy", "ngForTemplate"] }, { kind: "directive", type: i1.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }, { kind: "component", type: i6.DxoPositionComponent, selector: "dxo-position", inputs: ["at", "boundary", "boundaryOffset", "collision", "my", "of", "offset"] }, { kind: "component", type: i3.DxButtonComponent, selector: "dx-button", inputs: ["accessKey", "activeStateEnabled", "disabled", "elementAttr", "focusStateEnabled", "height", "hint", "hoverStateEnabled", "icon", "rtlEnabled", "stylingMode", "tabIndex", "template", "text", "type", "useSubmitBehavior", "validationGroup", "visible", "width"], outputs: ["onClick", "onContentReady", "onDisposing", "onInitialized", "onOptionChanged", "accessKeyChange", "activeStateEnabledChange", "disabledChange", "elementAttrChange", "focusStateEnabledChange", "heightChange", "hintChange", "hoverStateEnabledChange", "iconChange", "rtlEnabledChange", "stylingModeChange", "tabIndexChange", "templateChange", "textChange", "typeChange", "useSubmitBehaviorChange", "validationGroupChange", "visibleChange", "widthChange"] }, { kind: "component", type: i6$1.DxLoadPanelComponent, selector: "dx-load-panel", inputs: ["animation", "closeOnOutsideClick", "container", "copyRootClassesToWrapper", "deferRendering", "delay", "elementAttr", "focusStateEnabled", "height", "hideOnOutsideClick", "hideOnParentScroll", "hint", "hoverStateEnabled", "indicatorSrc", "maxHeight", "maxWidth", "message", "minHeight", "minWidth", "position", "rtlEnabled", "shading", "shadingColor", "showIndicator", "showPane", "visible", "width", "wrapperAttr"], outputs: ["onContentReady", "onDisposing", "onHidden", "onHiding", "onInitialized", "onOptionChanged", "onShowing", "onShown", "animationChange", "closeOnOutsideClickChange", "containerChange", "copyRootClassesToWrapperChange", "deferRenderingChange", "delayChange", "elementAttrChange", "focusStateEnabledChange", "heightChange", "hideOnOutsideClickChange", "hideOnParentScrollChange", "hintChange", "hoverStateEnabledChange", "indicatorSrcChange", "maxHeightChange", "maxWidthChange", "messageChange", "minHeightChange", "minWidthChange", "positionChange", "rtlEnabledChange", "shadingChange", "shadingColorChange", "showIndicatorChange", "showPaneChange", "visibleChange", "widthChange", "wrapperAttrChange"] }, { kind: "component", type: i7$1.DxValidationGroupComponent, selector: "dx-validation-group", inputs: ["elementAttr", "height", "width"], outputs: ["onDisposing", "onInitialized", "onOptionChanged", "elementAttrChange", "heightChange", "widthChange"] }, { kind: "component", type: SectionComponent, selector: "rs-section", inputs: ["section", "editMode", "pasteMode", "readonly"] }] });
|
|
5136
5155
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.10", ngImport: i0, type: WordEditorComponent, decorators: [{
|
|
5137
5156
|
type: Component,
|
|
5138
|
-
args: [{ selector: 'rs-word-editor', providers: [WordEditorService], template: "<dx-load-panel [container]=\"viewContainerRef.element.nativeElement\" [showPane]=\"false\" [visible]=\"loading\">\r\n <dxo-position [of]=\"viewContainerRef.element.nativeElement\"></dxo-position>\r\n</dx-load-panel>\r\n<div *ngIf=\"!readonly\" class=\"bar header\">\r\n <dx-button *ngIf=\"showPullTemplateButton\" type=\"success\" text=\"\u66F4\u65B0\u6A21\u677F\" (onClick)=\"pullTemplate()\"\r\n [disabled]=\"loading\"></dx-button>\r\n <dx-button *ngIf=\"showPullDataButton\" type=\"success\" text=\"\u586B\u5145\u6570\u636E\" (onClick)=\"pullData()\"\r\n [disabled]=\"loading\"></dx-button>\r\n
|
|
5157
|
+
args: [{ selector: 'rs-word-editor', providers: [WordEditorService], template: "<dx-load-panel [container]=\"viewContainerRef.element.nativeElement\" [showPane]=\"false\" [visible]=\"loading\">\r\n <dxo-position [of]=\"viewContainerRef.element.nativeElement\"></dxo-position>\r\n</dx-load-panel>\r\n<div *ngIf=\"!readonly\" class=\"bar header\">\r\n <dx-button *ngIf=\"showPullTemplateButton\" type=\"success\" text=\"\u66F4\u65B0\u6A21\u677F\" (onClick)=\"pullTemplate()\"\r\n [disabled]=\"loading\"></dx-button>\r\n <dx-button *ngIf=\"showPullDataButton\" type=\"success\" text=\"\u586B\u5145\u6570\u636E\" (onClick)=\"pullData()\"\r\n [disabled]=\"loading\"></dx-button>\r\n <dx-button *ngIf=\"showCalcButton\" type=\"default\" text=\"\u6267\u884C\u8BA1\u7B97\" (onClick)=\"calc()\"\r\n [disabled]=\"loading\"></dx-button>\r\n <dx-button *ngIf=\"showValidateButton\" type=\"default\" text=\"\u6267\u884C\u6821\u9A8C\" (onClick)=\"validate()\"\r\n [disabled]=\"loading\"></dx-button>\r\n</div>\r\n<dx-validation-group [class.validation-group]=\"true\" #validator>\r\n <div class=\"viewer-container\">\r\n <div class=\"viewer\">\r\n <ng-container *ngFor=\"let section of sections\">\r\n <rs-section [section]=\"section\"></rs-section>\r\n </ng-container>\r\n </div>\r\n </div>\r\n</dx-validation-group>\r\n<div *ngIf=\"!readonly || showCloseButton\" class=\"bar footer\">\r\n <dx-button *ngIf=\"!readonly && showSaveButton\" type=\"default\" text=\"\u4FDD\u5B58\" (onClick)=\"save()\"\r\n [disabled]=\"loading\"></dx-button>\r\n <dx-button *ngIf=\"!readonly && showGenerateFileButton\" type=\"success\" text=\"\u751F\u6210\u9644\u4EF6\" (onClick)=\"generateFile()\"\r\n [disabled]=\"loading\"></dx-button>\r\n <dx-button *ngIf=\"showCloseButton\" type=\"normal\" text=\"\u5173\u95ED\" (onClick)=\"onClosed.emit()\"></dx-button>\r\n</div>\r\n", styles: [":host{flex:1;display:flex;flex-flow:column nowrap;background-color:#f5f5f5}:host .bar{flex:none;padding:12px 24px;background-color:var(--coast-base-bg-color, rgb(255, 255, 255));z-index:1;display:flex;flex-flow:row nowrap}:host .bar>dx-button{width:80px}:host .bar>dx-button:not(:last-child){margin-right:8px}:host .header{border-bottom:1px solid var(--coast-border-color, rgb(221, 221, 221));position:sticky;top:0}:host .validation-group{flex:auto;height:0;overflow-y:auto;background-color:var(--coast-empty-color, rgb(229, 229, 229));display:flex;flex-flow:column nowrap}:host .validation-group .viewer-container{flex:auto;height:0;overflow-x:auto;padding:8px 16px 0;display:flex;flex-flow:row nowrap}:host .validation-group .viewer-container .viewer{margin:auto;display:flex;flex-flow:column nowrap;align-items:center;z-index:0}:host .footer{justify-content:flex-end;border-top:1px solid var(--coast-border-color, rgb(221, 221, 221));position:sticky;bottom:0}\n"] }]
|
|
5139
5158
|
}], ctorParameters: function () { return [{ type: SectionService }, { type: WordEditorService }, { type: i0.ViewContainerRef }]; }, propDecorators: { tenant: [{
|
|
5140
5159
|
type: Input
|
|
5141
5160
|
}], className: [{
|
|
@@ -5144,12 +5163,16 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.10", ngImpo
|
|
|
5144
5163
|
type: Input
|
|
5145
5164
|
}], templateClassName: [{
|
|
5146
5165
|
type: Input
|
|
5166
|
+
}], defaultTemplateNumber: [{
|
|
5167
|
+
type: Input
|
|
5147
5168
|
}], templateNumberAttribute: [{
|
|
5148
5169
|
type: Input
|
|
5149
5170
|
}], templateFileAttribute: [{
|
|
5150
5171
|
type: Input
|
|
5151
5172
|
}], templateConfigAttribute: [{
|
|
5152
5173
|
type: Input
|
|
5174
|
+
}], generateFileAttribute: [{
|
|
5175
|
+
type: Input
|
|
5153
5176
|
}], params: [{
|
|
5154
5177
|
type: Input
|
|
5155
5178
|
}], tabViewContainerRef: [{
|
|
@@ -5162,12 +5185,14 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.10", ngImpo
|
|
|
5162
5185
|
type: Input
|
|
5163
5186
|
}], showValidateButton: [{
|
|
5164
5187
|
type: Input
|
|
5165
|
-
}],
|
|
5188
|
+
}], showSaveButton: [{
|
|
5166
5189
|
type: Input
|
|
5167
|
-
}],
|
|
5190
|
+
}], showGenerateFileButton: [{
|
|
5168
5191
|
type: Input
|
|
5169
5192
|
}], showCloseButton: [{
|
|
5170
5193
|
type: Input
|
|
5194
|
+
}], generateToTemp: [{
|
|
5195
|
+
type: Input
|
|
5171
5196
|
}], readonly: [{
|
|
5172
5197
|
type: Input
|
|
5173
5198
|
}], onSaved: [{
|