@egova/egova-api 1.0.145 → 1.0.147

package/dist/index.umd.js

@@ -26701,7 +26701,7 @@ fixRegExpWellKnownSymbolLogic('match', function (MATCH, nativeMatch, maybeCallNa
 /***/ "46d3":
 /***/ (function(module, exports) {
 
-module.exports = "<article class=\"u-common-tree u-type-tree\">\r\n    <slot name=\"header\">\r\n        <header slot=\"header\" class=\"tree-header\">\r\n            <span>合并模型列表</span>\r\n            <i-upload\r\n                class=\"action-item\"\r\n                :action=\"uploadAction\"\r\n                accept=\".json\"\r\n                :headers=\"headers\"\r\n                :show-upload-list=\"false\"\r\n                :format=\"['json']\"\r\n                :on-success=\"onSuccess\"\r\n                :before-upload=\"onBeforeUpload\"\r\n                :on-format-error=\"onFormatError\"\r\n            >\r\n                <i title=\"导入\" class=\"iconfont icon-import\"></i>\r\n            </i-upload>\r\n            <i\r\n                @click=\"onModelExport(null)\"\r\n                :class=\"{'disabled': !data.length}\"\r\n                class=\"iconfont icon-export\"\r\n                title=\"导出\"\r\n            ></i>\r\n            <i @click.stop=\"onAddTreeNode\" title=\"新增合并模型\" class=\"iconfont icon-add-folder\"></i>\r\n        </header>\r\n    </slot>\r\n    <section class=\"content\">\r\n        <i-input class=\"search-input diy-input\" suffix=\"ios-search\" :placeholder=\"placeholder\" @on-change=\"onFilter\" v-model=\"keyword\" />\r\n        <i-tree :data=\"renderData\" :render=\"renderContent\" @on-toggle-expand=\"onToggleExpand\"></i-tree>\r\n    </section>\r\n    <u-add-node :data=\"tempNode\" :categories=\"data\" v-model=\"showAddTreeNodeModal\" @on-refresh=\"queryTreeData\"></u-add-node>\r\n</article>\r\n"
+module.exports = "<article class=\"u-common-tree u-type-tree\">\n    <slot name=\"header\">\n        <header slot=\"header\" class=\"tree-header\">\n            <span>合并模型列表</span>\n            <i-upload\n                class=\"action-item\"\n                :action=\"uploadAction\"\n                accept=\".json\"\n                :headers=\"headers\"\n                :show-upload-list=\"false\"\n                :format=\"['json']\"\n                :on-success=\"onSuccess\"\n                :before-upload=\"onBeforeUpload\"\n                :on-format-error=\"onFormatError\"\n            >\n                <i title=\"导入\" class=\"iconfont icon-import\"></i>\n            </i-upload>\n            <i\n                @click=\"onModelExport(null)\"\n                :class=\"{'disabled': !data.length}\"\n                class=\"iconfont icon-export\"\n                title=\"导出\"\n            ></i>\n            <i @click.stop=\"onAddTreeNode\" title=\"新增合并模型\" class=\"iconfont icon-add-folder\"></i>\n        </header>\n    </slot>\n    <section class=\"content\">\n        <i-input class=\"search-input diy-input\" suffix=\"ios-search\" :placeholder=\"placeholder\" @on-change=\"onFilter\" v-model=\"keyword\" />\n        <i-tree :data=\"renderData\" :render=\"renderContent\" @on-toggle-expand=\"onToggleExpand\"></i-tree>\n    </section>\n    <u-add-node :data=\"tempNode\" :categories=\"data\" v-model=\"showAddTreeNodeModal\" @on-refresh=\"queryTreeData\"></u-add-node>\n\n    <i-modal draggable sticky reset-drag-position v-model=\"showImportModal\" class=\"diy-modal duplicate-import-modal\" width=\"800\" :mask-closable=\"false\" title=\"导入已合并接口\">\n        <div class=\"import-title\">上传成功</div>\n        <div class=\"import-label\">{{ `上传共${importResult.total}条合并接口数据，其中${importResult.total - importResult.duplicateNum}条可成功导入。` }}</div>\n        <div class=\"import-label\">{{ `发现以下${importResult.duplicateNum}条接口数据存在编码重复（编码已存在），将不会被导入。` }}</div>\n        <i-table class=\"diy-table import-modal-table\" :columns=\"columns\" :data=\"importResult.items\">\n        </i-table>\n        <footer slot=\"footer\">\n            <i-button class=\"diy-btn-primary\" type=\"primary\" @click=\"onImportConfirm\">确定</i-button>\n            <i-button class=\"diy-btn-default\" @click=\"onImportCancel\">取消</i-button>\n        </footer>\n    </i-modal>\n</article>\n"
 
 /***/ }),
 
@@ -50882,6 +50882,15 @@ function (_super) {
     return this._post("/unity/combine-info/export", data);
   };
 
+  Service.prototype.confirmImport = function (id) {
+    return this._post("/unity/combine-info/import/confirm?key=".concat(id));
+  }; // @service("save", { title: "取消导入接口数据", showTip: true })
+
+
+  Service.prototype.cancelImport = function (id) {
+    return this._post("/unity/combine-info/import/cancel?key=".concat(id));
+  };
+
   tree_service_decorate([serviceHandler("save", {
     title: "保存",
     showTip: false
@@ -50892,6 +50901,12 @@ function (_super) {
     showTip: false
   }), tree_service_metadata("design:type", Function), tree_service_metadata("design:paramtypes", [String]), tree_service_metadata("design:returntype", void 0)], Service.prototype, "deleteTreeNodeById", null);
 
+  tree_service_decorate([serviceHandler("save", {
+    title: "导入接口数据",
+    showTip: true,
+    showErrorMsg: true
+  }), tree_service_metadata("design:type", Function), tree_service_metadata("design:paramtypes", [Object]), tree_service_metadata("design:returntype", void 0)], Service.prototype, "confirmImport", null);
+
   return Service;
 }(common_service);
 
@@ -51687,6 +51702,30 @@ function (_super) {
       type: _this.type,
       parentId: null
     };
+    _this.showImportModal = false;
+    _this.importResult = {}; // 表头信息
+
+    _this.columns = [{
+      type: "index",
+      title: "序号",
+      align: "center",
+      width: 80
+    }, {
+      title: "名称",
+      align: "center",
+      key: "name",
+      tooltip: true
+    }, {
+      title: "编码",
+      align: "center",
+      key: "code",
+      tooltip: true
+    }, {
+      title: "说明",
+      align: "center",
+      key: "remark",
+      tooltip: true
+    }];
     return _this; // public get headers() {
     //     let token = Cookies.get("access_token");
     //     return { Authorization: "Bearer " + token };
@@ -51711,11 +51750,101 @@ function (_super) {
     configurable: true
   });
 
+  Tree.prototype.onImportConfirm = function () {
+    return tree_awaiter(this, void 0, void 0, function () {
+      var res_1, res;
+      return tree_generator(this, function (_a) {
+        switch (_a.label) {
+          case 0:
+            if (!(this.importResult.total === this.importResult.duplicateNum)) return [3
+            /*break*/
+            , 2];
+            return [4
+            /*yield*/
+            , this.service.cancelImport(this.importResult.id)];
+
+          case 1:
+            res_1 = _a.sent();
+
+            if (res_1 && !res_1.hasError) {
+              this.$message.success("导入接口数据成功!");
+              this.showImportModal = false;
+              return [2
+              /*return*/
+              ];
+            }
+
+            this.$Message.error(res_1.message || "导入接口数据失败!");
+            return [2
+            /*return*/
+            ];
+
+          case 2:
+            return [4
+            /*yield*/
+            , this.service.confirmImport(this.importResult.id)];
+
+          case 3:
+            res = _a.sent();
+
+            if (res && !res.hasError) {
+              this.showImportModal = false;
+              this.queryTreeData();
+              return [2
+              /*return*/
+              ];
+            }
+
+            return [2
+            /*return*/
+            ];
+        }
+      });
+    });
+  };
+
+  Tree.prototype.onImportCancel = function () {
+    return tree_awaiter(this, void 0, void 0, function () {
+      var res;
+      return tree_generator(this, function (_a) {
+        switch (_a.label) {
+          case 0:
+            return [4
+            /*yield*/
+            , this.service.cancelImport(this.importResult.id)];
+
+          case 1:
+            res = _a.sent();
+
+            if (res && !res.hasError) {
+              this.$message.success("取消成功");
+              this.showImportModal = false;
+              return [2
+              /*return*/
+              ];
+            }
+
+            this.$Message.error(res.message || "取消异常");
+            return [2
+            /*return*/
+            ];
+        }
+      });
+    });
+  };
+
   Tree.prototype.onSuccess = function (res, file) {
+    // debugger
     if (res && !res.hasError) {
-      this.$Message.success("导入成功");
-      this.queryTreeData();
-      return;
+      if (!res.result) {
+        this.$Message.success("导入成功");
+        this.queryTreeData();
+        return;
+      } else {
+        this.showImportModal = true;
+        this.importResult = res.result;
+        return;
+      }
     }
 
     this.$Message.error(res.message || "导入出错，请稍后再试");
@@ -51818,7 +51947,7 @@ function (_super) {
           _this.onSelect(data);
         },
         "on-import-success": function onImportSuccess(res, file) {
-          _this.onSuccess(data, file);
+          _this.onSuccess(res, file);
         }
       }
     });