@egova/egova-api 1.0.82 → 1.0.83

package/dist/index.umd.js

@@ -51756,12 +51756,12 @@ var project_combine_generator = undefined && undefined.__generator || function (
 
 
 
-var project_combine_CombineManage =
+var project_combine_ProjectCombineManage =
 /** @class */
 function (_super) {
-  project_combine_extends(CombineManage, _super);
+  project_combine_extends(ProjectCombineManage, _super);
 
-  function CombineManage() {
+  function ProjectCombineManage() {
     var _this = _super !== null && _super.apply(this, arguments) || this;
 
     _this.split = 0.2;
@@ -51826,7 +51826,7 @@ function (_super) {
     return _this;
   }
 
-  Object.defineProperty(CombineManage.prototype, "form", {
+  Object.defineProperty(ProjectCombineManage.prototype, "form", {
     get: function get() {
       return this.$refs["searchForm"];
     },
@@ -51834,7 +51834,7 @@ function (_super) {
     configurable: true
   });
 
-  CombineManage.prototype.mounted = function () {
+  ProjectCombineManage.prototype.mounted = function () {
     var categoryId = this.$route.query.categoryId;
 
     if (categoryId) {
@@ -51844,23 +51844,23 @@ function (_super) {
     }
   };
 
-  CombineManage.prototype.onNodeSelect = function (node) {
+  ProjectCombineManage.prototype.onNodeSelect = function (node) {
     this.currentNode = node;
     this.onQuery();
   };
 
-  CombineManage.prototype.onReset = function () {
+  ProjectCombineManage.prototype.onReset = function () {
     this.form.resetFields();
     this.onQuery();
   };
 
-  CombineManage.prototype.onQuery = function () {
+  ProjectCombineManage.prototype.onQuery = function () {
     this.$set(this.paging, "pageIndex", 1); // this.$set(this.paging, "pageSize", 10);
 
     this.doQuery();
   };
 
-  CombineManage.prototype.doQuery = function () {
+  ProjectCombineManage.prototype.doQuery = function () {
     var _a, _b, _c, _d;
 
     return project_combine_awaiter(this, void 0, void 0, function () {
@@ -51912,23 +51912,23 @@ function (_super) {
     });
   };
 
-  CombineManage.prototype.onPageIndexChange = function (index) {
+  ProjectCombineManage.prototype.onPageIndexChange = function (index) {
     this.$set(this.paging, "pageIndex", index);
     this.doQuery();
   };
 
-  CombineManage.prototype.onPageSizeChange = function (size) {
+  ProjectCombineManage.prototype.onPageSizeChange = function (size) {
     this.$set(this.paging, "pageIndex", 1);
     this.$set(this.paging, "pageSize", size);
     this.doQuery();
   };
 
-  CombineManage.prototype.onEdit = function (row) {
+  ProjectCombineManage.prototype.onEdit = function (row) {
     var id = (row !== null && row !== void 0 ? row : {}).id;
     this.onAdd(id);
   };
 
-  CombineManage.prototype.onAdd = function (id) {
+  ProjectCombineManage.prototype.onAdd = function (id) {
     return project_combine_awaiter(this, void 0, void 0, function () {
       return project_combine_generator(this, function (_a) {
         this.$router.push({
@@ -51949,7 +51949,7 @@ function (_super) {
     });
   };
 
-  CombineManage.prototype.onDelete = function (row) {
+  ProjectCombineManage.prototype.onDelete = function (row) {
     return project_combine_awaiter(this, void 0, void 0, function () {
       var id, res;
       return project_combine_generator(this, function (_a) {
@@ -51982,7 +51982,7 @@ function (_super) {
     });
   };
 
-  CombineManage.prototype.onBatchDelete = function () {
+  ProjectCombineManage.prototype.onBatchDelete = function () {
     var _this = this;
 
     var ids = this.selection.map(function (item) {
@@ -52023,7 +52023,7 @@ function (_super) {
     });
   };
 
-  CombineManage.prototype.onStatusChange = function (value, row, index) {
+  ProjectCombineManage.prototype.onStatusChange = function (value, row, index) {
     return project_combine_awaiter(this, void 0, void 0, function () {
       var id, res;
       return project_combine_generator(this, function (_a) {
@@ -52060,11 +52060,11 @@ function (_super) {
     });
   };
 
-  CombineManage.prototype.onSelectChange = function (selection) {
+  ProjectCombineManage.prototype.onSelectChange = function (selection) {
     this.selection = selection;
   };
 
-  CombineManage.prototype.onOpenDoc = function (row) {
+  ProjectCombineManage.prototype.onOpenDoc = function (row) {
     return project_combine_awaiter(this, void 0, void 0, function () {
       var res;
       return project_combine_generator(this, function (_a) {
@@ -52096,7 +52096,7 @@ function (_super) {
     });
   };
 
-  CombineManage.prototype.activated = function () {
+  ProjectCombineManage.prototype.activated = function () {
     if (this.currentNode) {
       this.onQuery();
     }
@@ -52104,20 +52104,20 @@ function (_super) {
 
   var _a;
 
-  project_combine_decorate([autowired(project_combine_service), project_combine_metadata("design:type", typeof (_a = typeof project_combine_service !== "undefined" && project_combine_service) === "function" ? _a : Object)], CombineManage.prototype, "service", void 0);
+  project_combine_decorate([autowired(project_combine_service), project_combine_metadata("design:type", typeof (_a = typeof project_combine_service !== "undefined" && project_combine_service) === "function" ? _a : Object)], ProjectCombineManage.prototype, "service", void 0);
 
-  CombineManage = project_combine_decorate([Object(flagwind_web_["component"])({
-    name: "ApiCombineManage",
+  ProjectCombineManage = project_combine_decorate([Object(flagwind_web_["component"])({
+    name: "ProjectCombineManage",
     template: __webpack_require__("ccf6"),
     components: {
       "u-type-tree": project_combine_tree,
       "u-data-model-doc": data_model_data_model_doc
     }
-  })], CombineManage);
-  return CombineManage;
+  })], ProjectCombineManage);
+  return ProjectCombineManage;
 }(flagwind_web_["View"]);
 
-/* harmony default export */ var views_project_combine = (project_combine_CombineManage);
+/* harmony default export */ var views_project_combine = (project_combine_ProjectCombineManage);
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.includes.js
 var es_array_includes = __webpack_require__("caad");
 
@@ -55630,12 +55630,12 @@ var combine_model_spreadArray = undefined && undefined.__spreadArray || function
 
 
 
-var combine_model_ApiCombineModel =
+var combine_model_ProjectCombineModel =
 /** @class */
 function (_super) {
-  combine_model_extends(ApiCombineModel, _super);
+  combine_model_extends(ProjectCombineModel, _super);
 
-  function ApiCombineModel() {
+  function ProjectCombineModel() {
     var _this = _super !== null && _super.apply(this, arguments) || this;
 
     _this.model = {
@@ -55698,7 +55698,7 @@ function (_super) {
     return _this;
   }
 
-  Object.defineProperty(ApiCombineModel.prototype, "isEdit", {
+  Object.defineProperty(ProjectCombineModel.prototype, "isEdit", {
     get: function get() {
       var _a;
 
@@ -55707,7 +55707,7 @@ function (_super) {
     enumerable: false,
     configurable: true
   });
-  Object.defineProperty(ApiCombineModel.prototype, "dataModelRelations", {
+  Object.defineProperty(ProjectCombineModel.prototype, "dataModelRelations", {
     get: function get() {
       var _a, _b;
 
@@ -55718,7 +55718,7 @@ function (_super) {
     enumerable: false,
     configurable: true
   });
-  Object.defineProperty(ApiCombineModel.prototype, "apiProjectRelations", {
+  Object.defineProperty(ProjectCombineModel.prototype, "apiProjectRelations", {
     get: function get() {
       var _a, _b;
 
@@ -55730,7 +55730,7 @@ function (_super) {
     configurable: true
   });
 
-  ApiCombineModel.prototype.onBack = function () {
+  ProjectCombineModel.prototype.onBack = function () {
     this.$router.push({
       name: "combine" //   query: { categoryId: this.categoryId }
 
@@ -55738,15 +55738,15 @@ function (_super) {
     this.$store.commit("tag/closeCurrent", this.$route);
   };
 
-  ApiCombineModel.prototype.mounted = function () {
+  ProjectCombineModel.prototype.mounted = function () {
     this.init();
   };
 
-  ApiCombineModel.prototype.activated = function () {
+  ProjectCombineModel.prototype.activated = function () {
     this.init();
   };
 
-  ApiCombineModel.prototype.init = function () {
+  ProjectCombineModel.prototype.init = function () {
     var _a = this.$route.query || {},
         _b = _a.id,
         id = _b === void 0 ? "" : _b,
@@ -55761,7 +55761,7 @@ function (_super) {
     }
   };
 
-  ApiCombineModel.prototype.getById = function () {
+  ProjectCombineModel.prototype.getById = function () {
     return combine_model_awaiter(this, void 0, void 0, function () {
       var res;
       return combine_model_generator(this, function (_a) {
@@ -55792,7 +55792,7 @@ function (_super) {
     });
   };
 
-  ApiCombineModel.prototype.onValidate = function () {
+  ProjectCombineModel.prototype.onValidate = function () {
     var _this = this;
 
     return new Promise(function (resolve, reject) {
@@ -55807,13 +55807,13 @@ function (_super) {
         if (!((_b = r.name) === null || _b === void 0 ? void 0 : _b.length)) {
           _this.$message.error("请求参数名称不能为空！");
 
-          reject();
+          return reject();
         }
 
         if (nameMap.has(r.name)) {
           _this.$message.error("请求参数有重名！");
 
-          reject();
+          return reject();
         } else {
           nameMap.add(r.name);
         }
@@ -55823,115 +55823,119 @@ function (_super) {
       if (!((_c = _this.model.relations) === null || _c === void 0 ? void 0 : _c.length)) {
         _this.$message.error("合并列表不能为空！");
 
-        reject();
+        return reject();
       } // 执行脚本验证
 
 
       if (!((_d = _this.model.content) === null || _d === void 0 ? void 0 : _d.length)) {
         _this.$message.error("执行脚本不能为空！");
 
-        reject();
+        return reject();
       }
 
       var form = _this.$refs.form;
       form === null || form === void 0 ? void 0 : form.validate(function (valid) {
-        resolve(valid);
+        return resolve(valid);
       });
     });
   };
 
-  ApiCombineModel.prototype.onSave = function (isBack) {
-    return combine_model_awaiter(this, void 0, void 0, function () {
-      var res, _a;
+  ProjectCombineModel.prototype.onSave = function (isBack) {
+    var _this = this;
 
-      return combine_model_generator(this, function (_b) {
-        switch (_b.label) {
-          case 0:
-            if (this.saveing) {
-              return [2
-              /*return*/
-              , Promise.reject()];
-            }
+    return new Promise(function (resolve, reject) {
+      return combine_model_awaiter(_this, void 0, void 0, function () {
+        var res, _a;
 
-            this.saveing = true;
-            _b.label = 1;
+        return combine_model_generator(this, function (_b) {
+          switch (_b.label) {
+            case 0:
+              if (this.saveing) {
+                return [2
+                /*return*/
+                , reject()];
+              }
 
-          case 1:
-            _b.trys.push([1, 7, 8, 9]);
+              this.saveing = true;
+              _b.label = 1;
 
-            return [4
-            /*yield*/
-            , this.onValidate()];
+            case 1:
+              _b.trys.push([1, 7, 8, 9]);
 
-          case 2:
-            _b.sent();
+              return [4
+              /*yield*/
+              , this.onValidate()];
 
-            this.$set(this.model, "categoryId", this.categoryId);
-            return [4
-            /*yield*/
-            , this.service.save(this.model)];
+            case 2:
+              _b.sent();
 
-          case 3:
-            res = _b.sent();
-            if (!!(res === null || res === void 0 ? void 0 : res.hasError)) return [3
-            /*break*/
-            , 6];
-            if (!res.result) return [3
-            /*break*/
-            , 5];
-            this.id = res.result;
-            return [4
-            /*yield*/
-            , this.getById()];
+              this.$set(this.model, "categoryId", this.categoryId);
+              return [4
+              /*yield*/
+              , this.service.save(this.model)];
 
-          case 4:
-            _b.sent();
+            case 3:
+              res = _b.sent();
+              if (!!(res === null || res === void 0 ? void 0 : res.hasError)) return [3
+              /*break*/
+              , 6];
+              if (!res.result) return [3
+              /*break*/
+              , 5];
+              this.id = res.result;
+              return [4
+              /*yield*/
+              , this.getById()];
 
-            _b.label = 5;
+            case 4:
+              _b.sent();
 
-          case 5:
-            if (isBack) {
-              this.$message.success("保存数据成功!");
-              this.onBack();
-            }
+              _b.label = 5;
 
-            _b.label = 6;
+            case 5:
+              if (isBack) {
+                this.$message.success("保存数据成功!");
+                this.onBack();
+              }
 
-          case 6:
-            return [3
-            /*break*/
-            , 9];
+              _b.label = 6;
 
-          case 7:
-            _a = _b.sent();
-            return [3
-            /*break*/
-            , 9];
+            case 6:
+              return [2
+              /*return*/
+              , resolve(true)];
 
-          case 8:
-            this.saveing = false;
-            return [7
-            /*endfinally*/
-            ];
+            case 7:
+              _a = _b.sent();
+              return [3
+              /*break*/
+              , 9];
 
-          case 9:
-            return [2
-            /*return*/
-            , Promise.resolve()];
-        }
+            case 8:
+              this.saveing = false;
+              return [7
+              /*endfinally*/
+              ];
+
+            case 9:
+              return [2
+              /*return*/
+              ];
+          }
+        });
       });
     });
   };
 
-  ApiCombineModel.prototype.onAddDataModel = function () {
+  ProjectCombineModel.prototype.onAddDataModel = function () {
     this.dataModelShow = true;
   };
 
-  ApiCombineModel.prototype.onAddApiProject = function () {
+  ProjectCombineModel.prototype.onAddApiProject = function () {
     this.apiProjectShow = true;
   };
 
-  ApiCombineModel.prototype.onRelationsSave = function (relationType, addData, delData) {
+  ProjectCombineModel.prototype.onRelationsSave = function (relationType, addData, delData) {
     return combine_model_awaiter(this, void 0, void 0, function () {
       var delIds, addIds, addRelations, addReqParams, res, res;
       return combine_model_generator(this, function (_a) {
@@ -56028,7 +56032,7 @@ function (_super) {
     });
   };
 
-  ApiCombineModel.prototype.onRelationDelete = function (row) {
+  ProjectCombineModel.prototype.onRelationDelete = function (row) {
     this.model.relations = this.model.relations.filter(function (r) {
       return r.typeId !== row.typeId;
     });
@@ -56037,7 +56041,7 @@ function (_super) {
     });
   };
 
-  ApiCombineModel.prototype.onDetail = function (row) {
+  ProjectCombineModel.prototype.onDetail = function (row) {
     return combine_model_awaiter(this, void 0, void 0, function () {
       var res, res;
       return combine_model_generator(this, function (_a) {
@@ -56098,7 +56102,7 @@ function (_super) {
     });
   };
 
-  ApiCombineModel.prototype.onOpenTest = function () {
+  ProjectCombineModel.prototype.onOpenTest = function () {
     return combine_model_awaiter(this, void 0, void 0, function () {
       var _a;
 
@@ -56134,7 +56138,7 @@ function (_super) {
     });
   };
 
-  ApiCombineModel.prototype.onTestRun = function (context) {
+  ProjectCombineModel.prototype.onTestRun = function (context) {
     var _a, _b;
 
     return combine_model_awaiter(this, void 0, void 0, function () {
@@ -56167,14 +56171,14 @@ function (_super) {
 
   var _a, _b, _c;
 
-  combine_model_decorate([autowired(project_combine_service), combine_model_metadata("design:type", typeof (_a = typeof project_combine_service !== "undefined" && project_combine_service) === "function" ? _a : Object)], ApiCombineModel.prototype, "service", void 0);
+  combine_model_decorate([autowired(project_combine_service), combine_model_metadata("design:type", typeof (_a = typeof project_combine_service !== "undefined" && project_combine_service) === "function" ? _a : Object)], ProjectCombineModel.prototype, "service", void 0);
 
-  combine_model_decorate([autowired(data_model_service), combine_model_metadata("design:type", typeof (_b = typeof data_model_service !== "undefined" && data_model_service) === "function" ? _b : Object)], ApiCombineModel.prototype, "dataModelService", void 0);
+  combine_model_decorate([autowired(data_model_service), combine_model_metadata("design:type", typeof (_b = typeof data_model_service !== "undefined" && data_model_service) === "function" ? _b : Object)], ProjectCombineModel.prototype, "dataModelService", void 0);
 
-  combine_model_decorate([autowired(api_project_service), combine_model_metadata("design:type", typeof (_c = typeof api_project_service !== "undefined" && api_project_service) === "function" ? _c : Object)], ApiCombineModel.prototype, "apiProjectService", void 0);
+  combine_model_decorate([autowired(api_project_service), combine_model_metadata("design:type", typeof (_c = typeof api_project_service !== "undefined" && api_project_service) === "function" ? _c : Object)], ProjectCombineModel.prototype, "apiProjectService", void 0);
 
-  ApiCombineModel = combine_model_decorate([Object(flagwind_web_["component"])({
-    name: "ApiCombineModel",
+  ProjectCombineModel = combine_model_decorate([Object(flagwind_web_["component"])({
+    name: "ProjectCombineModel",
     template: __webpack_require__("d8e7"),
     components: {
       "u-base-editor": combine_model_base_editor,
@@ -56186,11 +56190,11 @@ function (_super) {
       "u-response-parameter-list": response_parameter_list,
       "u-test-run-modal": combine_model_test_run_modal
     }
-  })], ApiCombineModel);
-  return ApiCombineModel;
+  })], ProjectCombineModel);
+  return ProjectCombineModel;
 }(flagwind_web_["View"]);
 
-/* harmony default export */ var project_combine_combine_model = (combine_model_ApiCombineModel);
+/* harmony default export */ var project_combine_combine_model = (combine_model_ProjectCombineModel);
 // EXTERNAL MODULE: ./src/views/project-list/add-project-modal/index.scss
 var add_project_modal = __webpack_require__("1aea");