@zhubangyun/lowcode-core 6.3.20 → 6.4.4

package/es/index.d.ts

@@ -1,9 +1,9 @@
 import "./index.less";
 import * as lodash from "lodash";
+import utils from "./utils/index";
 export { LoadMaterials } from "./components/load-materials";
 export { PageLoading } from "./components/page-loading";
 export { RestApi, RestFormApi, apiRequest } from "./utils/api";
 export { Layout } from "./components/layout";
 export { ReactRender } from "./components/react-render";
-import utils from "./utils/index";
 export { utils, lodash };

package/es/index.js

@@ -2,16 +2,16 @@ import _message from "antd/es/message";
 import "./index.less";
 import { ReactRender } from "./components/react-render";
 import * as lodash from "lodash";
-export { LoadMaterials } from "./components/load-materials";
-export { PageLoading } from "./components/page-loading";
-export { RestApi, RestFormApi, apiRequest } from "./utils/api";
-export { Layout } from "./components/layout";
-export { ReactRender } from "./components/react-render";
 import utils from "./utils/index";
 import { uniBridge } from "./utils/uni-bridge";
 import { initBarHeight } from "./init/init.bar-height";
 import { initScrollSize } from "./init/init.scroll-size";
 import { initMobileClass } from "./init/init.mobile-class";
+export { LoadMaterials } from "./components/load-materials";
+export { PageLoading } from "./components/page-loading";
+export { RestApi, RestFormApi, apiRequest } from "./utils/api";
+export { Layout } from "./components/layout";
+export { ReactRender } from "./components/react-render";
 // @ts-ignore
 window.__ReactRender = ReactRender;
 // @ts-ignore

package/es/index.less

@@ -12,7 +12,6 @@
   height: 100%;
 }
 
-
 ul {
   margin-bottom: 0;
   padding-left: 0;

package/es/utils/api/form-api/form-api.assemble-entity.js

@@ -23,7 +23,7 @@ function assembleData(data, dataMap) {
   for (var _iterator2 = _createForOfIteratorHelperLoose(data), _step2; !(_step2 = _iterator2()).done;) {
     var item = _step2.value;
     assembleObject(item, dataMap, {
-      maxDepth: 5,
+      maxDepth: 3,
       depth: 1
     });
   }
@@ -40,7 +40,7 @@ function assembleRefs(refs, dataMap) {
     for (var _iterator4 = _createForOfIteratorHelperLoose(data), _step4; !(_step4 = _iterator4()).done;) {
       var item = _step4.value;
       assembleObject(item, dataMap, {
-        maxDepth: 2,
+        maxDepth: 3,
         depth: 1
       });
     }
@@ -73,7 +73,7 @@ function assembleObject(values, dataMap, options) {
           var valueElement = _step5.value;
           assembleObject(valueElement, dataMap, {
             maxDepth: maxDepth,
-            depth: depth + 1
+            depth: depth
           });
         }
       }
@@ -82,6 +82,12 @@ function assembleObject(values, dataMap, options) {
         if (dataMap.hasEntity(value)) {
           values[key] = dataMap.getEntity(value);
         }
+      } else if (key == "parent") {
+        //values.parent = dataMap.getEntity(value);
+        Object.defineProperty(values, "parent", {
+          value: dataMap.getEntity(value),
+          writable: true
+        });
       }
     }
   }

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

@@ -7,24 +7,33 @@ import { isLocalhost } from "../../common";
 import { formApiAssembleEntity } from "./form-api.assemble-entity";
 import { isTemplateHost } from "../../util.common";
 var SimpleSerialFieldNames = ["parent", "instance"];
+var IgnoreFieldNames = ["createdAt", "createdBy", "updatedAt", "updatedBy"];
 export function convertSaveData(data) {
   if (!data) return data;
   var seen = new WeakSet(); // WeakSet 只存储对象，非常适合检测引用
   return JSON.parse(JSON.stringify(data, function (key, value) {
+    if (IgnoreFieldNames.includes(key)) {
+      return undefined;
+    }
     if (value == null) {
       return null;
     } else if (Array.isArray(value)) {
       return value;
     } else if (typeof value == "object") {
+      if (key == "form") {
+        return value;
+      }
       if (SimpleSerialFieldNames.includes(key)) {
         var id = value === null || value === void 0 ? void 0 : value.id;
         return id ? {
-          id: id
+          id: id,
+          form: value === null || value === void 0 ? void 0 : value.form
         } : undefined;
       } else if (seen.has(value)) {
-        if (value.id) {
+        if (value.id && value.form) {
           return {
-            id: value.id
+            id: value.id,
+            form: value.form
           };
         } else {
           return value;
@@ -155,24 +164,9 @@ export function handleEntityLabel(data) {
     }
   }
 }
-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 [];
-  }
-}
 export function assembleAssociationField(data, refs) {
   var start = Date.now();
-  if (isLocalhost() || isTemplateHost()) {
+  if (isLocalhost() || isTemplateHost() || window.__mock) {
     formApiAssembleEntity(data, refs);
     return Date.now() - start;
   }

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

@@ -6,7 +6,6 @@ export declare class RestFormApi<DataType> extends RestApi<DataType> {
     private readonly fieldId?;
     private readonly mock;
     private initialized;
-    private schema;
     constructor(formId: string, fieldId?: string, mock?: boolean);
     initialize(): Promise<boolean>;
     handleRequestConfig(config: AxiosRequestConfig): Promise<void>;

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

@@ -4,7 +4,6 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { RestApi } from "./rest-api";
 import { assembleAssociationField, convertSaveData, handleFilterRules } from "./form-api/form-api.utils";
 import { formApi } from "../cache";
-import { getSchemaFromCache } from "./schema-api";
 import { uuid, uuidVersion } from "../common";
 export function getFormApi(_x, _x2, _x3) {
   return _getFormApi.apply(this, arguments);
@@ -46,7 +45,6 @@ export var RestFormApi = /*#__PURE__*/function (_RestApi) {
     _this.fieldId = void 0;
     _this.mock = void 0;
     _this.initialized = false;
-    _this.schema = void 0;
     _this.formId = formId;
     _this.fieldId = fieldId;
     _this.mock = !!mock;
@@ -56,41 +54,10 @@ export var RestFormApi = /*#__PURE__*/function (_RestApi) {
   var _proto = RestFormApi.prototype;
   _proto.initialize = /*#__PURE__*/function () {
     var _initialize = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
-      var _this2 = this;
-      var res, _this$schema, _this$schema$children, _this$schema$children2;
       return _regeneratorRuntime.wrap(function (_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            if (!this.initialized) {
-              try {
-                res = 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;
-                    });
-                  }
-                }
-              } catch (e) {
-                console.log("获取schema失败!", {
-                  formId: this.formId,
-                  field: this.fieldId,
-                  mock: this.mock
-                }, e);
-              }
-            }
+            this.initialized = true;
             return _context.abrupt("return", this.initialized);
           case 1:
           case "end":
@@ -241,7 +208,7 @@ export var RestFormApi = /*#__PURE__*/function (_RestApi) {
   }();
   _proto.labelToValue = /*#__PURE__*/function () {
     var _labelToValue = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee5(data, options) {
-      var _this3 = this;
+      var _this2 = this;
       var config, res;
       return _regeneratorRuntime.wrap(function (_context5) {
         while (1) switch (_context5.prev = _context5.next) {
@@ -258,8 +225,8 @@ export var RestFormApi = /*#__PURE__*/function (_RestApi) {
               res.data.forEach(function (item) {
                 item.id = uuid();
                 item.form = {
-                  id: _this3.formId,
-                  fieldId: _this3.fieldId
+                  id: _this2.formId,
+                  fieldId: _this2.fieldId
                 };
               });
             }

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

@@ -6,6 +6,11 @@ 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 = AxiosResponse<T, any, {}>, D = any>(config: import("axios").AxiosRequestConfig<D>) => Promise<R>;
+interface RequestResult {
+    success: boolean;
+    message?: string;
+    data: any;
+}
+export declare const request: (config: import("axios").AxiosRequestConfig<any>) => Promise<RequestResult>;
 export declare function onFulfilled(res: AxiosResponse): any;
 export declare function onRejected(error: any): any;

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

@@ -45,6 +45,7 @@ export declare abstract class BaseRestApi<DataType> {
      */
     getById(id: string, options?: BaseRequestOptions<DataType>): Promise<OneResult<DataType>>;
     save(data: DataType, options?: BaseRequestOptions<DataType>): Promise<OneResult<DataType>>;
+    saveMany(data: DataType, options?: BaseRequestOptions<DataType>): Promise<OneResult<DataType>>;
     /**
      * 创建
      */
@@ -98,6 +99,7 @@ export interface IBaseEntity {
         labelField: string;
     };
     _load?: boolean;
+    _process?: boolean;
 }
 /**
  * 基础返回结果