@zhubangyun/lowcode-core 5.4.120 → 5.4.251

package/es/components/react-render/index.js

@@ -1,9 +1,11 @@
+import _ConfigProvider from "antd/es/config-provider";
 import _extends from "@babel/runtime/helpers/extends";
 import _inheritsLoose from "@babel/runtime/helpers/inheritsLoose";
 import { PureComponent } from 'react';
 import { createFetchHandler } from "@alilc/lowcode-datasource-fetch-handler";
 import ReactRenderFactory from "./react-render-factory";
 import utils from "../../utils";
+import zhCN from "antd/locale/zh_CN";
 export var ReactRender = /*#__PURE__*/function (_PureComponent) {
   function ReactRender() {
     var _this;
@@ -21,21 +23,23 @@ export var ReactRender = /*#__PURE__*/function (_PureComponent) {
     var _this2 = this;
     var components = this.props.components;
     // @ts-ignore
-    return /*#__PURE__*/React.createElement(ReactRenderFactory, _extends({
+    return /*#__PURE__*/React.createElement(_ConfigProvider, {
+      locale: zhCN
+    }, /*#__PURE__*/React.createElement(ReactRenderFactory, _extends({
       key: this.key
     }, this.props, {
       ref: function ref(node) {
         _this2.node = node === null || node === void 0 ? void 0 : node.__ref;
       },
       thisRequiredInJSE: true,
-      components: components || window.components || {},
+      components: components || window._components || {},
       appHelper: {
         utils: utils,
         requestHandlersMap: {
           fetch: createFetchHandler()
         }
       }
-    }));
+    })));
   };
   return ReactRender;
 }(PureComponent);

package/es/index.js

@@ -1,7 +1,10 @@
 import utils from "./utils";
+import { ReactRender } from "./components/react-render";
 export { RestApi, RestFormApi, apiRequest } from "./utils/api";
 export { Layout } from "./components/layout";
 export { ReactRender } from "./components/react-render";
 // @ts-ignore
 window.utils = utils;
+// @ts-ignore
+window.__ReactRender = ReactRender;
 export { utils };

package/es/style.js

@@ -1,6 +1,6 @@
+import 'antd/es/message/style';
 import 'antd/es/drawer/style';
 import 'antd/es/modal/style';
 import 'antd/es/result/style';
 import 'antd/es/spin/style';
-import 'antd/es/message/style';
-import 'antd/es/config-provider/style';
+import 'antd/es/config-provider/style';

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

@@ -6,7 +6,6 @@ import { getSchema } from "./index";
 export var RestFormApi = /*#__PURE__*/function (_RestApi) {
   function RestFormApi(formId, fieldId, mock) {
     var _this;
-    console.log(formId, fieldId);
     _this = _RestApi.call(this, "forms", {}) || this;
     _this.formId = void 0;
     _this.fieldId = void 0;

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

@@ -6,3 +6,5 @@ export { RestFormApi } from "./form-api";
 export declare const apiRequest: import("axios").AxiosInstance;
 export declare function getSchema(pageId: string, mock?: boolean): Promise<OneResult<any>>;
 export declare function getFormApi(formId: string, fieldId?: string, mock?: boolean): Promise<RestFormApi<any>>;
+export declare function onFulfilled(res: any): any;
+export declare function onRejected(error: any): any;

package/es/utils/api/index.js

@@ -1,7 +1,6 @@
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import axios from "axios";
-import { onFulfilled, onRejected } from "./request";
 import { formApi, schema } from "../cache";
 export { RestApi } from "./rest-api";
 export { loadUserInfo } from "./user-info";
@@ -76,4 +75,19 @@ function _getFormApi() {
     }, _callee2);
   }));
   return _getFormApi.apply(this, arguments);
+}
+export function onFulfilled(res) {
+  return res.data;
+}
+export function onRejected(error) {
+  var _error$response = error.response,
+    status = _error$response.status,
+    statusText = _error$response.statusText;
+  if (status == 400) {
+    return error.response.data || {};
+  }
+  return {
+    success: false,
+    message: statusText
+  };
 }

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

@@ -5,6 +5,7 @@ export interface RestApiOptions {
      */
     timeout?: number;
     /**
+     *
      * 标题 用于message显示
      */
     title?: string;
@@ -82,6 +83,6 @@ export interface ManyResult<DataType> extends BaseResult<DataType> {
     total: number;
 }
 export interface BaseRequestOptions<DataType> {
-    onError?: (res: OneResult<DataType>) => Promise<void>;
-    onSuccess?: (res: OneResult<DataType>) => Promise<void>;
+    onError?: (res: OneResult<DataType>) => Promise<void> | void;
+    onSuccess?: (res: OneResult<DataType>) => Promise<void> | void;
 }

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

@@ -1,8 +1,9 @@
 import _inheritsLoose from "@babel/runtime/helpers/inheritsLoose";
+import _message from "antd/es/message";
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import axios from "axios";
-import { onFulfilled, onRejected } from "./request";
+import { onFulfilled, onRejected } from "./index";
 export var BaseRestApi = /*#__PURE__*/function () {
   function BaseRestApi(uri, options) {
     this.uri = void 0;
@@ -300,8 +301,8 @@ export var BaseRestApi = /*#__PURE__*/function () {
         while (1) switch (_context7.prev = _context7.next) {
           case 0:
             console.error("{" + this.title + "}" + type + (msg || ""));
-            //message?.error(`{${this.title}}` + type + (msg || "")).then();
-          case 1:
+            _message === null || _message === void 0 ? void 0 : _message.error("{" + this.title + "}" + type + (msg || "")).then();
+          case 2:
           case "end":
             return _context7.stop();
         }

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

@@ -1,5 +1,5 @@
 import { SingletonInstanceMap } from "../common/SingletonInstanceMap";
-import { RestFormApi } from "../api/form-api";
+import { RestFormApi } from "../api";
 export declare class SchemaCache extends SingletonInstanceMap<any, {
     mock?: boolean;
     pageId: string;

package/es/utils/cache/index.js

@@ -2,7 +2,7 @@ import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _inheritsLoose from "@babel/runtime/helpers/inheritsLoose";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { SingletonInstanceMap } from "../common/SingletonInstanceMap";
-import { RestFormApi } from "../api/form-api";
+import { RestFormApi } from "../api";
 import { handleFormSchema } from "./schema";
 import { apiRequest } from "../api";
 export var SchemaCache = /*#__PURE__*/function (_SingletonInstanceMap) {

package/es/utils/cache/schema.d.ts

@@ -7,6 +7,8 @@ export declare function handleFormSchema(schema: FormSchema): void;
 export declare function forEachFormSchema(schema: FormSchema, callback: (child: FormSchema, index: number, children: any[]) => boolean): void;
 export interface FormSchema {
     id?: string;
+    state: any;
+    methods: any;
     componentName: string;
     formId?: string;
     tableName?: string;
@@ -22,6 +24,8 @@ export interface FormSchemaProps {
     fieldSchema?: any;
     columnName: string;
     array: boolean;
+    layout?: "inline";
+    fdmSchema?: any;
     associationForm: {
         id: string;
         fieldId: string;

package/es/utils/cache/schema.js

@@ -1,9 +1,15 @@
 export function handleFormSchema(schema) {
   var fdmItems = [];
   var fieldIdMap = new Map();
+  schema.state = schema.state || {};
+  schema.methods = schema.methods || {};
   forEachFormSchema(schema, function (field) {
     if (field.fdmSchema) {
+      var _field$fdmSchema;
       fdmItems.push(field);
+      field.fdmSchema.props = ((_field$fdmSchema = field.fdmSchema) === null || _field$fdmSchema === void 0 ? void 0 : _field$fdmSchema.props) || {};
+      // @ts-ignore
+      field.fdmSchema.props.noContainer = true;
     }
     if (field.props.fieldId) {
       //删除children防止循环
@@ -13,13 +19,28 @@ export function handleFormSchema(schema) {
     }
     return true;
   });
+  //处理查询列
   fdmItems.forEach(function (fdmField) {
     forEachFormSchema(fdmField.fdmSchema, function (field) {
       var _field$props;
       var findSchema = fieldIdMap.get((_field$props = field.props) === null || _field$props === void 0 ? void 0 : _field$props.fieldId);
       if (findSchema) {
         field.componentName = findSchema.componentName;
-        Object.assign(field.props, findSchema.props);
+        field.props = Object.assign({}, JSON.parse(JSON.stringify(findSchema.props)), field.props);
+        if (findSchema.componentName == "SubFormField") {
+          if (findSchema.fdmSchema) {
+            var subFormFdmSchema = JSON.parse(JSON.stringify(findSchema.fdmSchema));
+            forEachFormSchema(subFormFdmSchema, function (field) {
+              if (field.componentName === "PageFdm") {
+                field.props.layout = "inline";
+              }
+              return true;
+            });
+            // @ts-ignore
+            field.props.fdmSchema = subFormFdmSchema;
+            field.children = subFormFdmSchema.children[0].children;
+          }
+        }
       }
       return true;
     });

package/es/utils/designer/assets/assets.data.base.js

@@ -18,7 +18,7 @@ var BaseAssets = {
     "library": "antd",
     "id": "antd",
     "external": true,
-    "urls": ["https://cdn.zhiyunhe.com/plugin/antd/5.17.0/antd.min.js", "https://cdn.zhiyunhe.com/plugin/antd/5.17.0/reset.min.css", "https://cdn.zhiyunhe.com/plugin/antdIcon/1.0.0/antdIcon.min.js", "https://cdn.zhiyunhe.com/plugin/lowcode/core/index.js"]
+    "urls": ["https://cdn.zhiyunhe.com/plugin/antd/latest/antd.min.js", "https://cdn.zhiyunhe.com/plugin/antd/latest/reset.css", "https://cdn.zhiyunhe.com/plugin/antdIcon/1.0.0/antdIcon.min.js", "https://cdn.zhiyunhe.com/plugin/lowcode/core/index.js"]
   }, {
     "package": "root-material",
     "version": "0.1.0",

package/es/utils/designer/engine/index.js

@@ -99,9 +99,13 @@ export var Engine = function Engine() {
               }
             });
           case 2:
-            _context4.next = 4;
+            if (!schema) {
+              _context4.next = 5;
+              break;
+            }
+            _context4.next = 5;
             return _this.openDocument(schema);
-          case 4:
+          case 5:
           case "end":
             return _context4.stop();
         }

package/es/utils/page/index.js

@@ -29,7 +29,7 @@ function _openPage() {
         case 7:
           page = window.open(url, target);
         case 8:
-          console.log("openPage", page);
+          console.debug("openPage", page, target);
           return _context.abrupt("return", page);
         case 10:
         case "end":

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

@@ -7,7 +7,7 @@ var _excluded = ["layout", "form", "onClose"],
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { PageLayout } from "./page-layout";
 import ReactDOM from "react-dom";
-import { Component } from "react";
+import React, { Component } from "react";
 import { PageLoadSchema } from "./page-load-schema";
 import { ReactRender } from "../../components/react-render";
 import { openPage } from "./index";
@@ -16,13 +16,12 @@ export function showForm(_x) {
 }
 function _showForm() {
   _showForm = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(options) {
-    var container, onClose, restProps, unmount, _options$form, paths, mode, dataId, params, page;
+    var container, onClose, restProps, unmount, _options$form, paths, mode, dataId, params, url, page;
     return _regeneratorRuntime.wrap(function _callee2$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
           container = options.container, onClose = options.onClose, restProps = _objectWithoutPropertiesLoose(options, _excluded2); //容器不存在需要手动取消挂载
           unmount = !container;
-          console.log("showForm.options", options);
           if (container) {
             _context2.next = 16;
             break;
@@ -34,9 +33,12 @@ function _showForm() {
           paths = window.location.pathname.split("/");
           mode = options.mode, dataId = options.dataId;
           params = new URLSearchParams();
-          params.set("dataId", dataId || "");
+          if (dataId) {
+            params.set("dataId", dataId);
+          }
+          url = "/" + paths[1] + "/" + paths[2] + "/" + ((_options$form = options.form) === null || _options$form === void 0 ? void 0 : _options$form.id) + "/" + mode + "?" + params.toString();
           _context2.next = 11;
-          return openPage("/" + paths[1] + "/" + paths[2] + "/" + ((_options$form = options.form) === null || _options$form === void 0 ? void 0 : _options$form.id) + "/" + mode + "?" + params.toString());
+          return openPage(url, url);
         case 11:
           page = _context2.sent;
           console.debug("openPage", page);
@@ -112,9 +114,10 @@ var FormRender = /*#__PURE__*/function (_Component) {
     }, /*#__PURE__*/React.createElement(PageLoadSchema, {
       pageId: form === null || form === void 0 ? void 0 : form.id
     }, function (schema) {
+      console.log(window._components || window.components || window.__components);
       return /*#__PURE__*/React.createElement(ReactRender, _extends({
         schema: schema,
-        components: window.__components
+        components: window._components || window.components || window.__components
       }, restProps));
     }));
   };

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

@@ -14,6 +14,7 @@ export declare class PageLayout extends Component<PageLayoutProps, PageLayoutSta
     constructor(props: any);
     componentDidMount(): void;
     componentWillUnmount(): void;
+    getWith: () => number;
     handleResize: () => void;
     render(): any;
 }

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

@@ -1,5 +1,4 @@
 import _Drawer from "antd/es/drawer";
-import _extends from "@babel/runtime/helpers/extends";
 import _Modal from "antd/es/modal";
 import _inheritsLoose from "@babel/runtime/helpers/inheritsLoose";
 import React, { Component } from "react";
@@ -15,12 +14,15 @@ export var PageLayout = /*#__PURE__*/function (_Component) {
         open: false
       });
     };
+    _this.getWith = function () {
+      return Math.min(window.innerWidth, 1440);
+    };
     _this.handleResize = function () {
       _this.setState({
-        width: Math.min(window.innerWidth, 1400)
+        width: _this.getWith()
       });
     };
-    _this.state.width = Math.min(window.innerWidth, 1400);
+    _this.state.width = _this.getWith();
     return _this;
   }
   _inheritsLoose(PageLayout, _Component);
@@ -53,15 +55,12 @@ export var PageLayout = /*#__PURE__*/function (_Component) {
           padding: 0
         }
       },
-      keyboard: false,
       maskClosable: false
     };
     if (layout == "modal") {
       return /*#__PURE__*/React.createElement(_Modal, restProps, children);
     } else if (layout == "drawer") {
-      return /*#__PURE__*/React.createElement(_Drawer, _extends({}, restProps, {
-        width: Math.max(1200, window.innerWidth)
-      }), children);
+      return /*#__PURE__*/React.createElement(_Drawer, restProps, children);
     }
     return children;
   };

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

@@ -26,13 +26,21 @@ export function PageLoadSchema(props) {
         }
       });
     } else {
+      setLoading(false);
+      setErrorMsg("页面id不可为空!");
+      console.error("页面id不可为空!");
       _message.error("页面id不可为空!").then();
     }
   }, []);
   if (loading) {
-    return /*#__PURE__*/React.createElement(_Spin, {
+    return /*#__PURE__*/React.createElement("div", {
+      style: {
+        width: "100%",
+        height: "100%"
+      }
+    }, /*#__PURE__*/React.createElement(_Spin, {
       spinning: true
-    });
+    }));
   }
   if (!schema) {
     return /*#__PURE__*/React.createElement(_Result, {

package/lib/components/react-render/index.js

@@ -3,12 +3,14 @@
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 exports.__esModule = true;
 exports.ReactRender = void 0;
+var _configProvider = _interopRequireDefault(require("antd/lib/config-provider"));
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _inheritsLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/inheritsLoose"));
 var _react = require("react");
 var _lowcodeDatasourceFetchHandler = require("@alilc/lowcode-datasource-fetch-handler");
 var _reactRenderFactory = _interopRequireDefault(require("./react-render-factory"));
 var _utils = _interopRequireDefault(require("../../utils"));
+var _zh_CN = _interopRequireDefault(require("antd/locale/zh_CN"));
 var ReactRender = exports.ReactRender = /*#__PURE__*/function (_PureComponent) {
   function ReactRender() {
     var _this;
@@ -26,21 +28,23 @@ var ReactRender = exports.ReactRender = /*#__PURE__*/function (_PureComponent) {
     var _this2 = this;
     var components = this.props.components;
     // @ts-ignore
-    return /*#__PURE__*/React.createElement(_reactRenderFactory["default"], (0, _extends2["default"])({
+    return /*#__PURE__*/React.createElement(_configProvider["default"], {
+      locale: _zh_CN["default"]
+    }, /*#__PURE__*/React.createElement(_reactRenderFactory["default"], (0, _extends2["default"])({
       key: this.key
     }, this.props, {
       ref: function ref(node) {
         _this2.node = node === null || node === void 0 ? void 0 : node.__ref;
       },
       thisRequiredInJSE: true,
-      components: components || window.components || {},
+      components: components || window._components || {},
       appHelper: {
         utils: _utils["default"],
         requestHandlersMap: {
           fetch: (0, _lowcodeDatasourceFetchHandler.createFetchHandler)()
         }
       }
-    }));
+    })));
   };
   return ReactRender;
 }(_react.PureComponent);

package/lib/index.js

@@ -2,16 +2,18 @@
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 exports.__esModule = true;
-exports.apiRequest = exports.RestFormApi = exports.RestApi = exports.ReactRender = exports.Layout = void 0;
+exports.apiRequest = exports.RestFormApi = exports.RestApi = exports.Layout = void 0;
 var _utils = _interopRequireDefault(require("./utils"));
 exports.utils = _utils["default"];
+var _reactRender = require("./components/react-render");
+exports.ReactRender = _reactRender.ReactRender;
 var _api = require("./utils/api");
 exports.RestApi = _api.RestApi;
 exports.RestFormApi = _api.RestFormApi;
 exports.apiRequest = _api.apiRequest;
 var _layout = require("./components/layout");
 exports.Layout = _layout.Layout;
-var _reactRender = require("./components/react-render");
-exports.ReactRender = _reactRender.ReactRender;
 // @ts-ignore
-window.utils = _utils["default"];
+window.utils = _utils["default"];
+// @ts-ignore
+window.__ReactRender = _reactRender.ReactRender;

package/lib/style.js

@@ -1,6 +1,6 @@
+require('antd/lib/message/style');
 require('antd/lib/drawer/style');
 require('antd/lib/modal/style');
 require('antd/lib/result/style');
 require('antd/lib/spin/style');
-require('antd/lib/message/style');
-require('antd/lib/config-provider/style');
+require('antd/lib/config-provider/style');

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

@@ -11,7 +11,6 @@ var _index = require("./index");
 var RestFormApi = exports.RestFormApi = /*#__PURE__*/function (_RestApi) {
   function RestFormApi(formId, fieldId, mock) {
     var _this;
-    console.log(formId, fieldId);
     _this = _RestApi.call(this, "forms", {}) || this;
     _this.formId = void 0;
     _this.fieldId = void 0;

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

@@ -6,3 +6,5 @@ export { RestFormApi } from "./form-api";
 export declare const apiRequest: import("axios").AxiosInstance;
 export declare function getSchema(pageId: string, mock?: boolean): Promise<OneResult<any>>;
 export declare function getFormApi(formId: string, fieldId?: string, mock?: boolean): Promise<RestFormApi<any>>;
+export declare function onFulfilled(res: any): any;
+export declare function onRejected(error: any): any;

package/lib/utils/api/index.js

@@ -6,10 +6,11 @@ exports.apiRequest = exports.RestFormApi = exports.RestApi = void 0;
 exports.getFormApi = getFormApi;
 exports.getSchema = getSchema;
 exports.loadUserInfo = void 0;
+exports.onFulfilled = onFulfilled;
+exports.onRejected = onRejected;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _axios = _interopRequireDefault(require("axios"));
-var _request = require("./request");
 var _cache = require("../cache");
 var _restApi = require("./rest-api");
 exports.RestApi = _restApi.RestApi;
@@ -26,7 +27,7 @@ var apiRequest = exports.apiRequest = _axios["default"].create({
     'Content-Type': 'application/json;charset=UTF-8'
   }
 });
-apiRequest.interceptors.response.use(_request.onFulfilled, _request.onRejected);
+apiRequest.interceptors.response.use(onFulfilled, onRejected);
 function getSchema(_x, _x2) {
   return _getSchema.apply(this, arguments);
 }
@@ -87,4 +88,19 @@ function _getFormApi() {
     }, _callee2);
   }));
   return _getFormApi.apply(this, arguments);
+}
+function onFulfilled(res) {
+  return res.data;
+}
+function onRejected(error) {
+  var _error$response = error.response,
+    status = _error$response.status,
+    statusText = _error$response.statusText;
+  if (status == 400) {
+    return error.response.data || {};
+  }
+  return {
+    success: false,
+    message: statusText
+  };
 }

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

@@ -5,6 +5,7 @@ export interface RestApiOptions {
      */
     timeout?: number;
     /**
+     *
      * 标题 用于message显示
      */
     title?: string;
@@ -82,6 +83,6 @@ export interface ManyResult<DataType> extends BaseResult<DataType> {
     total: number;
 }
 export interface BaseRequestOptions<DataType> {
-    onError?: (res: OneResult<DataType>) => Promise<void>;
-    onSuccess?: (res: OneResult<DataType>) => Promise<void>;
+    onError?: (res: OneResult<DataType>) => Promise<void> | void;
+    onSuccess?: (res: OneResult<DataType>) => Promise<void> | void;
 }

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

@@ -5,9 +5,10 @@ exports.__esModule = true;
 exports.RestApi = exports.BaseRestApi = void 0;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _inheritsLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/inheritsLoose"));
+var _message2 = _interopRequireDefault(require("antd/lib/message"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _axios = _interopRequireDefault(require("axios"));
-var _request = require("./request");
+var _index = require("./index");
 var BaseRestApi = exports.BaseRestApi = /*#__PURE__*/function () {
   function BaseRestApi(uri, options) {
     this.uri = void 0;
@@ -24,7 +25,7 @@ var BaseRestApi = exports.BaseRestApi = /*#__PURE__*/function () {
         'Content-Type': 'application/json;charset=UTF-8'
       }
     });
-    this.request.interceptors.response.use(_request.onFulfilled, _request.onRejected);
+    this.request.interceptors.response.use(_index.onFulfilled, _index.onRejected);
   }
   var _proto = BaseRestApi.prototype;
   _proto.search = /*#__PURE__*/function () {
@@ -305,8 +306,8 @@ var BaseRestApi = exports.BaseRestApi = /*#__PURE__*/function () {
         while (1) switch (_context7.prev = _context7.next) {
           case 0:
             console.error("{" + this.title + "}" + type + (msg || ""));
-            //message?.error(`{${this.title}}` + type + (msg || "")).then();
-          case 1:
+            _message2["default"] === null || _message2["default"] === void 0 ? void 0 : _message2["default"].error("{" + this.title + "}" + type + (msg || "")).then();
+          case 2:
           case "end":
             return _context7.stop();
         }

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

@@ -1,5 +1,5 @@
 import { SingletonInstanceMap } from "../common/SingletonInstanceMap";
-import { RestFormApi } from "../api/form-api";
+import { RestFormApi } from "../api";
 export declare class SchemaCache extends SingletonInstanceMap<any, {
     mock?: boolean;
     pageId: string;

package/lib/utils/cache/index.js

@@ -7,9 +7,8 @@ var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"))
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _inheritsLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/inheritsLoose"));
 var _SingletonInstanceMap3 = require("../common/SingletonInstanceMap");
-var _formApi = require("../api/form-api");
-var _schema = require("./schema");
 var _api = require("../api");
+var _schema = require("./schema");
 var SchemaCache = exports.SchemaCache = /*#__PURE__*/function (_SingletonInstanceMap) {
   function SchemaCache() {
     return _SingletonInstanceMap.apply(this, arguments) || this;
@@ -65,7 +64,7 @@ var FormApiCache = exports.FormApiCache = /*#__PURE__*/function (_SingletonInsta
               options = {};
             }
             _options = options, formId = _options.formId, fieldId = _options.fieldId, mock = _options.mock;
-            formApi = new _formApi.RestFormApi(formId, fieldId, mock);
+            formApi = new _api.RestFormApi(formId, fieldId, mock);
             _context2.next = 5;
             return formApi.initialize();
           case 5:

package/lib/utils/cache/schema.d.ts

@@ -7,6 +7,8 @@ export declare function handleFormSchema(schema: FormSchema): void;
 export declare function forEachFormSchema(schema: FormSchema, callback: (child: FormSchema, index: number, children: any[]) => boolean): void;
 export interface FormSchema {
     id?: string;
+    state: any;
+    methods: any;
     componentName: string;
     formId?: string;
     tableName?: string;
@@ -22,6 +24,8 @@ export interface FormSchemaProps {
     fieldSchema?: any;
     columnName: string;
     array: boolean;
+    layout?: "inline";
+    fdmSchema?: any;
     associationForm: {
         id: string;
         fieldId: string;

package/lib/utils/cache/schema.js

@@ -6,9 +6,15 @@ exports.handleFormSchema = handleFormSchema;
 function handleFormSchema(schema) {
   var fdmItems = [];
   var fieldIdMap = new Map();
+  schema.state = schema.state || {};
+  schema.methods = schema.methods || {};
   forEachFormSchema(schema, function (field) {
     if (field.fdmSchema) {
+      var _field$fdmSchema;
       fdmItems.push(field);
+      field.fdmSchema.props = ((_field$fdmSchema = field.fdmSchema) === null || _field$fdmSchema === void 0 ? void 0 : _field$fdmSchema.props) || {};
+      // @ts-ignore
+      field.fdmSchema.props.noContainer = true;
     }
     if (field.props.fieldId) {
       //删除children防止循环
@@ -18,13 +24,28 @@ function handleFormSchema(schema) {
     }
     return true;
   });
+  //处理查询列
   fdmItems.forEach(function (fdmField) {
     forEachFormSchema(fdmField.fdmSchema, function (field) {
       var _field$props;
       var findSchema = fieldIdMap.get((_field$props = field.props) === null || _field$props === void 0 ? void 0 : _field$props.fieldId);
       if (findSchema) {
         field.componentName = findSchema.componentName;
-        Object.assign(field.props, findSchema.props);
+        field.props = Object.assign({}, JSON.parse(JSON.stringify(findSchema.props)), field.props);
+        if (findSchema.componentName == "SubFormField") {
+          if (findSchema.fdmSchema) {
+            var subFormFdmSchema = JSON.parse(JSON.stringify(findSchema.fdmSchema));
+            forEachFormSchema(subFormFdmSchema, function (field) {
+              if (field.componentName === "PageFdm") {
+                field.props.layout = "inline";
+              }
+              return true;
+            });
+            // @ts-ignore
+            field.props.fdmSchema = subFormFdmSchema;
+            field.children = subFormFdmSchema.children[0].children;
+          }
+        }
       }
       return true;
     });

package/lib/utils/designer/assets/assets.data.base.js

@@ -22,7 +22,7 @@ var BaseAssets = {
     "library": "antd",
     "id": "antd",
     "external": true,
-    "urls": ["https://cdn.zhiyunhe.com/plugin/antd/5.17.0/antd.min.js", "https://cdn.zhiyunhe.com/plugin/antd/5.17.0/reset.min.css", "https://cdn.zhiyunhe.com/plugin/antdIcon/1.0.0/antdIcon.min.js", "https://cdn.zhiyunhe.com/plugin/lowcode/core/index.js"]
+    "urls": ["https://cdn.zhiyunhe.com/plugin/antd/latest/antd.min.js", "https://cdn.zhiyunhe.com/plugin/antd/latest/reset.css", "https://cdn.zhiyunhe.com/plugin/antdIcon/1.0.0/antdIcon.min.js", "https://cdn.zhiyunhe.com/plugin/lowcode/core/index.js"]
   }, {
     "package": "root-material",
     "version": "0.1.0",

package/lib/utils/designer/engine/index.js

@@ -104,9 +104,13 @@ var Engine = exports.Engine = function Engine() {
               }
             });
           case 2:
-            _context4.next = 4;
+            if (!schema) {
+              _context4.next = 5;
+              break;
+            }
+            _context4.next = 5;
             return _this.openDocument(schema);
-          case 4:
+          case 5:
           case "end":
             return _context4.stop();
         }

package/lib/utils/page/index.js

@@ -37,7 +37,7 @@ function _openPage() {
         case 7:
           page = window.open(url, target);
         case 8:
-          console.log("openPage", page);
+          console.debug("openPage", page, target);
           return _context.abrupt("return", page);
         case 10:
         case "end":

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

@@ -10,24 +10,25 @@ var _inheritsLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/inh
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _pageLayout = require("./page-layout");
 var _reactDom = _interopRequireDefault(require("react-dom"));
-var _react = require("react");
+var _react = _interopRequireWildcard(require("react"));
 var _pageLoadSchema = require("./page-load-schema");
 var _reactRender = require("../../components/react-render");
 var _index = require("./index");
 var _excluded = ["layout", "form", "onClose"],
   _excluded2 = ["container", "onClose"];
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
 function showForm(_x) {
   return _showForm.apply(this, arguments);
 }
 function _showForm() {
   _showForm = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(options) {
-    var container, onClose, restProps, unmount, _options$form, paths, mode, dataId, params, page;
+    var container, onClose, restProps, unmount, _options$form, paths, mode, dataId, params, url, page;
     return _regenerator["default"].wrap(function _callee2$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
           container = options.container, onClose = options.onClose, restProps = (0, _objectWithoutPropertiesLoose2["default"])(options, _excluded2); //容器不存在需要手动取消挂载
           unmount = !container;
-          console.log("showForm.options", options);
           if (container) {
             _context2.next = 16;
             break;
@@ -39,9 +40,12 @@ function _showForm() {
           paths = window.location.pathname.split("/");
           mode = options.mode, dataId = options.dataId;
           params = new URLSearchParams();
-          params.set("dataId", dataId || "");
+          if (dataId) {
+            params.set("dataId", dataId);
+          }
+          url = "/" + paths[1] + "/" + paths[2] + "/" + ((_options$form = options.form) === null || _options$form === void 0 ? void 0 : _options$form.id) + "/" + mode + "?" + params.toString();
           _context2.next = 11;
-          return (0, _index.openPage)("/" + paths[1] + "/" + paths[2] + "/" + ((_options$form = options.form) === null || _options$form === void 0 ? void 0 : _options$form.id) + "/" + mode + "?" + params.toString());
+          return (0, _index.openPage)(url, url);
         case 11:
           page = _context2.sent;
           console.debug("openPage", page);
@@ -50,7 +54,7 @@ function _showForm() {
           container = document.createElement("div");
           document.body.append(container);
         case 16:
-          _reactDom["default"].render( /*#__PURE__*/React.createElement(FormRender, (0, _extends2["default"])({}, restProps, {
+          _reactDom["default"].render( /*#__PURE__*/_react["default"].createElement(FormRender, (0, _extends2["default"])({}, restProps, {
             onClose: /*#__PURE__*/(0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
               return _regenerator["default"].wrap(function _callee$(_context) {
                 while (1) switch (_context.prev = _context.next) {
@@ -109,17 +113,18 @@ var FormRender = /*#__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();
     };
-    return /*#__PURE__*/React.createElement(_pageLayout.PageLayout, {
+    return /*#__PURE__*/_react["default"].createElement(_pageLayout.PageLayout, {
       layout: layout,
       ref: function ref(layout) {
         return _this2.layoutRef = layout;
       }
-    }, /*#__PURE__*/React.createElement(_pageLoadSchema.PageLoadSchema, {
+    }, /*#__PURE__*/_react["default"].createElement(_pageLoadSchema.PageLoadSchema, {
       pageId: form === null || form === void 0 ? void 0 : form.id
     }, function (schema) {
-      return /*#__PURE__*/React.createElement(_reactRender.ReactRender, (0, _extends2["default"])({
+      console.log(window._components || window.components || window.__components);
+      return /*#__PURE__*/_react["default"].createElement(_reactRender.ReactRender, (0, _extends2["default"])({
         schema: schema,
-        components: window.__components
+        components: window._components || window.components || window.__components
       }, restProps));
     }));
   };

package/lib/utils/page/page-layout.d.ts

@@ -14,6 +14,7 @@ export declare class PageLayout extends Component<PageLayoutProps, PageLayoutSta
     constructor(props: any);
     componentDidMount(): void;
     componentWillUnmount(): void;
+    getWith: () => number;
     handleResize: () => void;
     render(): any;
 }

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

@@ -4,7 +4,6 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 exports.__esModule = true;
 exports.PageLayout = void 0;
 var _drawer = _interopRequireDefault(require("antd/lib/drawer"));
-var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _modal = _interopRequireDefault(require("antd/lib/modal"));
 var _inheritsLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/inheritsLoose"));
 var _react = _interopRequireWildcard(require("react"));
@@ -22,12 +21,15 @@ var PageLayout = exports.PageLayout = /*#__PURE__*/function (_Component) {
         open: false
       });
     };
+    _this.getWith = function () {
+      return Math.min(window.innerWidth, 1440);
+    };
     _this.handleResize = function () {
       _this.setState({
-        width: Math.min(window.innerWidth, 1400)
+        width: _this.getWith()
       });
     };
-    _this.state.width = Math.min(window.innerWidth, 1400);
+    _this.state.width = _this.getWith();
     return _this;
   }
   (0, _inheritsLoose2["default"])(PageLayout, _Component);
@@ -60,15 +62,12 @@ var PageLayout = exports.PageLayout = /*#__PURE__*/function (_Component) {
           padding: 0
         }
       },
-      keyboard: false,
       maskClosable: false
     };
     if (layout == "modal") {
       return /*#__PURE__*/_react["default"].createElement(_modal["default"], restProps, children);
     } else if (layout == "drawer") {
-      return /*#__PURE__*/_react["default"].createElement(_drawer["default"], (0, _extends2["default"])({}, restProps, {
-        width: Math.max(1200, window.innerWidth)
-      }), children);
+      return /*#__PURE__*/_react["default"].createElement(_drawer["default"], restProps, children);
     }
     return children;
   };

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

@@ -31,13 +31,21 @@ function PageLoadSchema(props) {
         }
       });
     } else {
+      setLoading(false);
+      setErrorMsg("页面id不可为空!");
+      console.error("页面id不可为空!");
       _message2["default"].error("页面id不可为空!").then();
     }
   }, []);
   if (loading) {
-    return /*#__PURE__*/React.createElement(_spin["default"], {
+    return /*#__PURE__*/React.createElement("div", {
+      style: {
+        width: "100%",
+        height: "100%"
+      }
+    }, /*#__PURE__*/React.createElement(_spin["default"], {
       spinning: true
-    });
+    }));
   }
   if (!schema) {
     return /*#__PURE__*/React.createElement(_result["default"], {

package/package.json

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

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

@@ -1,2 +0,0 @@
-export declare function onFulfilled(res: any): any;
-export declare function onRejected(error: any): any;

package/es/utils/api/request.js

@@ -1,15 +0,0 @@
-export function onFulfilled(res) {
-  return res.data;
-}
-export function onRejected(error) {
-  var _error$response = error.response,
-    status = _error$response.status,
-    statusText = _error$response.statusText;
-  if (status == 400) {
-    return error.response.data || {};
-  }
-  return {
-    success: false,
-    message: statusText
-  };
-}

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

@@ -1,2 +0,0 @@
-export declare function onFulfilled(res: any): any;
-export declare function onRejected(error: any): any;

package/lib/utils/api/request.js

@@ -1,20 +0,0 @@
-"use strict";
-
-exports.__esModule = true;
-exports.onFulfilled = onFulfilled;
-exports.onRejected = onRejected;
-function onFulfilled(res) {
-  return res.data;
-}
-function onRejected(error) {
-  var _error$response = error.response,
-    status = _error$response.status,
-    statusText = _error$response.statusText;
-  if (status == 400) {
-    return error.response.data || {};
-  }
-  return {
-    success: false,
-    message: statusText
-  };
-}