【update】 web 打印去掉模板部分字段默认值; web 打印测试增加空值验证; review by songym

Author: xiongjiaojiao

src/common/iServer/WebPrintingJobLayoutOptions.js

@@ -111,10 +111,10 @@ export class WebPrintingJobLayoutOptions {
     toJSON() {
         var params = {
             templateName: this.templateName,
-            title: this.title || '',
-            subTitle: this.subTitle || '',
-            author: this.author || '',
-            copyright: this.copyright || ''
+            title: this.title,
+            subTitle: this.subTitle,
+            author: this.author,
+            copyright: this.copyright
         };
         if (this.scaleBarOptions) {
             params.scaleBarOptions = this.scaleBarOptions;

src/common/iServer/WebPrintingService.js

@@ -55,10 +55,6 @@ export class WebPrintingService extends CommonServiceBase {
             return;
         }
         if (params.layoutOptions) {
-            !params.layoutOptions.title && (params.layoutOptions.title = '');
-            !params.layoutOptions.subTitle && (params.layoutOptions.subTitle = '');
-            !params.layoutOptions.author && (params.layoutOptions.author = '');
-            !params.layoutOptions.copyright && (params.layoutOptions.copyright = '');
             if (params.layoutOptions.legendOptions) {
                 !params.layoutOptions.legendOptions.title && (params.layoutOptions.legendOptions.title = '');
                 params.layoutOptions.legendOptions.picAsBase64 =

test/leaflet/services/WebPrintingJobServiceSpec.js

@@ -54,6 +54,8 @@ describe('leaflet_WebPrintingJobService', () => {
             expect(method).toBe('POST');
             expect(testUrl).toBe(url + '/jobs');
             expect(params).not.toBeNull();
+            expect(params.layoutOptions.subTitle).toBeNull();
+            expect(params.layoutOptions.copyright).toBeNull();
             expect(options).not.toBeNull();
             return Promise.resolve(new Response(JSON.stringify(createWebPringintJobResultJson)));
         });

test/mapboxgl/services/WebPrintingJobServiceSpec.js

@@ -56,6 +56,8 @@ describe('mapboxgl_WebPrintingJobService', () => {
             expect(method).toBe('POST');
             expect(testUrl).toBe(url + '/jobs');
             expect(params).not.toBeNull();
+            expect(params.layoutOptions.subTitle).toBeNull();
+            expect(params.layoutOptions.copyright).toBeNull();
             expect(options).not.toBeNull();
             return Promise.resolve(new Response(JSON.stringify(createWebPringintJobResultJson)));
         });

test/openlayers/services/WebPrintingJobServiceSpec.js

@@ -56,6 +56,8 @@ describe('openlayers_WebPrintingJobService', () => {
             expect(method).toBe('POST');
             expect(testUrl).toBe(url + '/jobs');
             expect(params).not.toBeNull();
+            expect(params.layoutOptions.subTitle).toBeNull();
+            expect(params.layoutOptions.copyright).toBeNull();
             expect(options).not.toBeNull();
             return Promise.resolve(new Response(JSON.stringify(createWebPringintJobResultJson)));
         });