@zhubangyun/lowcode-core 5.12.161 → 6.1.90

package/es/utils/api/schema.util.js

@@ -12,21 +12,26 @@ export function forEachSchema(schema, callback) {
     }
   });
 }
-export function forEachFormSchema(schema, fdm, callback) {
+export function findFormSchemas(schema) {
+  var schemas = [];
   forEachSchema(schema, function (child) {
     if (["PageForm", "SubFormField"].includes(child.componentName)) {
-      callback(child);
-      if (fdm) {
-        if (child.fdmSchema) {
-          forEachSchema(child.fdmSchema, function (fdmChild) {
-            if (fdmChild.componentName == "PageFdm") {
-              callback(child);
-            }
-            return true;
-          });
-        }
-      }
+      schemas.push(child);
     }
     return true;
   });
+  return schemas;
+}
+export function findFdmSchemas(schema) {
+  var schemas = [];
+  if (!schema) {
+    return schemas;
+  }
+  forEachSchema(schema, function (child) {
+    if (["PageFdm"].includes(child.componentName)) {
+      schemas.push(child);
+    }
+    return true;
+  });
+  return schemas;
 }

package/es/utils/cache/index.js

@@ -3,7 +3,7 @@ import _inheritsLoose from "@babel/runtime/helpers/inheritsLoose";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { SingletonInstanceMap } from "../common/SingletonInstanceMap";
 import { apiRequest, RestFormApi } from "../api";
-import { forEachFormSchema } from "../api/schema.util";
+import { findFdmSchemas, findFormSchemas } from "../api/schema.util";
 export var SchemaCache = /*#__PURE__*/function (_SingletonInstanceMap) {
   function SchemaCache() {
     return _SingletonInstanceMap.apply(this, arguments) || this;
@@ -12,7 +12,7 @@ export var SchemaCache = /*#__PURE__*/function (_SingletonInstanceMap) {
   var _proto = SchemaCache.prototype;
   _proto.createInstance = /*#__PURE__*/function () {
     var _createInstance = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee(key, options) {
-      var mock, pageId, schemaRes, schema, permissionRes, permission;
+      var mock, pageId, schemaRes, schema, handleCommonSchema, permission, printTemplates, workflow, cloneSchema, _t;
       return _regeneratorRuntime.wrap(function (_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -25,30 +25,70 @@ export var SchemaCache = /*#__PURE__*/function (_SingletonInstanceMap) {
             });
           case 1:
             schemaRes = _context.sent;
-            schema = schemaRes.data;
-            if (!(typeof schema == "object")) {
-              _context.next = 3;
+            if (schemaRes.succss) {
+              _context.next = 2;
               break;
             }
-            _context.next = 2;
-            return apiRequest.get("pages/" + pageId + "/permission");
+            return _context.abrupt("return", schemaRes);
           case 2:
-            permissionRes = _context.sent;
-            permission = permissionRes.data;
-            if (typeof permission == "object") {
-              forEachFormSchema(schema, true, function (child) {
-                child.props = child.props || {};
-                child.props.permission = permission;
-              });
+            schema = schemaRes.data;
+            if (!(schema != null && typeof schema == "object")) {
+              _context.next = 8;
+              break;
+            }
+            handleCommonSchema = function handleCommonSchema(schema) {
+              schema.props = schema.props || {};
+              schema.props.permission = permission;
+              schema.props.printTemplates = printTemplates;
+              schema.props.workflow = workflow;
+            };
+            //处理权限
+            permission = null; //处理打印
+            workflow = null;
+            if (location.pathname.startsWith("/print")) {
+              _context.next = 7;
+              break;
             }
+            _context.next = 3;
+            return apiRequest.get("pages/" + pageId + "/permission");
           case 3:
-            console.log("schemaRes", schemaRes);
+            permission = _context.sent.data;
+            if (!((schema === null || schema === void 0 ? void 0 : schema.type) == "form")) {
+              _context.next = 7;
+              break;
+            }
+            _context.prev = 4;
+            _context.next = 5;
+            return apiRequest.get("pages/" + pageId + "/printTemplates");
+          case 5:
+            printTemplates = _context.sent.data;
+            _context.next = 7;
+            break;
+          case 6:
+            _context.prev = 6;
+            _t = _context["catch"](4);
+            console.log(_t);
+          case 7:
+            findFormSchemas(schema).forEach(function (formSchema) {
+              handleCommonSchema(formSchema);
+              findFdmSchemas(formSchema.fdmSchema).forEach(function (fdmSchema) {
+                handleCommonSchema(fdmSchema);
+                fdmSchema.props.form.label = formSchema.props.label;
+              });
+            });
+            cloneSchema = JSON.parse(JSON.stringify(schema));
+            findFormSchemas(schema).forEach(function (formSchema) {
+              findFdmSchemas(formSchema.fdmSchema).forEach(function (fdmSchema) {
+                fdmSchema.props.formElement = cloneSchema;
+              });
+            });
+          case 8:
             return _context.abrupt("return", schemaRes);
-          case 4:
+          case 9:
           case "end":
             return _context.stop();
         }
-      }, _callee);
+      }, _callee, null, [[4, 6]]);
     }));
     function createInstance(_x, _x2) {
       return _createInstance.apply(this, arguments);

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

@@ -1,3 +1,6 @@
 export { loadPlugins } from "./LoadPlugins";
 export declare function uuid(prefix?: string, separator?: string): string;
+export declare function uuidVersion(id: string): number;
 export declare function toArray(data: any): any[];
+export declare function isLocalhost(): boolean;
+export declare function isMobile(): boolean;

package/es/utils/common/index.js

@@ -1,13 +1,16 @@
-import { v4 } from "uuid";
+import { v7, version } from "uuid";
 export { loadPlugins } from "./LoadPlugins";
 export function uuid(prefix, separator) {
   if (!prefix && !separator) {
-    return v4();
+    return v7();
   }
-  return [prefix, separator, v4()].filter(function (v) {
+  return [prefix, separator, v7()].filter(function (v) {
     return !!v;
   }).join("");
 }
+export function uuidVersion(id) {
+  return version(id);
+}
 export function toArray(data) {
   if (!data) {
     return [];
@@ -16,4 +19,11 @@ export function toArray(data) {
   } else {
     return [data];
   }
+}
+export function isLocalhost() {
+  return window.location.hostname == "localhost";
+}
+export function isMobile() {
+  var userAgent = navigator.userAgent;
+  return /Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini|Mobile/i.test(userAgent);
 }

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

@@ -9,7 +9,7 @@ import { PageLayout } from "./page-layout";
 import React, { Component } from "react";
 import { ReactRender } from "../../components/react-render";
 import { renderElement } from "./page-render";
-import { v4 } from "uuid";
+import { uuid } from "../common";
 export function showFormDataManagerGroup(_x) {
   return _showFormDataManagerGroup.apply(this, arguments);
 }
@@ -82,7 +82,7 @@ var FormDataManagerRender = /*#__PURE__*/function (_Component) {
     }, /*#__PURE__*/React.createElement(ReactRender, _extends({}, restProps, {
       components: window._components || window.components || window.__components,
       schema: {
-        id: v4(),
+        id: uuid(),
         componentName: "Page",
         props: {},
         state: {},

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

@@ -11,6 +11,7 @@ export interface DataView {
         id?: string;
         fieldId?: string;
     };
+    extraProps?: any;
     labelField?: string;
     secondaryLabelFields?: string[];
     fieldWidth?: Record<string, number>;

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

@@ -9,9 +9,9 @@ import { PageLayout } from "./page-layout";
 import React, { Component } from "react";
 import { PageLoadSchema } from "./page-load-schema";
 import { ReactRender } from "../../components/react-render";
-import { forEachFormSchema } from "../cache/schema";
 import { cloneDataView } from "./page-schema-utils";
 import { renderElement } from "./page-render";
+import { forEachSchema } from "../api/schema.util";
 export function showFormDataManager(_x) {
   return _showFormDataManager.apply(this, arguments);
 }
@@ -87,7 +87,7 @@ var FormDataManagerRender = /*#__PURE__*/function (_Component) {
     }, function (schema) {
       var fdmSchema = schema.children[0].fdmSchema;
       if (form !== null && form !== void 0 && form.fieldId) {
-        forEachFormSchema(schema, function (field) {
+        forEachSchema(schema, function (field) {
           if (form.fieldId == field.props.fieldId) {
             fdmSchema = field.fdmSchema;
             return false;

package/es/utils/page/page-form-group.d.ts

@@ -7,6 +7,7 @@ export interface ShowFormGroupProps {
         id: string;
         fieldId?: string;
     };
+    extraProps?: any;
     items?: any[];
     mode?: PageFormModeType;
     onSubmitOk?: (data: any) => void;

package/es/utils/page/page-form-group.js

@@ -9,8 +9,8 @@ import { PageLayout } from "./page-layout";
 import { renderElement } from "./page-render";
 import React, { Component } from "react";
 import { ReactRender } from "../../components/react-render";
-import { v4 } from "uuid";
 import { PageLoadSchema } from "./page-load-schema";
+import { uuid } from "../common";
 export function showFormGroup(_x) {
   return _showFormGroup.apply(this, arguments);
 }
@@ -78,7 +78,7 @@ var FormGroupRender = /*#__PURE__*/function (_Component) {
       return /*#__PURE__*/React.createElement(ReactRender, _extends({}, restProps, {
         components: window._components || window.components || window.__components,
         schema: {
-          id: v4(),
+          id: uuid(),
           componentName: "Page",
           props: {},
           state: {},

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

@@ -7,6 +7,7 @@ export interface ShowFormProps {
         id: string;
         fieldId?: string;
     };
+    extraProps?: any;
     mode?: PageFormModeType;
     lockMode?: boolean;
     dataId?: string;

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

@@ -16,7 +16,7 @@ export function showForm(_x) {
 }
 function _showForm() {
   _showForm = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee(options) {
-    var container, onClose, props, _options$form, paths, mode, dataId, params, url, page;
+    var container, onClose, props, _options$form, paths, mode, dataId, params, _options$form2, url, page;
     return _regeneratorRuntime.wrap(function (_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
@@ -28,10 +28,20 @@ function _showForm() {
           paths = window.location.pathname.split("/");
           mode = options.mode, dataId = options.dataId;
           params = new URLSearchParams();
+          if ((_options$form = options.form) !== null && _options$form !== void 0 && _options$form.id) {
+            params.set("pageId", (_options$form2 = options.form) === null || _options$form2 === void 0 ? void 0 : _options$form2.id);
+          }
+          if (mode) {
+            params.set("mode", mode);
+          }
           if (dataId) {
             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();
+          url = "/" + paths[1] + "/pages?" + params.toString();
+          if (paths[1] == "workPlatform") {
+            url = "/pages?" + params.toString();
+          }
+          //const url = `/${paths[1]}/${paths[2]}/${options.form?.id}/${mode}?${params.toString()}`;
           _context.next = 1;
           return openPage(url, url);
         case 1:

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

@@ -12,6 +12,7 @@ interface PageLayoutState {
 }
 export declare class PageLayout extends Component<PageLayoutProps, PageLayoutState> {
     state: PageLayoutState;
+    get layout(): PageLayoutType;
     close: () => void;
     constructor(props: any);
     componentDidMount(): void;

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

@@ -2,8 +2,9 @@ import _Drawer from "antd/es/drawer";
 import _Modal from "antd/es/modal";
 import _extends from "@babel/runtime/helpers/extends";
 import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/objectWithoutPropertiesLoose";
+import _createClass from "@babel/runtime/helpers/createClass";
 import _inheritsLoose from "@babel/runtime/helpers/inheritsLoose";
-var _excluded = ["layout", "children"];
+var _excluded = ["children"];
 import React, { Component } from "react";
 import { LoadMaterials } from "../../components/load-materials";
 export var PageLayout = /*#__PURE__*/function (_Component) {
@@ -22,7 +23,7 @@ export var PageLayout = /*#__PURE__*/function (_Component) {
       return Math.min(window.innerWidth, 1600);
     };
     _this.handleResize = function () {
-      if (_this.props.layout == "drawer") {
+      if (_this.layout == "drawer") {
         _this.setState({
           width: _this.getWith()
         });
@@ -41,9 +42,9 @@ export var PageLayout = /*#__PURE__*/function (_Component) {
   };
   _proto.render = function render() {
     var _this$props = this.props,
-      layout = _this$props.layout,
       children = _this$props.children,
       extraProps = _objectWithoutPropertiesLoose(_this$props, _excluded);
+    var layout = this.layout;
     var state = this.state;
     var restProps = _extends({}, extraProps, {
       children: undefined,
@@ -72,11 +73,27 @@ export var PageLayout = /*#__PURE__*/function (_Component) {
       restProps.styles.body.height = "calc(100vh - 120px)";
       return /*#__PURE__*/React.createElement(_Modal, restProps, loadChildren);
     } else if (layout == "drawer") {
-      return /*#__PURE__*/React.createElement(_Drawer, restProps, loadChildren);
+      if (window.isMobile) {
+        restProps.placement = "bottom";
+      }
+      return /*#__PURE__*/React.createElement(_Drawer, _extends({}, restProps, {
+        height: "85vh"
+      }), loadChildren);
     }
     return loadChildren;
   };
-  return PageLayout;
+  return _createClass(PageLayout, [{
+    key: "layout",
+    get: function get() {
+      var layout = this.props.layout;
+      if (window.isMobile) {
+        if (layout == "modal") {
+          return "drawer";
+        }
+      }
+      return layout;
+    }
+  }]);
 }(Component);
 function LoadMaterialChildren(props) {
   return /*#__PURE__*/React.createElement(LoadMaterials, null, props.children);

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

@@ -1,56 +1,48 @@
 import _Result from "antd/es/result";
 import _message from "antd/es/message";
-import { useEffect, useState } from "react";
+import { Fragment, useEffect, useState } from "react";
 import { getSchema } from "../api";
-import { PageLoading } from "../../components/page-loading";
 import { getSchemaFromCache } from "../api/schema-api";
+import { hideLoading, showLoading } from "./index";
 export function PageLoadSchema(props) {
   var pageId = props.pageId,
     children = props.children;
   var cache = getSchemaFromCache(pageId);
-  var _useState = useState(!cache),
-    loading = _useState[0],
-    setLoading = _useState[1];
-  var _useState2 = useState(cache === null || cache === void 0 ? void 0 : cache.data),
-    schema = _useState2[0],
-    setSchema = _useState2[1];
-  var _useState3 = useState(),
-    errorMsg = _useState3[0],
-    setErrorMsg = _useState3[1];
+  var _useState = useState(cache === null || cache === void 0 ? void 0 : cache.data),
+    schema = _useState[0],
+    setSchema = _useState[1];
+  var _useState2 = useState(),
+    errorMsg = _useState2[0],
+    setErrorMsg = _useState2[1];
   useEffect(function () {
-    if (cache) {
+    if (cache !== null && cache !== void 0 && cache.success) {
       return;
     }
     if (pageId) {
+      showLoading().then();
       getSchema(pageId).then(function (res) {
         if (res.success) {
-          setLoading(false);
-          setSchema(res.data);
+          setSchema(res === null || res === void 0 ? void 0 : res.data);
         } else {
-          setErrorMsg(res.message);
+          setErrorMsg(res === null || res === void 0 ? void 0 : res.message);
         }
+      })["finally"](function () {
+        hideLoading().then();
       });
     } else {
-      setLoading(false);
-      setErrorMsg("页面id不可为空!");
-      console.error("页面id不可为空!");
-      _message.error("页面id不可为空!").then();
+      hideLoading().then();
+      setErrorMsg("参数错误:页面id不可为空!");
+      _message.error("参数错误:页面id不可为空!").then();
     }
   }, []);
-  if (cache) {
+  if (schema) {
     return children(schema);
   }
-  if (loading) {
-    return /*#__PURE__*/React.createElement(PageLoading, {
-      loading: true,
-      background: "rgba(255, 255, 255, 0)"
-    });
-  }
-  if (!schema) {
+  if (errorMsg) {
     return /*#__PURE__*/React.createElement(_Result, {
       status: 500,
       title: errorMsg
     });
   }
-  return children(schema);
+  return /*#__PURE__*/React.createElement(Fragment, null);
 }

package/es/utils/page/page-show.d.ts

@@ -4,6 +4,8 @@ export interface ShowPageProps {
     pageId: string;
     layout?: PageLayoutType;
     onClose?: () => void | Promise<void>;
+    extraProps?: any;
+    afterLoadSchema?: (schema: any) => void;
     pageRef?: (page: any) => void;
 }
 export declare function show(options: ShowPageProps): Promise<any | any[]>;

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

@@ -44,6 +44,7 @@ var PageRender = /*#__PURE__*/function (_Component) {
     }
     _this = _Component.call.apply(_Component, [this].concat(args)) || this;
     _this.layoutRef = void 0;
+    _this.schema = void 0;
     return _this;
   }
   _inheritsLoose(PageRender, _Component);
@@ -72,6 +73,10 @@ var PageRender = /*#__PURE__*/function (_Component) {
     }, /*#__PURE__*/React.createElement(PageLoadSchema, {
       pageId: pageId
     }, function (schema) {
+      _this2.schema = schema;
+      if (_this2.props.pageRef) {
+        _this2.props.pageRef(_this2);
+      }
       return /*#__PURE__*/React.createElement(ReactRender, _extends({
         schema: schema,
         components: window._components || window.components || window.__components

package/es/utils/page/print-form.js

@@ -64,7 +64,7 @@ function _print() {
           return _context2.abrupt("return");
         case 2:
           _context2.next = 3;
-          return openPrint(templateId);
+          return openPrint(templateId, options);
         case 3:
           iw = _context2.sent;
           if (iw) {
@@ -74,8 +74,6 @@ function _print() {
           _message.error("\u6253\u5370\u5931\u8D25!\u6253\u5370\u7A97\u53E3\u4E0D\u53EF\u4E3A\u7A7A!");
           return _context2.abrupt("return");
         case 4:
-          // @ts-ignore
-          iw.printOptions = options;
           _context2.next = 6;
           break;
         case 5:
@@ -93,39 +91,50 @@ function _print() {
   }));
   return _print.apply(this, arguments);
 }
-function openPrint(_x3) {
+function openPrint(_x3, _x4) {
   return _openPrint.apply(this, arguments);
 }
 function _openPrint() {
-  _openPrint = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee4(templateId) {
+  _openPrint = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee4(templateId, options) {
+    var url;
     return _regeneratorRuntime.wrap(function (_context4) {
       while (1) switch (_context4.prev = _context4.next) {
         case 0:
+          url = "/print/" + templateId;
           return _context4.abrupt("return", new Promise(/*#__PURE__*/function () {
             var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee3(resolve, reject) {
-              var iframe, iframeWindow;
+              var printWindow, iframe;
               return _regeneratorRuntime.wrap(function (_context3) {
                 while (1) switch (_context3.prev = _context3.next) {
                   case 0:
                     iframe = document.createElement("iframe");
-                    iframe.src = "/print/" + templateId;
-                    iframe.style.display = "none";
+                    iframe.src = url;
+                    iframe.className = "print-iframe";
                     document.body.appendChild(iframe);
-                    iframeWindow = iframe.contentWindow;
-                    if (iframeWindow) {
+                    printWindow = iframe.contentWindow;
+                    if (printWindow) {
                       _context3.next = 1;
                       break;
                     }
                     reject("创建Iframe失败!");
                     return _context3.abrupt("return");
                   case 1:
-                    iframeWindow.onload = function () {
-                      resolve(iframeWindow);
+                    // @ts-ignore
+                    window.printWindow = printWindow;
+                    printWindow.onload = function () {
+                      // @ts-ignore
+                      printWindow.printOptions = options;
                     };
-                    iframeWindow.addEventListener("beforeprint", function () {});
-                    iframeWindow.addEventListener("afterprint", function () {
+                    printWindow.addEventListener("beforeprint", function () {});
+                    printWindow.addEventListener("afterprint", function () {
                       hideLoading();
-                      iframe.remove();
+                      setTimeout(function () {
+                        resolve(printWindow);
+                        if (window.__debug) {
+                          return;
+                        }
+                        iframe.remove();
+                      }, 100);
                     });
                   case 2:
                   case "end":
@@ -133,7 +142,7 @@ function _openPrint() {
                 }
               }, _callee3);
             }));
-            return function (_x4, _x5) {
+            return function (_x5, _x6) {
               return _ref.apply(this, arguments);
             };
           }()));

package/es/utils/uni-bridge.d.ts

@@ -0,0 +1,18 @@
+interface ScanCodeOptions {
+    onlyFromCamera?: boolean;
+    openUrl?: boolean;
+}
+interface ScanCodeResult {
+    result: string;
+}
+declare class UniBridge {
+    private callbacks;
+    navigateTo(src: string): void;
+    scanCode(options: ScanCodeOptions): Promise<ScanCodeResult>;
+    getBarHeight(): Promise<unknown>;
+    getLocation(options: {}): Promise<unknown>;
+    private doAction;
+    private receiveMessage;
+}
+export declare const uniBridge: UniBridge;
+export {};