@zhubangyun/lowcode-core 5.10.221 → 5.12.10

package/es/utils/page/page-form.d.ts

@@ -10,8 +10,9 @@ export interface ShowFormProps {
     mode?: PageFormModeType;
     lockMode?: boolean;
     dataId?: string;
-    onSubmitOk?: () => void;
+    onSubmitOk?: (data: any) => void;
     onRemoveOk?: () => void;
     onClose?: () => void | Promise<void>;
+    pageRef?: (page: any) => void;
 }
 export declare function showForm(options: ShowFormProps): Promise<any>;

package/es/utils/page/page-form.js

@@ -16,7 +16,7 @@ export function showForm(_x) {
 }
 function _showForm() {
   _showForm = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(options) {
-    var container, onClose, props, _options$form, paths, mode, dataId, params, url, page;
+    var container, onClose, props, _options$form, paths, mode, dataId, params, url, _page;
     return _regeneratorRuntime.wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
@@ -35,8 +35,8 @@ function _showForm() {
           _context.next = 9;
           return openPage(url, url);
         case 9:
-          page = _context.sent;
-          console.debug("openPage", page);
+          _page = _context.sent;
+          console.debug("openPage", _page);
           return _context.abrupt("return");
         case 12:
           return _context.abrupt("return", renderElement({

package/es/utils/page/page-render.js

@@ -37,8 +37,7 @@ export function renderElement(options) {
               }
             }));
             root.render(element);
-            return _context.abrupt("return", element);
-          case 8:
+          case 7:
           case "end":
             return _context.stop();
         }

package/es/utils/page/page-show.d.ts

@@ -4,5 +4,6 @@ export interface ShowPageProps {
     pageId: string;
     layout?: PageLayoutType;
     onClose?: () => void | Promise<void>;
+    pageRef?: (page: any) => void;
 }
 export declare function show(options: ShowPageProps): Promise<any | any[]>;

package/es/utils/page/print-form.d.ts

@@ -0,0 +1,8 @@
+interface PrintOptions {
+    templateId: string;
+    mode?: "print" | "export";
+    data: any;
+}
+export declare function getFormPrintTemplates(formId: string): Promise<any[]>;
+export declare function print(options: PrintOptions): Promise<void>;
+export {};

package/es/utils/page/print-form.js

@@ -0,0 +1,147 @@
+import _message from "antd/es/message";
+import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
+import _regeneratorRuntime from "@babel/runtime/regenerator";
+import { apiRequest } from "../api";
+import { FormIds } from "../formIds";
+import { hideLoading, showLoading } from "./index";
+export function getFormPrintTemplates(_x) {
+  return _getFormPrintTemplates.apply(this, arguments);
+}
+function _getFormPrintTemplates() {
+  _getFormPrintTemplates = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(formId) {
+    var res;
+    return _regeneratorRuntime.wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          _context.next = 2;
+          return apiRequest.get("forms/search", {
+            params: {
+              formId: FormIds.printTemplate,
+              filterRules: [{
+                key: "page",
+                operator: "eq",
+                value: formId
+              }],
+              pageSize: 1000
+            }
+          });
+        case 2:
+          res = _context.sent;
+          if (!res.success) {
+            _context.next = 7;
+            break;
+          }
+          return _context.abrupt("return", res.data);
+        case 7:
+          return _context.abrupt("return", []);
+        case 8:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee);
+  }));
+  return _getFormPrintTemplates.apply(this, arguments);
+}
+export function print(_x2) {
+  return _print.apply(this, arguments);
+}
+function _print() {
+  _print = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(options) {
+    var templateId, iw;
+    return _regeneratorRuntime.wrap(function _callee2$(_context2) {
+      while (1) switch (_context2.prev = _context2.next) {
+        case 0:
+          _context2.prev = 0;
+          _context2.next = 3;
+          return showLoading();
+        case 3:
+          templateId = options === null || options === void 0 ? void 0 : options.templateId;
+          if (templateId) {
+            _context2.next = 7;
+            break;
+          }
+          _message.error("\u6253\u5370\u5931\u8D25!\u6A21\u677Fid\u4E0D\u53EF\u4E3A\u7A7A!");
+          return _context2.abrupt("return");
+        case 7:
+          _context2.next = 9;
+          return openPrint(templateId);
+        case 9:
+          iw = _context2.sent;
+          if (iw) {
+            _context2.next = 13;
+            break;
+          }
+          _message.error("\u6253\u5370\u5931\u8D25!\u6253\u5370\u7A97\u53E3\u4E0D\u53EF\u4E3A\u7A7A!");
+          return _context2.abrupt("return");
+        case 13:
+          // @ts-ignore
+          iw.printOptions = options;
+          _context2.next = 19;
+          break;
+        case 16:
+          _context2.prev = 16;
+          _context2.t0 = _context2["catch"](0);
+          console.log("打印失败", _context2.t0);
+        case 19:
+          _context2.prev = 19;
+          return _context2.finish(19);
+        case 21:
+        case "end":
+          return _context2.stop();
+      }
+    }, _callee2, null, [[0, 16, 19, 21]]);
+  }));
+  return _print.apply(this, arguments);
+}
+function openPrint(_x3) {
+  return _openPrint.apply(this, arguments);
+}
+function _openPrint() {
+  _openPrint = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4(templateId) {
+    return _regeneratorRuntime.wrap(function _callee4$(_context4) {
+      while (1) switch (_context4.prev = _context4.next) {
+        case 0:
+          return _context4.abrupt("return", new Promise( /*#__PURE__*/function () {
+            var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(resolve, reject) {
+              var iframe, iframeWindow;
+              return _regeneratorRuntime.wrap(function _callee3$(_context3) {
+                while (1) switch (_context3.prev = _context3.next) {
+                  case 0:
+                    iframe = document.createElement("iframe");
+                    iframe.src = "/print/" + templateId;
+                    iframe.style.display = "none";
+                    document.body.appendChild(iframe);
+                    iframeWindow = iframe.contentWindow;
+                    if (iframeWindow) {
+                      _context3.next = 8;
+                      break;
+                    }
+                    reject("创建Iframe失败!");
+                    return _context3.abrupt("return");
+                  case 8:
+                    iframeWindow.onload = function () {
+                      resolve(iframeWindow);
+                    };
+                    iframeWindow.addEventListener("beforeprint", function () {});
+                    iframeWindow.addEventListener("afterprint", function () {
+                      hideLoading();
+                      iframe.remove();
+                    });
+                  case 11:
+                  case "end":
+                    return _context3.stop();
+                }
+              }, _callee3);
+            }));
+            return function (_x4, _x5) {
+              return _ref.apply(this, arguments);
+            };
+          }()));
+        case 1:
+        case "end":
+          return _context4.stop();
+      }
+    }, _callee4);
+  }));
+  return _openPrint.apply(this, arguments);
+}

package/lib/index.less

@@ -1,3 +1,13 @@
 [componentname="Page"] {
   height: 100%;
 }
+
+ul {
+  margin-bottom: 0;
+  padding-left: 0;
+  list-style: none;
+}
+
+.page-content {
+  overflow: hidden;
+}

package/lib/utils/api/file-api.d.ts

@@ -1,7 +1,19 @@
+/// <reference types="node" />
 import { AxiosProgressEvent } from "axios";
-export declare function upload(file: any, options?: {
-    onProgress: (evt: AxiosProgressEvent) => void;
-    onFinished: () => void;
-    onError: (e: any) => void;
-}): Promise<void>;
+interface File {
+    id?: string;
+    size?: number;
+    name?: string;
+    type?: string;
+    status?: "done" | "uploading" | "error";
+    url: string;
+    percent?: number;
+    buffer?: Buffer;
+}
+export declare function upload(file: File, options?: {
+    onProgress?: (evt: AxiosProgressEvent) => void;
+    onFinished?: () => void;
+    onError?: (e: any) => void;
+}): Promise<File>;
 export declare function update(file: any): Promise<void>;
+export {};

package/lib/utils/api/file-api.js

@@ -20,10 +20,11 @@ function _upload() {
             _context.next = 2;
             break;
           }
-          return _context.abrupt("return");
+          return _context.abrupt("return", file);
         case 2:
           _context.next = 4;
           return _index.apiRequest.post("files/signature", {
+            id: file.id,
             size: file.size,
             name: file.name,
             type: file.type
@@ -41,7 +42,7 @@ function _upload() {
           file.status = "uploading";
           _context.prev = 10;
           _context.next = 13;
-          return _index.apiRequest.put(ossFile.uploadUrl, file, {
+          return _index.apiRequest.put(ossFile.uploadUrl, (file === null || file === void 0 ? void 0 : file.buffer) || file, {
             headers: {
               'Content-Type': file.type
             },
@@ -54,18 +55,20 @@ function _upload() {
             }
           });
         case 13:
+          file.status = "done";
           options === null || options === void 0 ? void 0 : (_options$onFinished = options.onFinished) === null || _options$onFinished === void 0 ? void 0 : _options$onFinished.call(options);
-          _context.next = 19;
+          _context.next = 21;
           break;
-        case 16:
-          _context.prev = 16;
+        case 17:
+          _context.prev = 17;
           _context.t0 = _context["catch"](10);
+          file.status = "error";
           options === null || options === void 0 ? void 0 : (_options$onError = options.onError) === null || _options$onError === void 0 ? void 0 : _options$onError.call(options, _context.t0);
-        case 19:
+        case 21:
         case "end":
           return _context.stop();
       }
-    }, _callee, null, [[10, 16]]);
+    }, _callee, null, [[10, 17]]);
   }));
   return _upload.apply(this, arguments);
 }

package/lib/utils/api/form-api.js

@@ -9,9 +9,9 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
 var _inheritsLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/inheritsLoose"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _restApi = require("./rest-api");
-var _index = require("./index");
 var _formApi = require("./form-api.utils");
 var _cache = require("../cache");
+var _schemaApi = require("./schema-api");
 function getFormApi(_x, _x2, _x3) {
   return _getFormApi.apply(this, arguments);
 }
@@ -61,56 +61,46 @@ var RestFormApi = exports.RestFormApi = /*#__PURE__*/function (_RestApi) {
   _proto.initialize = /*#__PURE__*/function () {
     var _initialize = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
       var _this2 = this;
-      var _this$schema$children, _this$schema$children2, res;
+      var res, _this$schema, _this$schema$children, _this$schema$children2;
       return _regenerator["default"].wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             if (!this.initialized) {
-              _context.next = 4;
-              break;
-            }
-            return _context.abrupt("return", true);
-          case 4:
-            _context.prev = 4;
-            _context.next = 7;
-            return (0, _index.getSchema)(this.formId, this.mock);
-          case 7:
-            res = _context.sent;
-            this.schema = res.data;
-            this.initialized = !!this.schema;
-            this.title = (_this$schema$children = this.schema.children[0]) === null || _this$schema$children === void 0 ? void 0 : (_this$schema$children2 = _this$schema$children.props) === null || _this$schema$children2 === void 0 ? void 0 : _this$schema$children2.label;
-            if (this.fieldId) {
-              JSON.stringify(this.schema, function (key, value) {
-                var _value$props;
-                if (key == "fdmSchema") {
-                  return undefined;
-                }
-                if ((value === null || value === void 0 ? void 0 : (_value$props = value.props) === null || _value$props === void 0 ? void 0 : _value$props.fieldId) === _this2.fieldId) {
-                  if (value.props.label) {
-                    _this2.title += "." + value.props.label;
+              try {
+                res = (0, _schemaApi.getSchemaFromCache)(this.formId, this.mock);
+                this.schema = res === null || res === void 0 ? void 0 : res.data;
+                this.initialized = !!this.schema;
+                if (this.initialized) {
+                  this.title = (_this$schema = this.schema) === null || _this$schema === void 0 ? void 0 : (_this$schema$children = _this$schema.children[0]) === null || _this$schema$children === void 0 ? void 0 : (_this$schema$children2 = _this$schema$children.props) === null || _this$schema$children2 === void 0 ? void 0 : _this$schema$children2.label;
+                  if (this.fieldId) {
+                    JSON.stringify(this.schema, function (key, value) {
+                      var _value$props;
+                      if (key == "fdmSchema") {
+                        return undefined;
+                      }
+                      if ((value === null || value === void 0 ? void 0 : (_value$props = value.props) === null || _value$props === void 0 ? void 0 : _value$props.fieldId) === _this2.fieldId) {
+                        if (value.props.label) {
+                          _this2.title += "." + value.props.label;
+                        }
+                      }
+                      return value;
+                    });
                   }
                 }
-                return value;
-              });
+              } catch (e) {
+                console.log("获取schema失败!", {
+                  formId: this.formId,
+                  field: this.fieldId,
+                  mock: this.mock
+                }, e);
+              }
             }
-            _context.next = 18;
-            break;
-          case 14:
-            _context.prev = 14;
-            _context.t0 = _context["catch"](4);
-            console.log("获取schema失败!", {
-              formId: this.formId,
-              field: this.fieldId,
-              mock: this.mock
-            }, _context.t0);
-            throw _context.t0;
-          case 18:
             return _context.abrupt("return", this.initialized);
-          case 19:
+          case 2:
           case "end":
             return _context.stop();
         }
-      }, _callee, this, [[4, 14]]);
+      }, _callee, this);
     }));
     function initialize() {
       return _initialize.apply(this, arguments);
@@ -160,7 +150,7 @@ var RestFormApi = exports.RestFormApi = /*#__PURE__*/function (_RestApi) {
               fieldId: this.fieldId
             };
             if (__mock) {
-              params.description = "" + this.title;
+              params.description = (this.title || "表单") + ".\u67E5\u8BE2";
             }
             config = {
               params: params
@@ -197,7 +187,7 @@ var RestFormApi = exports.RestFormApi = /*#__PURE__*/function (_RestApi) {
   }();
   _proto.getById = /*#__PURE__*/function () {
     var _getById = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee4(id, options) {
-      var res, start;
+      var res;
       return _regenerator["default"].wrap(function _callee4$(_context4) {
         while (1) switch (_context4.prev = _context4.next) {
           case 0:
@@ -205,11 +195,10 @@ var RestFormApi = exports.RestFormApi = /*#__PURE__*/function (_RestApi) {
             return _RestApi.prototype.getById.call(this, id, options);
           case 2:
             res = _context4.sent;
-            start = Date.now();
             (0, _formApi.assembleAssociationField)(res.data, res.refs);
             console.debug("formApi.getById", res);
             return _context4.abrupt("return", res);
-          case 7:
+          case 6:
           case "end":
             return _context4.stop();
         }

package/lib/utils/api/form-api.utils.d.ts

@@ -1,15 +1,15 @@
-import { BaseType, FilterRule, Refs } from "./rest-api";
+import { FilterRule, IBaseEntity, Refs } from "./rest-api";
 export declare function convertSaveData(data: any): any;
-export declare function handleEntityLabel(data: BaseType | BaseType[]): void;
 export declare function dataToLabel(value: any): any;
-export declare function assembleAssociationFieldV2(data: BaseType | BaseType[], refs?: Refs): void;
+export declare function assembleAssociationFieldV2(data: IBaseEntity | IBaseEntity[], refs?: Refs): void;
 /**
  * 加载字段
  * @param data
  * @param dataMap
  */
-export declare function assembleAssociationFieldDataV2(data: BaseType | BaseType[], dataMap: Map<string, BaseType>): void;
-export declare function assembleAssociationField(data: BaseType | BaseType[], refs?: Refs): void;
+export declare function assembleAssociationFieldDataV2(data: IBaseEntity | IBaseEntity[], dataMap: Map<string, IBaseEntity>): void;
+export declare function handleEntityLabel(data: IBaseEntity | IBaseEntity[]): void;
+export declare function assembleAssociationField(data: IBaseEntity | IBaseEntity[], refs?: Refs): void;
 export declare function handleFilterRules(filters: FilterRule[], options: {
     filterNullValue: boolean;
 }): FilterRule[];

package/lib/utils/api/form-api.utils.js

@@ -34,21 +34,6 @@ function getDataKey(data) {
   }
   return key + "." + data.id;
 }
-function handleEntityLabel(data) {
-  if (!Array.isArray(data)) {
-    data = [data];
-  }
-  for (var _iterator = _createForOfIteratorHelperLoose(data), _step; !(_step = _iterator()).done;) {
-    var _item$form;
-    var item = _step.value;
-    var labelField = (_item$form = item.form) === null || _item$form === void 0 ? void 0 : _item$form.labelField;
-    if (labelField) {
-      // @ts-ignore
-      var value = safeGet(item, labelField);
-      item.label = dataToLabel(value);
-    }
-  }
-}
 function dataToLabel(value) {
   if (value == null) {
     return "";
@@ -72,44 +57,44 @@ function dataToLabel(value) {
 function assembleAssociationFieldV2(data, refs) {
   if (!data || !refs) return;
   var dataMap = new Map();
-  for (var _iterator2 = _createForOfIteratorHelperLoose(refs), _step2; !(_step2 = _iterator2()).done;) {
-    var ref = _step2.value;
-    for (var _iterator4 = _createForOfIteratorHelperLoose(ref.data), _step4; !(_step4 = _iterator4()).done;) {
-      var datum = _step4.value;
+  for (var _iterator = _createForOfIteratorHelperLoose(refs), _step; !(_step = _iterator()).done;) {
+    var ref = _step.value;
+    ref.label = ref.form.label;
+    for (var _iterator3 = _createForOfIteratorHelperLoose(ref.data), _step3; !(_step3 = _iterator3()).done;) {
+      var datum = _step3.value;
       var key = getDataKey(datum);
       dataMap.set(key, datum);
     }
   }
-
   //组装refs的关联属性
-  for (var _iterator3 = _createForOfIteratorHelperLoose(dataMap.values()), _step3; !(_step3 = _iterator3()).done;) {
-    var item = _step3.value;
+  for (var _iterator2 = _createForOfIteratorHelperLoose(dataMap.values()), _step2; !(_step2 = _iterator2()).done;) {
+    var item = _step2.value;
     for (var _i2 = 0, _Object$keys = Object.keys(item); _i2 < _Object$keys.length; _i2++) {
       var _key = _Object$keys[_i2];
-      // @ts-ignore
       var value = item[_key];
       assembleAssociationFieldDataV2(value, dataMap);
     }
   }
-  handleEntityLabel([].concat(dataMap.values()));
   function loopAssembleAssociation(value) {
+    var _value$form;
     if (Array.isArray(value)) {
       value.forEach(function (item) {
         return loopAssembleAssociation(item);
       });
-    } else if (value !== null && value !== void 0 && value.id) {
-      handleEntityLabel(value);
+    } else if (value !== null && value !== void 0 && value.id && (_value$form = value.form) !== null && _value$form !== void 0 && _value$form.id) {
+      if (value._load) return;
       assembleAssociationFieldDataV2(value, dataMap);
-      //处理子表
       for (var _i = 0, _Object$values = Object.values(value); _i < _Object$values.length; _i++) {
         var subValues = _Object$values[_i];
-        if (typeof subValues == "object") {
+        if (subValues !== null && typeof subValues == "object") {
           loopAssembleAssociation(subValues);
         }
       }
     }
   }
   loopAssembleAssociation(data);
+  handleEntityLabel(data);
+  dataMap.clear();
 }
 
 /**
@@ -118,28 +103,62 @@ function assembleAssociationFieldV2(data, refs) {
  * @param dataMap
  */
 function assembleAssociationFieldDataV2(data, dataMap) {
-  if (data == null) {
-    return;
-  }
+  if (data == null || typeof data != "object") return;
   if (Array.isArray(data)) {
     data.forEach(function (item) {
       return assembleAssociationFieldDataV2(item, dataMap);
     });
   } else {
-    if (data._load == false) {
+    if (!data._load) {
       var _data$form3;
-      if (data !== null && data !== void 0 && (_data$form3 = data.form) !== null && _data$form3 !== void 0 && _data$form3.id && data !== null && data !== void 0 && data.id) {
-        delete data._load;
+      if (data !== null && data !== void 0 && data.id && data !== null && data !== void 0 && (_data$form3 = data.form) !== null && _data$form3 !== void 0 && _data$form3.id) {
         var key = getDataKey(data);
         var value = dataMap.get(key);
         if (value) {
-          Object.assign(data, value);
-          delete data._load;
+          Object.assign(data, JSON.parse(JSON.stringify(value)));
         }
+        data._load = true;
       }
     }
   }
 }
+function handleEntityLabel(data) {
+  if (Array.isArray(data)) {
+    data.forEach(function (item) {
+      return handleEntityLabel(item);
+    });
+  } else if (typeof data == "object") {
+    var form = data === null || data === void 0 ? void 0 : data.form;
+    if (form) {
+      var labelField = form === null || form === void 0 ? void 0 : form.labelField;
+      if (labelField) {
+        // @ts-ignore
+        var label = safeGet(data, labelField);
+        data.label = dataToLabel(label);
+      }
+      for (var _i3 = 0, _Object$keys2 = Object.keys(data); _i3 < _Object$keys2.length; _i3++) {
+        var key = _Object$keys2[_i3];
+        // @ts-ignore
+        handleEntityLabel(data[key]);
+      }
+    }
+  }
+}
+function valueToFormDataArray(value) {
+  if (typeof value == null || typeof value !== "object") {
+    return [];
+  }
+  if (Array.isArray(value)) {
+    return value === null || value === void 0 ? void 0 : value.filter(function (item) {
+      var _item$form;
+      return (item === null || item === void 0 ? void 0 : item.id) && (item === null || item === void 0 ? void 0 : (_item$form = item.form) === null || _item$form === void 0 ? void 0 : _item$form.id);
+    });
+  } else if (typeof value == "object" && value !== null) {
+    return valueToFormDataArray([value]);
+  } else {
+    return [];
+  }
+}
 function assembleAssociationField(data, refs) {
   assembleAssociationFieldV2(data, refs);
 }

package/lib/utils/api/index.d.ts

@@ -1,10 +1,11 @@
 export { RestApi } from "./rest-api";
 export { getFormApi, RestFormApi } from "./form-api";
+import { AxiosResponse } from "axios/index";
 export { getSchema } from "./schema-api";
-export { loadUserInfo } from "./user-info";
+export { getUserinfo } from "./user-info";
 export * as files from "./file-api";
 export * as scrips from "./script-api";
 export declare const apiRequest: import("axios").AxiosInstance;
-export declare const request: <T = any, R = import("axios").AxiosResponse<T, any>, D = any>(config: import("axios").AxiosRequestConfig<D>) => Promise<R>;
-export declare function onFulfilled(res: any): any;
+export declare const request: <T = any, R = AxiosResponse<T, any>, D = any>(config: import("axios").AxiosRequestConfig<D>) => Promise<R>;
+export declare function onFulfilled(res: AxiosResponse): any;
 export declare function onRejected(error: any): any;

package/lib/utils/api/index.js

@@ -2,7 +2,7 @@
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 exports.__esModule = true;
-exports.loadUserInfo = exports.getSchema = exports.getFormApi = exports.files = exports.apiRequest = exports.RestFormApi = exports.RestApi = void 0;
+exports.getUserinfo = exports.getSchema = exports.getFormApi = exports.files = exports.apiRequest = exports.RestFormApi = exports.RestApi = void 0;
 exports.onFulfilled = onFulfilled;
 exports.onRejected = onRejected;
 exports.scrips = exports.request = void 0;
@@ -15,7 +15,7 @@ exports.RestFormApi = _formApi.RestFormApi;
 var _schemaApi = require("./schema-api");
 exports.getSchema = _schemaApi.getSchema;
 var _userInfo = require("./user-info");
-exports.loadUserInfo = _userInfo.loadUserInfo;
+exports.getUserinfo = _userInfo.getUserinfo;
 var _files = _interopRequireWildcard(require("./file-api"));
 exports.files = _files;
 var _scrips = _interopRequireWildcard(require("./script-api"));
@@ -25,7 +25,7 @@ function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e;
 var apiRequest = exports.apiRequest = _axios["default"].create({
   baseURL: "/api",
   // 基础URL
-  timeout: 10000,
+  timeout: 600000,
   // 请求超时时间（毫秒）
   headers: {
     'Content-Type': 'application/json;charset=UTF-8'
@@ -34,6 +34,13 @@ var apiRequest = exports.apiRequest = _axios["default"].create({
 apiRequest.interceptors.response.use(onFulfilled, onRejected);
 var request = exports.request = apiRequest.request;
 function onFulfilled(res) {
+  if (typeof res.data == "object") {
+    if ("success" in res.data) {
+      if (res.headers["Request-Id"]) {
+        res.data.requestId = res.headers["Request-Id"];
+      }
+    }
+  }
   return res.data;
 }
 function onRejected(error) {