fix isvj-7291, isvj-7511 web打印running回调不应触发 review by songym

Author: xilanhuaweidapao

src/common/iServer/WebPrintingService.js

@@ -71,15 +71,13 @@ export class WebPrintingService extends CommonServiceBase {
 
     /**
      * @function WebPrintingService.prototype.getPrintingJob
-     * @description 获取 Web 打印输出文档任务。
-     * @param {string} jobId - Web 打印输入文档任务 ID。
+     * @description 获取 Web 打印输出文档任务, 轮询获取打印状态，只有当状态为完成或失败才返回结果。
+     * @param {string} jobId - Web 打印任务 ID
      * @param {RequestCallback} callback - 回调函数。
      */
     getPrintingJob(jobId, callback) {
         var me = this;
-        me.processAsync(`jobs/${jobId}`, 'GET', function(result) {
-          me.rollingProcess(result, me._processUrl(`jobs/${jobId}`), callback);
-        });
+        me.rollingProcess(me._processUrl(`jobs/${jobId}`), callback);
     }
 
     /**
@@ -108,11 +106,8 @@ export class WebPrintingService extends CommonServiceBase {
      * @description 轮询查询 Web 打印任务。
      * @param {Object} result - 服务器返回的结果对象。
      */
-    rollingProcess(result, url, callback) {
+    rollingProcess(url, callback) {
         var me = this;
-        if (!result) {
-            return;
-        }
         this.id && clearInterval(this.id);
         this.id = setInterval(function () {
           me.request({
@@ -142,6 +137,8 @@ export class WebPrintingService extends CommonServiceBase {
       result = Util.transformResult(result);
       if (result.status === 'FINISHED' || result.status === 'ERROR') {
         clearInterval(this.id);
+      } else if (result.status === 'RUNNING') {
+        options.success = false;
       }
       return { result, options };
     }

src/openlayers/mapping/WebMap.js

@@ -3236,7 +3236,7 @@ export class WebMap extends Observable {
         }
         if (featureType === "LINE") {
           colors.push(customSettings[key].strokeColor);
-        } else {
+        } else if(customSettings[key].fillColor) {
           colors.push(customSettings[key].fillColor);
         }
       });