@zhubangyun/lowcode-core 5.10.220 → 5.12.10

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

@@ -6,26 +6,41 @@ exports.RestFormApi = void 0;
 exports.getFormApi = getFormApi;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
-var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 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");
-function getFormApi(formId, fieldId, mock) {
-  if (typeof mock != "boolean") {
-    if (typeof window.__mock == "boolean") {
-      mock = window.__mock;
-    }
-  }
-  var key = [formId, fieldId, mock ? "mock" : ""].filter(function (key) {
-    return !!key;
-  }).join("_");
-  return _cache.formApi.getInstance(key, {
-    mock: mock,
-    fieldId: fieldId,
-    formId: formId
-  });
+var _schemaApi = require("./schema-api");
+function getFormApi(_x, _x2, _x3) {
+  return _getFormApi.apply(this, arguments);
+}
+function _getFormApi() {
+  _getFormApi = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee9(formId, fieldId, mock) {
+    var key;
+    return _regenerator["default"].wrap(function _callee9$(_context9) {
+      while (1) switch (_context9.prev = _context9.next) {
+        case 0:
+          if (typeof mock != "boolean") {
+            if (typeof window.__mock == "boolean") {
+              mock = window.__mock;
+            }
+          }
+          key = [formId, fieldId, mock ? "mock" : ""].filter(function (key) {
+            return !!key;
+          }).join("_");
+          return _context9.abrupt("return", _cache.formApi.getInstance(key, {
+            mock: mock,
+            fieldId: fieldId,
+            formId: formId
+          }));
+        case 3:
+        case "end":
+          return _context9.stop();
+      }
+    }, _callee9);
+  }));
+  return _getFormApi.apply(this, arguments);
 }
 var RestFormApi = exports.RestFormApi = /*#__PURE__*/function (_RestApi) {
   function RestFormApi(formId, fieldId, mock) {
@@ -46,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);
@@ -127,7 +132,7 @@ var RestFormApi = exports.RestFormApi = /*#__PURE__*/function (_RestApi) {
         }
       }, _callee2, this);
     }));
-    function handleRequestConfig(_x) {
+    function handleRequestConfig(_x4) {
       return _handleRequestConfig.apply(this, arguments);
     }
     return handleRequestConfig;
@@ -145,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
@@ -175,14 +180,14 @@ var RestFormApi = exports.RestFormApi = /*#__PURE__*/function (_RestApi) {
         }
       }, _callee3, this);
     }));
-    function search(_x2) {
+    function search(_x5) {
       return _search.apply(this, arguments);
     }
     return search;
   }();
   _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:
@@ -190,17 +195,16 @@ 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();
         }
       }, _callee4, this);
     }));
-    function getById(_x3, _x4) {
+    function getById(_x6, _x7) {
       return _getById.apply(this, arguments);
     }
     return getById;
@@ -217,7 +221,7 @@ var RestFormApi = exports.RestFormApi = /*#__PURE__*/function (_RestApi) {
         }
       }, _callee5, this);
     }));
-    function save(_x5, _x6) {
+    function save(_x8, _x9) {
       return _save.apply(this, arguments);
     }
     return save;
@@ -234,7 +238,7 @@ var RestFormApi = exports.RestFormApi = /*#__PURE__*/function (_RestApi) {
         }
       }, _callee6, this);
     }));
-    function create(_x7, _x8) {
+    function create(_x10, _x11) {
       return _create.apply(this, arguments);
     }
     return create;
@@ -251,7 +255,7 @@ var RestFormApi = exports.RestFormApi = /*#__PURE__*/function (_RestApi) {
         }
       }, _callee7, this);
     }));
-    function update(_x9, _x10, _x11) {
+    function update(_x12, _x13, _x14) {
       return _update.apply(this, arguments);
     }
     return update;
@@ -268,7 +272,7 @@ var RestFormApi = exports.RestFormApi = /*#__PURE__*/function (_RestApi) {
         }
       }, _callee8, this);
     }));
-    function serviceUpdate(_x12, _x13) {
+    function serviceUpdate(_x15, _x16) {
       return _serviceUpdate.apply(this, arguments);
     }
     return serviceUpdate;

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) {

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

@@ -60,7 +60,7 @@ export declare class RestApi<DataType> extends BaseRestApi<DataType> {
     constructor(uri: string, options?: RestApiOptions);
     handleRequestConfig(config: AxiosRequestConfig): Promise<void>;
 }
-export interface BaseType {
+export interface IBaseEntity {
     /**
      * 对象id
      */
@@ -103,19 +103,20 @@ export interface BaseResult<DataType> {
     refs?: Refs;
 }
 export interface Ref {
+    label: string;
     form: {
         id: string;
         fieldId?: string;
+        label: string;
     };
-    fieldIds: string[];
-    data: BaseType[];
+    data: IBaseEntity[];
 }
 export type Refs = Ref[];
 export interface OneResult<DataType> extends BaseResult<DataType> {
-    data: DataType & BaseType;
+    data: DataType & IBaseEntity;
 }
 export interface ManyResult<DataType> extends BaseResult<DataType> {
-    data: (DataType & BaseType)[];
+    data: (DataType & IBaseEntity)[];
     total: number;
 }
 export interface BaseRequestOptions<DataType> {

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

@@ -23,7 +23,7 @@ var BaseRestApi = exports.BaseRestApi = /*#__PURE__*/function () {
     this.request = _axios["default"].create({
       baseURL: "/api/" + uri,
       // 基础URL
-      timeout: 10000,
+      timeout: 60000,
       // 请求超时时间（毫秒）
       headers: {
         'Content-Type': 'application/json;charset=UTF-8'

package/lib/utils/api/schema.util.d.ts

@@ -0,0 +1,14 @@
+/**
+ * 遍历schema
+ * @param schema
+ * @param callback 返回true 继续往下遍历
+ */
+export declare function forEachSchema(schema: Schema, callback: (child: Schema, index: number, children: any[]) => boolean): void;
+export declare function forEachFormSchema(schema: Schema, fdm: boolean, callback: (child: Schema) => void): void;
+interface Schema {
+    componentName: string;
+    props: any;
+    children?: Schema[];
+    fdmSchema?: Schema;
+}
+export {};

package/lib/utils/api/schema.util.js

@@ -0,0 +1,37 @@
+"use strict";
+
+exports.__esModule = true;
+exports.forEachFormSchema = forEachFormSchema;
+exports.forEachSchema = forEachSchema;
+/**
+ * 遍历schema
+ * @param schema
+ * @param callback 返回true 继续往下遍历
+ */
+function forEachSchema(schema, callback) {
+  var _schema$children;
+  schema === null || schema === void 0 ? void 0 : (_schema$children = schema.children) === null || _schema$children === void 0 ? void 0 : _schema$children.forEach(function (child, index, children) {
+    var ctn = callback(child, index, children);
+    if (ctn) {
+      forEachSchema(child, callback);
+    }
+  });
+}
+function forEachFormSchema(schema, fdm, callback) {
+  forEachSchema(schema, function (child) {
+    if (["PageForm", "SubFormField"].includes(child.componentName)) {
+      callback(child);
+      if (fdm) {
+        if (child.fdmSchema) {
+          forEachSchema(child.fdmSchema, function (fdmChild) {
+            if (fdmChild.componentName == "PageFdm") {
+              callback(child);
+            }
+            return true;
+          });
+        }
+      }
+    }
+    return true;
+  });
+}

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

@@ -17,7 +17,7 @@ function _loadDts() {
         case 0:
           _context.prev = 0;
           _context.next = 3;
-          return (0, _index.getFormApi)("form_bea7fcc6376c4461965237056f970fb7");
+          return (0, _index.getFormApi)("c40772eb-864b-42bb-ae31-9921d8ede97f");
         case 3:
           api = _context.sent;
           _context.next = 6;

package/lib/utils/api/user-info.d.ts

@@ -1,9 +1,19 @@
-export interface UserInfo {
-    userId: string;
-    userName: string;
+import { IBaseEntity } from "./rest-api";
+export interface Userinfo {
+    id: string;
+    label: string;
+    username: string;
     staffId: string;
     staffName: string;
-    roleIds: string[];
-    deptIds: string[];
+    form: {
+        id: string;
+    };
+    depts: IBaseEntity[];
+    roles: IBaseEntity[];
+    corp: {
+        id: string;
+        name: string;
+        shortName: string;
+    };
 }
-export declare function loadUserInfo(): Promise<UserInfo | false>;
+export declare function getUserinfo(): Promise<Userinfo | null>;