@egova/egova-api 1.0.208 → 1.0.209

package/dist/index.common.js

@@ -60601,6 +60601,7 @@ var pre_execution_setting = __webpack_require__("d928");
 
 
 
+
 
 var pre_execution_setting_extends = undefined && undefined.__extends || function () {
   var _extendStatics = function extendStatics(d, b) {
@@ -60828,6 +60829,7 @@ function (_super) {
     _this.diyKeywordList = [];
     _this.refreshEditor = true;
     _this.keyword = "";
+    _this.errorMap = new Map();
     _this.onFilter = lodash_debounce_default()(function () {
       _this.filterTypeList();
     }, 300);
@@ -60854,23 +60856,7 @@ function (_super) {
     var scrollWrap = document.getElementsByClassName("ace_scrollbar")[0]; // 监听代码编辑器内容区滚动事件
 
     scrollWrap.addEventListener("scroll", function () {
-      var lineAll = document.getElementsByClassName("ace_gutter-cell");
-      lineAll.forEach(function (h) {
-        // 如果滚动的时候错误行代码在可视区，则实时将错误图标添加到该行号前
-        if (_this.errorLine && (h === null || h === void 0 ? void 0 : h.innerHTML.includes(_this.errorLine))) {
-          // 添加之前首先清除上一次的图标
-          var lastText = document.getElementsByClassName("icon-a-cuowutishi1");
-
-          if (lastText === null || lastText === void 0 ? void 0 : lastText.length) {
-            var parent = lastText[0].parentNode;
-            parent.removeChild(lastText[0]);
-          }
-
-          var errIcon = document.createElement("i");
-          errIcon.className = "iconfont icon-a-cuowutishi1";
-          h.insertBefore(errIcon, h.firstChild);
-        }
-      });
+      _this.displayError(_this.errorLine);
     });
   };
 
@@ -60891,36 +60877,34 @@ function (_super) {
 
 
   PreExecutionSetting.prototype.displayError = function (value) {
-    var _this = this; // 移除上一次的错误行图标
-
-
-    var lastText = document.getElementsByClassName("icon-a-cuowutishi1");
-
-    if (lastText === null || lastText === void 0 ? void 0 : lastText.length) {
-      var parent = lastText[0].parentNode;
-      parent.removeChild(lastText[0]);
-    }
+    var _this = this;
 
-    if (value) {
+    if (value === null || value === void 0 ? void 0 : value.length) {
       // 检查错误行是否在当前代码编辑器可视区
-      var textAll = document.getElementsByClassName("ace_gutter-cell");
-      var isView_1 = false;
-      textAll === null || textAll === void 0 ? void 0 : textAll.forEach(function (h) {
-        if (h === null || h === void 0 ? void 0 : h.innerHTML.includes(_this.errorLine)) {
-          isView_1 = true;
-        }
-      }); // 如果当前错误行不在可视区则交由监听滚动去处理
+      var textAll_1 = document.getElementsByClassName("ace_gutter-cell"); // 清楚上一次所有的错误图标
 
-      if (!isView_1) {
-        return;
-      } // 给语法错误行新增提示图标
+      this.errorMap.forEach(function (value, key) {
+        var _a;
 
+        var son = (_a = textAll_1[value]) === null || _a === void 0 ? void 0 : _a.firstElementChild;
+        son && textAll_1[value].removeChild(son);
+      }); // 清楚保存错误信息的容器
 
-      var text = textAll[value - 1];
-      var errIcon = document.createElement("i");
-      errIcon.className = "iconfont icon-a-cuowutishi1"; // 将节点插入到子节点的首位
+      this.errorMap.clear();
+      value.forEach(function (h) {
+        textAll_1 === null || textAll_1 === void 0 ? void 0 : textAll_1.forEach(function (v, index) {
+          // 如果当前错误行在可视区内
+          if (v === null || v === void 0 ? void 0 : v.innerHTML.includes(h)) {
+            var text = v;
+            var errIcon = document.createElement("i");
+            errIcon.className = "iconfont icon-a-cuowutishi1"; // 将节点插入到子节点的首位
 
-      text.insertBefore(errIcon, text.firstChild);
+            text.insertBefore(errIcon, text.firstChild); // 将错误行的行号作为键名，固定的代码编辑器行作为键值，因为代码编辑器的行数不变，实时更新的行的节点内容
+
+            _this.errorMap.set(h, index);
+          }
+        });
+      });
     }
   };
 
@@ -61048,7 +61032,8 @@ function (_super) {
   }), pre_execution_setting_metadata("design:type", Object)], PreExecutionSetting.prototype, "errorLine", void 0);
 
   pre_execution_setting_decorate([Object(flagwind_web_["watch"])("errorLine", {
-    immediate: true
+    immediate: true,
+    deep: true
   }), pre_execution_setting_metadata("design:type", Function), pre_execution_setting_metadata("design:paramtypes", [Object]), pre_execution_setting_metadata("design:returntype", void 0)], PreExecutionSetting.prototype, "handleError", null);
 
   PreExecutionSetting = pre_execution_setting_decorate([Object(flagwind_web_["component"])({
@@ -63904,8 +63889,6 @@ function (_super) {
 
 
 
-
-
 
 
 
@@ -64196,15 +64179,15 @@ function (_super) {
   };
 
   InterfaceSettings.prototype.onRun = function () {
-    var _a, _b, _c;
+    var _a, _b, _c, _d;
 
     return interface_settings_awaiter(this, void 0, void 0, function () {
-      var formParams, requestHeaders, index, result, reg, isError, line;
+      var formParams, requestHeaders, index, result;
 
       var _this = this;
 
-      return interface_settings_generator(this, function (_d) {
-        switch (_d.label) {
+      return interface_settings_generator(this, function (_e) {
+        switch (_e.label) {
           case 0:
             this.loading = true;
             formParams = [];
@@ -64237,7 +64220,7 @@ function (_super) {
             }))];
 
           case 1:
-            result = _d.sent();
+            result = _e.sent();
             this.loading = false;
             this.response = (result === null || result === void 0 ? void 0 : result.result) || new Response();
 
@@ -64247,16 +64230,7 @@ function (_super) {
             }
 
             this.responseCache.set(this.interfaceModel.info.id, this.response);
-            reg = /Error Line number:\s([0-9]+)/g;
-            isError = this.response.output.match(reg);
-
-            if (isError) {
-              line = isError[0].match(/([0-9]+)/g);
-              line.length && (this.errorLine = line[0]);
-            } else {
-              this.errorLine = null;
-            }
-
+            ((_d = this.response.errorLineNumbers) === null || _d === void 0 ? void 0 : _d.length) && (this.errorLine = this.response.errorLineNumbers);
             return [2
             /*return*/
             ];

package/dist/index.umd.js

@@ -60610,6 +60610,7 @@ var pre_execution_setting = __webpack_require__("d928");
 
 
 
+
 
 var pre_execution_setting_extends = undefined && undefined.__extends || function () {
   var _extendStatics = function extendStatics(d, b) {
@@ -60837,6 +60838,7 @@ function (_super) {
     _this.diyKeywordList = [];
     _this.refreshEditor = true;
     _this.keyword = "";
+    _this.errorMap = new Map();
     _this.onFilter = lodash_debounce_default()(function () {
       _this.filterTypeList();
     }, 300);
@@ -60863,23 +60865,7 @@ function (_super) {
     var scrollWrap = document.getElementsByClassName("ace_scrollbar")[0]; // 监听代码编辑器内容区滚动事件
 
     scrollWrap.addEventListener("scroll", function () {
-      var lineAll = document.getElementsByClassName("ace_gutter-cell");
-      lineAll.forEach(function (h) {
-        // 如果滚动的时候错误行代码在可视区，则实时将错误图标添加到该行号前
-        if (_this.errorLine && (h === null || h === void 0 ? void 0 : h.innerHTML.includes(_this.errorLine))) {
-          // 添加之前首先清除上一次的图标
-          var lastText = document.getElementsByClassName("icon-a-cuowutishi1");
-
-          if (lastText === null || lastText === void 0 ? void 0 : lastText.length) {
-            var parent = lastText[0].parentNode;
-            parent.removeChild(lastText[0]);
-          }
-
-          var errIcon = document.createElement("i");
-          errIcon.className = "iconfont icon-a-cuowutishi1";
-          h.insertBefore(errIcon, h.firstChild);
-        }
-      });
+      _this.displayError(_this.errorLine);
     });
   };
 
@@ -60900,36 +60886,34 @@ function (_super) {
 
 
   PreExecutionSetting.prototype.displayError = function (value) {
-    var _this = this; // 移除上一次的错误行图标
-
-
-    var lastText = document.getElementsByClassName("icon-a-cuowutishi1");
-
-    if (lastText === null || lastText === void 0 ? void 0 : lastText.length) {
-      var parent = lastText[0].parentNode;
-      parent.removeChild(lastText[0]);
-    }
+    var _this = this;
 
-    if (value) {
+    if (value === null || value === void 0 ? void 0 : value.length) {
       // 检查错误行是否在当前代码编辑器可视区
-      var textAll = document.getElementsByClassName("ace_gutter-cell");
-      var isView_1 = false;
-      textAll === null || textAll === void 0 ? void 0 : textAll.forEach(function (h) {
-        if (h === null || h === void 0 ? void 0 : h.innerHTML.includes(_this.errorLine)) {
-          isView_1 = true;
-        }
-      }); // 如果当前错误行不在可视区则交由监听滚动去处理
+      var textAll_1 = document.getElementsByClassName("ace_gutter-cell"); // 清楚上一次所有的错误图标
 
-      if (!isView_1) {
-        return;
-      } // 给语法错误行新增提示图标
+      this.errorMap.forEach(function (value, key) {
+        var _a;
 
+        var son = (_a = textAll_1[value]) === null || _a === void 0 ? void 0 : _a.firstElementChild;
+        son && textAll_1[value].removeChild(son);
+      }); // 清楚保存错误信息的容器
 
-      var text = textAll[value - 1];
-      var errIcon = document.createElement("i");
-      errIcon.className = "iconfont icon-a-cuowutishi1"; // 将节点插入到子节点的首位
+      this.errorMap.clear();
+      value.forEach(function (h) {
+        textAll_1 === null || textAll_1 === void 0 ? void 0 : textAll_1.forEach(function (v, index) {
+          // 如果当前错误行在可视区内
+          if (v === null || v === void 0 ? void 0 : v.innerHTML.includes(h)) {
+            var text = v;
+            var errIcon = document.createElement("i");
+            errIcon.className = "iconfont icon-a-cuowutishi1"; // 将节点插入到子节点的首位
 
-      text.insertBefore(errIcon, text.firstChild);
+            text.insertBefore(errIcon, text.firstChild); // 将错误行的行号作为键名，固定的代码编辑器行作为键值，因为代码编辑器的行数不变，实时更新的行的节点内容
+
+            _this.errorMap.set(h, index);
+          }
+        });
+      });
     }
   };
 
@@ -61057,7 +61041,8 @@ function (_super) {
   }), pre_execution_setting_metadata("design:type", Object)], PreExecutionSetting.prototype, "errorLine", void 0);
 
   pre_execution_setting_decorate([Object(flagwind_web_["watch"])("errorLine", {
-    immediate: true
+    immediate: true,
+    deep: true
   }), pre_execution_setting_metadata("design:type", Function), pre_execution_setting_metadata("design:paramtypes", [Object]), pre_execution_setting_metadata("design:returntype", void 0)], PreExecutionSetting.prototype, "handleError", null);
 
   PreExecutionSetting = pre_execution_setting_decorate([Object(flagwind_web_["component"])({
@@ -63913,8 +63898,6 @@ function (_super) {
 
 
 
-
-
 
 
 
@@ -64205,15 +64188,15 @@ function (_super) {
   };
 
   InterfaceSettings.prototype.onRun = function () {
-    var _a, _b, _c;
+    var _a, _b, _c, _d;
 
     return interface_settings_awaiter(this, void 0, void 0, function () {
-      var formParams, requestHeaders, index, result, reg, isError, line;
+      var formParams, requestHeaders, index, result;
 
       var _this = this;
 
-      return interface_settings_generator(this, function (_d) {
-        switch (_d.label) {
+      return interface_settings_generator(this, function (_e) {
+        switch (_e.label) {
           case 0:
             this.loading = true;
             formParams = [];
@@ -64246,7 +64229,7 @@ function (_super) {
             }))];
 
           case 1:
-            result = _d.sent();
+            result = _e.sent();
             this.loading = false;
             this.response = (result === null || result === void 0 ? void 0 : result.result) || new Response();
 
@@ -64256,16 +64239,7 @@ function (_super) {
             }
 
             this.responseCache.set(this.interfaceModel.info.id, this.response);
-            reg = /Error Line number:\s([0-9]+)/g;
-            isError = this.response.output.match(reg);
-
-            if (isError) {
-              line = isError[0].match(/([0-9]+)/g);
-              line.length && (this.errorLine = line[0]);
-            } else {
-              this.errorLine = null;
-            }
-
+            ((_d = this.response.errorLineNumbers) === null || _d === void 0 ? void 0 : _d.length) && (this.errorLine = this.response.errorLineNumbers);
             return [2
             /*return*/
             ];