@zhubangyun/lowcode-core 5.4.120 → 5.4.150

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.js

@@ -2,7 +2,7 @@ import _inheritsLoose from "@babel/runtime/helpers/inheritsLoose";
 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;

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;
@@ -35,8 +34,9 @@ function _showForm() {
           mode = options.mode, dataId = options.dataId;
           params = new URLSearchParams();
           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);

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

@@ -17,10 +17,10 @@ export var PageLayout = /*#__PURE__*/function (_Component) {
     };
     _this.handleResize = function () {
       _this.setState({
-        width: Math.min(window.innerWidth, 1400)
+        width: Math.min(window.innerWidth, 1200)
       });
     };
-    _this.state.width = Math.min(window.innerWidth, 1400);
+    _this.state.width = Math.min(window.innerWidth, 1200);
     return _this;
   }
   _inheritsLoose(PageLayout, _Component);

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.js

@@ -7,7 +7,7 @@ var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"))
 var _inheritsLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/inheritsLoose"));
 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 +24,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 () {

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;
@@ -40,8 +41,9 @@ function _showForm() {
           mode = options.mode, dataId = options.dataId;
           params = new URLSearchParams();
           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 +52,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,15 +111,15 @@ 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"])({
+      return /*#__PURE__*/_react["default"].createElement(_reactRender.ReactRender, (0, _extends2["default"])({
         schema: schema,
         components: window.__components
       }, restProps));

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

@@ -24,10 +24,10 @@ var PageLayout = exports.PageLayout = /*#__PURE__*/function (_Component) {
     };
     _this.handleResize = function () {
       _this.setState({
-        width: Math.min(window.innerWidth, 1400)
+        width: Math.min(window.innerWidth, 1200)
       });
     };
-    _this.state.width = Math.min(window.innerWidth, 1400);
+    _this.state.width = Math.min(window.innerWidth, 1200);
     return _this;
   }
   (0, _inheritsLoose2["default"])(PageLayout, _Component);

package/package.json

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