hoeditor-web 3.0.39 → 3.0.40

package/lib/hoeditor.umd.js

@@ -58699,6 +58699,10 @@ var SignNode = /*#__PURE__*/function (_BaseNode) {
       var imgHeight = isClearSign ? 0 : Number(json.imgHeight);
       var isTemplate = json.isTemplate === true || json.isTemplate === "true" ? true : false;
       var attribute = json.attribute ? Number(json.attribute) : 0;
+      // 处理otherProperties参数传错导致fingerPrintSrc属性错误问题
+      if ((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_typeof_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z)(json.fingerPrintSrc) == 'object') {
+        json.fingerPrintSrc = '';
+      }
       var signNode = new SignNode(hoEditorFactoryID, rootNodes, pNode ? pNode : null, _BaseNode__WEBPACK_IMPORTED_MODULE_15__/* .NodeType.ntSign */ .Jq.ntSign, number, type, json.name, json.signType ? Number(json.signType) : 0, json.signFormat ? json.signFormat : "签名医师", isClearSign ? "" : json.signor, isClearSign ? "" : json.signTime, json.signTimeFormat ? json.signTimeFormat : "yyyy-MM-dd HH:mm", isClearSign ? "" : json.imgSrc, imgWidth, imgHeight, isClearSign ? undefined : json.customProperty, isTemplate, json.styleIndex ? Number(json.styleIndex) : undefined, json.connectMode, json.isFront, json.allowEditSignTime, isClearSign ? "" : json.fingerPrintSrc, isClearSign ? 0 : json.fingerPosition, attribute, json.connectChar, json.otherProperties);
       signNode.PNGToJPG = json.PNGToJPG == 1 ? 1 : 0;
       // if (json.id != "") {
@@ -68443,6 +68447,7 @@ var DrawArea = /*#__PURE__*/function (_DrawRect) {
               this._endDline = -2;
             }
             isFull = true;
+            this._docHeight -= aTop;
             // this.clearOverDitem(dlines, nextDline);
             return [isFull, dTop, restHeight];
           } else {
@@ -70504,10 +70509,11 @@ var DrawCell = /*#__PURE__*/function (_DrawRect) {
       var valignTop = 0;
       if (startDline === 0) {
         var aHeight = this._cell.drawCell.calcCellHeight();
+        var cellMaxHeigth = Math.min(maxHeight, aHeight);
         if (this._cell.cellProperty.align === _editor_dom_TableProperty__WEBPACK_IMPORTED_MODULE_13__/* .VAlign.vatop */ .TR.vatop) {
           valignTop = 0;
-        } else if (this._cell.cellProperty.align === _editor_dom_TableProperty__WEBPACK_IMPORTED_MODULE_13__/* .VAlign.vacenter */ .TR.vacenter && aHeight > this._cell.drawCell.docHeight) {
-          valignTop = (aHeight - this._cell.drawCell.docHeight) / 2;
+        } else if (this._cell.cellProperty.align === _editor_dom_TableProperty__WEBPACK_IMPORTED_MODULE_13__/* .VAlign.vacenter */ .TR.vacenter && cellMaxHeigth > this._cell.drawCell.docHeight) {
+          valignTop = (cellMaxHeigth - this._cell.drawCell.docHeight) / 2;
         } else if (this._cell.cellProperty.align === _editor_dom_TableProperty__WEBPACK_IMPORTED_MODULE_13__/* .VAlign.vabottom */ .TR.vabottom && aHeight > this._cell.drawCell.docHeight) {
           valignTop = aHeight - this._cell.drawCell.docHeight;
         }
@@ -231712,7 +231718,7 @@ Input.install = function (Vue) {
 
 
 /* harmony default export */ var antd = ([es_button, input, input_number, es_checkbox, date_picker, time_picker, es_radio, es_select, es_tabs, es_dropdown, es_menu, es_upload, tooltip, table, popover, es_icon/* default */.Z, config_provider]);
-;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/HoDocs.vue?vue&type=template&id=7a9c6e06&
+;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/HoDocs.vue?vue&type=template&id=1ebd4c64&
 var render = function render() {
   var _vm = this,
     _c = _vm._self._c;
@@ -231830,8 +231836,8 @@ var es_string_match = __webpack_require__(4723);
 var es_number_constructor = __webpack_require__(9653);
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.json.stringify.js
 var es_json_stringify = __webpack_require__(38862);
-;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/HoDoc.vue?vue&type=template&id=1e74a76d&
-var HoDocvue_type_template_id_1e74a76d_render = function render() {
+;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/HoDoc.vue?vue&type=template&id=c172646e&
+var HoDocvue_type_template_id_c172646e_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -231977,7 +231983,7 @@ var HoDocvue_type_template_id_1e74a76d_render = function render() {
     }
   }, [_vm._v("v " + _vm._s(_vm.version))])])])], 1);
 };
-var HoDocvue_type_template_id_1e74a76d_staticRenderFns = [];
+var HoDocvue_type_template_id_c172646e_staticRenderFns = [];
 
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.filter.js
 var es_array_filter = __webpack_require__(57327);
@@ -232510,55 +232516,43 @@ var DrawSelectLevel = /*#__PURE__*/function () {
         this._oldRange = hoeditorfactory.docTree.curDomRange.clone();
         var startPos = hoeditorfactory.drawTree.getStagePosition(dPage, dPage.activeDrawRect, aevent.stageX, aevent.stageY);
         if (startPos) {
-          // if (hoeditorfactory.structureConvert._signNodes.length > 0) {
-          // }
-
-          var curOnDragNode = hoeditorfactory.docTree.curOnDragNode;
-          if (curOnDragNode) {
-            var nodePath = curOnDragNode.getNodePath();
-            // drawNode.children.forEach((value, index) => {
-            //   if (value.name !== curOnDragNode.id) {
-            //     value.alpha = 0;
-            //   }
-            // });
-            if (nodePath !== startPos.path) {
-              var drawNode = curOnDragNode.drawNodes[0];
-              for (var d = drawNode.children.length - 1; d >= 0; d--) {
-                if (drawNode.children[d].name !== curOnDragNode.id) {
-                  drawNode.children.splice(d, 1);
+          if (aevent.nativeEvent.button === 0) {
+            var curOnDragNode = hoeditorfactory.docTree.curOnDragNode;
+            if (curOnDragNode) {
+              var nodePath = curOnDragNode.getNodePath();
+              if (nodePath !== startPos.path) {
+                var drawNode = curOnDragNode.drawNodes[0];
+                for (var d = drawNode.children.length - 1; d >= 0; d--) {
+                  if (drawNode.children[d].name !== curOnDragNode.id) {
+                    drawNode.children.splice(d, 1);
+                  }
                 }
+                hoeditorfactory.docTree.curOnDragNode = null;
+                HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID).drawPageTree.updateDrawPage(dPage.pageIndex);
               }
-              hoeditorfactory.docTree.curOnDragNode = null;
-              HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID).drawPageTree.updateDrawPage(dPage.pageIndex);
             }
-            //if (drawLine instanceof DrawLine) drawLine.updateCache();
-            //drawNode.stage.update();
-          }
-
-          var curComment = hoeditorfactory.drawTree.curOnSelectedComment;
-          if (curComment) {
-            var endDrawNode = curComment.eNode.drawNodes[0];
-            var drawArea = hoeditorfactory.drawPageTree.getMainRootArea(endDrawNode);
-            if (!drawArea) return false;
-            for (var i = 0; i < drawArea.children.length; i++) {
-              var child = drawArea.children[i];
-              if (child instanceof createjs.Shape && curComment.id === child.name) {
-                child.alpha = 0.5;
-              }
-              if (child instanceof createjs.Container && curComment.id === child.name) {
-                child.children.forEach(function (value) {
-                  if (value.name === 'back') {
-                    value.alpha = 0.5;
-                  }
-                });
+            var curComment = hoeditorfactory.drawTree.curOnSelectedComment;
+            if (curComment) {
+              var endDrawNode = curComment.eNode.drawNodes[0];
+              var drawArea = hoeditorfactory.drawPageTree.getMainRootArea(endDrawNode);
+              if (!drawArea) return false;
+              for (var i = 0; i < drawArea.children.length; i++) {
+                var child = drawArea.children[i];
+                if (child instanceof createjs.Shape && curComment.id === child.name) {
+                  child.alpha = 0.5;
+                }
+                if (child instanceof createjs.Container && curComment.id === child.name) {
+                  child.children.forEach(function (value) {
+                    if (value.name === 'back') {
+                      value.alpha = 0.5;
+                    }
+                  });
+                }
               }
+              hoeditorfactory.drawTree.curOnSelectedComment = null;
+              HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID).drawPageTree.updateDrawPage(dPage.pageIndex);
             }
-            hoeditorfactory.drawTree.curOnSelectedComment = null;
-            //drawArea.stage.update();
-            HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID).drawPageTree.updateDrawPage(dPage.pageIndex);
-            //dline.stage.update();
           }
-
           hoeditorfactory.drawTree.selectRange.spStart = startPos;
           hoeditorfactory.drawTree.selectRange.spEnd = startPos;
           hoeditorfactory.docTree.curDomRange.setSamePath(startPos.path);
@@ -232615,6 +232609,7 @@ var DrawSelectLevel = /*#__PURE__*/function () {
         }
       } else if (aevent.nativeEvent.button === 2) {
         hoeditorfactory.drawTree.selectRange.beginRangeSelect = false;
+        this.mouseDownHandle(aevent);
       }
       return true;
     }
@@ -235189,7 +235184,7 @@ var ParagraphNode = __webpack_require__(67945);
 // EXTERNAL MODULE: ./src/editor/dom/treeNode/MarkNode.ts
 var MarkNode = __webpack_require__(57727);
 ;// CONCATENATED MODULE: ./src/components/version.ts
-/* harmony default export */ var version = ('3.0.39');
+/* harmony default export */ var version = ('3.0.40');
 // EXTERNAL MODULE: ./src/components/controls/poperTipText/PoperTipText.vue + 5 modules
 var PoperTipText = __webpack_require__(15845);
 ;// CONCATENATED MODULE: ./src/components/controls/poperTipText/index.ts
@@ -235896,10 +235891,10 @@ var defaultHeight = Math.floor(1122 * DrawConfig/* DrawConfig.instance */.f.inst
 });
 ;// CONCATENATED MODULE: ./src/components/HoDoc.vue?vue&type=script&lang=js&
  /* harmony default export */ var components_HoDocvue_type_script_lang_js_ = (HoDocvue_type_script_lang_js_); 
-;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/HoDoc.vue?vue&type=style&index=0&id=1e74a76d&prod&lang=scss&
+;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/HoDoc.vue?vue&type=style&index=0&id=c172646e&prod&lang=scss&
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./src/components/HoDoc.vue?vue&type=style&index=0&id=1e74a76d&prod&lang=scss&
+;// CONCATENATED MODULE: ./src/components/HoDoc.vue?vue&type=style&index=0&id=c172646e&prod&lang=scss&
 
 ;// CONCATENATED MODULE: ./src/components/HoDoc.vue
 
@@ -235912,8 +235907,8 @@ var defaultHeight = Math.floor(1122 * DrawConfig/* DrawConfig.instance */.f.inst
 
 var HoDoc_component = (0,componentNormalizer/* default */.Z)(
   components_HoDocvue_type_script_lang_js_,
-  HoDocvue_type_template_id_1e74a76d_render,
-  HoDocvue_type_template_id_1e74a76d_staticRenderFns,
+  HoDocvue_type_template_id_c172646e_render,
+  HoDocvue_type_template_id_c172646e_staticRenderFns,
   false,
   null,
   null,
@@ -256127,10 +256122,10 @@ var commondata = __webpack_require__(76285);
 });
 ;// CONCATENATED MODULE: ./src/components/HoDocs.vue?vue&type=script&lang=js&
  /* harmony default export */ var components_HoDocsvue_type_script_lang_js_ = (HoDocsvue_type_script_lang_js_); 
-;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/HoDocs.vue?vue&type=style&index=0&id=7a9c6e06&prod&lang=scss&media=print&
+;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/HoDocs.vue?vue&type=style&index=0&id=1ebd4c64&prod&lang=scss&media=print&
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./src/components/HoDocs.vue?vue&type=style&index=0&id=7a9c6e06&prod&lang=scss&media=print&
+;// CONCATENATED MODULE: ./src/components/HoDocs.vue?vue&type=style&index=0&id=1ebd4c64&prod&lang=scss&media=print&
 
 ;// CONCATENATED MODULE: ./src/components/HoDocs.vue