@zhubangyun/lowcode-core 5.12.161 → 6.1.90

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

@@ -350,16 +350,98 @@ var BaseRestApi = exports.BaseRestApi = /*#__PURE__*/function () {
     }
     return _delete;
   }();
-  _proto.showError = /*#__PURE__*/function () {
-    var _showError = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee8(type, res) {
-      var msg, props, _t;
+  _proto["export"] = /*#__PURE__*/function () {
+    var _export2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee8(data, options) {
+      var _this$handleRequestCo8;
+      var config, res, _options$onError7, _options$onSuccess7;
       return _regenerator["default"].wrap(function (_context8) {
         while (1) switch (_context8.prev = _context8.next) {
+          case 0:
+            config = {};
+            _context8.next = 1;
+            return (_this$handleRequestCo8 = this.handleRequestConfig) === null || _this$handleRequestCo8 === void 0 ? void 0 : _this$handleRequestCo8.call(this, config);
+          case 1:
+            _context8.next = 2;
+            return this.request.post("/export", data, config);
+          case 2:
+            res = _context8.sent;
+            if (res.success) {
+              _context8.next = 4;
+              break;
+            }
+            this.showError("\u5BFC\u51FA\u5931\u8D25!", res).then();
+            _context8.next = 3;
+            return options === null || options === void 0 ? void 0 : (_options$onError7 = options.onError) === null || _options$onError7 === void 0 ? void 0 : _options$onError7.call(options, res);
+          case 3:
+            _context8.next = 5;
+            break;
+          case 4:
+            _context8.next = 5;
+            return options === null || options === void 0 ? void 0 : (_options$onSuccess7 = options.onSuccess) === null || _options$onSuccess7 === void 0 ? void 0 : _options$onSuccess7.call(options, res);
+          case 5:
+            return _context8.abrupt("return", res);
+          case 6:
+          case "end":
+            return _context8.stop();
+        }
+      }, _callee8, this);
+    }));
+    function _export(_x13, _x14) {
+      return _export2.apply(this, arguments);
+    }
+    return _export;
+  }();
+  _proto["import"] = /*#__PURE__*/function () {
+    var _import2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee9(data, options) {
+      var _this$handleRequestCo9;
+      var config, res, _options$onError8, _options$onSuccess8;
+      return _regenerator["default"].wrap(function (_context9) {
+        while (1) switch (_context9.prev = _context9.next) {
+          case 0:
+            config = {};
+            _context9.next = 1;
+            return (_this$handleRequestCo9 = this.handleRequestConfig) === null || _this$handleRequestCo9 === void 0 ? void 0 : _this$handleRequestCo9.call(this, config);
+          case 1:
+            _context9.next = 2;
+            return this.request.post("import", data, config);
+          case 2:
+            res = _context9.sent;
+            if (res.success) {
+              _context9.next = 4;
+              break;
+            }
+            this.showError("\u5BFC\u5165\u5931\u8D25!", res).then();
+            _context9.next = 3;
+            return options === null || options === void 0 ? void 0 : (_options$onError8 = options.onError) === null || _options$onError8 === void 0 ? void 0 : _options$onError8.call(options, res);
+          case 3:
+            _context9.next = 5;
+            break;
+          case 4:
+            _context9.next = 5;
+            return options === null || options === void 0 ? void 0 : (_options$onSuccess8 = options.onSuccess) === null || _options$onSuccess8 === void 0 ? void 0 : _options$onSuccess8.call(options, res);
+          case 5:
+            return _context9.abrupt("return", res);
+          case 6:
+          case "end":
+            return _context9.stop();
+        }
+      }, _callee9, this);
+    }));
+    function _import(_x15, _x16) {
+      return _import2.apply(this, arguments);
+    }
+    return _import;
+  }();
+  _proto.showError = /*#__PURE__*/function () {
+    var _showError = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee0(type, res) {
+      var msg, props, _t;
+      return _regenerator["default"].wrap(function (_context0) {
+        while (1) switch (_context0.prev = _context0.next) {
           case 0:
             msg = res.message;
-            _context8.prev = 1;
+            _context0.prev = 1;
             if (!msg) {
-              _context8.next = 4;
+              _context0.next = 4;
               break;
             }
             props = JSON.parse(msg);
@@ -368,31 +450,31 @@ var BaseRestApi = exports.BaseRestApi = /*#__PURE__*/function () {
               props.title = "" + this.title + type;
             }
             if (!(props.type == "message")) {
-              _context8.next = 2;
+              _context0.next = 2;
               break;
             }
             _message2["default"].error(props);
-            return _context8.abrupt("return");
+            return _context0.abrupt("return");
           case 2:
             if (!(props.type == "modal")) {
-              _context8.next = 3;
+              _context0.next = 3;
               break;
             }
             _modal["default"].error(props);
-            return _context8.abrupt("return");
+            return _context0.abrupt("return");
           case 3:
             if (!(props.type == "notification")) {
-              _context8.next = 4;
+              _context0.next = 4;
               break;
             }
             _notification2["default"].error(props);
-            return _context8.abrupt("return");
+            return _context0.abrupt("return");
           case 4:
-            _context8.next = 6;
+            _context0.next = 6;
             break;
           case 5:
-            _context8.prev = 5;
-            _t = _context8["catch"](1);
+            _context0.prev = 5;
+            _t = _context0["catch"](1);
             console.error("" + this.title + type + (msg || ""));
             _modal["default"].error({
               title: "" + this.title + type,
@@ -404,11 +486,11 @@ var BaseRestApi = exports.BaseRestApi = /*#__PURE__*/function () {
             });
           case 6:
           case "end":
-            return _context8.stop();
+            return _context0.stop();
         }
-      }, _callee8, this, [[1, 5]]);
+      }, _callee0, this, [[1, 5]]);
     }));
-    function showError(_x13, _x14) {
+    function showError(_x17, _x18) {
       return _showError.apply(this, arguments);
     }
     return showError;
@@ -430,16 +512,16 @@ var RestApi = exports.RestApi = /*#__PURE__*/function (_BaseRestApi2) {
   (0, _inheritsLoose2["default"])(RestApi, _BaseRestApi2);
   var _proto2 = RestApi.prototype;
   _proto2.handleRequestConfig = /*#__PURE__*/function () {
-    var _handleRequestConfig = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee9(config) {
-      return _regenerator["default"].wrap(function (_context9) {
-        while (1) switch (_context9.prev = _context9.next) {
+    var _handleRequestConfig = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee1(config) {
+      return _regenerator["default"].wrap(function (_context1) {
+        while (1) switch (_context1.prev = _context1.next) {
           case 0:
           case "end":
-            return _context9.stop();
+            return _context1.stop();
         }
-      }, _callee9);
+      }, _callee1);
     }));
-    function handleRequestConfig(_x15) {
+    function handleRequestConfig(_x19) {
       return _handleRequestConfig.apply(this, arguments);
     }
     return handleRequestConfig;

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

@@ -4,11 +4,11 @@
  * @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 {
+export declare function findFormSchemas(schema: Schema): Schema[];
+export declare function findFdmSchemas(schema?: Schema): Schema[];
+export interface Schema {
     componentName: string;
     props: any;
     children?: Schema[];
     fdmSchema?: Schema;
 }
-export {};

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

@@ -1,7 +1,8 @@
 "use strict";
 
 exports.__esModule = true;
-exports.forEachFormSchema = forEachFormSchema;
+exports.findFdmSchemas = findFdmSchemas;
+exports.findFormSchemas = findFormSchemas;
 exports.forEachSchema = forEachSchema;
 /**
  * 遍历schema
@@ -17,21 +18,26 @@ function forEachSchema(schema, callback) {
     }
   });
 }
-function forEachFormSchema(schema, fdm, callback) {
+function findFormSchemas(schema) {
+  var schemas = [];
   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;
-          });
-        }
-      }
+      schemas.push(child);
     }
     return true;
   });
+  return schemas;
+}
+function findFdmSchemas(schema) {
+  var schemas = [];
+  if (!schema) {
+    return schemas;
+  }
+  forEachSchema(schema, function (child) {
+    if (["PageFdm"].includes(child.componentName)) {
+      schemas.push(child);
+    }
+    return true;
+  });
+  return schemas;
 }

package/lib/utils/cache/index.js

@@ -17,7 +17,7 @@ var SchemaCache = exports.SchemaCache = /*#__PURE__*/function (_SingletonInstanc
   var _proto = SchemaCache.prototype;
   _proto.createInstance = /*#__PURE__*/function () {
     var _createInstance = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee(key, options) {
-      var mock, pageId, schemaRes, schema, permissionRes, permission;
+      var mock, pageId, schemaRes, schema, handleCommonSchema, permission, printTemplates, workflow, cloneSchema, _t;
       return _regenerator["default"].wrap(function (_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -30,30 +30,70 @@ var SchemaCache = exports.SchemaCache = /*#__PURE__*/function (_SingletonInstanc
             });
           case 1:
             schemaRes = _context.sent;
-            schema = schemaRes.data;
-            if (!(typeof schema == "object")) {
-              _context.next = 3;
+            if (schemaRes.succss) {
+              _context.next = 2;
               break;
             }
-            _context.next = 2;
-            return _api.apiRequest.get("pages/" + pageId + "/permission");
+            return _context.abrupt("return", schemaRes);
           case 2:
-            permissionRes = _context.sent;
-            permission = permissionRes.data;
-            if (typeof permission == "object") {
-              (0, _schema.forEachFormSchema)(schema, true, function (child) {
-                child.props = child.props || {};
-                child.props.permission = permission;
-              });
+            schema = schemaRes.data;
+            if (!(schema != null && typeof schema == "object")) {
+              _context.next = 8;
+              break;
+            }
+            handleCommonSchema = function handleCommonSchema(schema) {
+              schema.props = schema.props || {};
+              schema.props.permission = permission;
+              schema.props.printTemplates = printTemplates;
+              schema.props.workflow = workflow;
+            };
+            //处理权限
+            permission = null; //处理打印
+            workflow = null;
+            if (location.pathname.startsWith("/print")) {
+              _context.next = 7;
+              break;
             }
+            _context.next = 3;
+            return _api.apiRequest.get("pages/" + pageId + "/permission");
           case 3:
-            console.log("schemaRes", schemaRes);
+            permission = _context.sent.data;
+            if (!((schema === null || schema === void 0 ? void 0 : schema.type) == "form")) {
+              _context.next = 7;
+              break;
+            }
+            _context.prev = 4;
+            _context.next = 5;
+            return _api.apiRequest.get("pages/" + pageId + "/printTemplates");
+          case 5:
+            printTemplates = _context.sent.data;
+            _context.next = 7;
+            break;
+          case 6:
+            _context.prev = 6;
+            _t = _context["catch"](4);
+            console.log(_t);
+          case 7:
+            (0, _schema.findFormSchemas)(schema).forEach(function (formSchema) {
+              handleCommonSchema(formSchema);
+              (0, _schema.findFdmSchemas)(formSchema.fdmSchema).forEach(function (fdmSchema) {
+                handleCommonSchema(fdmSchema);
+                fdmSchema.props.form.label = formSchema.props.label;
+              });
+            });
+            cloneSchema = JSON.parse(JSON.stringify(schema));
+            (0, _schema.findFormSchemas)(schema).forEach(function (formSchema) {
+              (0, _schema.findFdmSchemas)(formSchema.fdmSchema).forEach(function (fdmSchema) {
+                fdmSchema.props.formElement = cloneSchema;
+              });
+            });
+          case 8:
             return _context.abrupt("return", schemaRes);
-          case 4:
+          case 9:
           case "end":
             return _context.stop();
         }
-      }, _callee);
+      }, _callee, null, [[4, 6]]);
     }));
     function createInstance(_x, _x2) {
       return _createInstance.apply(this, arguments);

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

@@ -1,3 +1,6 @@
 export { loadPlugins } from "./LoadPlugins";
 export declare function uuid(prefix?: string, separator?: string): string;
+export declare function uuidVersion(id: string): number;
 export declare function toArray(data: any): any[];
+export declare function isLocalhost(): boolean;
+export declare function isMobile(): boolean;

package/lib/utils/common/index.js

@@ -1,20 +1,26 @@
 "use strict";
 
 exports.__esModule = true;
+exports.isLocalhost = isLocalhost;
+exports.isMobile = isMobile;
 exports.loadPlugins = void 0;
 exports.toArray = toArray;
 exports.uuid = uuid;
+exports.uuidVersion = uuidVersion;
 var _uuid = require("uuid");
 var _LoadPlugins = require("./LoadPlugins");
 exports.loadPlugins = _LoadPlugins.loadPlugins;
 function uuid(prefix, separator) {
   if (!prefix && !separator) {
-    return (0, _uuid.v4)();
+    return (0, _uuid.v7)();
   }
-  return [prefix, separator, (0, _uuid.v4)()].filter(function (v) {
+  return [prefix, separator, (0, _uuid.v7)()].filter(function (v) {
     return !!v;
   }).join("");
 }
+function uuidVersion(id) {
+  return (0, _uuid.version)(id);
+}
 function toArray(data) {
   if (!data) {
     return [];
@@ -23,4 +29,11 @@ function toArray(data) {
   } else {
     return [data];
   }
+}
+function isLocalhost() {
+  return window.location.hostname == "localhost";
+}
+function isMobile() {
+  var userAgent = navigator.userAgent;
+  return /Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini|Mobile/i.test(userAgent);
 }

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

@@ -12,7 +12,7 @@ var _pageLayout = require("./page-layout");
 var _react = _interopRequireWildcard(require("react"));
 var _reactRender = require("../../components/react-render");
 var _pageRender = require("./page-render");
-var _uuid = require("uuid");
+var _common = require("../common");
 var _excluded = ["layout", "items", "onSelectOk", "onClose"],
   _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); }
@@ -88,7 +88,7 @@ var FormDataManagerRender = /*#__PURE__*/function (_Component) {
     }, /*#__PURE__*/_react["default"].createElement(_reactRender.ReactRender, (0, _extends2["default"])({}, restProps, {
       components: window._components || window.components || window.__components,
       schema: {
-        id: (0, _uuid.v4)(),
+        id: (0, _common.uuid)(),
         componentName: "Page",
         props: {},
         state: {},

package/lib/utils/page/page-form-data-manager.d.ts

@@ -11,6 +11,7 @@ export interface DataView {
         id?: string;
         fieldId?: string;
     };
+    extraProps?: any;
     labelField?: string;
     secondaryLabelFields?: string[];
     fieldWidth?: Record<string, number>;

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

@@ -12,9 +12,9 @@ var _pageLayout = require("./page-layout");
 var _react = _interopRequireWildcard(require("react"));
 var _pageLoadSchema = require("./page-load-schema");
 var _reactRender = require("../../components/react-render");
-var _schema = require("../cache/schema");
 var _pageSchemaUtils = require("./page-schema-utils");
 var _pageRender = require("./page-render");
+var _schema = require("../api/schema.util");
 var _excluded = ["layout", "form", "onSelectOk", "onClose"],
   _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); }
@@ -93,7 +93,7 @@ var FormDataManagerRender = /*#__PURE__*/function (_Component) {
     }, function (schema) {
       var fdmSchema = schema.children[0].fdmSchema;
       if (form !== null && form !== void 0 && form.fieldId) {
-        (0, _schema.forEachFormSchema)(schema, function (field) {
+        (0, _schema.forEachSchema)(schema, function (field) {
           if (form.fieldId == field.props.fieldId) {
             fdmSchema = field.fdmSchema;
             return false;

package/lib/utils/page/page-form-group.d.ts

@@ -7,6 +7,7 @@ export interface ShowFormGroupProps {
         id: string;
         fieldId?: string;
     };
+    extraProps?: any;
     items?: any[];
     mode?: PageFormModeType;
     onSubmitOk?: (data: any) => void;

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

@@ -12,8 +12,8 @@ var _pageLayout = require("./page-layout");
 var _pageRender = require("./page-render");
 var _react = _interopRequireWildcard(require("react"));
 var _reactRender = require("../../components/react-render");
-var _uuid = require("uuid");
 var _pageLoadSchema = require("./page-load-schema");
+var _common = require("../common");
 var _excluded = ["layout", "form", "items", "onClose"],
   _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); }
@@ -84,7 +84,7 @@ var FormGroupRender = /*#__PURE__*/function (_Component) {
       return /*#__PURE__*/_react["default"].createElement(_reactRender.ReactRender, (0, _extends2["default"])({}, restProps, {
         components: window._components || window.components || window.__components,
         schema: {
-          id: (0, _uuid.v4)(),
+          id: (0, _common.uuid)(),
           componentName: "Page",
           props: {},
           state: {},

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

@@ -7,6 +7,7 @@ export interface ShowFormProps {
         id: string;
         fieldId?: string;
     };
+    extraProps?: any;
     mode?: PageFormModeType;
     lockMode?: boolean;
     dataId?: string;

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

@@ -22,7 +22,7 @@ function showForm(_x) {
 }
 function _showForm() {
   _showForm = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].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, _options$form2, url, page;
     return _regenerator["default"].wrap(function (_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
@@ -34,10 +34,20 @@ function _showForm() {
           paths = window.location.pathname.split("/");
           mode = options.mode, dataId = options.dataId;
           params = new URLSearchParams();
+          if ((_options$form = options.form) !== null && _options$form !== void 0 && _options$form.id) {
+            params.set("pageId", (_options$form2 = options.form) === null || _options$form2 === void 0 ? void 0 : _options$form2.id);
+          }
+          if (mode) {
+            params.set("mode", mode);
+          }
           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();
+          url = "/" + paths[1] + "/pages?" + params.toString();
+          if (paths[1] == "workPlatform") {
+            url = "/pages?" + params.toString();
+          }
+          //const url = `/${paths[1]}/${paths[2]}/${options.form?.id}/${mode}?${params.toString()}`;
           _context.next = 1;
           return (0, _index.openPage)(url, url);
         case 1:

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

@@ -12,6 +12,7 @@ interface PageLayoutState {
 }
 export declare class PageLayout extends Component<PageLayoutProps, PageLayoutState> {
     state: PageLayoutState;
+    get layout(): PageLayoutType;
     close: () => void;
     constructor(props: any);
     componentDidMount(): void;

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

@@ -7,10 +7,11 @@ var _drawer = _interopRequireDefault(require("antd/lib/drawer"));
 var _modal = _interopRequireDefault(require("antd/lib/modal"));
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _objectWithoutPropertiesLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutPropertiesLoose"));
+var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _inheritsLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/inheritsLoose"));
 var _react = _interopRequireWildcard(require("react"));
 var _loadMaterials = require("../../components/load-materials");
-var _excluded = ["layout", "children"];
+var _excluded = ["children"];
 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); }
 var PageLayout = exports.PageLayout = /*#__PURE__*/function (_Component) {
   function PageLayout(props) {
@@ -28,7 +29,7 @@ var PageLayout = exports.PageLayout = /*#__PURE__*/function (_Component) {
       return Math.min(window.innerWidth, 1600);
     };
     _this.handleResize = function () {
-      if (_this.props.layout == "drawer") {
+      if (_this.layout == "drawer") {
         _this.setState({
           width: _this.getWith()
         });
@@ -47,9 +48,9 @@ var PageLayout = exports.PageLayout = /*#__PURE__*/function (_Component) {
   };
   _proto.render = function render() {
     var _this$props = this.props,
-      layout = _this$props.layout,
       children = _this$props.children,
       extraProps = (0, _objectWithoutPropertiesLoose2["default"])(_this$props, _excluded);
+    var layout = this.layout;
     var state = this.state;
     var restProps = (0, _extends2["default"])({}, extraProps, {
       children: undefined,
@@ -78,11 +79,27 @@ var PageLayout = exports.PageLayout = /*#__PURE__*/function (_Component) {
       restProps.styles.body.height = "calc(100vh - 120px)";
       return /*#__PURE__*/_react["default"].createElement(_modal["default"], restProps, loadChildren);
     } else if (layout == "drawer") {
-      return /*#__PURE__*/_react["default"].createElement(_drawer["default"], restProps, loadChildren);
+      if (window.isMobile) {
+        restProps.placement = "bottom";
+      }
+      return /*#__PURE__*/_react["default"].createElement(_drawer["default"], (0, _extends2["default"])({}, restProps, {
+        height: "85vh"
+      }), loadChildren);
     }
     return loadChildren;
   };
-  return PageLayout;
+  return (0, _createClass2["default"])(PageLayout, [{
+    key: "layout",
+    get: function get() {
+      var layout = this.props.layout;
+      if (window.isMobile) {
+        if (layout == "modal") {
+          return "drawer";
+        }
+      }
+      return layout;
+    }
+  }]);
 }(_react.Component);
 function LoadMaterialChildren(props) {
   return /*#__PURE__*/_react["default"].createElement(_loadMaterials.LoadMaterials, null, props.children);

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

@@ -7,55 +7,47 @@ var _result = _interopRequireDefault(require("antd/lib/result"));
 var _message2 = _interopRequireDefault(require("antd/lib/message"));
 var _react = require("react");
 var _api = require("../api");
-var _pageLoading = require("../../components/page-loading");
 var _schemaApi = require("../api/schema-api");
+var _index = require("./index");
 function PageLoadSchema(props) {
   var pageId = props.pageId,
     children = props.children;
   var cache = (0, _schemaApi.getSchemaFromCache)(pageId);
-  var _useState = (0, _react.useState)(!cache),
-    loading = _useState[0],
-    setLoading = _useState[1];
-  var _useState2 = (0, _react.useState)(cache === null || cache === void 0 ? void 0 : cache.data),
-    schema = _useState2[0],
-    setSchema = _useState2[1];
-  var _useState3 = (0, _react.useState)(),
-    errorMsg = _useState3[0],
-    setErrorMsg = _useState3[1];
+  var _useState = (0, _react.useState)(cache === null || cache === void 0 ? void 0 : cache.data),
+    schema = _useState[0],
+    setSchema = _useState[1];
+  var _useState2 = (0, _react.useState)(),
+    errorMsg = _useState2[0],
+    setErrorMsg = _useState2[1];
   (0, _react.useEffect)(function () {
-    if (cache) {
+    if (cache !== null && cache !== void 0 && cache.success) {
       return;
     }
     if (pageId) {
+      (0, _index.showLoading)().then();
       (0, _api.getSchema)(pageId).then(function (res) {
         if (res.success) {
-          setLoading(false);
-          setSchema(res.data);
+          setSchema(res === null || res === void 0 ? void 0 : res.data);
         } else {
-          setErrorMsg(res.message);
+          setErrorMsg(res === null || res === void 0 ? void 0 : res.message);
         }
+      })["finally"](function () {
+        (0, _index.hideLoading)().then();
       });
     } else {
-      setLoading(false);
-      setErrorMsg("页面id不可为空!");
-      console.error("页面id不可为空!");
-      _message2["default"].error("页面id不可为空!").then();
+      (0, _index.hideLoading)().then();
+      setErrorMsg("参数错误:页面id不可为空!");
+      _message2["default"].error("参数错误:页面id不可为空!").then();
     }
   }, []);
-  if (cache) {
+  if (schema) {
     return children(schema);
   }
-  if (loading) {
-    return /*#__PURE__*/React.createElement(_pageLoading.PageLoading, {
-      loading: true,
-      background: "rgba(255, 255, 255, 0)"
-    });
-  }
-  if (!schema) {
+  if (errorMsg) {
     return /*#__PURE__*/React.createElement(_result["default"], {
       status: 500,
       title: errorMsg
     });
   }
-  return children(schema);
+  return /*#__PURE__*/React.createElement(_react.Fragment, null);
 }