@zhubangyun/lowcode-core 5.8.291 → 5.10.81

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

@@ -9,12 +9,12 @@ var _objectWithoutPropertiesLoose2 = _interopRequireDefault(require("@babel/runt
 var _inheritsLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/inheritsLoose"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _pageLayout = require("./page-layout");
-var _reactDom = _interopRequireDefault(require("react-dom"));
 var _react = _interopRequireWildcard(require("react"));
 var _pageLoadSchema = require("./page-load-schema");
 var _reactRender = require("../../components/react-render");
-var _index = require("./index");
 var _schema = require("../cache/schema");
+var _pageSchemaUtils = require("./page-schema-utils");
+var _pageRender = require("./page-render");
 var _excluded = ["layout", "form", "onSelectOk", "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); }
@@ -23,83 +23,25 @@ function showFormDataManager(_x) {
   return _showFormDataManager.apply(this, arguments);
 }
 function _showFormDataManager() {
-  _showFormDataManager = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3(options) {
-    return _regenerator["default"].wrap(function _callee3$(_context3) {
-      while (1) switch (_context3.prev = _context3.next) {
+  _showFormDataManager = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(options) {
+    var container, onClose, props;
+    return _regenerator["default"].wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
         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;
-              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;
-                    if (container) {
-                      _context2.next = 15;
-                      break;
-                    }
-                    if (!(options.layout == "page")) {
-                      _context2.next = 13;
-                      break;
-                    }
-                    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();
-                    _context2.next = 10;
-                    return (0, _index.openPage)(url, url);
-                  case 10:
-                    page = _context2.sent;
-                    console.debug("openPage", page);
-                    return _context2.abrupt("return");
-                  case 13:
-                    container = document.createElement("div");
-                    document.body.append(container);
-                  case 15:
-                    _reactDom["default"].render( /*#__PURE__*/_react["default"].createElement(FormDataManagerRender, (0, _extends2["default"])({}, restProps, {
-                      onSelectOk: function onSelectOk(data) {
-                        resolve(data || null);
-                      },
-                      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) {
-                            case 0:
-                              resolve(null);
-                              setTimeout(function () {
-                                _reactDom["default"].unmountComponentAtNode(container);
-                              }, 10);
-                              if (unmount) {
-                                //等待动画结束
-                                setTimeout(function () {
-                                  var _container;
-                                  //移除
-                                  (_container = container) === null || _container === void 0 ? void 0 : _container.remove();
-                                }, 100);
-                              }
-                              onClose === null || onClose === void 0 ? void 0 : onClose();
-                            case 4:
-                            case "end":
-                              return _context.stop();
-                          }
-                        }, _callee);
-                      }))
-                    })), container);
-                  case 16:
-                  case "end":
-                    return _context2.stop();
-                }
-              }, _callee2);
-            }));
-            return function (_x2, _x3) {
-              return _ref.apply(this, arguments);
-            };
-          }()));
-        case 1:
+          container = options.container, onClose = options.onClose, props = (0, _objectWithoutPropertiesLoose2["default"])(options, _excluded2);
+          return _context.abrupt("return", (0, _pageRender.renderElement)({
+            container: container,
+            onClose: onClose,
+            element: {
+              component: FormDataManagerRender,
+              props: props
+            }
+          }));
+        case 2:
         case "end":
-          return _context3.stop();
+          return _context.stop();
       }
-    }, _callee3);
+    }, _callee);
   }));
   return _showFormDataManager.apply(this, arguments);
 }
@@ -124,7 +66,6 @@ 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 || "modal";
     // @ts-ignore
@@ -139,6 +80,7 @@ var FormDataManagerRender = /*#__PURE__*/function (_Component) {
       (_self$layoutRef2 = self.layoutRef) === null || _self$layoutRef2 === void 0 ? void 0 : _self$layoutRef2.close();
       onSelectOk === null || onSelectOk === void 0 ? void 0 : onSelectOk(data);
     };
+    var dataView = (0, _pageSchemaUtils.cloneDataView)(this.props.dataView, this.props.extraProps);
     return /*#__PURE__*/_react["default"].createElement(_pageLayout.PageLayout, {
       layout: layout,
       ref: function ref(layout) {
@@ -157,10 +99,13 @@ var FormDataManagerRender = /*#__PURE__*/function (_Component) {
           return true;
         });
       }
-      return /*#__PURE__*/_react["default"].createElement(_reactRender.ReactRender, (0, _extends2["default"])({
+      return /*#__PURE__*/_react["default"].createElement(_reactRender.ReactRender, (0, _extends2["default"])({}, restProps, {
         schema: fdmSchema,
         components: window._components || window.components || window.__components
-      }, restProps));
+        // @ts-ignore
+        ,
+        dataView: dataView
+      }));
     }));
   };
   return FormDataManagerRender;

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

@@ -13,4 +13,4 @@ export interface ShowFormProps {
     onRemoveOk?: () => void;
     onClose?: () => void | Promise<void>;
 }
-export declare function showForm(options: ShowFormProps): Promise<void>;
+export declare function showForm(options: ShowFormProps): Promise<any>;

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

@@ -9,11 +9,11 @@ var _objectWithoutPropertiesLoose2 = _interopRequireDefault(require("@babel/runt
 var _inheritsLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/inheritsLoose"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _pageLayout = require("./page-layout");
-var _reactDom = _interopRequireDefault(require("react-dom"));
 var _react = _interopRequireWildcard(require("react"));
 var _pageLoadSchema = require("./page-load-schema");
 var _reactRender = require("../../components/react-render");
 var _index = require("./index");
+var _pageRender = require("./page-render");
 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); }
@@ -22,19 +22,14 @@ 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, url, page;
-    return _regenerator["default"].wrap(function _callee2$(_context2) {
-      while (1) switch (_context2.prev = _context2.next) {
+  _showForm = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(options) {
+    var container, onClose, props, _options$form, paths, mode, dataId, params, url, page;
+    return _regenerator["default"].wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
         case 0:
-          container = options.container, onClose = options.onClose, restProps = (0, _objectWithoutPropertiesLoose2["default"])(options, _excluded2); //容器不存在需要手动取消挂载
-          unmount = !container;
-          if (container) {
-            _context2.next = 16;
-            break;
-          }
-          if (!(options.layout == "page")) {
-            _context2.next = 14;
+          container = options.container, onClose = options.onClose, props = (0, _objectWithoutPropertiesLoose2["default"])(options, _excluded2); //容器不存在需要手动取消挂载
+          if (!(options.layout == "page" && !container)) {
+            _context.next = 12;
             break;
           }
           paths = window.location.pathname.split("/");
@@ -44,44 +39,26 @@ function _showForm() {
             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;
+          _context.next = 9;
           return (0, _index.openPage)(url, url);
-        case 11:
-          page = _context2.sent;
+        case 9:
+          page = _context.sent;
           console.debug("openPage", page);
-          return _context2.abrupt("return");
-        case 14:
-          container = document.createElement("div");
-          document.body.append(container);
-        case 16:
-          _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) {
-                  case 0:
-                    if (unmount) {
-                      //等待动画结束
-                      setTimeout(function () {
-                        var _container;
-                        //取消挂载
-                        _reactDom["default"].unmountComponentAtNode(container);
-                        //移除
-                        (_container = container) === null || _container === void 0 ? void 0 : _container.remove();
-                      }, 1000);
-                    }
-                    onClose === null || onClose === void 0 ? void 0 : onClose();
-                  case 2:
-                  case "end":
-                    return _context.stop();
-                }
-              }, _callee);
-            }))
-          })), container);
-        case 17:
+          return _context.abrupt("return");
+        case 12:
+          return _context.abrupt("return", (0, _pageRender.renderElement)({
+            container: container,
+            onClose: onClose,
+            element: {
+              component: FormRender,
+              props: props
+            }
+          }));
+        case 13:
         case "end":
-          return _context2.stop();
+          return _context.stop();
       }
-    }, _callee2);
+    }, _callee);
   }));
   return _showForm.apply(this, arguments);
 }

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

@@ -69,7 +69,7 @@ var PageLayout = exports.PageLayout = /*#__PURE__*/function (_Component) {
     };
     if (layout == "modal") {
       restProps.style.top = 64;
-      restProps.styles.body.maxHeight = "calc(100vh - 180px)";
+      restProps.styles.body.height = "calc(100vh - 120px)";
       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-render.d.ts

@@ -0,0 +1,10 @@
+interface PageRenderProps {
+    container?: HTMLDivElement;
+    onClose?: () => void;
+    element: {
+        component: any;
+        props: any;
+    };
+}
+export declare function renderElement(options: PageRenderProps): Promise<any>;
+export {};

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

@@ -0,0 +1,56 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+exports.__esModule = true;
+exports.renderElement = renderElement;
+var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+var _reactDom = _interopRequireDefault(require("react-dom"));
+var _react = require("react");
+function renderElement(options) {
+  return new Promise( /*#__PURE__*/function () {
+    var _ref = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(resolve, reject) {
+      var container, _onClose, _options$element, component, props, unmount, element;
+      return _regenerator["default"].wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            container = options.container, _onClose = options.onClose;
+            _options$element = options.element, component = _options$element.component, props = _options$element.props;
+            unmount = !container;
+            if (!container) {
+              container = document.createElement("div");
+              document.body.append(container);
+            }
+            element = /*#__PURE__*/(0, _react.createElement)(component, (0, _extends2["default"])({}, props, {
+              onSelectOk: function onSelectOk(data) {
+                resolve(data || null);
+              },
+              onClose: function onClose() {
+                resolve(false);
+                setTimeout(function () {
+                  _reactDom["default"].unmountComponentAtNode(container);
+                }, 100);
+                if (unmount) {
+                  //等待动画结束
+                  setTimeout(function () {
+                    var _container;
+                    //移除
+                    (_container = container) === null || _container === void 0 ? void 0 : _container.remove();
+                  }, 1000);
+                }
+                _onClose === null || _onClose === void 0 ? void 0 : _onClose();
+              }
+            }));
+            _reactDom["default"].render(element, container);
+          case 6:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee);
+    }));
+    return function (_x, _x2) {
+      return _ref.apply(this, arguments);
+    };
+  }());
+}

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

@@ -0,0 +1 @@
+export declare function cloneDataView(dataView: any, extraProps: any): any;

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

@@ -0,0 +1,79 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+exports.__esModule = true;
+exports.cloneDataView = cloneDataView;
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+function cloneDataView(dataView, extraProps) {
+  if (!dataView) {
+    return {};
+  }
+  if (typeof extraProps !== "object") {
+    extraProps = {};
+  }
+  var cloneDataView = (0, _extends2["default"])({}, dataView);
+  var filterRules = dataView.filterRules,
+    searchFields = dataView.searchFields;
+  function createFilterRules(rules) {
+    if (!Array.isArray(rules)) {
+      return [];
+    }
+    var scripts = [];
+    for (var _i = 0, _Object$keys = Object.keys(extraProps); _i < _Object$keys.length; _i++) {
+      var key = _Object$keys[_i];
+      scripts.push("const " + key + " = extraProps[\"" + key + "\"];");
+    }
+    scripts.push(compileFilterRules(rules));
+    var compile = scripts.join("\n");
+    try {
+      return eval(compile);
+    } catch (e) {
+      console.log("\u89E3\u6790dataView.rules\u5F02\u5E38", e);
+      console.log({
+        rules: rules,
+        compile: compile,
+        extraProps: extraProps
+      });
+    }
+    return [];
+  }
+  cloneDataView.filterRules = createFilterRules(filterRules);
+  cloneDataView.searchFields = createFilterRules(searchFields);
+  return cloneDataView;
+}
+function compileFilterRules(rules) {
+  var _rules, _rules$forEach;
+  if (rules === void 0) {
+    rules = [];
+  }
+  var scripts = ["["];
+  (_rules = rules) === null || _rules === void 0 ? void 0 : (_rules$forEach = _rules.forEach) === null || _rules$forEach === void 0 ? void 0 : _rules$forEach.call(_rules, function (rule, index, array) {
+    var _rule$rules;
+    var isFirst = index == 0;
+    var isLast = index + 1 == array.length;
+    scripts.push("{");
+    if (!isFirst) {
+      var connector = rule.connector == "or" ? "or" : "and";
+      scripts.push("\"connector\":\"" + connector + "\",");
+    }
+    if (rule !== null && rule !== void 0 && (_rule$rules = rule.rules) !== null && _rule$rules !== void 0 && _rule$rules.length) {
+      //分组
+      scripts.push("\"rules\":" + compileFilterRules(rule.rules) + ",");
+    } else {
+      var value = rule.value;
+      if (rule.valueType == "express") {
+        if (value === "") {
+          value = "undefined";
+        }
+      } else if (rule.valueType == "value" || !rule.valueType || typeof value === "object") {
+        value = JSON.stringify(value);
+      }
+      scripts.push("\"key\":\"" + rule.key + "\",");
+      scripts.push("\"operator\":\"" + rule.operator + "\",");
+      scripts.push("\"value\":" + value + ",");
+    }
+    scripts.push("}" + (isLast ? "" : ","));
+  });
+  scripts.push("]");
+  return scripts.join("");
+}

package/package.json

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

package/es/utils/common/FormDataHandler.d.ts

@@ -1,45 +0,0 @@
-import { ProcessScriptOptions, ProcessScriptType } from "./ProcessHandler";
-declare type Schema = {
-    componentName: string;
-    props: {
-        scripts: ProcessScriptType[];
-        format: string;
-        defaultValue: {
-            custom: any;
-            linkage: any;
-            shortcut: string;
-            formula: string;
-            type: "linkage" | "custom" | "formula" | "shortcut";
-        };
-        trim: boolean;
-        name: string;
-        label: string;
-        fillTableValues?: string[];
-        formula?: string;
-    };
-};
-export default class FormDataHandler {
-    schema: Schema;
-    name: string;
-    fields: Schema[];
-    scripts: ProcessScriptType[];
-    subFormHandlers: FormDataHandler[];
-    constructor(schema: any);
-    onValuesChange(options: ProcessScriptOptions): Promise<void>;
-    /**
-     * 处理联动数据
-     * @private
-     */
-    private handleLinkage;
-    private handleFieldValue;
-    /**
-     * 处理填充子表
-     */
-    private handleFillTableValues;
-    /***
-     * 创建初期值
-     * @private
-     */
-    createInitValues(): Promise<any>;
-}
-export {};