hoeditor-web 2.0.99 → 2.0.100

package/lib/hoeditor.common.js

@@ -6000,7 +6000,7 @@ var component = (0,componentNormalizer/* default */.Z)(
 
 /***/ }),
 
-/***/ 23915:
+/***/ 2706:
 /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -6012,7 +6012,7 @@ __webpack_require__.d(__webpack_exports__, {
   "default": function() { return /* binding */ PoperSelect; }
 });
 
-;// CONCATENATED MODULE: ./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/poperSelect/PoperSelect.vue?vue&type=template&id=1331ab94&scoped=true&
+;// CONCATENATED MODULE: ./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/poperSelect/PoperSelect.vue?vue&type=template&id=39dd7333&scoped=true&
 var render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{ref:"poperSelectedModal",staticClass:"poper-selected-modal animation-in"},[_c('div',{staticStyle:{"height":"0","overflow":"hidden"}},[_c('svg',{attrs:{"viewBox":"0 0 1303 1024","version":"1.1","xmlns":"http://www.w3.org/2000/svg","width":"16","height":"16"}},[_c('defs',[_c('g',{attrs:{"id":"selected"}},[_c('path',{attrs:{"d":"M498.688 1024c-26.996364 0-52.782545-11.636364-71.214545-32.395636L29.323636 536.017455a124.276364 124.276364 0 0 1 0-160.302546 89.181091 89.181091 0 0 1 132.747637-11.915636l11.264 11.915636L497.105455 749.288727 1133.102545 34.443636a88.994909 88.994909 0 0 1 129.489455-11.915636l11.357091 11.915636c39.098182 45.521455 39.098182 114.874182 0 160.395637l-705.629091 796.765091c-17.966545 20.48-43.194182 32.209455-69.632 32.395636","fill":"#2175FF"}})])])])]),(_vm.isCanSearch && !_vm.mutexSelect)?_c('div',{staticStyle:{"padding":"5px"}},[_c('el-input',{attrs:{"placeholder":_vm.currentListNameText + '搜索',"size":"mini"},on:{"input":_vm.searchList},model:{value:(_vm.input),callback:function ($$v) {_vm.input=$$v},expression:"input"}})],1):_vm._e(),(_vm.poperType === 'selectPoper' && _vm.currentList.length >= 0)?_c('div',{staticClass:"select-poper"},[_c('div',{staticClass:"list-box"},[(_vm.currentList.length == 0)?_c('ul',{staticClass:"list"},[_c('li',{staticStyle:{"text-align":"center"}},[_vm._v("无选项")])]):_vm._e(),(_vm.isAllowMultiSelect && !_vm.mutexSelect && _vm.currentList.length > 0)?_c('el-checkbox-group',{on:{"change":_vm.selectItemsChange},model:{value:(_vm.selectedIds),callback:function ($$v) {_vm.selectedIds=$$v},expression:"selectedIds"}},[_c('RecycleScroller',{staticClass:"scroller",attrs:{"items":_vm.currentList,"item-size":32,"key-field":"id"},scopedSlots:_vm._u([{key:"default",fn:function(ref){
 var item = ref.item;
 return [(item.title)?_c('p',{staticClass:"poper-select-title"},[_vm._v(_vm._s(item.text))]):_vm._e(),(!item.title)?_c('el-checkbox',{key:item.id + Math.random(),attrs:{"label":item.id}},[_vm._v(" "+_vm._s(item.text && item.text.indexOf("<元素>") !== -1 ? item.text.split("<元素>")[0] : item.text.split("<搜索>")[0])+" ")]):_vm._e()]}}],null,false,4143456003)})],1):_vm._e(),(_vm.isAllowMultiSelect && _vm.mutexSelect && _vm.currentList.length > 0)?[_c('el-checkbox-group',{on:{"change":_vm.mutexSelectItemsChange},model:{value:(_vm.mutexSelectedIds),callback:function ($$v) {_vm.mutexSelectedIds=$$v},expression:"mutexSelectedIds"}},[_vm._l((_vm.currentList),function(item,index){return [(index >= 1 && item.type != _vm.currentList[index - 1].type)?_c('p',{key:index + Math.random(),staticClass:"el-checkbox-mutex-line"}):_vm._e(),_c('el-checkbox',{key:item.id + Math.random(),attrs:{"label":item.id,"disabled":_vm.mutexType !== '' && _vm.mutexType != item.type}},[_vm._v(" "+_vm._s(item.text && item.text.indexOf("<元素>") !== -1 ? item.text.split("<元素>")[0] : item.text.split("<搜索>")[0])+" ")])]})],2)]:_vm._e(),(!_vm.isAllowMultiSelect && _vm.currentList.length > 0)?_c('el-radio-group',{model:{value:(_vm.selectedId),callback:function ($$v) {_vm.selectedId=$$v},expression:"selectedId"}},_vm._l((_vm.currentList),function(item){return _c('el-radio',{key:item.id + Math.random(),attrs:{"label":item.id},nativeOn:{"~click":function($event){return _vm.selectItemsChange(item)}}},[_vm._v(" "+_vm._s(item.text && item.text.indexOf("<元素>") !== -1 ? item.text.split("<元素>")[0] : item.text.split("<搜索>")[0])+" ")])}),1):_vm._e(),(_vm.selectedList.length > 0 && _vm.isAllowMultiSelect && !_vm.mutexSelect && _vm.isCanSearch)?_c('transition-group',{staticClass:"list",attrs:{"name":"drag","tag":"ul"}},[_c('li',{key:"已选择",staticStyle:{"position":"absolute","top":"0px","z-index":"111","background":"#fff"}},[_vm._v("已选择"+_vm._s(_vm.currentListNameText))]),_vm._l((_vm.selectedList),function(item,index){return [_c('li',{key:item.id + Math.random(),staticClass:"drag-item selected",attrs:{"draggable":""},on:{"dragenter":function($event){return _vm.dragenter($event, index)},"dragover":function($event){return _vm.dragover($event, index)},"dragstart":function($event){return _vm.dragstart(index)}}},[_c('span',[_vm._v(_vm._s(item.text && item.text.indexOf("<元素>") !== -1 ? item.text.split("<元素>")[0] : item.text.split("<搜索>")[0]))]),_c('i',{staticClass:"el-icon-delete",on:{"click":function($event){return _vm.deleteItems(item, index)}}})])]})],2):_vm._e()],2)]):_vm._e(),(_vm.poperType === 'selectPoper' && !_vm.isAllowMultiSelect)?_c('footer',[_c('el-button',{staticStyle:{"padding":"5px 13px"},attrs:{"size":"mini"},on:{"click":_vm.handleClose}},[_vm._v("关闭")])],1):_vm._e(),(_vm.poperType === 'selectPoper' && _vm.isAllowMultiSelect)?_c('footer',[(!_vm.mutexSelect)?_c('el-button',{staticStyle:{"padding":"5px 13px"},attrs:{"size":"mini"},on:{"click":_vm.allSelect}},[_vm._v("全选")]):_vm._e(),_c('el-button',{staticStyle:{"padding":"5px 13px"},attrs:{"size":"mini"},on:{"click":_vm.sureSelect}},[_vm._v("确定")]),_c('el-button',{staticStyle:{"padding":"5px 13px"},attrs:{"size":"mini"},on:{"click":_vm.cancelSelect}},[_vm._v("清空")]),_c('el-button',{staticStyle:{"padding":"5px 13px"},attrs:{"size":"mini"},on:{"click":_vm.handleClose}},[_vm._v("取消")])],1):_vm._e(),(_vm.poperType === 'datePoper')?_c('div',{staticClass:"date-poper"},[(_vm.dateTimeStyle.includes('dd'))?_c('DatePanel',{attrs:{"value":_vm.date},on:{"getValue":_vm.getTime}}):_vm._e(),(_vm.dateTimeStyle.includes('MM') && !_vm.dateTimeStyle.includes('dd'))?_c('DatePanel',{attrs:{"dateType":"month","value":_vm.date},on:{"getValue":_vm.getTime}}):_vm._e(),(_vm.dateTimeStyle.includes('yyyy') && !_vm.dateTimeStyle.includes('MM'))?_c('DatePanel',{attrs:{"dateType":"year","value":_vm.date},on:{"getValue":_vm.getTime}}):_vm._e(),(_vm.dateTimeStyle.includes('HH'))?_c('div',{staticClass:"timepicker",staticStyle:{"padding":"8px 0"}},[_c('el-time-picker',{staticStyle:{"width":"200px"},attrs:{"type":"time","format":_vm.timeStyle,"value-format":_vm.timeStyle,"size":"mini"},model:{value:(_vm.time),callback:function ($$v) {_vm.time=$$v},expression:"time"}})],1):_vm._e(),_c('footer',[_c('el-button',{staticStyle:{"padding":"5px 13px"},attrs:{"size":"mini"},on:{"click":_vm.sureDate}},[_vm._v("确定")]),_c('el-button',{staticStyle:{"padding":"5px 13px"},attrs:{"size":"mini"},on:{"click":_vm.currentDateTime}},[_vm._v("此刻")]),_c('el-button',{staticStyle:{"padding":"5px 13px"},attrs:{"size":"mini"},on:{"click":_vm.handleClose}},[_vm._v("取消")])],1)],1):_vm._e()])}
@@ -8408,7 +8408,7 @@ var popper = __webpack_require__(14519);
         if (_this2.poppernIstance) {
           _this2.poppernIstance.update();
         }
-      }, 0);
+      }, 100);
     }
   },
   methods: {
@@ -8829,10 +8829,10 @@ var popper = __webpack_require__(14519);
 });
 ;// CONCATENATED MODULE: ./src/components/controls/poperSelect/PoperSelect.vue?vue&type=script&lang=js&
  /* harmony default export */ var poperSelect_PoperSelectvue_type_script_lang_js_ = (PoperSelectvue_type_script_lang_js_); 
-;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-22[0].rules[0].use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22[0].rules[0].use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22[0].rules[0].use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22[0].rules[0].use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/poperSelect/PoperSelect.vue?vue&type=style&index=0&id=1331ab94&lang=scss&scoped=true&
+;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-22[0].rules[0].use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22[0].rules[0].use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22[0].rules[0].use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22[0].rules[0].use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/poperSelect/PoperSelect.vue?vue&type=style&index=0&id=39dd7333&lang=scss&scoped=true&
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./src/components/controls/poperSelect/PoperSelect.vue?vue&type=style&index=0&id=1331ab94&lang=scss&scoped=true&
+;// CONCATENATED MODULE: ./src/components/controls/poperSelect/PoperSelect.vue?vue&type=style&index=0&id=39dd7333&lang=scss&scoped=true&
 
 // EXTERNAL MODULE: ./node_modules/@vue/vue-loader-v15/lib/runtime/componentNormalizer.js
 var componentNormalizer = __webpack_require__(1001);
@@ -8851,7 +8851,7 @@ var component = (0,componentNormalizer/* default */.Z)(
   staticRenderFns,
   false,
   null,
-  "1331ab94",
+  "39dd7333",
   null
   
 )
@@ -26872,10 +26872,18 @@ var DocController = /*#__PURE__*/function () {
 
       if (node instanceof _treeNode_TextNode__WEBPACK_IMPORTED_MODULE_27__/* .TextNode */ .R && parentNode instanceof _treeNode_TextInputFieldNode__WEBPACK_IMPORTED_MODULE_46__/* .TextInputFieldNode */ .re && parentNode.inputFieldType == 1 && isResetFieldText) {
         var firstPath = parentNode.StartMarkNode.getNodePath();
+        var lastPath = parentNode.EndMarkNode.getNodePath();
 
         if (curRange.isEmpty && curRange.endPath == firstPath) {
-          var lastPath = hoEditorFactory.docTree.getNodeLastPath(parentNode.EndMarkNode.previousLeaf());
-          curRange.endPath = lastPath;
+          var ePath = hoEditorFactory.docTree.getNodeLastPath(parentNode.EndMarkNode.previousLeaf());
+          curRange.endPath = ePath;
+        }
+
+        if (!curRange.isEmpty && curRange.endPath == lastPath) {
+          var _ePath = hoEditorFactory.docTree.getNodeLastPath(parentNode.EndMarkNode.previousLeaf());
+
+          curRange.startPath = firstPath;
+          curRange.endPath = _ePath;
         }
       }
 
@@ -27094,13 +27102,16 @@ var DocController = /*#__PURE__*/function () {
                   });
                 }
               } else {
+                node = hoEditorFactory.docTree.findNodePositionByPath(strPath).node;
+
                 if (aTextArray[0] == 0 && node instanceof _treeNode_TextNode__WEBPACK_IMPORTED_MODULE_27__/* .TextNode */ .R && childIndex >= 0 && node.styleIndex == hoEditorFactory.docTree.curStyleIndex) {
                   if (hoEditorFactory.drawTree.paintStatus !== _draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_28__/* .PaintState.psReview */ .Dh.psReview || hoEditorFactory.drawTree.paintStatus === _draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_28__/* .PaintState.psReview */ .Dh.psReview && !curTextStyle.combineStyle.strikeout) {
                     var textNode = node;
 
-                    _this.insertNodeText(textNode, strPath, aText);
+                    _this.insertNodeText(textNode, strPath, aText); //strPath = hoEditorFactory.docTree.curDomRange.startPath;
+
 
-                    strPath = hoEditorFactory.docTree.curDomRange.startPath;
+                    strPath = hoEditorFactory.docTree.getNodeLastPath(textNode);
                   } else {
                     var _textNode = new _treeNode_TextNode__WEBPACK_IMPORTED_MODULE_27__/* .TextNode */ .R(_this._hoEditorFactoryID, roots, pNode, _treeNode_BaseNode__WEBPACK_IMPORTED_MODULE_24__/* .NodeType.ntText */ .Jq.ntText, aText, hoEditorFactory.docTree.curStyleIndex);
 
@@ -58157,6 +58168,11 @@ var DrawArea = /*#__PURE__*/function (_DrawRect) {
 
           if (!canfit && this._allowAcrossPage) {
             this._endDline = nextDline - 1;
+
+            if (this._endDline == -1) {
+              this._endDline = -2;
+            }
+
             this.clearOverDitem(dlines, nextDline);
             isFull = true;
             bFinishedPaint = false;
@@ -58322,6 +58338,11 @@ var DrawArea = /*#__PURE__*/function (_DrawRect) {
           if (!canfit && dTop > 0 && this._allowAcrossPage) {
             var nextArea = this.getNextDrawArea();
             this._endDline = nextDline - 1;
+
+            if (this._endDline == -1) {
+              this._endDline = -2;
+            }
+
             isFull = true; // this.clearOverDitem(dlines, nextDline);
 
             return [isFull, dTop, restHeight];
@@ -63019,6 +63040,8 @@ var DrawPageCell = /*#__PURE__*/function (_DrawArea) {
   }, {
     key: "paintArea",
     value: function paintArea(dlines, startIndex, dTop) {
+      startIndex = startIndex < -1 ? 0 : startIndex;
+
       var _get$call = (0,get/* default */.Z)((0,getPrototypeOf/* default */.Z)(DrawPageCell.prototype), "paintArea", this).call(this, dlines, startIndex, dTop),
           _get$call2 = (0,slicedToArray/* default */.Z)(_get$call, 3),
           bret = _get$call2[0],
@@ -63424,9 +63447,9 @@ var DrawPageCell = /*#__PURE__*/function (_DrawArea) {
       // }
 
 
-      this._startDline = startIndex;
+      this._startDline = startIndex < -1 ? 0 : startIndex;
 
-      var ret = (0,get/* default */.Z)((0,getPrototypeOf/* default */.Z)(DrawPageCell.prototype), "update", this).call(this, prevDrawArea, dlines, startIndex, valignTop, restHeight);
+      var ret = (0,get/* default */.Z)((0,getPrototypeOf/* default */.Z)(DrawPageCell.prototype), "update", this).call(this, prevDrawArea, dlines, this._startDline, valignTop, restHeight);
 
       this._docHeight = Math.max(0, this._docHeight - valignTop);
       this.updateDHeight();
@@ -64441,7 +64464,11 @@ var DrawPageTable = /*#__PURE__*/function (_DrawRect) {
                 dHeight = _cell.drawCell.getCellRestHeight(_cell.drawCell.drawPageCells.indexOf(dPartCell) - 1);
 
                 if (dPartCell.isEndLineFinished()) {
-                  startDline = dPartCell.endDline + 1;
+                  if (dPartCell.endDline == -2) {
+                    startDline = 0;
+                  } else {
+                    startDline = dPartCell.endDline + 1;
+                  }
                 } else startDline = dPartCell.endDline;
               }
             } else if (_cell.drawCell.drawPageCells.length > 0) {
@@ -65178,7 +65205,13 @@ var DrawPageTable = /*#__PURE__*/function (_DrawRect) {
 
               if (dPrevPartCell) {
                 partCellindex = _cell2.drawCell.drawPageCells.indexOf(dPrevPartCell);
-                if (dPrevPartCell.isEndLineFinished()) startChildIndex = dPrevPartCell.endDline + 1;else startChildIndex = dPrevPartCell.endDline;
+                if (dPrevPartCell.isEndLineFinished()) {
+                  if (dPrevPartCell.endDline == -2) {
+                    startChildIndex = 0;
+                  } else {
+                    startChildIndex = dPrevPartCell.endDline + 1;
+                  }
+                } else startChildIndex = dPrevPartCell.endDline;
               }
             }
 
@@ -213171,7 +213204,7 @@ var map = {
 	"./pageInfoes/PageInfoes.vue": 67977,
 	"./paragraph/ParagraphDialog.vue": 32679,
 	"./poperSelect/PoperMark.vue": 93069,
-	"./poperSelect/PoperSelect.vue": 23915,
+	"./poperSelect/PoperSelect.vue": 2706,
 	"./poperTipText/PoperTipText.vue": 91831,
 	"./popers/Poper.vue": 25425,
 	"./popers/Title.vue": 40168,
@@ -214727,9 +214760,9 @@ 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/@vue/vue-loader-v15/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/HoDoc.vue?vue&type=template&id=6a4e96d0&
-var HoDocvue_type_template_id_6a4e96d0_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{class:_vm.docClassNames},[_c('div',{ref:"editorArea",staticClass:"editors"},[(_vm.drawPageLength > 0)?_c('div',{staticClass:"editor",on:{"click":function($event){return _vm.setActiveDocIndex(_vm.hoEditorId)}}},[_vm._l((_vm.drawPageCount.count),function(pgIndex){return [_c('HoPage',{key:pgIndex - 1,attrs:{"data-id":pgIndex - 1,"index":pgIndex - 1,"docIndex":_vm.docIndex,"canvasWidth":_vm.canvasParams.width,"canvasHeight":_vm.canvasParams.height,"currentActivePages":_vm.activePageIndex.index,"hoEditorId":_vm.hoEditorId,"hoEditorFactoryIdList":_vm.hoEditorFactoryIdList,"mouseMoveNodes":_vm.mouseMoveNodes,"viewableAreaObserver":_vm.viewableAreaObserver,"inViewPages":_vm.inViewPages,"canvasHeadFootPos":_vm.canvasHeadFootPos,"poperTipPos":_vm.poperTipPos,"textStyle":_vm.textStyle,"aiInfo":_vm.aiInfo},on:{"pageReady":_vm.pageReady,"canvasRightClick":_vm.mouseRightClickEvent},scopedSlots:_vm._u([{key:"hoPageHead",fn:function(){return [_vm._t("hoDocHead")]},proxy:true},{key:"hoPageFoot",fn:function(){return [_vm._t("hoDocFoot")]},proxy:true}],null,true)})]})],2):_vm._e()]),(_vm.poperType === 'datePoper' || _vm.poperType === 'selectPoper')?_c('PoperSelectModal',{attrs:{"poperType":_vm.poperType,"poperSelectList":_vm.poperSelectList,"poperPos":_vm.poperPos,"hoEditorId":_vm.hoEditorId},on:{"poperClose":_vm.poperClose}}):_vm._e(),_c('PoperMark',{directives:[{name:"show",rawName:"v-show",value:(_vm.poperType === 'datePoper' || _vm.poperType === 'selectPoper' || _vm.poperType === 'table-cell-poper'),expression:"poperType === 'datePoper' || poperType === 'selectPoper' || poperType === 'table-cell-poper'"}]}),(_vm.poperType === 'table-cell-poper')?_c('TableCellPoper',{attrs:{"poperNode":_vm.nodeValue,"poperPos":_vm.poperPos},on:{"poperClose":_vm.poperClose}}):_vm._e(),_c('HoToPage',{attrs:{"hoEditorId":_vm.hoEditorId,"inViewPages":_vm.inViewPages}}),_c('PoperTipText',{attrs:{"isPoperText":_vm.isPoperText,"poperText":_vm.poperText,"poperPos":_vm.poperTextPos},on:{"poperTextClose":_vm.poperTextClose}}),_c('ul',{directives:[{name:"click-outside",rawName:"v-click-outside",value:(function () { return (_vm.isCreateRightMenuModal = false); }),expression:"() => (isCreateRightMenuModal = false)"},{name:"show",rawName:"v-show",value:(_vm.isCreateRightMenuModal),expression:"isCreateRightMenuModal"}],ref:"rightMenuModal",staticClass:"create-right-menu"},[(_vm.showCommentsBtn)?_c('li',{staticClass:"mouse-menu-item",on:{"click":_vm.hideComments}},[_vm._v(_vm._s(_vm.isHideComments ? '显示' : '隐藏')+"批注")]):_vm._e(),(_vm.showDeleteSignMenu)?_c('li',{staticClass:"mouse-menu-item",on:{"click":_vm.deleteSignNode}},[_vm._v("删除签名")]):_vm._e(),_c('li',{staticClass:"mouse-menu-item"},[_vm._v(" 编辑器内核版本:   "),_c('span',{staticStyle:{"font-size":"14px","color":"#0a77e3"}},[_vm._v("v "+_vm._s(_vm.version))])])])],1)}
-var HoDocvue_type_template_id_6a4e96d0_staticRenderFns = []
+;// CONCATENATED MODULE: ./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/HoDoc.vue?vue&type=template&id=088d007e&
+var HoDocvue_type_template_id_088d007e_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{class:_vm.docClassNames},[_c('div',{ref:"editorArea",staticClass:"editors"},[(_vm.drawPageLength > 0)?_c('div',{staticClass:"editor",on:{"click":function($event){return _vm.setActiveDocIndex(_vm.hoEditorId)}}},[_vm._l((_vm.drawPageCount.count),function(pgIndex){return [_c('HoPage',{key:pgIndex - 1,attrs:{"data-id":pgIndex - 1,"index":pgIndex - 1,"docIndex":_vm.docIndex,"canvasWidth":_vm.canvasParams.width,"canvasHeight":_vm.canvasParams.height,"currentActivePages":_vm.activePageIndex.index,"hoEditorId":_vm.hoEditorId,"hoEditorFactoryIdList":_vm.hoEditorFactoryIdList,"mouseMoveNodes":_vm.mouseMoveNodes,"viewableAreaObserver":_vm.viewableAreaObserver,"inViewPages":_vm.inViewPages,"canvasHeadFootPos":_vm.canvasHeadFootPos,"poperTipPos":_vm.poperTipPos,"textStyle":_vm.textStyle,"aiInfo":_vm.aiInfo},on:{"pageReady":_vm.pageReady,"canvasRightClick":_vm.mouseRightClickEvent},scopedSlots:_vm._u([{key:"hoPageHead",fn:function(){return [_vm._t("hoDocHead")]},proxy:true},{key:"hoPageFoot",fn:function(){return [_vm._t("hoDocFoot")]},proxy:true}],null,true)})]})],2):_vm._e()]),(_vm.poperType === 'datePoper' || _vm.poperType === 'selectPoper')?_c('PoperSelectModal',{attrs:{"poperType":_vm.poperType,"poperSelectList":_vm.poperSelectList,"poperPos":_vm.poperPos,"hoEditorId":_vm.hoEditorId},on:{"poperClose":_vm.poperClose}}):_vm._e(),_c('PoperMark',{directives:[{name:"show",rawName:"v-show",value:(_vm.poperType === 'datePoper' || _vm.poperType === 'selectPoper' || _vm.poperType === 'table-cell-poper'),expression:"poperType === 'datePoper' || poperType === 'selectPoper' || poperType === 'table-cell-poper'"}]}),(_vm.poperType === 'table-cell-poper')?_c('TableCellPoper',{attrs:{"poperNode":_vm.nodeValue,"poperPos":_vm.poperPos},on:{"poperClose":_vm.poperClose}}):_vm._e(),_c('HoToPage',{attrs:{"hoEditorId":_vm.hoEditorId,"inViewPages":_vm.inViewPages}}),_c('PoperTipText',{attrs:{"isPoperText":_vm.isPoperText,"poperText":_vm.poperText,"poperPos":_vm.poperTextPos},on:{"poperTextClose":_vm.poperTextClose}}),_c('ul',{directives:[{name:"click-outside",rawName:"v-click-outside",value:(function () { return (_vm.isCreateRightMenuModal = false); }),expression:"() => (isCreateRightMenuModal = false)"},{name:"show",rawName:"v-show",value:(_vm.isCreateRightMenuModal),expression:"isCreateRightMenuModal"}],ref:"rightMenuModal",staticClass:"create-right-menu"},[(_vm.showCommentsBtn)?_c('li',{staticClass:"mouse-menu-item",on:{"click":_vm.hideComments}},[_vm._v(_vm._s(_vm.isHideComments ? '显示' : '隐藏')+"批注")]):_vm._e(),(_vm.showDeleteSignMenu)?_c('li',{staticClass:"mouse-menu-item",on:{"click":_vm.deleteSignNode}},[_vm._v("删除签名")]):_vm._e(),_c('li',{staticClass:"mouse-menu-item"},[_vm._v(" 编辑器内核版本:   "),_c('span',{staticStyle:{"font-size":"14px","color":"#0a77e3"}},[_vm._v("v "+_vm._s(_vm.version))])])])],1)}
+var HoDocvue_type_template_id_088d007e_staticRenderFns = []
 
 
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.filter.js
@@ -215386,7 +215419,7 @@ var DrawSelectLevel = /*#__PURE__*/function () {
       var hoeditorfactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID);
       var dPage = hoeditorfactory.drawTree.drawPages[this._pageIndex];
 
-      if (!dPage.drawDomLevel) {
+      if (!dPage || !dPage.drawDomLevel) {
         return false;
       }
 
@@ -216658,7 +216691,7 @@ var DrawPage = __webpack_require__(65870);
 // EXTERNAL MODULE: ./src/plugins/util.ts
 var util = __webpack_require__(33913);
 // EXTERNAL MODULE: ./src/components/controls/poperSelect/PoperSelect.vue + 8 modules
-var PoperSelect = __webpack_require__(23915);
+var PoperSelect = __webpack_require__(2706);
 // EXTERNAL MODULE: ./src/components/controls/poperSelect/PoperMark.vue + 5 modules
 var PoperMark = __webpack_require__(93069);
 ;// CONCATENATED MODULE: ./src/components/controls/poperSelect/index.ts
@@ -218370,7 +218403,7 @@ var SignNode = __webpack_require__(34450);
 // EXTERNAL MODULE: ./src/editor/dom/treeNode/ParagraphNode.ts
 var ParagraphNode = __webpack_require__(14208);
 ;// CONCATENATED MODULE: ./src/components/version.ts
-/* harmony default export */ var version = ('2.0.99');
+/* harmony default export */ var version = ('2.0.100');
 // EXTERNAL MODULE: ./src/components/controls/poperTipText/PoperTipText.vue + 5 modules
 var PoperTipText = __webpack_require__(91831);
 ;// CONCATENATED MODULE: ./src/components/controls/poperTipText/index.ts
@@ -219153,8 +219186,8 @@ var ImageNode = __webpack_require__(88389);
 
 var HoDoc_component = (0,componentNormalizer/* default */.Z)(
   components_HoDocvue_type_script_lang_js_,
-  HoDocvue_type_template_id_6a4e96d0_render,
-  HoDocvue_type_template_id_6a4e96d0_staticRenderFns,
+  HoDocvue_type_template_id_088d007e_render,
+  HoDocvue_type_template_id_088d007e_staticRenderFns,
   false,
   null,
   null,
@@ -219421,6 +219454,7 @@ var DrawPageTree = /*#__PURE__*/function () {
       var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID);
 
       if (aDrawArea instanceof DrawPageCell/* DrawPageCell */.k) {
+        //单元格内的绘制单独调用paintDrawPageCell
         this.paintDrawPageCell(aDrawArea, dRoots, startLine, endLine);
         return;
       }
@@ -219428,16 +219462,19 @@ var DrawPageTree = /*#__PURE__*/function () {
       var startUpdateLine = endLine;
       var drawArea = aDrawArea;
       this._oldPageCount = hoEditorFactory.drawTree.drawPages.length;
-      var restHeight = Infinity;
+      var restHeight = Infinity; //-----------开始定位绘制起始行，绘制起始位置--------------------------
+
       var aline = dRoots[startLine];
       var dLine;
       var dTop = 0;
       var mainDTop = 0;
 
       if (aline instanceof DrawTable/* DrawTable */.t) {
+        //表格在绘制时，只取最后一个分页表格，
         if (aline.drawPageTables.length > 0) {
           dLine = aline.drawPageTables[aline.drawPageTables.length - 1];
         } else {
+          //表格还未开始绘制，无起始行 
           dLine = null;
 
           if (startLine > 0) {
@@ -219469,7 +219506,8 @@ var DrawPageTree = /*#__PURE__*/function () {
       } else {
         dLine = aline;
         dTop = aline.y;
-      }
+      } //----------------结束定位绘制起始行，绘制起始位置--------------------------
+
 
       if (drawArea.allowAcrossPage) restHeight = drawArea.maxHeight - dTop; // let drawArea = this.getMainRootArea(dLine);
 
@@ -219487,12 +219525,13 @@ var DrawPageTree = /*#__PURE__*/function () {
         this.clearAreas([mainArea]);
       }
 
-      var nextLine = startLine;
+      var nextLine = startLine; //用于判断是否页已经満页的map 
+
       var pageIsFull = new Map();
 
       try {
         this._startNeedUpdatePage = -1;
-        this._endNeedUpdatePage = -1;
+        this._endNeedUpdatePage = -1; //------------开始将不分页绘制树中的绘制行，按页进行摆放--------------------------
 
         while (nextLine <= endLine) {
           var dline = dRoots[nextLine]; //如果需要新起一页，则新起一页
@@ -219505,7 +219544,8 @@ var DrawPageTree = /*#__PURE__*/function () {
             drawArea = this.getNextDrawArea(drawArea, true)[0];
             dTop = 0;
             if (drawArea.allowAcrossPage) restHeight = drawArea.maxHeight - dTop;
-          }
+          } // 判断是否已经满页
+
 
           if (dline instanceof DrawTable/* DrawTable */.t && restHeight < hoEditorFactory.defaultLineHeight || dline instanceof DrawLine/* DrawLine */.a && restHeight < dline.dHeight) {
             if (dline instanceof DrawLine/* DrawLine */.a && restHeight >= hoEditorFactory.defaultLineHeight) {
@@ -219524,11 +219564,13 @@ var DrawPageTree = /*#__PURE__*/function () {
 
 
             if (drawArea instanceof DrawPageMainDoc/* DrawPageMainDoc */.$) {
-              this.afterAreaFinishPaint(drawArea);
+              //当前已经満页，绘制批注页码等信息
+              this.afterAreaFinishPaint(drawArea); //  计算重绘页范围 ，已废弃
+
               this._startNeedUpdatePage = Math.min(drawArea.pageIndex, this._startNeedUpdatePage === -1 ? 99999 : this._startNeedUpdatePage);
               this._endNeedUpdatePage = Math.max(drawArea.pageIndex, this._endNeedUpdatePage);
               pageIsFull.set(drawArea.index, true);
-              var isNew = false;
+              var isNew = false; //获取下一个绘制页，并初始化绘制位置
 
               var _this$getNextDrawArea = this.getNextDrawArea(drawArea);
 
@@ -219546,7 +219588,8 @@ var DrawPageTree = /*#__PURE__*/function () {
                 break;
               }
             }
-          }
+          } //当前行不会触发满页,正常绘制 
+
 
           var _dobj = dRoots[nextLine];
           var cbParagraph = _dobj.paragraphNode.combineParagraph;
@@ -219555,10 +219598,12 @@ var DrawPageTree = /*#__PURE__*/function () {
             var bFinishedPaint = _dobj.drawPageTables.length > 0 && _dobj.isFinishedPaint();
 
             if (bFinishedPaint) {
+              //修改起始绘制点，已废弃
               if (nextLine < startUpdateLine) {
                 startUpdateLine = nextLine > 0 ? nextLine - 1 : 0;
               }
             } else {
+              //表格分页绘制，当表格分页绘制完成，但未达到最后一行绘制完时，需要新起一页，接着绘制，直到表格绘制完成
               while (!bFinishedPaint) {
                 var startRow = 0;
 
@@ -219621,6 +219666,7 @@ var DrawPageTree = /*#__PURE__*/function () {
               dTop += cbParagraph.lineSpace;
             }
           } else {
+            //普通行绘制,检查是否满页，満页后需要新起一页绘制  
             if (_dobj.dHeight > restHeight && dTop > 0) {
               if (drawArea instanceof DrawPageMainDoc/* DrawPageMainDoc */.$) {
                 drawArea.endDline = nextLine - 1; // drawArea.stage.update();
@@ -219636,12 +219682,14 @@ var DrawPageTree = /*#__PURE__*/function () {
                   restHeight = drawArea.maxHeight - dTop;
                 }
               }
-            }
+            } //普通行正常绘制
+
 
             if (nextLine > startLine || nextLine === startLine && !drawArea.contains(_dobj)) {
               drawArea.addChild(_dobj);
               _dobj.y = dTop; // dobj.x = cbParagraph.leftMarginPixes;
-            }
+            } //修改下一行的绘制起始位置
+
 
             dTop = _dobj.y + _dobj.dHeight + _dobj.paragraphNode.combineParagraph.lineSpace;
             mainArea.docHeight = dTop;
@@ -219654,7 +219702,7 @@ var DrawPageTree = /*#__PURE__*/function () {
         // }
 
 
-        var mainIndex = Math.min(nextLine, endLine, startUpdateLine); //正文绘制完毕 最后一行不需要执行更新
+        var mainIndex = Math.min(nextLine, endLine, startUpdateLine); //绘制完成，清理多出来的绘制页
 
         if (drawArea instanceof DrawPageMainDoc/* DrawPageMainDoc */.$ && mainIndex === dRoots.length - 1) {
           drawArea.endDline = mainIndex;
@@ -219731,7 +219779,8 @@ var DrawPageTree = /*#__PURE__*/function () {
 
         if (startDrawLine instanceof DrawPageTable/* DrawPageTable */.ox && !mainArea.contains(startDrawLine) && startDrawLine instanceof DrawPageTable/* DrawPageTable */.ox && startDrawLine.table.drawTable.drawPageTables.indexOf(startDrawLine) > 0) {
           drawTop = 0;
-        }
+        } //对于新插入的内容绘制完成后（一直到最后一个插入的段落结束），后续的段落需要进行移动位置，则调用update 
+
 
         this.update(mainArea, dMainRoots, drawTop, mainIndex, mainIndex, true);
       } finally {
@@ -219999,7 +220048,8 @@ var DrawPageTree = /*#__PURE__*/function () {
         }
 
         var startIndex = startLine;
-        var bChangedInTable = false;
+        var bChangedInTable = false; //计算绘制起始坐标
+
         var nextDlineTop = 0;
 
         if (startIndex === endLine && dRoots[startIndex] instanceof DrawTable/* DrawTable */.t) {
@@ -220017,7 +220067,8 @@ var DrawPageTree = /*#__PURE__*/function () {
 
             nextDlineTop = dobj.y;
           }
-        }
+        } //----------
+
 
         var aEndLine = dRoots.length - 1;
         var restHeight = Infinity;
@@ -220050,6 +220101,7 @@ var DrawPageTree = /*#__PURE__*/function () {
           //   dLine.paragraphNode.combineParagraph.lineSpace;
           // startDline.dHeight +
           // startDline.paragraphNode.combineParagraph.lineSpace;
+          //启用绘制优化，如果当前页不可见，则缓存绘制调用，当页可见时再调用
 
 
           if (hoEditorFactory.isUseDrawingOptimization) {
@@ -220060,13 +220112,14 @@ var DrawPageTree = /*#__PURE__*/function () {
                 return;
               }
             }
-          }
+          } //按区域调整区域内的所有坐标
+
 
           drawArea.update(prevArea, dRoots, startIndex, dTop, restHeight);
           this.afterAreaFinishPaint(drawArea);
           this._startNeedUpdatePage = Math.min(drawArea.index, this._startNeedUpdatePage === -1 ? 99999 : this._startNeedUpdatePage);
           this._endNeedUpdatePage = Math.max(drawArea.index, this._endNeedUpdatePage);
-          startIndex = drawArea.endDline;
+          startIndex = drawArea.endDline; //如果绘制是在表格内，将下一个绘制对象切换到表格外(只遍历最外层绘制对象)
 
           if (bChangedInTable && startIndex > endLine + 1) {
             var _dItem = dRoots[endLine + 1];
@@ -224988,6 +225041,11 @@ var StructureNode = /*#__PURE__*/function () {
       this._text = this._Convertor.toText();
 
       if (clipboard) {
+        if (this._json != "") {
+          var patientID = hoEditorFactory.docTree.docProperty.patientID;
+          this._json = patientID + ":" + this._json;
+        }
+
         clipboard.setData(ClipboardType.ctJSON, this._json);
         clipboard.setData(ClipboardType.ctHTML, this._html);
         clipboard.setData(ClipboardType.ctText, this._text);
@@ -232724,6 +232782,10 @@ var message_default = /*#__PURE__*/__webpack_require__.n(message);
 
 
 
+
+
+
+
 
 
 
@@ -233059,10 +233121,28 @@ var EditController = /*#__PURE__*/function () {
 
       var nodes;
 
+      if (!jsonData) {
+        if (hoeditorfactory.notAllowCrossPatiPaste && hoeditorfactory.drawTree.paintStatus !== DrawTree/* PaintState.psDesign */.Dh.psDesign) {
+          message_box_default().alert("不能粘贴他人病历内容到该患者病历中");
+
+          return;
+        }
+      }
+
       if (jsonData) {
+        var patientID = jsonData.split(":")[0];
+        var index = jsonData.indexOf(":");
+        jsonData = jsonData.substring(index + 1, jsonData.length);
+
         if (hoeditorfactory.drawTree.paintStatus === DrawTree/* PaintState.psDesign */.Dh.psDesign) {
           nodes = hoeditorfactory.structureNode.Parse(ClipboardType.ctJSON, jsonData);
         } else {
+          if (hoeditorfactory.notAllowCrossPatiPaste && patientID !== hoeditorfactory.docTree.docProperty.patientID) {
+            message_box_default().alert("不能粘贴他人病历内容到该患者病历中");
+
+            return;
+          }
+
           var jsonObject = JSON.parse(jsonData);
 
           if (jsonObject.length == 1 && jsonObject[0].nodeType === "ntTable" && parentNode instanceof CellNode/* CellNode */.D) {
@@ -235309,28 +235389,24 @@ var HoLocalStorage = /*#__PURE__*/function () {
     // 	storeName: this._storeName,
     // });
 
-    (_window = window) === null || _window === void 0 ? void 0 : (_window$chrome = _window.chrome) === null || _window$chrome === void 0 ? void 0 : (_window$chrome$webvie = _window$chrome.webview) === null || _window$chrome$webvie === void 0 ? void 0 : _window$chrome$webvie.addEventListener("message", function (e) {
+    (_window = window) === null || _window === void 0 ? void 0 : (_window$chrome = _window.chrome) === null || _window$chrome === void 0 ? void 0 : (_window$chrome$webvie = _window$chrome.webview) === null || _window$chrome$webvie === void 0 ? void 0 : _window$chrome$webvie.addEventListener('message', function (e) {
       var res = JSON.parse(e.data);
 
-      if (res.result == true && res.res.cmd == "GetList") {
+      if (res.result == true && res.res.cmd == 'GetList') {
         var _this$callBack;
 
         _this._localXmlList = res.res.EMR;
         (_this$callBack = _this.callBack) === null || _this$callBack === void 0 ? void 0 : _this$callBack.call(_this, _this._localXmlList);
       }
 
-      ;
-
-      if (res.result == true && res.res.cmd == "Load") {
+      if (res.result == true && res.res.cmd == 'Load') {
         var _this$callBackForLoad;
 
         _this._localXmlContent = res.res.EMR;
         (_this$callBackForLoad = _this.callBackForLoad) === null || _this$callBackForLoad === void 0 ? void 0 : _this$callBackForLoad.call(_this, _this._localXmlContent);
       }
 
-      ;
-
-      if (res.res.cmd == "save") {} else {
+      if (res.res.cmd == 'save') {} else {
         return false;
       }
     });
@@ -235364,9 +235440,9 @@ var HoLocalStorage = /*#__PURE__*/function () {
       this.callBack = callBack;
       var hoEitfactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID);
       var data = {
-        exec: "emr",
+        exec: 'emr',
         data: {
-          cmd: "getlist",
+          cmd: 'getlist',
           content: {
             PatientID: hoEitfactory.docTree.docProperty.patientID,
             EMRName: hoEitfactory.docTree.docProperty.title
@@ -235391,9 +235467,9 @@ var HoLocalStorage = /*#__PURE__*/function () {
 
       this.callBackForLoad = callBack;
       var data = {
-        exec: "emr",
+        exec: 'emr',
         data: {
-          cmd: "load",
+          cmd: 'load',
           content: {
             PatientID: item.PatientID,
             FileName: item.FileName
@@ -235451,9 +235527,9 @@ var HoLocalStorage = /*#__PURE__*/function () {
 
         if (hoEitfactory && hoEitfactory.vueController.isModifyDoc()) {
           var data = {
-            exec: "emr",
+            exec: 'emr',
             data: {
-              cmd: "save",
+              cmd: 'save',
               content: {
                 PatientID: hoEitfactory.docTree.docProperty.patientID,
                 EMRName: hoEitfactory.docTree.docProperty.title,
@@ -235540,10 +235616,18 @@ var HoLocalStorage = /*#__PURE__*/function () {
     key: "saveFontString",
     value: function saveFontString(font) {
       this._print_font.setItem('sunsim_font', font);
+
+      this._print_font.setItem('sunsim_font_cache', '1');
     }
   }, {
     key: "loadFontString",
-    value: function loadFontString() {
+    value: function loadFontString(cache) {
+      if (cache === '1') {
+        return this._print_font.getItem('sunsim_font_cache');
+      }
+
+      this._print_font.setItem('sunsim_font_cache', '1');
+
       return this._print_font.getItem('sunsim_font');
     }
   }]);
@@ -235625,6 +235709,8 @@ var HOEditorFactory = /*#__PURE__*/function () {
     this._lastSaveTime = new Date(Date.now());
     this._superiorSigns = []; //上级医生签名
 
+    this._notAllowCrossPatiPaste = false; //不允许跨病人复制粘贴
+
     this._hoEditorFactoryId = id;
   }
   /**
@@ -236181,6 +236267,16 @@ var HOEditorFactory = /*#__PURE__*/function () {
         this._pasteBase = value;
       }
     }
+  }, {
+    key: "notAllowCrossPatiPaste",
+    get: function get() {
+      return this._notAllowCrossPatiPaste;
+    },
+    set: function set(value) {
+      if (this._notAllowCrossPatiPaste !== value) {
+        this._notAllowCrossPatiPaste = value;
+      }
+    }
   }, {
     key: "isHideComments",
     get: function get() {