@zhubangyun/lowcode-core 6.1.90 → 6.2.30

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): Promise<any>;
 export declare function print(options: PrintOptions): Promise<void>;
 export {};

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

@@ -10,16 +10,23 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 var _api = require("../api");
 var _formIds = require("../formIds");
 var _index = require("./index");
+var cache = new Map();
 function getFormPrintTemplates(_x) {
   return _getFormPrintTemplates.apply(this, arguments);
 }
 function _getFormPrintTemplates() {
-  _getFormPrintTemplates = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee(formId) {
+  _getFormPrintTemplates = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee2(formId) {
     var res;
-    return _regenerator["default"].wrap(function (_context) {
-      while (1) switch (_context.prev = _context.next) {
+    return _regenerator["default"].wrap(function (_context2) {
+      while (1) switch (_context2.prev = _context2.next) {
         case 0:
-          _context.next = 1;
+          if (!cache.has(formId)) {
+            _context2.next = 1;
+            break;
+          }
+          return _context2.abrupt("return", cache.get(formId));
+        case 1:
+          _context2.next = 2;
           return _api.apiRequest.get("forms/search", {
             params: {
               formId: _formIds.FormIds.printTemplate,
@@ -31,20 +38,21 @@ function _getFormPrintTemplates() {
               pageSize: 1000
             }
           });
-        case 1:
-          res = _context.sent;
+        case 2:
+          res = _context2.sent;
+          cache.set(formId, res.data || []);
           if (!res.success) {
-            _context.next = 2;
+            _context2.next = 3;
             break;
           }
-          return _context.abrupt("return", res.data);
-        case 2:
-          return _context.abrupt("return", []);
+          return _context2.abrupt("return", res.data);
         case 3:
+          return _context2.abrupt("return", []);
+        case 4:
         case "end":
-          return _context.stop();
+          return _context2.stop();
       }
-    }, _callee);
+    }, _callee2);
   }));
   return _getFormPrintTemplates.apply(this, arguments);
 }
@@ -52,48 +60,52 @@ function print(_x2) {
   return _print.apply(this, arguments);
 }
 function _print() {
-  _print = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee2(options) {
+  _print = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee3(options) {
     var templateId, iw, _t;
-    return _regenerator["default"].wrap(function (_context2) {
-      while (1) switch (_context2.prev = _context2.next) {
+    return _regenerator["default"].wrap(function (_context3) {
+      while (1) switch (_context3.prev = _context3.next) {
         case 0:
-          _context2.prev = 0;
-          _context2.next = 1;
+          _context3.prev = 0;
+          if (!(options.showLoading != false)) {
+            _context3.next = 1;
+            break;
+          }
+          _context3.next = 1;
           return (0, _index.showLoading)();
         case 1:
           templateId = options === null || options === void 0 ? void 0 : options.templateId;
           if (templateId) {
-            _context2.next = 2;
+            _context3.next = 2;
             break;
           }
           _message2["default"].error("\u6253\u5370\u5931\u8D25!\u6A21\u677Fid\u4E0D\u53EF\u4E3A\u7A7A!");
-          return _context2.abrupt("return");
+          return _context3.abrupt("return");
         case 2:
-          _context2.next = 3;
+          _context3.next = 3;
           return openPrint(templateId, options);
         case 3:
-          iw = _context2.sent;
+          iw = _context3.sent;
           if (iw) {
-            _context2.next = 4;
+            _context3.next = 4;
             break;
           }
           _message2["default"].error("\u6253\u5370\u5931\u8D25!\u6253\u5370\u7A97\u53E3\u4E0D\u53EF\u4E3A\u7A7A!");
-          return _context2.abrupt("return");
+          return _context3.abrupt("return");
         case 4:
-          _context2.next = 6;
+          _context3.next = 6;
           break;
         case 5:
-          _context2.prev = 5;
-          _t = _context2["catch"](0);
+          _context3.prev = 5;
+          _t = _context3["catch"](0);
           console.log("打印失败", _t);
         case 6:
-          _context2.prev = 6;
-          return _context2.finish(6);
+          _context3.prev = 6;
+          return _context3.finish(6);
         case 7:
         case "end":
-          return _context2.stop();
+          return _context3.stop();
       }
-    }, _callee2, null, [[0, 5, 6, 7]]);
+    }, _callee3, null, [[0, 5, 6, 7]]);
   }));
   return _print.apply(this, arguments);
 }
@@ -101,29 +113,33 @@ function openPrint(_x3, _x4) {
   return _openPrint.apply(this, arguments);
 }
 function _openPrint() {
-  _openPrint = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee4(templateId, options) {
+  _openPrint = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee6(templateId, options) {
     var url;
-    return _regenerator["default"].wrap(function (_context4) {
-      while (1) switch (_context4.prev = _context4.next) {
+    return _regenerator["default"].wrap(function (_context6) {
+      while (1) switch (_context6.prev = _context6.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) {
+          return _context6.abrupt("return", new Promise(/*#__PURE__*/function () {
+            var _ref = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee5(resolve, reject) {
               var printWindow, iframe;
-              return _regenerator["default"].wrap(function (_context3) {
-                while (1) switch (_context3.prev = _context3.next) {
+              return _regenerator["default"].wrap(function (_context5) {
+                while (1) switch (_context5.prev = _context5.next) {
                   case 0:
                     iframe = document.createElement("iframe");
                     iframe.src = url;
                     iframe.className = "print-iframe";
+                    iframe.onload = function () {
+                      // @ts-ignore
+                      iframe.contentWindow.printOptions = options;
+                    };
                     document.body.appendChild(iframe);
                     printWindow = iframe.contentWindow;
                     if (printWindow) {
-                      _context3.next = 1;
+                      _context5.next = 1;
                       break;
                     }
                     reject("创建Iframe失败!");
-                    return _context3.abrupt("return");
+                    return _context5.abrupt("return");
                   case 1:
                     // @ts-ignore
                     window.printWindow = printWindow;
@@ -132,31 +148,145 @@ function _openPrint() {
                       printWindow.printOptions = options;
                     };
                     printWindow.addEventListener("beforeprint", function () {});
-                    printWindow.addEventListener("afterprint", function () {
-                      (0, _index.hideLoading)();
-                      setTimeout(function () {
-                        resolve(printWindow);
-                        if (window.__debug) {
-                          return;
+                    printWindow.addEventListener("afterprint", /*#__PURE__*/(0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee4() {
+                      var _printWindow, printer, _printWindow2, doc, html;
+                      return _regenerator["default"].wrap(function (_context4) {
+                        while (1) switch (_context4.prev = _context4.next) {
+                          case 0:
+                            if (window.__debug) {
+                              console.debug((_printWindow = printWindow) === null || _printWindow === void 0 ? void 0 : _printWindow.document.documentElement.outerHTML);
+                            }
+                            _context4.next = 1;
+                            return (0, _index.hideLoading)();
+                          case 1:
+                            if (!(options.mode == "cloud_print")) {
+                              _context4.next = 5;
+                              break;
+                            }
+                            _context4.next = 2;
+                            return getCloudPrinter();
+                          case 2:
+                            printer = _context4.sent;
+                            if (!printer) {
+                              _context4.next = 4;
+                              break;
+                            }
+                            doc = (_printWindow2 = printWindow) === null || _printWindow2 === void 0 ? void 0 : _printWindow2.document;
+                            if (!doc) {
+                              _context4.next = 3;
+                              break;
+                            }
+                            doc.querySelectorAll("script").forEach(function (item) {
+                              return item.remove();
+                            });
+                            html = doc.documentElement.outerHTML;
+                            _context4.next = 3;
+                            return printer.post("<!doctype html>" + html);
+                          case 3:
+                            _context4.next = 5;
+                            break;
+                          case 4:
+                            _message2["default"].error("\u6253\u5370\u5931\u8D25\uFF01\u8BF7\u5148\u7ED1\u5B9A\u4E91\u6253\u5370\u673A");
+                          case 5:
+                            resolve(printWindow);
+                            setTimeout(function () {
+                              return iframe.remove();
+                            }, 100);
+                          case 6:
+                          case "end":
+                            return _context4.stop();
                         }
-                        iframe.remove();
-                      }, 100);
-                    });
+                      }, _callee4);
+                    })));
                   case 2:
                   case "end":
-                    return _context3.stop();
+                    return _context5.stop();
                 }
-              }, _callee3);
+              }, _callee5);
             }));
-            return function (_x5, _x6) {
+            return function (_x6, _x7) {
               return _ref.apply(this, arguments);
             };
           }()));
         case 1:
         case "end":
-          return _context4.stop();
+          return _context6.stop();
       }
-    }, _callee4);
+    }, _callee6);
   }));
   return _openPrint.apply(this, arguments);
-}
+}
+function getCloudPrinter() {
+  return _getCloudPrinter.apply(this, arguments);
+}
+function _getCloudPrinter() {
+  _getCloudPrinter = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee7() {
+    var itemValue;
+    return _regenerator["default"].wrap(function (_context7) {
+      while (1) switch (_context7.prev = _context7.next) {
+        case 0:
+          itemValue = localStorage.getItem("default:cloud-printer");
+          if (!(itemValue == null)) {
+            _context7.next = 1;
+            break;
+          }
+          return _context7.abrupt("return", null);
+        case 1:
+          return _context7.abrupt("return", new CloudPrinter(JSON.parse(itemValue)));
+        case 2:
+        case "end":
+          return _context7.stop();
+      }
+    }, _callee7);
+  }));
+  return _getCloudPrinter.apply(this, arguments);
+}
+var CloudPrinter = /*#__PURE__*/function () {
+  function CloudPrinter(options) {
+    this.deviceName = void 0;
+    this.serverIp = void 0;
+    this.port = void 0;
+    Object.assign(this, options);
+  }
+  var _proto = CloudPrinter.prototype;
+  _proto.post = /*#__PURE__*/function () {
+    var _post = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee(html) {
+      var baseUrl, baseRes, res;
+      return _regenerator["default"].wrap(function (_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            baseUrl = "http://" + this.serverIp + ":" + this.port;
+            _context.next = 1;
+            return _api.apiRequest.get(baseUrl);
+          case 1:
+            baseRes = _context.sent;
+            if (baseRes !== null && baseRes !== void 0 && baseRes.success) {
+              _context.next = 2;
+              break;
+            }
+            _message2["default"].error("云打印服务不可用");
+            return _context.abrupt("return");
+          case 2:
+            _context.next = 3;
+            return _api.apiRequest.post(baseUrl + "/print", {
+              deviceName: this.deviceName,
+              data: html
+            });
+          case 3:
+            res = _context.sent;
+            if (!res.success) {
+              _message2["default"].error(res.message);
+            }
+          case 4:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee, this);
+    }));
+    function post(_x5) {
+      return _post.apply(this, arguments);
+    }
+    return post;
+  }();
+  return CloudPrinter;
+}();

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

@@ -1,6 +1,7 @@
 interface ScanCodeOptions {
     onlyFromCamera?: boolean;
     openUrl?: boolean;
+    scanType?: string[];
 }
 interface ScanCodeResult {
     result: string;
@@ -10,6 +11,7 @@ declare class UniBridge {
     navigateTo(src: string): void;
     scanCode(options: ScanCodeOptions): Promise<ScanCodeResult>;
     getBarHeight(): Promise<unknown>;
+    scanCodeResult(): Promise<string>;
     getLocation(options: {}): Promise<unknown>;
     private doAction;
     private receiveMessage;

package/lib/utils/uni-bridge.js

@@ -6,7 +6,7 @@ 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 _uuid = require("uuid");
 var UniBridge = /*#__PURE__*/function () {
   function UniBridge() {
     this.callbacks = {};
@@ -17,9 +17,13 @@ var UniBridge = /*#__PURE__*/function () {
     if (!src.startsWith("http")) {
       url = new URL(url, window.location.href).href;
     }
-    uni.navigateTo({
-      url: "/pages/web-page/index?url=" + url
-    });
+    if (window.plus) {
+      uni.navigateTo({
+        url: "/pages/web-page/index?url=" + encodeURIComponent(url)
+      });
+    } else {
+      window.open(url);
+    }
   };
   _proto.scanCode = /*#__PURE__*/function () {
     var _scanCode = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee(options) {
@@ -27,21 +31,21 @@ var UniBridge = /*#__PURE__*/function () {
       return _regenerator["default"].wrap(function (_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            _context.prev = 0;
-            _context.next = 1;
+            options.scanType = ['qrCode', 'barCode'];
+            _context.prev = 1;
+            _context.next = 2;
             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;
+            return _context.abrupt("return", _context.sent);
           case 3:
+            _context.prev = 3;
+            _t = _context["catch"](1);
+            throw _t;
+          case 4:
           case "end":
             return _context.stop();
         }
-      }, _callee, this, [[0, 2]]);
+      }, _callee, this, [[1, 3]]);
     }));
     function scanCode(_x) {
       return _scanCode.apply(this, arguments);
@@ -65,53 +69,90 @@ var UniBridge = /*#__PURE__*/function () {
     }
     return getBarHeight;
   }();
-  _proto.getLocation = /*#__PURE__*/function () {
-    var _getLocation = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee3(options) {
+  _proto.scanCodeResult = /*#__PURE__*/function () {
+    var _scanCodeResult = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee3() {
+      var res;
       return _regenerator["default"].wrap(function (_context3) {
         while (1) switch (_context3.prev = _context3.next) {
           case 0:
-            return _context3.abrupt("return", this.doAction("getLocation", {
-              type: 'wgs84'
-            }));
+            _context3.next = 1;
+            return this.scanCode({
+              onlyFromCamera: false,
+              openUrl: false
+            });
           case 1:
+            res = _context3.sent;
+            return _context3.abrupt("return", res.result);
+          case 2:
           case "end":
             return _context3.stop();
         }
       }, _callee3, this);
     }));
+    function scanCodeResult() {
+      return _scanCodeResult.apply(this, arguments);
+    }
+    return scanCodeResult;
+  }();
+  _proto.getLocation = /*#__PURE__*/function () {
+    var _getLocation = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee4(options) {
+      return _regenerator["default"].wrap(function (_context4) {
+        while (1) switch (_context4.prev = _context4.next) {
+          case 0:
+            return _context4.abrupt("return", this.doAction("getLocation", {
+              type: 'wgs84'
+            }));
+          case 1:
+          case "end":
+            return _context4.stop();
+        }
+      }, _callee4, 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 _doAction = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee5(action, options) {
       var _this = this;
       var messageId;
-      return _regenerator["default"].wrap(function (_context4) {
-        while (1) switch (_context4.prev = _context4.next) {
+      return _regenerator["default"].wrap(function (_context5) {
+        while (1) switch (_context5.prev = _context5.next) {
           case 0:
-            uniqueId++;
-            messageId = "msg_" + uniqueId + Date.now().toString(36);
-            return _context4.abrupt("return", new Promise(function (resolve, reject) {
+            if (window.uni) {
+              _context5.next = 1;
+              break;
+            }
+            _message2["default"].error("\u6267\u884C\u5931\u8D25\uFF01\u7F3A\u5C11uni\u63D2\u4EF6");
+            return _context5.abrupt("return");
+          case 1:
+            messageId = (0, _uuid.v7)();
+            return _context5.abrupt("return", new Promise(function (resolve, reject) {
+              console.log("UniBridge.doAction", messageId, action, options);
               _this.callbacks[messageId] = {
                 resolve: resolve,
                 reject: reject
               };
-              console.log("postMessage", action, options);
-              uni.postMessage({
-                data: {
-                  action: action,
-                  messageId: messageId,
-                  options: options
-                }
-              });
+              try {
+                console.log("postMessage", messageId, action, options);
+                uni.postMessage({
+                  data: {
+                    action: action,
+                    messageId: messageId,
+                    options: options
+                  }
+                });
+              } catch (e) {
+                console.log("UniBridge.doAction 异常", e);
+                delete _this.callbacks[messageId];
+              }
             }));
-          case 1:
+          case 2:
           case "end":
-            return _context4.stop();
+            return _context5.stop();
         }
-      }, _callee4);
+      }, _callee5);
     }));
     function doAction(_x3, _x4) {
       return _doAction.apply(this, arguments);
@@ -119,8 +160,9 @@ var UniBridge = /*#__PURE__*/function () {
     return doAction;
   }();
   _proto.receiveMessage = function receiveMessage(message) {
-    console.log('收到 UniApp 消息:', message);
     var callback = this.callbacks[message.messageId];
+    console.log('客户端收到 UniApp 消息:', JSON.stringify(message));
+    console.log('客户端收到 UniApp 消息:callbacks', this.callbacks);
     if (callback) {
       if (message.success) {
         callback.resolve(message.data);

package/lib/utils/utils.scrollbar-size.js

@@ -0,0 +1 @@
+"use strict";

package/package.json

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