@zhubangyun/lowcode-core 5.6.214 → 5.8.110

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

@@ -5,10 +5,13 @@ 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 _notification2 = _interopRequireDefault(require("antd/lib/notification"));
+var _modal = _interopRequireDefault(require("antd/lib/modal"));
 var _message2 = _interopRequireDefault(require("antd/lib/message"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _axios = _interopRequireDefault(require("axios"));
 var _index = require("./index");
+var _data = require("../data");
 var BaseRestApi = exports.BaseRestApi = /*#__PURE__*/function () {
   function BaseRestApi(uri, options) {
     this.uri = void 0;
@@ -119,7 +122,7 @@ var BaseRestApi = exports.BaseRestApi = /*#__PURE__*/function () {
             return (_this$handleRequestCo3 = this.handleRequestConfig) === null || _this$handleRequestCo3 === void 0 ? void 0 : _this$handleRequestCo3.call(this, config);
           case 3:
             _context3.next = 5;
-            return this.request.post("", data, config);
+            return this.request.post("save", data, config);
           case 5:
             res = _context3.sent;
             if (res.success) {
@@ -289,26 +292,130 @@ var BaseRestApi = exports.BaseRestApi = /*#__PURE__*/function () {
     }
     return deleteById;
   }();
-  _proto.showError = /*#__PURE__*/function () {
-    var _showError = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee7(type, msg) {
+  _proto["delete"] = /*#__PURE__*/function () {
+    var _delete2 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee7(data, options) {
+      var _this$handleRequestCo7;
+      var config, arrayData, idValue, res, _options$onError6, _options$onSuccess6;
       return _regenerator["default"].wrap(function _callee7$(_context7) {
         while (1) switch (_context7.prev = _context7.next) {
           case 0:
-            console.error("{" + this.title + "}" + type + (msg || ""));
-            _message2["default"] === null || _message2["default"] === void 0 ? void 0 : _message2["default"].error("{" + this.title + "}" + type + (msg || "")).then();
-          case 2:
+            config = {};
+            _context7.next = 3;
+            return (_this$handleRequestCo7 = this.handleRequestConfig) === null || _this$handleRequestCo7 === void 0 ? void 0 : _this$handleRequestCo7.call(this, config);
+          case 3:
+            arrayData = [];
+            idValue = (0, _data.transformerId)(data);
+            if (!Array.isArray(idValue)) {
+              arrayData.push(idValue);
+            } else {
+              arrayData = idValue;
+            }
+            arrayData = arrayData.filter(function (item) {
+              return !!item;
+            });
+            if (!(arrayData.length == 0)) {
+              _context7.next = 9;
+              break;
+            }
+            throw new Error("删除对象不可为空!");
+          case 9:
+            _context7.next = 11;
+            return this.request.post("remove", arrayData, config);
+          case 11:
+            res = _context7.sent;
+            if (res.success) {
+              _context7.next = 18;
+              break;
+            }
+            this.showError("\u5220\u9664\u5931\u8D25!", res.message).then();
+            _context7.next = 16;
+            return options === null || options === void 0 ? void 0 : (_options$onError6 = options.onError) === null || _options$onError6 === void 0 ? void 0 : _options$onError6.call(options, res);
+          case 16:
+            _context7.next = 20;
+            break;
+          case 18:
+            _context7.next = 20;
+            return options === null || options === void 0 ? void 0 : (_options$onSuccess6 = options.onSuccess) === null || _options$onSuccess6 === void 0 ? void 0 : _options$onSuccess6.call(options, res);
+          case 20:
+            return _context7.abrupt("return", res);
+          case 21:
           case "end":
             return _context7.stop();
         }
       }, _callee7, this);
     }));
-    function showError(_x13, _x14) {
+    function _delete(_x13, _x14) {
+      return _delete2.apply(this, arguments);
+    }
+    return _delete;
+  }();
+  _proto.showError = /*#__PURE__*/function () {
+    var _showError = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee8(type, msg) {
+      var props;
+      return _regenerator["default"].wrap(function _callee8$(_context8) {
+        while (1) switch (_context8.prev = _context8.next) {
+          case 0:
+            _context8.prev = 0;
+            if (!msg) {
+              _context8.next = 18;
+              break;
+            }
+            props = JSON.parse(msg);
+            props.content = props.message;
+            if (props.title) {
+              props.title = "" + this.title + type;
+            }
+            if (!(props.type == "message")) {
+              _context8.next = 10;
+              break;
+            }
+            _message2["default"].error(props);
+            return _context8.abrupt("return");
+          case 10:
+            if (!(props.type == "modal")) {
+              _context8.next = 15;
+              break;
+            }
+            _modal["default"].error(props);
+            return _context8.abrupt("return");
+          case 15:
+            if (!(props.type == "notification")) {
+              _context8.next = 18;
+              break;
+            }
+            _notification2["default"].error(props);
+            return _context8.abrupt("return");
+          case 18:
+            _context8.next = 23;
+            break;
+          case 20:
+            _context8.prev = 20;
+            _context8.t0 = _context8["catch"](0);
+            console.log("`showError`解析异常:", _context8.t0);
+          case 23:
+            console.error("{" + this.title + "}" + type + (msg || ""));
+            _message2["default"] === null || _message2["default"] === void 0 ? void 0 : _message2["default"].error("{" + this.title + "}" + type + (msg || "")).then();
+          case 25:
+          case "end":
+            return _context8.stop();
+        }
+      }, _callee8, this, [[0, 20]]);
+    }));
+    function showError(_x15, _x16) {
       return _showError.apply(this, arguments);
     }
     return showError;
   }();
   return BaseRestApi;
 }();
+function getStringId(item) {
+  if (typeof (item === null || item === void 0 ? void 0 : item.id) === "string") {
+    return item.id;
+  } else if (typeof item === "string") {
+    return item;
+  }
+  return null;
+}
 var RestApi = exports.RestApi = /*#__PURE__*/function (_BaseRestApi2) {
   function RestApi(uri, options) {
     return _BaseRestApi2.call(this, uri, options) || this;
@@ -316,16 +423,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 _callee8(config) {
-      return _regenerator["default"].wrap(function _callee8$(_context8) {
-        while (1) switch (_context8.prev = _context8.next) {
+    var _handleRequestConfig = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee9(config) {
+      return _regenerator["default"].wrap(function _callee9$(_context9) {
+        while (1) switch (_context9.prev = _context9.next) {
           case 0:
           case "end":
-            return _context8.stop();
+            return _context9.stop();
         }
-      }, _callee8);
+      }, _callee9);
     }));
-    function handleRequestConfig(_x15) {
+    function handleRequestConfig(_x17) {
       return _handleRequestConfig.apply(this, arguments);
     }
     return handleRequestConfig;

package/lib/utils/cache/schema.js

@@ -20,13 +20,25 @@ function _handleFormSchema() {
     return _regenerator["default"].wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
+          if (!(schema.type !== "form")) {
+            _context.next = 2;
+            break;
+          }
+          return _context.abrupt("return");
+        case 2:
+          if (schema !== null && schema !== void 0 && schema.componentName) {
+            _context.next = 4;
+            break;
+          }
+          return _context.abrupt("return");
+        case 4:
           fdmItems = [];
           fieldIdMap = new Map();
           schema.state = schema.state || {};
           schema.methods = schema.methods || {};
-          _context.next = 6;
+          _context.next = 10;
           return handleAssociationForm(schema);
-        case 6:
+        case 10:
           //初次处理
           forEachFormSchema(schema, function (field) {
             if (field.fdmSchema) {
@@ -73,7 +85,7 @@ function _handleFormSchema() {
               return true;
             });
           });
-        case 8:
+        case 12:
         case "end":
           return _context.stop();
       }

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

@@ -0,0 +1 @@
+export declare function transformerId(value: any): any;

package/lib/utils/data/index.js

@@ -0,0 +1,24 @@
+"use strict";
+
+exports.__esModule = true;
+exports.transformerId = transformerId;
+function transformerId(value) {
+  if (value == null) {
+    return null;
+  }
+  if (Array.isArray(value)) {
+    return value.map(transformerId).filter(function (value) {
+      return !!value;
+    });
+  }
+  if (typeof value == "object") {
+    return (value === null || value === void 0 ? void 0 : value.id) || (value === null || value === void 0 ? void 0 : value.value) || value;
+  }
+  if (typeof value == "string") {
+    return value;
+  }
+  if (typeof value == "number") {
+    return value;
+  }
+  return (value === null || value === void 0 ? void 0 : value.id) || value.value || value;
+}

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

@@ -1,5 +1,5 @@
 import { PageLayoutType } from "./page-layout";
-export declare type PageFormDataManagerModeType = "dataManager" | "selectOne" | "selectMore";
+export declare type PageFormDataManagerModeType = "associationField" | "dataManager" | "selectOne" | "selectMore";
 export interface ShowPageFormDataManagerProps {
     container?: HTMLDivElement;
     layout?: PageLayoutType;
@@ -8,6 +8,12 @@ export interface ShowPageFormDataManagerProps {
         fieldId?: string;
     };
     mode?: PageFormDataManagerModeType;
+    extraProps?: any;
     onClose?: () => void | Promise<void>;
+    onSearch?: (params: any[]) => void | Promise<void>;
+    onLoadData?: (response: {
+        data: any[];
+        total: number;
+    }) => void | Promise<void>;
 }
 export declare function showFormDataManager(options: ShowPageFormDataManagerProps): Promise<any | any[]>;

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

@@ -29,7 +29,7 @@ function _showFormDataManager() {
         case 0:
           return _context3.abrupt("return", new Promise( /*#__PURE__*/function () {
             var _ref = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(resolve, reject) {
-              var container, onClose, restProps, unmount, _options$form, paths, mode, params, url, page;
+              var container, onClose, restProps, unmount, _options$form, paths, mode, _params, url, page;
               return _regenerator["default"].wrap(function _callee2$(_context2) {
                 while (1) switch (_context2.prev = _context2.next) {
                   case 0:
@@ -45,8 +45,8 @@ function _showFormDataManager() {
                     }
                     paths = window.location.pathname.split("/");
                     mode = options.mode;
-                    params = new URLSearchParams();
-                    url = "/" + paths[1] + "/" + paths[2] + "/" + ((_options$form = options.form) === null || _options$form === void 0 ? void 0 : _options$form.id) + "/" + mode + "?" + params.toString();
+                    _params = new URLSearchParams();
+                    url = "/" + paths[1] + "/" + paths[2] + "/" + ((_options$form = options.form) === null || _options$form === void 0 ? void 0 : _options$form.id) + "/" + mode + "?" + _params.toString();
                     _context2.next = 10;
                     return (0, _index.openPage)(url, url);
                   case 10:
@@ -66,18 +66,19 @@ function _showFormDataManager() {
                           while (1) switch (_context.prev = _context.next) {
                             case 0:
                               resolve(null);
+                              setTimeout(function () {
+                                _reactDom["default"].unmountComponentAtNode(container);
+                              }, 10);
                               if (unmount) {
                                 //等待动画结束
                                 setTimeout(function () {
                                   var _container;
-                                  //取消挂载
-                                  _reactDom["default"].unmountComponentAtNode(container);
                                   //移除
                                   (_container = container) === null || _container === void 0 ? void 0 : _container.remove();
-                                }, 1000);
+                                }, 100);
                               }
                               onClose === null || onClose === void 0 ? void 0 : onClose();
-                            case 3:
+                            case 4:
                             case "end":
                               return _context.stop();
                           }
@@ -123,8 +124,9 @@ var FormDataManagerRender = /*#__PURE__*/function (_Component) {
       onSelectOk = _this$props.onSelectOk,
       onClose = _this$props.onClose,
       restProps = (0, _objectWithoutPropertiesLoose2["default"])(_this$props, _excluded);
+
     // @ts-ignore
-    restProps.layout = layout || "drawer";
+    restProps.layout = layout || "modal";
     // @ts-ignore
     restProps.onClose = function () {
       var _self$layoutRef;

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

@@ -22,12 +22,14 @@ var PageLayout = exports.PageLayout = /*#__PURE__*/function (_Component) {
       });
     };
     _this.getWith = function () {
-      return Math.min(window.innerWidth, 1440);
+      return Math.min(window.innerWidth, 1600);
     };
     _this.handleResize = function () {
-      _this.setState({
-        width: _this.getWith()
-      });
+      if (_this.props.layout == "drawer") {
+        _this.setState({
+          width: _this.getWith()
+        });
+      }
     };
     _this.state.width = _this.getWith();
     return _this;
@@ -51,6 +53,7 @@ var PageLayout = exports.PageLayout = /*#__PURE__*/function (_Component) {
       onClose: this.close,
       footer: false,
       closable: false,
+      style: {},
       styles: {
         header: {
           display: "none"
@@ -65,6 +68,8 @@ var PageLayout = exports.PageLayout = /*#__PURE__*/function (_Component) {
       maskClosable: false
     };
     if (layout == "modal") {
+      restProps.style.top = 64;
+      restProps.styles.body.maxHeight = "calc(100vh - 180px)";
       return /*#__PURE__*/_react["default"].createElement(_modal["default"], restProps, children);
     } else if (layout == "drawer") {
       return /*#__PURE__*/_react["default"].createElement(_drawer["default"], restProps, children);

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

@@ -39,7 +39,8 @@ function PageLoadSchema(props) {
   }, []);
   if (loading) {
     return /*#__PURE__*/React.createElement(_pageLoading.PageLoading, {
-      loading: true
+      loading: true,
+      background: "rgba(255, 255, 255, 0)"
     });
   }
   if (!schema) {

package/package.json

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