@zhubangyun/lowcode-core 6.1.90 → 6.3.20

package/lib/utils/page/index.js

@@ -3,13 +3,17 @@
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 exports.__esModule = true;
 exports.closePage = closePage;
-exports.getFormPrintTemplates = void 0;
+exports.getSchema = exports.getFormPrintTemplates = exports.createForm = void 0;
 exports.hideLoading = hideLoading;
 exports.openPage = openPage;
 exports.showFormGroup = exports.showFormDataManagerGroup = exports.showFormDataManager = exports.showForm = exports.show = exports.print = void 0;
 exports.showLoading = showLoading;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+var _uniBridge = require("../uni-bridge");
+var _pageCreateElement = require("./page-create-element");
+exports.createForm = _pageCreateElement.createForm;
+exports.getSchema = _pageCreateElement.getSchema;
 var _printForm = require("./print-form");
 exports.print = _printForm.print;
 exports.getFormPrintTemplates = _printForm.getFormPrintTemplates;
@@ -44,6 +48,7 @@ function _showLoading() {
     return _regenerator["default"].wrap(function (_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
+          console.log("page.show.loading");
           loading = document.getElementById("fullscreen-loading");
           if (loading) {
             loading.style.display = "flex";
@@ -104,14 +109,15 @@ function _openPage() {
             url: url
           });
         case 1:
-          page = _context3.sent;
-          _context3.next = 3;
-          break;
+          return _context3.abrupt("return", _context3.sent);
         case 2:
-          page = window.open(url, target);
+          if (!isMobile) {
+            _context3.next = 3;
+            break;
+          }
+          return _context3.abrupt("return", _uniBridge.uniBridge.navigateTo(url));
         case 3:
-          console.debug("openPage", page, target);
-          return _context3.abrupt("return", page);
+          return _context3.abrupt("return", window.open(url, target));
         case 4:
         case "end":
           return _context3.stop();

package/lib/utils/page/page-create-element.d.ts

@@ -0,0 +1,6 @@
+/// <reference types="react" />
+export interface PageCreateOptions {
+    formId: string;
+}
+export declare function getSchema(pageId: string): import("../api/schema.util").Schema & import("../api/rest-api").IBaseEntity;
+export declare function createForm(options: PageCreateOptions): JSX.Element;

package/lib/utils/page/page-create-element.js

@@ -0,0 +1,29 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+exports.__esModule = true;
+exports.createForm = createForm;
+exports.getSchema = getSchema;
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+var _objectWithoutPropertiesLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutPropertiesLoose"));
+var _schemaApi = require("../api/schema-api");
+var _react = _interopRequireDefault(require("react"));
+var _reactRender = require("../../components/react-render");
+var _excluded = ["formId"];
+function getSchema(pageId) {
+  var _getSchemaFromCache;
+  return (_getSchemaFromCache = (0, _schemaApi.getSchemaFromCache)(pageId)) === null || _getSchemaFromCache === void 0 ? void 0 : _getSchemaFromCache.data;
+}
+function createForm(options) {
+  var formId = options.formId,
+    restProps = (0, _objectWithoutPropertiesLoose2["default"])(options, _excluded);
+  var schemaRes = (0, _schemaApi.getSchemaFromCache)(formId, window.__mock);
+  if (schemaRes !== null && schemaRes !== void 0 && schemaRes.success) {
+    var schema = schemaRes.data;
+    return /*#__PURE__*/_react["default"].createElement(_reactRender.ReactRender, (0, _extends2["default"])({
+      schema: schema,
+      components: window._components || window.components || window.__components
+    }, restProps));
+  }
+  return null;
+}

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

@@ -13,21 +13,21 @@ var _react = _interopRequireWildcard(require("react"));
 var _reactRender = require("../../components/react-render");
 var _pageRender = require("./page-render");
 var _common = require("../common");
-var _excluded = ["layout", "items", "onSelectOk", "onClose"],
-  _excluded2 = ["container", "onClose"];
+var _excluded = ["layout", "items", "onSelectOk", "container", "onClose"],
+  _excluded2 = ["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); }
 function showFormDataManagerGroup(_x) {
   return _showFormDataManagerGroup.apply(this, arguments);
 }
 function _showFormDataManagerGroup() {
   _showFormDataManagerGroup = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee(options) {
-    var container, onClose, props;
+    var onClose, props;
     return _regenerator["default"].wrap(function (_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
-          container = options.container, onClose = options.onClose, props = (0, _objectWithoutPropertiesLoose2["default"])(options, _excluded2);
+          onClose = options.onClose, props = (0, _objectWithoutPropertiesLoose2["default"])(options, _excluded2);
           return _context.abrupt("return", (0, _pageRender.renderElement)({
-            container: container,
+            container: props.container,
             onClose: onClose,
             element: {
               component: FormDataManagerRender,
@@ -61,6 +61,7 @@ var FormDataManagerRender = /*#__PURE__*/function (_Component) {
       layout = _this$props.layout,
       items = _this$props.items,
       onSelectOk = _this$props.onSelectOk,
+      container = _this$props.container,
       onClose = _this$props.onClose,
       restProps = (0, _objectWithoutPropertiesLoose2["default"])(_this$props, _excluded);
     // @ts-ignore
@@ -78,13 +79,12 @@ var FormDataManagerRender = /*#__PURE__*/function (_Component) {
       onSelectOk === null || onSelectOk === void 0 ? void 0 : onSelectOk(data);
     };
     return /*#__PURE__*/_react["default"].createElement(_pageLayout.PageLayout, {
+      container: container,
       ref: function ref(layout) {
         return _this2.layoutRef = layout;
       },
       layout: layout,
-      onClose: function onClose() {
-        onSelectOk === null || onSelectOk === void 0 ? void 0 : onSelectOk(undefined);
-      }
+      onClose: onClose
     }, /*#__PURE__*/_react["default"].createElement(_reactRender.ReactRender, (0, _extends2["default"])({}, restProps, {
       components: window._components || window.components || window.__components,
       schema: {

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

@@ -15,21 +15,21 @@ var _reactRender = require("../../components/react-render");
 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"];
+var _excluded = ["layout", "form", "onSelectOk", "onClose", "container"],
+  _excluded2 = ["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); }
 function showFormDataManager(_x) {
   return _showFormDataManager.apply(this, arguments);
 }
 function _showFormDataManager() {
   _showFormDataManager = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee(options) {
-    var container, onClose, props;
+    var onClose, props;
     return _regenerator["default"].wrap(function (_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
-          container = options.container, onClose = options.onClose, props = (0, _objectWithoutPropertiesLoose2["default"])(options, _excluded2);
+          onClose = options.onClose, props = (0, _objectWithoutPropertiesLoose2["default"])(options, _excluded2);
           return _context.abrupt("return", (0, _pageRender.renderElement)({
-            container: container,
+            container: props.container,
             onClose: onClose,
             element: {
               component: FormDataManagerRender,
@@ -64,6 +64,7 @@ var FormDataManagerRender = /*#__PURE__*/function (_Component) {
       form = _this$props.form,
       onSelectOk = _this$props.onSelectOk,
       onClose = _this$props.onClose,
+      container = _this$props.container,
       restProps = (0, _objectWithoutPropertiesLoose2["default"])(_this$props, _excluded);
     // @ts-ignore
     restProps.layout = layout || "modal";
@@ -81,13 +82,12 @@ var FormDataManagerRender = /*#__PURE__*/function (_Component) {
     };
     var dataView = (0, _pageSchemaUtils.cloneDataView)(this.props.dataView, this.props.extraProps);
     return /*#__PURE__*/_react["default"].createElement(_pageLayout.PageLayout, {
+      container: container,
       ref: function ref(layout) {
         return _this2.layoutRef = layout;
       },
       layout: layout,
-      onClose: function onClose() {
-        onSelectOk === null || onSelectOk === void 0 ? void 0 : onSelectOk(undefined);
-      }
+      onClose: onClose
     }, /*#__PURE__*/_react["default"].createElement(_pageLoadSchema.PageLoadSchema, {
       pageId: form === null || form === void 0 ? void 0 : form.id
     }, function (schema) {

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, _options$form2, url, page;
+    var container, onClose, props, _options$form, paths, mode, dataId, params, _options$form2, url;
     return _regenerator["default"].wrap(function (_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
@@ -43,16 +43,14 @@ function _showForm() {
           if (dataId) {
             params.set("dataId", dataId);
           }
-          url = "/" + paths[1] + "/pages?" + params.toString();
-          if (paths[1] == "workPlatform") {
-            url = "/pages?" + params.toString();
+          url = "/pages?" + params.toString();
+          if (paths[1] == "admin") {
+            url = "/admin/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:
-          page = _context.sent;
-          console.debug("openPage", page);
           return _context.abrupt("return");
         case 2:
           return _context.abrupt("return", (0, _pageRender.renderElement)({

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

@@ -1,8 +1,9 @@
 import { Component } from "react";
 export type PageLayoutType = "page" | "modal" | "drawer";
 interface PageLayoutProps {
+    container?: any;
     layout?: PageLayoutType;
-    onClose?: (evt: any) => void;
+    onClose?: () => void;
     keyboard?: boolean;
     children: any;
 }

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

@@ -47,6 +47,7 @@ var PageLayout = exports.PageLayout = /*#__PURE__*/function (_Component) {
     window.removeEventListener("resize", this.handleResize);
   };
   _proto.render = function render() {
+    var _this2 = this;
     var _this$props = this.props,
       children = _this$props.children,
       extraProps = (0, _objectWithoutPropertiesLoose2["default"])(_this$props, _excluded);
@@ -71,19 +72,38 @@ var PageLayout = exports.PageLayout = /*#__PURE__*/function (_Component) {
           padding: 0
         }
       },
-      maskClosable: false
+      maskClosable: isMobile
     });
     var loadChildren = /*#__PURE__*/_react["default"].createElement(LoadMaterialChildren, null, children);
     if (layout == "modal") {
       restProps.style.top = 64;
       restProps.styles.body.height = "calc(100vh - 120px)";
-      return /*#__PURE__*/_react["default"].createElement(_modal["default"], restProps, loadChildren);
+      return /*#__PURE__*/_react["default"].createElement(_modal["default"], (0, _extends2["default"])({}, restProps, {
+        getContainer: function getContainer() {
+          return _this2.props.container || window.document.body;
+        },
+        afterOpenChange: function afterOpenChange(open) {
+          if (!open) {
+            var _this2$props$onClose, _this2$props;
+            (_this2$props$onClose = (_this2$props = _this2.props).onClose) === null || _this2$props$onClose === void 0 ? void 0 : _this2$props$onClose.call(_this2$props);
+          }
+        }
+      }), loadChildren);
     } else if (layout == "drawer") {
       if (window.isMobile) {
         restProps.placement = "bottom";
       }
       return /*#__PURE__*/_react["default"].createElement(_drawer["default"], (0, _extends2["default"])({}, restProps, {
-        height: "85vh"
+        getContainer: function getContainer() {
+          return _this2.props.container || window.document.body;
+        },
+        height: "75vh",
+        afterVisibleChange: function afterVisibleChange(open) {
+          if (!open) {
+            var _this2$props$onClose2, _this2$props2;
+            (_this2$props$onClose2 = (_this2$props2 = _this2.props).onClose) === null || _this2$props$onClose2 === void 0 ? void 0 : _this2$props$onClose2.call(_this2$props2);
+          }
+        }
       }), loadChildren);
     }
     return loadChildren;

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

@@ -11,13 +11,13 @@ var _client = require("react-dom/client");
 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, root, element;
+      var container, _onClose, _options$element, component, props, needUnmount, root, element;
       return _regenerator["default"].wrap(function (_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;
+            needUnmount = !container;
             if (!container) {
               container = document.createElement("div");
               document.body.append(container);
@@ -28,16 +28,15 @@ function renderElement(options) {
                 resolve(data || null);
               },
               onClose: function onClose() {
-                resolve(false);
+                resolve(null);
                 //等待动画结束
                 setTimeout(function () {
                   root.unmount();
-                  if (unmount) {
+                  if (needUnmount) {
                     var _container;
-                    //移除
                     (_container = container) === null || _container === void 0 ? void 0 : _container.remove();
                   }
-                }, 200);
+                }, 150);
                 _onClose === null || _onClose === void 0 ? void 0 : _onClose();
               }
             }));

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

@@ -65,10 +65,11 @@ function compileFilterRules(rules) {
         if (value === "") {
           value = "undefined";
         }
-      } else if (rule.valueType == "value" || !rule.valueType || typeof value === "object") {
+      } else if (rule.valueType == "value" || rule.valueType == "column" || !rule.valueType || typeof value === "object") {
         value = JSON.stringify(value);
       }
       scripts.push("\"key\":\"" + rule.key + "\",");
+      scripts.push("\"valueType\":\"" + rule.valueType + "\",");
       scripts.push("\"operator\":\"" + rule.operator + "\",");
       scripts.push("\"value\":" + value + ",");
     }

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

@@ -14,20 +14,20 @@ var _pageLayout = require("./page-layout");
 var _pageLoadSchema = require("./page-load-schema");
 var _reactRender = require("../../components/react-render");
 var _excluded = ["layout", "pageId", "onClose"],
-  _excluded2 = ["container", "onClose"];
+  _excluded2 = ["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); }
 function show(_x) {
   return _show.apply(this, arguments);
 }
 function _show() {
   _show = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee(options) {
-    var container, onClose, props;
+    var onClose, props;
     return _regenerator["default"].wrap(function (_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
-          container = options.container, onClose = options.onClose, props = (0, _objectWithoutPropertiesLoose2["default"])(options, _excluded2);
+          onClose = options.onClose, props = (0, _objectWithoutPropertiesLoose2["default"])(options, _excluded2);
           return _context.abrupt("return", (0, _pageRender.renderElement)({
-            container: container,
+            container: props.container,
             onClose: onClose,
             element: {
               component: PageRender,

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

@@ -1,8 +1,9 @@
 interface PrintOptions {
+    showLoading?: boolean;
     templateId: string;
-    mode?: "print" | "export";
+    mode?: "print" | "export" | "cloud_print";
     data: any;
 }
-export declare function getFormPrintTemplates(formId: string): Promise<any[]>;
+export declare function getFormPrintTemplates(formId: string, disableCache?: boolean): Promise<any>;
 export declare function print(options: PrintOptions): Promise<void>;
 export {};