@zhubangyun/lowcode-core 6.3.20 → 6.3.25

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

@@ -16,15 +16,20 @@ export function convertSaveData(data) {
     } 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 +160,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/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

@@ -98,6 +98,7 @@ export interface IBaseEntity {
         labelField: string;
     };
     _load?: boolean;
+    _process?: boolean;
 }
 /**
  * 基础返回结果

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

@@ -2,7 +2,7 @@ import _extends from "@babel/runtime/helpers/extends";
 import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/objectWithoutPropertiesLoose";
 import _inheritsLoose from "@babel/runtime/helpers/inheritsLoose";
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
-var _excluded = ["layout", "form", "items", "onClose"],
+var _excluded = ["layout", "form", "onClose", "onSubmitOk"],
   _excluded2 = ["container", "onClose"];
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { PageLayout } from "./page-layout";
@@ -55,8 +55,8 @@ var FormGroupRender = /*#__PURE__*/function (_Component) {
     var _this$props = this.props,
       layout = _this$props.layout,
       form = _this$props.form,
-      items = _this$props.items,
       onClose = _this$props.onClose,
+      onSubmitOk = _this$props.onSubmitOk,
       restProps = _objectWithoutPropertiesLoose(_this$props, _excluded);
     // @ts-ignore
     restProps.layout = layout || "modal";
@@ -66,6 +66,12 @@ var FormGroupRender = /*#__PURE__*/function (_Component) {
       (_self$layoutRef = self.layoutRef) === null || _self$layoutRef === void 0 ? void 0 : _self$layoutRef.close();
       onClose === null || onClose === void 0 ? void 0 : onClose();
     };
+    // @ts-ignore
+    restProps.onSubmitOk = function (data) {
+      var _self$layoutRef2;
+      onSubmitOk === null || onSubmitOk === void 0 ? void 0 : onSubmitOk(data);
+      (_self$layoutRef2 = self.layoutRef) === null || _self$layoutRef2 === void 0 ? void 0 : _self$layoutRef2.close();
+    };
     return /*#__PURE__*/React.createElement(PageLayout, {
       ref: function ref(layout) {
         return _this2.layoutRef = layout;
@@ -85,9 +91,9 @@ var FormGroupRender = /*#__PURE__*/function (_Component) {
           children: [{
             componentName: "PageFormGroup",
             props: {
+              mode: "show",
               title: schema.label,
-              form: form,
-              items: items
+              form: form
             }
           }]
         }

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

@@ -1,4 +1,18 @@
 import _extends from "@babel/runtime/helpers/extends";
+function replacer(key, value) {
+  if (value == null) {
+    return null;
+  } else if (Array.isArray(value)) {
+    return value;
+  } else if (value !== null && value !== void 0 && value.id) {
+    return {
+      id: value.id,
+      label: value.label,
+      form: value.form
+    };
+  }
+  return value;
+}
 export function cloneDataView(dataView, extraProps) {
   if (!dataView) {
     return {};
@@ -61,10 +75,12 @@ function compileFilterRules(rules) {
           value = "undefined";
         }
       } else if (rule.valueType == "value" || rule.valueType == "column" || !rule.valueType || typeof value === "object") {
-        value = JSON.stringify(value);
+        value = JSON.stringify(value, replacer);
       }
       scripts.push("\"key\":\"" + rule.key + "\",");
-      scripts.push("\"valueType\":\"" + rule.valueType + "\",");
+      if (rule.valueType) {
+        scripts.push("\"valueType\":\"" + rule.valueType + "\",");
+      }
       scripts.push("\"operator\":\"" + rule.operator + "\",");
       scripts.push("\"value\":" + value + ",");
     }

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

@@ -27,7 +27,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
     });
   }
@@ -44,7 +44,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
       });
     }
@@ -77,7 +77,7 @@ function assembleObject(values, dataMap, options) {
           var valueElement = _step5.value;
           assembleObject(valueElement, dataMap, {
             maxDepth: maxDepth,
-            depth: depth + 1
+            depth: depth
           });
         }
       }
@@ -86,6 +86,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/lib/utils/api/form-api/form-api.utils.js

@@ -28,15 +28,20 @@ function convertSaveData(data) {
     } 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;
@@ -167,24 +172,9 @@ 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 [];
-  }
-}
 function assembleAssociationField(data, refs) {
   var start = Date.now();
-  if ((0, _common.isLocalhost)() || (0, _util.isTemplateHost)()) {
+  if ((0, _common.isLocalhost)() || (0, _util.isTemplateHost)() || window.__mock) {
     (0, _formApi.formApiAssembleEntity)(data, refs);
     return Date.now() - start;
   }

package/lib/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/lib/utils/api/rest-api.d.ts

@@ -98,6 +98,7 @@ export interface IBaseEntity {
         labelField: string;
     };
     _load?: boolean;
+    _process?: boolean;
 }
 /**
  * 基础返回结果

package/lib/utils/page/page-form-group.js

@@ -14,7 +14,7 @@ var _react = _interopRequireWildcard(require("react"));
 var _reactRender = require("../../components/react-render");
 var _pageLoadSchema = require("./page-load-schema");
 var _common = require("../common");
-var _excluded = ["layout", "form", "items", "onClose"],
+var _excluded = ["layout", "form", "onClose", "onSubmitOk"],
   _excluded2 = ["container", "onClose"];
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, "default": e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 function showFormGroup(_x) {
@@ -61,8 +61,8 @@ var FormGroupRender = /*#__PURE__*/function (_Component) {
     var _this$props = this.props,
       layout = _this$props.layout,
       form = _this$props.form,
-      items = _this$props.items,
       onClose = _this$props.onClose,
+      onSubmitOk = _this$props.onSubmitOk,
       restProps = (0, _objectWithoutPropertiesLoose2["default"])(_this$props, _excluded);
     // @ts-ignore
     restProps.layout = layout || "modal";
@@ -72,6 +72,12 @@ var FormGroupRender = /*#__PURE__*/function (_Component) {
       (_self$layoutRef = self.layoutRef) === null || _self$layoutRef === void 0 ? void 0 : _self$layoutRef.close();
       onClose === null || onClose === void 0 ? void 0 : onClose();
     };
+    // @ts-ignore
+    restProps.onSubmitOk = function (data) {
+      var _self$layoutRef2;
+      onSubmitOk === null || onSubmitOk === void 0 ? void 0 : onSubmitOk(data);
+      (_self$layoutRef2 = self.layoutRef) === null || _self$layoutRef2 === void 0 ? void 0 : _self$layoutRef2.close();
+    };
     return /*#__PURE__*/_react["default"].createElement(_pageLayout.PageLayout, {
       ref: function ref(layout) {
         return _this2.layoutRef = layout;
@@ -91,9 +97,9 @@ var FormGroupRender = /*#__PURE__*/function (_Component) {
           children: [{
             componentName: "PageFormGroup",
             props: {
+              mode: "show",
               title: schema.label,
-              form: form,
-              items: items
+              form: form
             }
           }]
         }

package/lib/utils/page/page-schema-utils.js

@@ -4,6 +4,20 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 exports.__esModule = true;
 exports.cloneDataView = cloneDataView;
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+function replacer(key, value) {
+  if (value == null) {
+    return null;
+  } else if (Array.isArray(value)) {
+    return value;
+  } else if (value !== null && value !== void 0 && value.id) {
+    return {
+      id: value.id,
+      label: value.label,
+      form: value.form
+    };
+  }
+  return value;
+}
 function cloneDataView(dataView, extraProps) {
   if (!dataView) {
     return {};
@@ -66,10 +80,12 @@ function compileFilterRules(rules) {
           value = "undefined";
         }
       } else if (rule.valueType == "value" || rule.valueType == "column" || !rule.valueType || typeof value === "object") {
-        value = JSON.stringify(value);
+        value = JSON.stringify(value, replacer);
       }
       scripts.push("\"key\":\"" + rule.key + "\",");
-      scripts.push("\"valueType\":\"" + rule.valueType + "\",");
+      if (rule.valueType) {
+        scripts.push("\"valueType\":\"" + rule.valueType + "\",");
+      }
       scripts.push("\"operator\":\"" + rule.operator + "\",");
       scripts.push("\"value\":" + value + ",");
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhubangyun/lowcode-core",
-  "version": "6.3.20",
+  "version": "6.3.25",
   "description": "低代码核心",
   "files": [
     "lib",