hoeditor-web 3.1.27 → 3.1.28

package/lib/hoeditor.umd.js

@@ -79042,6 +79042,7 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
             var fingerImage = new Image();
             var fingerBitmap;
             fingerImage.src = _this2.fingerPrintSrc;
+            // fingerImage.crossOrigin = "Anonymous";
             fingerBitmap = new createjs.Bitmap(fingerImage);
             fingerBitmap.setBounds(0, 0, node.imgWidth, node.imgHeight);
             drawNode.addChildAt(fingerBitmap, 0);
@@ -79068,6 +79069,7 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
           } else {
             var image = new Image();
             image.src = _this2.imgSrc;
+            // image.crossOrigin = "Anonymous";
             var bitmap = new createjs.Bitmap(image);
             bitmap.y = 0;
             bitmap.x = 0;
@@ -79080,6 +79082,7 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
             var _fingerBitmap;
             if (drawNode.fingerPrintSrc !== '') {
               _fingerImage.src = _this2.fingerPrintSrc;
+              // fingerImage.crossOrigin = "Anonymous";
               _fingerBitmap = new createjs.Bitmap(_fingerImage);
               _fingerBitmap.setBounds(0, 0, node.imgWidth, node.imgHeight);
               drawNode.addChildAt(_fingerBitmap, 1);
@@ -79210,6 +79213,7 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
         if (_this3.type === 1) {
           var image = new Image();
           image.src = _this3.imgSrc;
+          // image.crossOrigin = "Anonymous";
           var bitmap = new createjs.Bitmap(image);
           bitmap.y = -_this3.dHeight;
           bitmap.setBounds(0, 0, drawNode.dWidth, drawNode.dHeight);
@@ -89956,7 +89960,7 @@ var NodeStyleUndoUnit = /*#__PURE__*/function () {
 /* harmony export */   F: function() { return /* binding */ NodesDeleteUndoUnit; }
 /* harmony export */ });
 /* harmony import */ var ant_design_vue_es_message_style__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(94310);
-/* harmony import */ var ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_41__ = __webpack_require__(40735);
+/* harmony import */ var ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_42__ = __webpack_require__(40735);
 /* harmony import */ var D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_regeneratorRuntime_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(80543);
 /* harmony import */ var D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_asyncToGenerator_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(81448);
 /* harmony import */ var D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(27222);
@@ -90007,6 +90011,8 @@ var NodeStyleUndoUnit = /*#__PURE__*/function () {
 /* harmony import */ var _dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_38__ = __webpack_require__(24701);
 /* harmony import */ var _dom_NodePosition__WEBPACK_IMPORTED_MODULE_39__ = __webpack_require__(42921);
 /* harmony import */ var _dom_treeNode_TableFormula__WEBPACK_IMPORTED_MODULE_40__ = __webpack_require__(90832);
+/* harmony import */ var _dom_treeNode_RareCharNode__WEBPACK_IMPORTED_MODULE_41__ = __webpack_require__(34910);
+
 
 
 
@@ -90524,7 +90530,7 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
                 _context2.next = 11;
                 break;
               }
-              ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_41__/* ["default"] */ .Z.warn("该内容当前已处于删除状态!");
+              ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_42__/* ["default"] */ .Z.warn("该内容当前已处于删除状态!");
               this._isError = true;
               return _context2.abrupt("return");
             case 11:
@@ -90573,7 +90579,7 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
               //   this._isError = true;
               //   return;
               // }
-              if (!(node instanceof _dom_treeNode_ControlNode__WEBPACK_IMPORTED_MODULE_33__/* .ControlNode */ .w || node instanceof _dom_treeNode_TextInputFieldNode__WEBPACK_IMPORTED_MODULE_25__/* .TextInputFieldNode */ .re)) {
+              if (!(node instanceof _dom_treeNode_ControlNode__WEBPACK_IMPORTED_MODULE_33__/* .ControlNode */ .w && !(node instanceof _dom_treeNode_RareCharNode__WEBPACK_IMPORTED_MODULE_41__/* .RareCharNode */ .Q) || node instanceof _dom_treeNode_TextInputFieldNode__WEBPACK_IMPORTED_MODULE_25__/* .TextInputFieldNode */ .re)) {
                 _context2.next = 37;
                 break;
               }
@@ -90594,8 +90600,8 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
               if (node instanceof _dom_treeNode_DownListNode__WEBPACK_IMPORTED_MODULE_36__/* .DownListNode */ .yF) {
                 tip = "下拉列表";
               }
-              ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_41__/* ["default"] */ .Z.destroy();
-              ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_41__/* ["default"] */ .Z.warn(tip + "元素已设置为不允许删除。请先右键元素属性设置成允许删除,再进行删除操作。");
+              ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_42__/* ["default"] */ .Z.destroy();
+              ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_42__/* ["default"] */ .Z.warn(tip + "元素已设置为不允许删除。请先右键元素属性设置成允许删除,再进行删除操作。");
               this._isError = true;
               return _context2.abrupt("return");
             case 37:
@@ -90603,8 +90609,8 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
                 _context2.next = 42;
                 break;
               }
-              ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_41__/* ["default"] */ .Z.destroy();
-              ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_41__/* ["default"] */ .Z.warn("元素已设置为不允许删除,请正确操作。");
+              ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_42__/* ["default"] */ .Z.destroy();
+              ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_42__/* ["default"] */ .Z.warn("元素已设置为不允许删除,请正确操作。");
               this._isError = true;
               return _context2.abrupt("return");
             case 42:
@@ -90612,8 +90618,8 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
                 _context2.next = 47;
                 break;
               }
-              ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_41__/* ["default"] */ .Z.destroy();
-              ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_41__/* ["default"] */ .Z.warn("不允许删除表格计算公式");
+              ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_42__/* ["default"] */ .Z.destroy();
+              ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_42__/* ["default"] */ .Z.warn("不允许删除表格计算公式");
               this._isError = true;
               return _context2.abrupt("return");
             case 47:
@@ -90621,8 +90627,8 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
                 _context2.next = 52;
                 break;
               }
-              ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_41__/* ["default"] */ .Z.destroy();
-              ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_41__/* ["default"] */ .Z.warn("不允许删除表格");
+              ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_42__/* ["default"] */ .Z.destroy();
+              ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_42__/* ["default"] */ .Z.warn("不允许删除表格");
               this._isError = true;
               return _context2.abrupt("return");
             case 52:
@@ -90630,8 +90636,8 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
                 _context2.next = 57;
                 break;
               }
-              ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_41__/* ["default"] */ .Z.destroy();
-              ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_41__/* ["default"] */ .Z.warn("不允许直接删除签名！");
+              ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_42__/* ["default"] */ .Z.destroy();
+              ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_42__/* ["default"] */ .Z.warn("不允许直接删除签名！");
               this._isError = true;
               return _context2.abrupt("return");
             case 57:
@@ -218034,7 +218040,7 @@ var TextNode = __webpack_require__(27198);
 // EXTERNAL MODULE: ./src/editor/dom/treeNode/ParagraphNode.ts
 var ParagraphNode = __webpack_require__(67945);
 ;// CONCATENATED MODULE: ./src/components/version.ts
-/* harmony default export */ var version = ('3.1.27');
+/* harmony default export */ var version = ('3.1.28');
 // EXTERNAL MODULE: ./src/components/controls/poperTipText/PoperTipText.vue + 5 modules
 var PoperTipText = __webpack_require__(50987);
 ;// CONCATENATED MODULE: ./src/components/controls/poperTipText/index.ts
@@ -228095,12 +228101,18 @@ var VueController = /*#__PURE__*/function () {
         return (0,regeneratorRuntime/* default */.Z)().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
+              if (!(strHtml === "<span></span>")) {
+                _context.next = 2;
+                break;
+              }
+              return _context.abrupt("return");
+            case 2:
               hoEditorFactory = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this._hoEditorFactoryID);
               strHtml = hoEditorFactory.unitConvert.replaceAll(strHtml, '</上标>', '<上标/>');
               strHtml = hoEditorFactory.unitConvert.replaceAll(strHtml, '</下标>', '<下标/>');
               result = hoEditorFactory.editController.canIsEdit(hoEditorFactory);
               if (!result) {
-                _context.next = 36;
+                _context.next = 38;
                 break;
               }
               nodes = hoEditorFactory.htmlConverter.parseHtmlString(strHtml);
@@ -228119,23 +228131,23 @@ var VueController = /*#__PURE__*/function () {
                 }
               }
               if (!(value && keyValue && listItems)) {
-                _context.next = 35;
+                _context.next = 37;
                 break;
               }
               startPath = hoEditorFactory.docTree.curDomRange.normalize().startPath;
               parentNode = hoEditorFactory.docTree.getParentNode(startPath);
               if (!(parentNode instanceof TextInputFieldNode/* TextInputFieldNode */.re && parentNode.inputFieldType == 1 && parentNode.insCheckSyncUpdateList)) {
-                _context.next = 35;
+                _context.next = 37;
                 break;
               }
               downListProperty = parentNode.downListProperty;
               if (!downListProperty.allowMultiSelected) {
-                _context.next = 35;
+                _context.next = 37;
                 break;
               }
               arr = downListProperty.listItems ? JSON.parse(downListProperty.listItems) : [];
               if (!clear) {
-                _context.next = 29;
+                _context.next = 31;
                 break;
               }
               parentNode.value = '';
@@ -228149,12 +228161,12 @@ var VueController = /*#__PURE__*/function () {
               if (!canModifyContent) {
                 parentNode.canModifyContent = true;
               }
-              _context.next = 27;
+              _context.next = 29;
               return hoEditorFactory.docController.deleteRange(range, true, 'update');
-            case 27:
+            case 29:
               parentNode.canModifyContent = canModifyContent;
               hoEditorFactory.docTree.curDomRange.setSamePath(spath);
-            case 29:
+            case 31:
               parentNode.text = strHtml;
               parentNode.value = parentNode.value ? parentNode.value + ',' + value : value;
               parentNode.keyValue = parentNode.keyValue ? parentNode.keyValue + ',' + keyValue : keyValue;
@@ -228163,9 +228175,9 @@ var VueController = /*#__PURE__*/function () {
               if (nodes[nodes.length - 1] instanceof ParagraphNode/* ParagraphNode */.C) {
                 nodes.splice(nodes.length - 1, 1);
               }
-            case 35:
+            case 37:
               hoEditorFactory.docController.parseNodeData(nodes);
-            case 36:
+            case 38:
             case "end":
               return _context.stop();
           }
@@ -230538,6 +230550,21 @@ var VueController = /*#__PURE__*/function () {
       }
       return getBase64;
     }()
+  }, {
+    key: "isSetFontFamily",
+    value: function isSetFontFamily(callback) {
+      var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this._hoEditorFactoryID);
+      if (!hoEditorFactory.printController.isSetFont) {
+        hoEditorFactory.vueController.hoLocalStorage().loadFontString().then(function (font) {
+          if (font) {
+            hoEditorFactory.printController.setjsPDFFonts(font);
+            callback();
+          }
+        });
+      } else {
+        callback();
+      }
+    }
     /**
      *  患者签名插入和更新
      */
@@ -231618,7 +231645,7 @@ var VueController = /*#__PURE__*/function () {
           return previousNode === null || previousNode === void 0 ? void 0 : previousNode.parentNode.text;
         }
       };
-      if (node instanceof TextNode/* TextNode */.R && !(node instanceof TextInputFieldNode/* TextInputFieldNode */.re)) {
+      if (node instanceof TextNode/* TextNode */.R) {
         if (node.text) {
           text = node.text;
         } else {
@@ -232288,7 +232315,10 @@ var VueController = /*#__PURE__*/function () {
     key: "pasteInsertDocument",
     value: function pasteInsertDocument(jsonData, htmlData, textData) {
       var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this._hoEditorFactoryID);
-      hoEditorFactory.editController.pasteInsert(jsonData, htmlData, textData);
+      var result = hoEditorFactory.editController.canIsEdit(hoEditorFactory);
+      if (result) {
+        hoEditorFactory.editController.pasteInsert(jsonData, htmlData, textData);
+      }
     }
     /**
      * 添加对角线