@zhubangyun/lowcode-core 5.12.161 → 6.1.90

package/lib/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/lib/utils/page/page-show.js

@@ -50,6 +50,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;
   }
   (0, _inheritsLoose2["default"])(PageRender, _Component);
@@ -78,6 +79,10 @@ var PageRender = /*#__PURE__*/function (_Component) {
     }, /*#__PURE__*/_react["default"].createElement(_pageLoadSchema.PageLoadSchema, {
       pageId: pageId
     }, function (schema) {
+      _this2.schema = schema;
+      if (_this2.props.pageRef) {
+        _this2.props.pageRef(_this2);
+      }
       return /*#__PURE__*/_react["default"].createElement(_reactRender.ReactRender, (0, _extends2["default"])({
         schema: schema,
         components: window._components || window.components || window.__components

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

@@ -70,7 +70,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) {
@@ -80,8 +80,6 @@ function _print() {
           _message2["default"].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:
@@ -99,39 +97,50 @@ function _print() {
   }));
   return _print.apply(this, arguments);
 }
-function openPrint(_x3) {
+function openPrint(_x3, _x4) {
   return _openPrint.apply(this, arguments);
 }
 function _openPrint() {
-  _openPrint = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee4(templateId) {
+  _openPrint = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee4(templateId, options) {
+    var url;
     return _regenerator["default"].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 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee3(resolve, reject) {
-              var iframe, iframeWindow;
+              var printWindow, iframe;
               return _regenerator["default"].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 () {
                       (0, _index.hideLoading)();
-                      iframe.remove();
+                      setTimeout(function () {
+                        resolve(printWindow);
+                        if (window.__debug) {
+                          return;
+                        }
+                        iframe.remove();
+                      }, 100);
                     });
                   case 2:
                   case "end":
@@ -139,7 +148,7 @@ function _openPrint() {
                 }
               }, _callee3);
             }));
-            return function (_x4, _x5) {
+            return function (_x5, _x6) {
               return _ref.apply(this, arguments);
             };
           }()));

package/lib/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 {};

package/lib/utils/uni-bridge.js

@@ -0,0 +1,135 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+exports.__esModule = true;
+exports.uniBridge = void 0;
+var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+var _message2 = _interopRequireDefault(require("antd/lib/message"));
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+var uniqueId = 0;
+var UniBridge = /*#__PURE__*/function () {
+  function UniBridge() {
+    this.callbacks = {};
+  }
+  var _proto = UniBridge.prototype;
+  _proto.navigateTo = function navigateTo(src) {
+    var url = src;
+    if (!src.startsWith("http")) {
+      url = new URL(url, window.location.href).href;
+    }
+    uni.navigateTo({
+      url: "/pages/web-page/index?url=" + url
+    });
+  };
+  _proto.scanCode = /*#__PURE__*/function () {
+    var _scanCode = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee(options) {
+      var _t;
+      return _regenerator["default"].wrap(function (_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            _context.prev = 0;
+            _context.next = 1;
+            return this.doAction("scanCode", options);
+          case 1:
+            return _context.abrupt("return", _context.sent);
+          case 2:
+            _context.prev = 2;
+            _t = _context["catch"](0);
+            _message2["default"].error("");
+            throw _t;
+          case 3:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee, this, [[0, 2]]);
+    }));
+    function scanCode(_x) {
+      return _scanCode.apply(this, arguments);
+    }
+    return scanCode;
+  }();
+  _proto.getBarHeight = /*#__PURE__*/function () {
+    var _getBarHeight = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee2() {
+      return _regenerator["default"].wrap(function (_context2) {
+        while (1) switch (_context2.prev = _context2.next) {
+          case 0:
+            return _context2.abrupt("return", this.doAction("getBarHeight", {}));
+          case 1:
+          case "end":
+            return _context2.stop();
+        }
+      }, _callee2, this);
+    }));
+    function getBarHeight() {
+      return _getBarHeight.apply(this, arguments);
+    }
+    return getBarHeight;
+  }();
+  _proto.getLocation = /*#__PURE__*/function () {
+    var _getLocation = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee3(options) {
+      return _regenerator["default"].wrap(function (_context3) {
+        while (1) switch (_context3.prev = _context3.next) {
+          case 0:
+            return _context3.abrupt("return", this.doAction("getLocation", {
+              type: 'wgs84'
+            }));
+          case 1:
+          case "end":
+            return _context3.stop();
+        }
+      }, _callee3, this);
+    }));
+    function getLocation(_x2) {
+      return _getLocation.apply(this, arguments);
+    }
+    return getLocation;
+  }();
+  _proto.doAction = /*#__PURE__*/function () {
+    var _doAction = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee4(action, options) {
+      var _this = this;
+      var messageId;
+      return _regenerator["default"].wrap(function (_context4) {
+        while (1) switch (_context4.prev = _context4.next) {
+          case 0:
+            uniqueId++;
+            messageId = "msg_" + uniqueId + Date.now().toString(36);
+            return _context4.abrupt("return", new Promise(function (resolve, reject) {
+              _this.callbacks[messageId] = {
+                resolve: resolve,
+                reject: reject
+              };
+              console.log("postMessage", action, options);
+              uni.postMessage({
+                data: {
+                  action: action,
+                  messageId: messageId,
+                  options: options
+                }
+              });
+            }));
+          case 1:
+          case "end":
+            return _context4.stop();
+        }
+      }, _callee4);
+    }));
+    function doAction(_x3, _x4) {
+      return _doAction.apply(this, arguments);
+    }
+    return doAction;
+  }();
+  _proto.receiveMessage = function receiveMessage(message) {
+    console.log('收到 UniApp 消息:', message);
+    var callback = this.callbacks[message.messageId];
+    if (callback) {
+      if (message.success) {
+        callback.resolve(message.data);
+      } else {
+        callback.reject(message.error || new Error('操作失败'));
+      }
+      delete this.callbacks[message.messageId];
+    }
+  };
+  return UniBridge;
+}();
+var uniBridge = exports.uniBridge = new UniBridge();

package/lib/utils/util.common.d.ts

@@ -0,0 +1 @@
+export declare function isTemplate(): boolean;

package/lib/utils/util.common.js

@@ -0,0 +1,8 @@
+"use strict";
+
+exports.__esModule = true;
+exports.isTemplate = isTemplate;
+function isTemplate() {
+  return false;
+  return location.host == "templates.zhiyunhe.com";
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhubangyun/lowcode-core",
-  "version": "5.12.161",
+  "version": "6.1.90",
   "description": "低代码核心",
   "files": [
     "lib",
@@ -24,7 +24,7 @@
     "@alifd/next": "^1.24.18",
     "axios": "^1.7.9",
     "case": "^1.6.3",
-    "uuid": "^8.3.2"
+    "uuid": "^10.0.0"
   },
   "devDependencies": {
     "@alib/build-scripts": "^0.1.18",