@zhubangyun/lowcode-core 5.3.184 → 5.4.21

package/es/index.js

@@ -4,7 +4,6 @@ export { RestFormApi } from "./utils/form/form.api";
 export { Layout } from "./components/layout";
 export { SchemaRender } from "./components/schema-render";
 export { ReactRender } from "./components/react-render";
-
 // @ts-ignore
 window.utils = utils;
 export { utils };

package/es/style.js

@@ -1,4 +1,3 @@
-import 'antd/es/message/style';
 import 'antd/es/result/style';
 import 'antd/es/config-provider/style';
 

package/es/utils/api/RestApi.js

@@ -1,5 +1,4 @@
 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";
@@ -126,7 +125,7 @@ export var BaseRestApi = /*#__PURE__*/function () {
               _context3.next = 11;
               break;
             }
-            this.showError("\u4FDD\u5B58\u5931\u8D25!", res.message).then();
+            this.showError("\u63D0\u4EA4\u5931\u8D25!", res.message).then();
             _context3.next = 9;
             return options === null || options === void 0 ? void 0 : (_options$onError2 = options.onError) === null || _options$onError2 === void 0 ? void 0 : _options$onError2.call(options, res);
           case 9:
@@ -288,7 +287,8 @@ export var BaseRestApi = /*#__PURE__*/function () {
       return _regeneratorRuntime.wrap(function _callee7$(_context7) {
         while (1) switch (_context7.prev = _context7.next) {
           case 0:
-            _message === null || _message === void 0 ? void 0 : _message.error("{" + this.title + "}" + type + (msg || "")).then();
+            console.error("{" + this.title + "}" + type + (msg || ""));
+            //message?.error(`{${this.title}}` + type + (msg || "")).then();
           case 1:
           case "end":
             return _context7.stop();

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

@@ -1,3 +1,5 @@
+import { OneResult } from "./RestApi";
+import { RestFormApi } from "../form/form.api";
 export declare const request: import("axios").AxiosInstance;
-export declare function getSchema(schemaId: string, mock?: boolean): Promise<any>;
-export declare function getFormApi(schemaId: string, mock?: boolean): Promise<any>;
+export declare function getSchema(schemaId: string, mock?: boolean): Promise<OneResult<any>>;
+export declare function getFormApi(schemaId: string, mock?: boolean): Promise<RestFormApi<any>>;

package/es/utils/api/index.js

@@ -44,12 +44,17 @@ function _getFormApi() {
     return _regeneratorRuntime.wrap(function _callee2$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
-          key = mock ? schemaId + "_mock" : schemaId;
-          _context2.next = 3;
+          if (typeof mock != "boolean") {
+            if (typeof window.__mock == "boolean") {
+              mock = window.__mock;
+            }
+          }
+          key = !!mock ? schemaId + "_mock" : schemaId;
+          _context2.next = 4;
           return formApi.getInstance(key);
-        case 3:
-          return _context2.abrupt("return", _context2.sent);
         case 4:
+          return _context2.abrupt("return", _context2.sent);
+        case 5:
         case "end":
           return _context2.stop();
       }

package/es/utils/designer/index.js

@@ -8,6 +8,7 @@ export function initEngine() {
 }
 function _initEngine() {
   _initEngine = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
+    var _window$AntdProMateri, _window$AntdProMateri2;
     return _regeneratorRuntime.wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
@@ -19,8 +20,13 @@ function _initEngine() {
             return "https://cdn.zhiyunhe.com/lowcode/designer/" + uri;
           }));
         case 2:
+          _context.next = 4;
+          return loadPlugins(["https://cdn.zhiyunhe.com/plugin/dayjs/dayjs.min.js", "https://cdn.zhiyunhe.com/plugin/antd/latest/reset.css", "https://cdn.zhiyunhe.com/plugin/antd/latest/antd.min.js", "https://cdn.zhiyunhe.com/plugin/lowcode/materials/antd-pro/view.css", "https://cdn.zhiyunhe.com/plugin/lowcode/materials/antd-pro/view.js"]);
+        case 4:
+          //注册setter
+          (_window$AntdProMateri = window.AntdProMaterial) === null || _window$AntdProMateri === void 0 ? void 0 : (_window$AntdProMateri2 = _window$AntdProMateri.registerSetters) === null || _window$AntdProMateri2 === void 0 ? void 0 : _window$AntdProMateri2.call(_window$AntdProMateri);
           return _context.abrupt("return", new Engine());
-        case 3:
+        case 6:
         case "end":
           return _context.stop();
       }

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

@@ -19,6 +19,7 @@ export var RestFormApi = /*#__PURE__*/function (_RestApi) {
   var _proto = RestFormApi.prototype;
   _proto.initialize = /*#__PURE__*/function () {
     var _initialize = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
+      var res;
       return _regeneratorRuntime.wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -32,25 +33,26 @@ export var RestFormApi = /*#__PURE__*/function (_RestApi) {
             _context.next = 7;
             return getSchema(this.formId, this.mock);
           case 7:
-            this.schema = _context.sent;
+            res = _context.sent;
+            this.schema = res.data;
             this.initialized = !!this.schema;
-            _context.next = 15;
+            _context.next = 16;
             break;
-          case 11:
-            _context.prev = 11;
+          case 12:
+            _context.prev = 12;
             _context.t0 = _context["catch"](4);
             console.log("获取schema失败!", {
               id: this.formId,
               mock: this.mock
             });
             throw _context.t0;
-          case 15:
-            return _context.abrupt("return", this.initialized);
           case 16:
+            return _context.abrupt("return", this.initialized);
+          case 17:
           case "end":
             return _context.stop();
         }
-      }, _callee, this, [[4, 11]]);
+      }, _callee, this, [[4, 12]]);
     }));
     function initialize() {
       return _initialize.apply(this, arguments);

package/lib/style.js

@@ -1,4 +1,3 @@
-require('antd/lib/message/style');
 require('antd/lib/result/style');
 require('antd/lib/config-provider/style');
 

package/lib/utils/api/RestApi.js

@@ -5,7 +5,6 @@ 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");
@@ -131,7 +130,7 @@ var BaseRestApi = exports.BaseRestApi = /*#__PURE__*/function () {
               _context3.next = 11;
               break;
             }
-            this.showError("\u4FDD\u5B58\u5931\u8D25!", res.message).then();
+            this.showError("\u63D0\u4EA4\u5931\u8D25!", res.message).then();
             _context3.next = 9;
             return options === null || options === void 0 ? void 0 : (_options$onError2 = options.onError) === null || _options$onError2 === void 0 ? void 0 : _options$onError2.call(options, res);
           case 9:
@@ -293,7 +292,8 @@ var BaseRestApi = exports.BaseRestApi = /*#__PURE__*/function () {
       return _regenerator["default"].wrap(function _callee7$(_context7) {
         while (1) switch (_context7.prev = _context7.next) {
           case 0:
-            _message2["default"] === null || _message2["default"] === void 0 ? void 0 : _message2["default"].error("{" + this.title + "}" + type + (msg || "")).then();
+            console.error("{" + this.title + "}" + type + (msg || ""));
+            //message?.error(`{${this.title}}` + type + (msg || "")).then();
           case 1:
           case "end":
             return _context7.stop();

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

@@ -1,3 +1,5 @@
+import { OneResult } from "./RestApi";
+import { RestFormApi } from "../form/form.api";
 export declare const request: import("axios").AxiosInstance;
-export declare function getSchema(schemaId: string, mock?: boolean): Promise<any>;
-export declare function getFormApi(schemaId: string, mock?: boolean): Promise<any>;
+export declare function getSchema(schemaId: string, mock?: boolean): Promise<OneResult<any>>;
+export declare function getFormApi(schemaId: string, mock?: boolean): Promise<RestFormApi<any>>;

package/lib/utils/api/index.js

@@ -51,12 +51,17 @@ function _getFormApi() {
     return _regenerator["default"].wrap(function _callee2$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
-          key = mock ? schemaId + "_mock" : schemaId;
-          _context2.next = 3;
+          if (typeof mock != "boolean") {
+            if (typeof window.__mock == "boolean") {
+              mock = window.__mock;
+            }
+          }
+          key = !!mock ? schemaId + "_mock" : schemaId;
+          _context2.next = 4;
           return _cache.formApi.getInstance(key);
-        case 3:
-          return _context2.abrupt("return", _context2.sent);
         case 4:
+          return _context2.abrupt("return", _context2.sent);
+        case 5:
         case "end":
           return _context2.stop();
       }

package/lib/utils/designer/index.js

@@ -15,6 +15,7 @@ function initEngine() {
 }
 function _initEngine() {
   _initEngine = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
+    var _window$AntdProMateri, _window$AntdProMateri2;
     return _regenerator["default"].wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
@@ -26,8 +27,13 @@ function _initEngine() {
             return "https://cdn.zhiyunhe.com/lowcode/designer/" + uri;
           }));
         case 2:
+          _context.next = 4;
+          return (0, _common.loadPlugins)(["https://cdn.zhiyunhe.com/plugin/dayjs/dayjs.min.js", "https://cdn.zhiyunhe.com/plugin/antd/latest/reset.css", "https://cdn.zhiyunhe.com/plugin/antd/latest/antd.min.js", "https://cdn.zhiyunhe.com/plugin/lowcode/materials/antd-pro/view.css", "https://cdn.zhiyunhe.com/plugin/lowcode/materials/antd-pro/view.js"]);
+        case 4:
+          //注册setter
+          (_window$AntdProMateri = window.AntdProMaterial) === null || _window$AntdProMateri === void 0 ? void 0 : (_window$AntdProMateri2 = _window$AntdProMateri.registerSetters) === null || _window$AntdProMateri2 === void 0 ? void 0 : _window$AntdProMateri2.call(_window$AntdProMateri);
           return _context.abrupt("return", new _engine.Engine());
-        case 3:
+        case 6:
         case "end":
           return _context.stop();
       }

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

@@ -24,6 +24,7 @@ var RestFormApi = exports.RestFormApi = /*#__PURE__*/function (_RestApi) {
   var _proto = RestFormApi.prototype;
   _proto.initialize = /*#__PURE__*/function () {
     var _initialize = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
+      var res;
       return _regenerator["default"].wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -37,25 +38,26 @@ var RestFormApi = exports.RestFormApi = /*#__PURE__*/function (_RestApi) {
             _context.next = 7;
             return (0, _api.getSchema)(this.formId, this.mock);
           case 7:
-            this.schema = _context.sent;
+            res = _context.sent;
+            this.schema = res.data;
             this.initialized = !!this.schema;
-            _context.next = 15;
+            _context.next = 16;
             break;
-          case 11:
-            _context.prev = 11;
+          case 12:
+            _context.prev = 12;
             _context.t0 = _context["catch"](4);
             console.log("获取schema失败!", {
               id: this.formId,
               mock: this.mock
             });
             throw _context.t0;
-          case 15:
-            return _context.abrupt("return", this.initialized);
           case 16:
+            return _context.abrupt("return", this.initialized);
+          case 17:
           case "end":
             return _context.stop();
         }
-      }, _callee, this, [[4, 11]]);
+      }, _callee, this, [[4, 12]]);
     }));
     function initialize() {
       return _initialize.apply(this, arguments);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhubangyun/lowcode-core",
-  "version": "5.3.184",
+  "version": "5.4.021",
   "description": "低代码核心",
   "files": [
     "lib",
@@ -28,7 +28,6 @@
   },
   "devDependencies": {
     "@alib/build-scripts": "^0.1.18",
-
     "@alilc/build-plugin-lce": "^0.0.5",
     "@alilc/lowcode-engine": "^1.1.2",
     "@alilc/lowcode-test-mate": "^1.0.1",