hoeditor-web 2.0.99 → 2.0.101

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
   
 )
@@ -26600,7 +26600,7 @@ var SubDocManger = /*#__PURE__*/function () {
 /* harmony import */ var element_ui_lib_message_box__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(86769);
 /* harmony import */ var element_ui_lib_message_box__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(element_ui_lib_message_box__WEBPACK_IMPORTED_MODULE_4__);
 /* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_classCallCheck_js__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(35671);
-/* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_87__ = __webpack_require__(22342);
+/* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_88__ = __webpack_require__(22342);
 /* harmony import */ var core_js_modules_es_object_to_string_js__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(41539);
 /* harmony import */ var core_js_modules_es_object_to_string_js__WEBPACK_IMPORTED_MODULE_6___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_object_to_string_js__WEBPACK_IMPORTED_MODULE_6__);
 /* harmony import */ var core_js_modules_es_promise_js__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(88674);
@@ -26699,6 +26699,8 @@ var SubDocManger = /*#__PURE__*/function () {
 /* harmony import */ var _treeNode_SignNode__WEBPACK_IMPORTED_MODULE_84__ = __webpack_require__(34450);
 /* harmony import */ var _events_NodeNeedModifyEvent__WEBPACK_IMPORTED_MODULE_85__ = __webpack_require__(49482);
 /* harmony import */ var _treeNode_GestationNode__WEBPACK_IMPORTED_MODULE_86__ = __webpack_require__(74873);
+/* harmony import */ var _undoRedo_TableUndos_TableDeleteParagraphUndoUnit__WEBPACK_IMPORTED_MODULE_87__ = __webpack_require__(72964);
+
 
 
 
@@ -26806,7 +26808,7 @@ var DocController = /*#__PURE__*/function () {
   // }
 
 
-  (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_87__/* ["default"] */ .Z)(DocController, [{
+  (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_88__/* ["default"] */ .Z)(DocController, [{
     key: "onInsertNodeByID",
     get: function get() {
       return this._onInsertNodeByID;
@@ -26872,10 +26874,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 +27104,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);
 
@@ -27371,7 +27384,7 @@ var DocController = /*#__PURE__*/function () {
                 // );
                 // hoEditorFactory.undoService.commit();
 
-                _context.next = 124;
+                _context.next = 123;
                 break;
 
               case 6:
@@ -27380,12 +27393,12 @@ var DocController = /*#__PURE__*/function () {
                 node = nodePosition.node;
 
                 if (!node) {
-                  _context.next = 124;
+                  _context.next = 123;
                   break;
                 }
 
                 if (!domRange.isEmpty) {
-                  _context.next = 124;
+                  _context.next = 123;
                   break;
                 }
 
@@ -27454,7 +27467,7 @@ var DocController = /*#__PURE__*/function () {
                 aRange = new _DomRange__WEBPACK_IMPORTED_MODULE_31__/* .DomRange */ .a(this._hoEditorFactoryID, startPath, topath).normalize();
                 this.deleteRange(aRange, true);
                 hoEditorFactory.docTree.curDomRange = new _DomRange__WEBPACK_IMPORTED_MODULE_31__/* .DomRange */ .a(this._hoEditorFactoryID, topath, topath);
-                _context.next = 124;
+                _context.next = 123;
                 break;
 
               case 36:
@@ -27513,12 +27526,12 @@ var DocController = /*#__PURE__*/function () {
                 // );
                 // hoEditorFactory.undoService.commit();
 
-                _context.next = 124;
+                _context.next = 123;
                 break;
 
               case 55:
                 if (!(node instanceof _treeNode_ParagraphNode__WEBPACK_IMPORTED_MODULE_30__/* .ParagraphNode */ .C)) {
-                  _context.next = 82;
+                  _context.next = 81;
                   break;
                 }
 
@@ -27533,12 +27546,12 @@ var DocController = /*#__PURE__*/function () {
 
               case 59:
                 if (!(prevNode == null)) {
-                  _context.next = 82;
+                  _context.next = 81;
                   break;
                 }
 
                 if (!(node.parentNode instanceof _treeNode_CellNode__WEBPACK_IMPORTED_MODULE_57__/* .CellNode */ .D)) {
-                  _context.next = 81;
+                  _context.next = 80;
                   break;
                 }
 
@@ -27549,35 +27562,39 @@ var DocController = /*#__PURE__*/function () {
                 preParaNode = hoEditorFactory.docTree.getSameRectPrevParanode(tableNode.paragraphNode);
 
                 if (!(preParaNode && tIndex == 0 && cIndex == 0 && preParaNode.drawlines.length == 1 && preParaNode.drawlines[0] instanceof _draw_DrawLine__WEBPACK_IMPORTED_MODULE_80__/* .DrawLine */ .a && preParaNode.drawlines[0].isEmpty())) {
-                  _context.next = 78;
+                  _context.next = 77;
                   break;
                 }
 
+                // hoEditorFactory.undoService.begin();
+                // hoEditorFactory.undoService.add(
+                //   new NodeDeleteUndoUnit(this._hoEditorFactoryID, tableNode.paragraphNode, tableNode.paragraphNode.getNodePath())
+                // );
+                // await hoEditorFactory.undoService.commit();
                 hoEditorFactory.undoService.begin();
-                hoEditorFactory.undoService.add(new _undoRedo_NodeDeleteUndoUnit__WEBPACK_IMPORTED_MODULE_37__/* .NodeDeleteUndoUnit */ .w(this._hoEditorFactoryID, tableNode.paragraphNode, tableNode.paragraphNode.getNodePath()));
-                tableNode.paragraphNode = preParaNode;
-                _context.next = 72;
+                hoEditorFactory.undoService.add(new _undoRedo_TableUndos_TableDeleteParagraphUndoUnit__WEBPACK_IMPORTED_MODULE_87__/* .TableDeleteParagraphUndoUnit */ .T(this._hoEditorFactoryID, tableNode, tableNode.paragraphNode));
+                _context.next = 71;
                 return hoEditorFactory.undoService.commit();
 
-              case 72:
+              case 71:
                 newpath = cellNode.childNodes[0].getNodePath();
                 hoEditorFactory.docTree.curDomRange.setSamePath(newpath);
                 hoEditorFactory.drawTree.moveCaretToPath(newpath);
                 return _context.abrupt("return");
 
-              case 78:
+              case 77:
                 return _context.abrupt("return");
 
-              case 79:
-                _context.next = 82;
+              case 78:
+                _context.next = 81;
                 break;
 
-              case 81:
+              case 80:
                 return _context.abrupt("return");
 
-              case 82:
+              case 81:
                 if (!(hoEditorFactory.drawTree.paintStatus === _draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_28__/* .PaintState.psReview */ .Dh.psReview && !(node instanceof _treeNode_SignNode__WEBPACK_IMPORTED_MODULE_84__/* .SignNode */ .N))) {
-                  _context.next = 87;
+                  _context.next = 86;
                   break;
                 }
 
@@ -27585,16 +27602,16 @@ var DocController = /*#__PURE__*/function () {
 
                 return _context.abrupt("return");
 
-              case 87:
+              case 86:
                 if (!(hoEditorFactory.drawTree.paintStatus === _draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_28__/* .PaintState.psReview */ .Dh.psReview && node instanceof _treeNode_SignNode__WEBPACK_IMPORTED_MODULE_84__/* .SignNode */ .N)) {
-                  _context.next = 92;
+                  _context.next = 91;
                   break;
                 }
 
                 signUserId = node.customProperty.bce01;
 
                 if (!(hoEditorFactory.userInfo.id != signUserId)) {
-                  _context.next = 92;
+                  _context.next = 91;
                   break;
                 }
 
@@ -27602,9 +27619,9 @@ var DocController = /*#__PURE__*/function () {
 
                 return _context.abrupt("return");
 
-              case 92:
+              case 91:
                 if (!(hoEditorFactory.drawTree.paintStatus !== _draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_28__/* .PaintState.psDesign */ .Dh.psDesign && node instanceof _treeNode_SignNode__WEBPACK_IMPORTED_MODULE_84__/* .SignNode */ .N)) {
-                  _context.next = 95;
+                  _context.next = 94;
                   break;
                 }
 
@@ -27612,9 +27629,9 @@ var DocController = /*#__PURE__*/function () {
 
                 return _context.abrupt("return");
 
-              case 95:
+              case 94:
                 if (!(hoEditorFactory.drawTree.paintStatus !== _draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_28__/* .PaintState.psDesign */ .Dh.psDesign && node instanceof _treeNode_SignNode__WEBPACK_IMPORTED_MODULE_84__/* .SignNode */ .N && node.isTemplate && node.number === 0)) {
-                  _context.next = 98;
+                  _context.next = 97;
                   break;
                 }
 
@@ -27622,9 +27639,9 @@ var DocController = /*#__PURE__*/function () {
 
                 return _context.abrupt("return");
 
-              case 98:
+              case 97:
                 if (!(node instanceof _treeNode_SignNode__WEBPACK_IMPORTED_MODULE_84__/* .SignNode */ .N)) {
-                  _context.next = 119;
+                  _context.next = 118;
                   break;
                 }
 
@@ -27632,7 +27649,7 @@ var DocController = /*#__PURE__*/function () {
                 nextNode = node.nextLeaf();
 
                 if (!((node.imgSrc !== "" || node.fingerPrintSrc !== "") && node.isTemplate && !(preNode instanceof _treeNode_SignNode__WEBPACK_IMPORTED_MODULE_84__/* .SignNode */ .N) && !(nextNode instanceof _treeNode_SignNode__WEBPACK_IMPORTED_MODULE_84__/* .SignNode */ .N))) {
-                  _context.next = 109;
+                  _context.next = 108;
                   break;
                 }
 
@@ -27644,9 +27661,9 @@ var DocController = /*#__PURE__*/function () {
                 hoEditorFactory.undoService.commit();
                 return _context.abrupt("return");
 
-              case 109:
+              case 108:
                 if (!(preNode instanceof _treeNode_SignNode__WEBPACK_IMPORTED_MODULE_84__/* .SignNode */ .N)) {
-                  _context.next = 119;
+                  _context.next = 118;
                   break;
                 }
 
@@ -27672,7 +27689,7 @@ var DocController = /*#__PURE__*/function () {
                 hoEditorFactory.undoService.commit();
                 return _context.abrupt("return");
 
-              case 119:
+              case 118:
                 pNode = node.parentNode;
                 hoEditorFactory.undoService.begin();
                 hoEditorFactory.undoService.add(new _undoRedo_NodeDeleteUndoUnit__WEBPACK_IMPORTED_MODULE_37__/* .NodeDeleteUndoUnit */ .w(this._hoEditorFactoryID, node, startPath));
@@ -27682,7 +27699,7 @@ var DocController = /*#__PURE__*/function () {
                   this.resetEmptyInputFieldNode(hoEditorFactory, pNode);
                 }
 
-              case 124:
+              case 123:
               case "end":
                 return _context.stop();
             }
@@ -30505,6 +30522,28 @@ var DocController = /*#__PURE__*/function () {
         hoEditorFactory.undoService.commit();
       }
     }
+    /**
+       * 修改空签名
+       * @param node 签名节点
+       * @param name 签名名称
+       * @param attribute 签名属性
+       */
+
+  }, {
+    key: "updateEmptySignNode",
+    value: function updateEmptySignNode(node, name, attribute, connectChar) {
+      var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_77__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
+      var sPath = hoEditorFactory.docTree.getNodeLastPath(node.previousLeaf());
+      var ePath = hoEditorFactory.docTree.getNodeLastPath(node);
+      var changeEvent = new _events_NodeChangeEvent__WEBPACK_IMPORTED_MODULE_75__/* .NodeChangeEvent */ .G(this._hoEditorFactoryID, _DocTree__WEBPACK_IMPORTED_MODULE_26__/* .DocAction.daModifyStyle */ .gk.daModifyStyle, sPath, ePath);
+      changeEvent.oldEndPath = ePath;
+      changeEvent.afterChangePath = ePath;
+      changeEvent.oldDrawLines = new _draw_SelectRange__WEBPACK_IMPORTED_MODULE_76__/* .SelectRange */ .E(this._hoEditorFactoryID).getRangeDrawLines(sPath, ePath, true);
+      node.name = name;
+      node.connectChar = connectChar;
+      node.attribute = attribute;
+      hoEditorFactory.docTree.change(changeEvent);
+    }
     /**
        * 更新签名时间
        * @param node 签名节点
@@ -30801,6 +30840,8 @@ var DocAction;
   DocAction[DocAction["daParaStyleChange"] = 10] = "daParaStyleChange";
   DocAction[DocAction["daInsertAreaFirstParagraph"] = 11] = "daInsertAreaFirstParagraph";
   DocAction[DocAction["daInsertParagraphBetweenTab"] = 12] = "daInsertParagraphBetweenTab";
+  DocAction[DocAction["daInsertParagraphBeforeTab"] = 13] = "daInsertParagraphBeforeTab";
+  DocAction[DocAction["daDeleteParagraphBeforeTab"] = 14] = "daDeleteParagraphBeforeTab";
 })(DocAction || (DocAction = {}));
 
 var ctlKey;
@@ -47928,6 +47969,7 @@ var SignNode = /*#__PURE__*/function (_BaseNode) {
     set: function set(value) {
       if (this._attribute !== value) {
         this._attribute = value;
+        this.node2DrawNodeRange(0, 0);
       }
     }
   }, {
@@ -58157,6 +58199,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 +58369,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 +63071,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 +63478,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 +64495,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 +65236,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;
               }
             }
 
@@ -72045,15 +72109,114 @@ var DrawTree = /*#__PURE__*/function () {
           //   dendDrawLine = e.redrawEndPositon.drawRoots[e.redrawEndPositon.index];
           // }
 
-        } else if (e.action === DocTree/* DocAction.daInsertAreaFirstParagraph */.gk.daInsertAreaFirstParagraph) {
+        } else if (e.action === DocTree/* DocAction.daInsertParagraphBeforeTab */.gk.daInsertParagraphBeforeTab) {
           if (dCell) {
             dCell.needUpdate = true;
           }
 
-          var np = hoEditorFactory.docTree.findNodePositionByPath(e.beforeChangePath);
+          var np = hoEditorFactory.docTree.findNodePositionByPath(e.afterChangePath);
 
           if (np && np.node && np.node instanceof ParagraphNode/* ParagraphNode */.C) {
-            paragraphNode = np.node;
+            var beforeNode = np.node.prevSibling();
+            var afterNode = np.node.nextSibling();
+
+            if (beforeNode instanceof ParagraphNode/* ParagraphNode */.C && afterNode instanceof TableNode/* TableNode */.Fh && beforeNode.drawlines[0] instanceof DrawTable/* DrawTable */.t) {
+              var dTable = beforeNode.drawlines[0];
+              var index = beforeNode.drootNodes.indexOf(dTable);
+              beforeNode.drootNodes.splice(index, 1);
+              beforeNode.node2DrawNode();
+
+              if (dArea instanceof DrawPageMainDoc/* DrawPageMainDoc */.$ && beforeNode.rootNodes.indexOf(beforeNode) == 0) {
+                beforeNode.drawlines[0].dTop = hoEditorFactory.firstPageStartTop;
+                beforeNode.drawlines[0].y = hoEditorFactory.firstPageStartTop;
+                beforeNode.drawlines[0].x = paragraphNode.drawlines[0].dLeft;
+                beforeNode.drootNodes.splice(index, 0, beforeNode.drawlines[0]);
+
+                if (dArea) {
+                  dArea.addChild(paragraphNode.drawlines[0]);
+
+                  if (index == 0) {
+                    dArea.topDline = paragraphNode.drawlines[0];
+                  }
+                }
+              } else {
+                beforeNode.clear();
+                beforeNode.node2DrawNode();
+                beforeNode.placeDNodeAfterDline(beforeNode.drootNodes[index - 1]);
+              }
+
+              beforeNode.updateDrawLineStyle();
+              beforeNode.updateDrawInfos();
+              np.node.node2DrawNode();
+              np.node.placeDNodeAfterDline(beforeNode.drawlines[0]);
+              dTable.table.placeDNodeAfterDrawLine(np.node, np.node.drawlines[0], e.afterChangePath);
+              dline = node.drawTable;
+
+              if (e.repaintImmediate) {
+                if (!dArea) {
+                  return false;
+                }
+
+                dArea.changed = true;
+
+                var _mainArea4 = hoEditorFactory.drawPageTree.getMainRootArea(dArea);
+
+                if (!_mainArea4) return false;
+                _mainArea4.changed = true;
+                hoEditorFactory.drawPageTree.update(dArea, alines, beforeNode.drawlines[0].dTop, index, beforeNode.drootNodes.length - 1);
+              }
+            }
+          }
+        } else if (e.action === DocTree/* DocAction.daDeleteParagraphBeforeTab */.gk.daDeleteParagraphBeforeTab) {
+          if (dCell) {
+            dCell.needUpdate = true;
+          }
+
+          var _np = hoEditorFactory.docTree.findNodePositionByPath(e.afterChangePath);
+
+          if (_np && _np.node && _np.node instanceof TableNode/* TableNode */.Fh) {
+            var _beforeNode = _np.node.prevSibling();
+
+            if (_beforeNode instanceof ParagraphNode/* ParagraphNode */.C && _np.node instanceof TableNode/* TableNode */.Fh && _beforeNode.drawlines[0] instanceof DrawLine/* DrawLine */.a) {
+              var _dTable = _np.node.drawTable;
+              var tabIndex = alines.indexOf(_dTable);
+
+              if (tabIndex >= 0) {
+                alines.splice(tabIndex, 1);
+              }
+
+              var _index2 = _beforeNode.drootNodes.indexOf(_beforeNode.drawlines[0]);
+
+              var dTop = _beforeNode.drawlines[0].y;
+
+              _np.node.placeDNodeAfterDrawLine(_beforeNode, _beforeNode.drawlines[0], e.afterChangePath);
+
+              dline = node.drawTable;
+
+              if (e.repaintImmediate) {
+                if (!dArea) {
+                  return false;
+                }
+
+                dArea.changed = true;
+
+                var _mainArea5 = hoEditorFactory.drawPageTree.getMainRootArea(dArea);
+
+                if (!_mainArea5) return false;
+                _mainArea5.changed = true;
+                hoEditorFactory.drawPageTree.update(dArea, alines, dTop, _index2, _beforeNode.drootNodes.length - 1);
+              }
+            }
+          }
+        } else if (e.action === DocTree/* DocAction.daInsertAreaFirstParagraph */.gk.daInsertAreaFirstParagraph) {
+          if (dCell) {
+            dCell.needUpdate = true;
+          }
+
+          var _np2 = hoEditorFactory.docTree.findNodePositionByPath(e.beforeChangePath);
+
+          if (_np2 && _np2.node && _np2.node instanceof ParagraphNode/* ParagraphNode */.C) {
+            paragraphNode = _np2.node;
             lineIndex = 0;
             paragraphNode.drawlines[0].updateLineStyle();
             paragraphNode.drootNodes.splice(0, 0, paragraphNode.drawlines[0]);
@@ -72085,10 +72248,10 @@ var DrawTree = /*#__PURE__*/function () {
 
               dArea.changed = true;
 
-              var _mainArea4 = hoEditorFactory.drawPageTree.getMainRootArea(dArea);
+              var _mainArea6 = hoEditorFactory.drawPageTree.getMainRootArea(dArea);
 
-              if (!_mainArea4) return false;
-              _mainArea4.changed = true;
+              if (!_mainArea6) return false;
+              _mainArea6.changed = true;
               var _drawTop3 = alines[0].y;
               hoEditorFactory.drawPageTree.update(dArea, alines, _drawTop3, 0, alines.length - 1);
             }
@@ -72098,13 +72261,15 @@ var DrawTree = /*#__PURE__*/function () {
             dCell.needUpdate = true;
           }
 
-          var _np = hoEditorFactory.docTree.findNodePositionByPath(e.afterChangePath);
+          var _np3 = hoEditorFactory.docTree.findNodePositionByPath(e.afterChangePath);
 
-          if (_np && _np.node && _np.node instanceof ParagraphNode/* ParagraphNode */.C) {
-            paragraphNode = _np.node;
+          if (_np3 && _np3.node && _np3.node instanceof ParagraphNode/* ParagraphNode */.C) {
+            paragraphNode = _np3.node;
             lineIndex = 0;
-            var index = paragraphNode.drootNodes.indexOf(dline);
-            var prevDline = paragraphNode.drootNodes[index - 1];
+
+            var _index3 = paragraphNode.drootNodes.indexOf(dline);
+
+            var prevDline = paragraphNode.drootNodes[_index3 - 1];
             paragraphNode.placeDNodeAfterDline(prevDline);
             paragraphNode.drawlines[0].fitLines();
             paragraphNode.updateDrawLineStyle();
@@ -72123,11 +72288,11 @@ var DrawTree = /*#__PURE__*/function () {
 
               dArea.changed = true;
 
-              var _mainArea5 = hoEditorFactory.drawPageTree.getMainRootArea(dArea);
+              var _mainArea7 = hoEditorFactory.drawPageTree.getMainRootArea(dArea);
 
-              if (!_mainArea5) return false;
-              _mainArea5.changed = true;
-              hoEditorFactory.drawPageTree.paint(dArea, alines, index - 1, alines.length - 1);
+              if (!_mainArea7) return false;
+              _mainArea7.changed = true;
+              hoEditorFactory.drawPageTree.paint(dArea, alines, _index3 - 1, alines.length - 1);
             }
           }
         } // if (dCell) {
@@ -72975,11 +73140,11 @@ var DrawTree = /*#__PURE__*/function () {
         if (dPlace instanceof DrawPageCell/* DrawPageCell */.k && dPlace.isEmpty()) {
           var aPrevPlace;
 
-          var _index2 = dPlace.cell.drawCell.drawPageCells.indexOf(dPlace);
+          var _index4 = dPlace.cell.drawCell.drawPageCells.indexOf(dPlace);
 
           if (dPlace.cell.cellProperty.align != TableProperty/* VAlign.vabottom */.TR.vabottom) {
-            while (_index2 > 0) {
-              aPrevPlace = dPlace.cell.drawCell.drawPageCells[_index2 - 1];
+            while (_index4 > 0) {
+              aPrevPlace = dPlace.cell.drawCell.drawPageCells[_index4 - 1];
 
               if (!aPrevPlace.isEmpty()) {
                 var rootArea = hoeditfactory.drawPageTree.getMainRootArea(aPrevPlace);
@@ -72991,11 +73156,11 @@ var DrawTree = /*#__PURE__*/function () {
                 return this.getStagePosition(aPage, aPrevPlace, x, 99999999);
               }
 
-              _index2 -= 1;
+              _index4 -= 1;
             }
           } else {
-            while (_index2 < dPlace.cell.drawCell.drawPageCells.length - 1) {
-              aPrevPlace = dPlace.cell.drawCell.drawPageCells[_index2 + 1];
+            while (_index4 < dPlace.cell.drawCell.drawPageCells.length - 1) {
+              aPrevPlace = dPlace.cell.drawCell.drawPageCells[_index4 + 1];
 
               if (!aPrevPlace.isEmpty()) {
                 var _rootArea = hoeditfactory.drawPageTree.getMainRootArea(aPrevPlace);
@@ -73007,7 +73172,7 @@ var DrawTree = /*#__PURE__*/function () {
                 return this.getStagePosition(aPage, aPrevPlace, x, 99999999);
               }
 
-              _index2 += 1;
+              _index4 += 1;
             }
           }
         } // if (dPlace instanceof DrawCell) {
@@ -78448,6 +78613,156 @@ var TableDeleteColUndoUnit = /*#__PURE__*/function () {
 
 /***/ }),
 
+/***/ 72964:
+/***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export */ __webpack_require__.d(__webpack_exports__, {
+/* harmony export */   "T": function() { return /* binding */ TableDeleteParagraphUndoUnit; }
+/* harmony export */ });
+/* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_classCallCheck_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(35671);
+/* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(22342);
+/* harmony import */ var core_js_modules_es_error_cause_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(21703);
+/* harmony import */ var core_js_modules_es_error_cause_js__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_error_cause_js__WEBPACK_IMPORTED_MODULE_1__);
+/* harmony import */ var _editor_dom_DocTree__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(23375);
+/* harmony import */ var _editor_dom_DomRange__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(66828);
+/* harmony import */ var _editor_dom_treeNode_BaseNode__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(50369);
+/* harmony import */ var _editor_dom_treeNode_ParagraphNode__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(14208);
+/* harmony import */ var _editor_draw_SelectRange__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(1470);
+/* harmony import */ var _editor_events_NodeChangeEvent__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(34534);
+/* harmony import */ var _editor_events_SelectionChangeEvent__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(13113);
+/* harmony import */ var _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(41005);
+
+
+
+
+
+
+
+
+
+
+
+var TableDeleteParagraphUndoUnit = /*#__PURE__*/function () {
+  function TableDeleteParagraphUndoUnit(hoEditorFactoryID, positionNode, deleteNode) {
+    (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_classCallCheck_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z)(this, TableDeleteParagraphUndoUnit);
+
+    this._hoEditorFactoryID = hoEditorFactoryID;
+    this._positionNode = positionNode;
+    this._deleteNode = deleteNode;
+    this._opTime = new Date();
+    this._affectText = "";
+  }
+
+  (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_10__/* ["default"] */ .Z)(TableDeleteParagraphUndoUnit, [{
+    key: "isEmpty",
+    get: function get() {
+      return false;
+    }
+  }, {
+    key: "redo",
+    value: function redo() {
+      var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_9__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
+      var startPath = '';
+      var endPath = '';
+      var cgEvent;
+
+      var prevNode = this._deleteNode.prevSibling(); // if (this._action === DocAction.daInsertAreaFirstParagraph || this._action === DocAction.daInsertParagraphBetweenTab) {
+      //     startPath = this._deleteNode.getNodePath();
+      //     endPath = this._positionNode.paragraphNode.getNodePath();
+      //     cgEvent = new NodeChangeEvent(this._hoEditorFactoryID, DocAction.daDelete, startPath, endPath)
+      //     cgEvent.oldEndPath = endPath;
+      //     cgEvent.oldDrawTreeLines = new SelectRange(this._hoEditorFactoryID).getRangeDrawTreeLines(startPath, endPath);
+      //     hoEditorFactory.docTree.deleteNode(this._positionNode.paragraphNode);
+      // }
+      // else
+
+
+      {
+        if (prevNode && prevNode instanceof _editor_dom_treeNode_ParagraphNode__WEBPACK_IMPORTED_MODULE_5__/* .ParagraphNode */ .C) {
+          startPath = prevNode.getNodePath();
+          endPath = this._deleteNode.getNodePath();
+          cgEvent = new _editor_events_NodeChangeEvent__WEBPACK_IMPORTED_MODULE_7__/* .NodeChangeEvent */ .G(this._hoEditorFactoryID, _editor_dom_DocTree__WEBPACK_IMPORTED_MODULE_2__/* .DocAction.daDeleteParagraphBeforeTab */ .gk.daDeleteParagraphBeforeTab, startPath, endPath);
+          cgEvent.oldEndPath = endPath;
+          cgEvent.oldDrawTreeLines = new _editor_draw_SelectRange__WEBPACK_IMPORTED_MODULE_6__/* .SelectRange */ .E(this._hoEditorFactoryID).getRangeDrawTreeLines(startPath, endPath);
+          this._positionNode.paragraphNode = prevNode;
+          hoEditorFactory.docTree.deleteNode(this._deleteNode);
+        } else {
+          throw new Error('错误的撤销恢复链，无法恢复');
+        }
+      } // hoEditorFactory.docController.deleteRange(new DomRange(this._hoEditorFactoryID, startPath, endPath), true)
+
+      hoEditorFactory.docTree.change(cgEvent);
+      var caretPath = "".concat(this._positionNode.childNodes[0].getNodePath(), "/0");
+      var oldRange = new _editor_dom_DomRange__WEBPACK_IMPORTED_MODULE_3__/* .DomRange */ .a(this._hoEditorFactoryID, startPath, startPath);
+      var newRange = new _editor_dom_DomRange__WEBPACK_IMPORTED_MODULE_3__/* .DomRange */ .a(this._hoEditorFactoryID, caretPath, caretPath);
+      var scgEvent = new _editor_events_SelectionChangeEvent__WEBPACK_IMPORTED_MODULE_8__/* .SelectionChangeEvent */ .r(oldRange, newRange);
+      hoEditorFactory.docTree.selectChange(scgEvent);
+      return;
+    }
+  }, {
+    key: "undo",
+    value: function undo() {
+      //上方插入行
+      var hoeditorfacotry = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_9__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
+      this._positionNode.paragraphNode = this._deleteNode;
+      hoeditorfacotry.docTree.insertNodeBeforeNode(this._positionNode, this._deleteNode);
+
+      var prevNode = this._deleteNode.prevSibling();
+
+      var startPath = '';
+      var endPath = '';
+      var action = _editor_dom_DocTree__WEBPACK_IMPORTED_MODULE_2__/* .DocAction.daInsert */ .gk.daInsert;
+
+      if (prevNode) {
+        startPath = hoeditorfacotry.docTree.getNodeLastPath(prevNode);
+        endPath = this._deleteNode.getNodePath();
+
+        if (prevNode.nodeType == _editor_dom_treeNode_BaseNode__WEBPACK_IMPORTED_MODULE_4__/* .NodeType.ntTable */ .Jq.ntTable) {
+          action = _editor_dom_DocTree__WEBPACK_IMPORTED_MODULE_2__/* .DocAction.daInsertParagraphBetweenTab */ .gk.daInsertParagraphBetweenTab;
+        } else {
+          action = _editor_dom_DocTree__WEBPACK_IMPORTED_MODULE_2__/* .DocAction.daInsertParagraphBeforeTab */ .gk.daInsertParagraphBeforeTab;
+        }
+      } else {
+        startPath = this._deleteNode.getNodePath();
+        endPath = startPath;
+      }
+
+      this._action = action;
+      var cgEvent = new _editor_events_NodeChangeEvent__WEBPACK_IMPORTED_MODULE_7__/* .NodeChangeEvent */ .G(this._hoEditorFactoryID, action, startPath, endPath);
+      hoeditorfacotry.docTree.change(cgEvent);
+      var oldRange = hoeditorfacotry.docTree.curDomRange.clone();
+      var newRange = new _editor_dom_DomRange__WEBPACK_IMPORTED_MODULE_3__/* .DomRange */ .a(this._hoEditorFactoryID, endPath, endPath);
+      var scgEvent = new _editor_events_SelectionChangeEvent__WEBPACK_IMPORTED_MODULE_8__/* .SelectionChangeEvent */ .r(oldRange, newRange);
+      hoeditorfacotry.docTree.selectChange(scgEvent);
+    }
+  }, {
+    key: "merge",
+    value: function merge(undoUnit) {
+      return false;
+    }
+  }, {
+    key: "actionString",
+    value: function actionString() {
+      return "表格上方删除空行";
+    }
+  }, {
+    key: "opTime",
+    get: function get() {
+      return this._opTime;
+    }
+  }, {
+    key: "affectText",
+    get: function get() {
+      return this._affectText;
+    }
+  }]);
+
+  return TableDeleteParagraphUndoUnit;
+}();
+
+/***/ }),
+
 /***/ 83588:
 /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
@@ -78806,7 +79121,7 @@ var TableInsertParagraphUndoUnit = /*#__PURE__*/function () {
 
 
       hoEditorFactory.docTree.change(cgEvent);
-      var caretPath = "".concat(this._positionNode.childNodes[0], "/0");
+      var caretPath = "".concat(this._positionNode.childNodes[0].getNodePath(), "/0");
       var oldRange = new _editor_dom_DomRange__WEBPACK_IMPORTED_MODULE_3__/* .DomRange */ .a(this._hoEditorFactoryID, startPath, startPath);
       var newRange = new _editor_dom_DomRange__WEBPACK_IMPORTED_MODULE_3__/* .DomRange */ .a(this._hoEditorFactoryID, caretPath, caretPath);
       var scgEvent = new _editor_events_SelectionChangeEvent__WEBPACK_IMPORTED_MODULE_7__/* .SelectionChangeEvent */ .r(oldRange, newRange);
@@ -213171,7 +213486,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 +215042,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 +215701,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 +216973,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 +218685,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.101');
 // 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 +219468,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 +219736,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 +219744,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 +219788,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 +219807,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 +219826,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 +219846,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 +219870,8 @@ var DrawPageTree = /*#__PURE__*/function () {
                 break;
               }
             }
-          }
+          } //当前行不会触发满页,正常绘制 
+
 
           var _dobj = dRoots[nextLine];
           var cbParagraph = _dobj.paragraphNode.combineParagraph;
@@ -219555,10 +219880,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 +219948,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 +219964,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 +219984,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 +220061,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 +220330,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 +220349,8 @@ var DrawPageTree = /*#__PURE__*/function () {
 
             nextDlineTop = dobj.y;
           }
-        }
+        } //----------
+
 
         var aEndLine = dRoots.length - 1;
         var restHeight = Infinity;
@@ -220050,6 +220383,7 @@ var DrawPageTree = /*#__PURE__*/function () {
           //   dLine.paragraphNode.combineParagraph.lineSpace;
           // startDline.dHeight +
           // startDline.paragraphNode.combineParagraph.lineSpace;
+          //启用绘制优化，如果当前页不可见，则缓存绘制调用，当页可见时再调用
 
 
           if (hoEditorFactory.isUseDrawingOptimization) {
@@ -220060,13 +220394,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];
@@ -221689,7 +222024,7 @@ var es_string_search = __webpack_require__(64765);
 
 
 
-function xmlBeauty(text) {
+function XmlBeauty_xmlBeauty(text) {
   var ar = text //.replace(/>\s{0,}</g, "><")
   .replace(/</g, "~::~<").replace(/xmlns:/g, "~::~xmlns:").replace(/xmlns=/g, "~::~xmlns=").split('~::~');
   var len = ar.length;
@@ -222647,13 +222982,13 @@ var StructureConvert = /*#__PURE__*/function () {
         xmlRoot += "</pageSettings>";
         xmlRoot += "<styles>";
 
-        var _styles = this.doc2Json("styles");
+        var _styles = this.doc2Json("styles", "xml", xmlRoot, clearSign);
 
         xmlRoot += x2js.js2xml(_styles);
         xmlRoot += "</styles>";
         xmlRoot += "<comments>";
 
-        var _comments = this.doc2Json("comments");
+        var _comments = this.doc2Json("comments", "xml", xmlRoot, clearSign);
 
         xmlRoot += x2js.js2xml(_comments);
         xmlRoot += "</comments>";
@@ -222686,9 +223021,16 @@ var StructureConvert = /*#__PURE__*/function () {
           return xmlRoot;
         }
 
-        return xmlBeauty(xmlRoot);
+        return XmlBeauty_xmlBeauty(xmlRoot);
       }
     }
+  }, {
+    key: "xmlBeauty",
+    value: function xmlBeauty(xml) {
+      var axml = XmlBeauty_xmlBeauty(xml);
+
+      return axml;
+    }
   }, {
     key: "xml2Doc",
     value: function xml2Doc(xml, isClearSign) {
@@ -222740,6 +223082,7 @@ var StructureConvert = /*#__PURE__*/function () {
       //       footerArrays[index][fj] = node;
       //     }
       //   }
+      //this.xmlBeauty(xml)
       var aobject = this.xml2Object(xml);
 
       if (aobject) {
@@ -223128,6 +223471,10 @@ var StructureConvert = /*#__PURE__*/function () {
             delete textStyleJson["creatorIndex"];
           }
 
+          if (clearSign && textStyle.commentID !== "0" && textStyle.commentID !== undefined) {
+            textStyle.commentID = "0";
+          }
+
           if (textStyle.commentID === "0" || textStyle.commentID === undefined || textStyle.commentID === defaultFont.commentID) {
             delete textStyleJson["commentID"];
           }
@@ -223187,12 +223534,16 @@ var StructureConvert = /*#__PURE__*/function () {
 
       if (xmlNode === "comments") {
         var commentsArr = [];
-        var comments = hoEditorFactory.drawTree.commentsMap;
-        comments.forEach(function (value) {
-          var commentJson = JSON.parse(JSON.stringify(value, Comment/* Comment.whiteList */.s.whiteList()));
-          commentJson.customProperty = value.customProperty;
-          commentsArr.push(commentJson);
-        });
+
+        if (!clearSign) {
+          var comments = hoEditorFactory.drawTree.commentsMap;
+          comments.forEach(function (value) {
+            var commentJson = JSON.parse(JSON.stringify(value, Comment/* Comment.whiteList */.s.whiteList()));
+            commentJson.customProperty = value.customProperty;
+            commentsArr.push(commentJson);
+          });
+        }
+
         return {
           comment: commentsArr
         };
@@ -223925,6 +224276,9 @@ var StructureConvert = /*#__PURE__*/function () {
         }
       } else if (temp.nodeType == BaseNode/* NodeType.ntImage */.Jq.ntImage) {
         if (temp.imageType == "Image") {
+          // if (temp.imageDataBase64String.substring(0, 5) == "file:") {
+          //   return;
+          // }
           return ImageNode/* ImageNode.json2Node */.H.json2Node(this._hoEditorFactoryID, temp, rootNodes, parentNode);
         } else if (temp.imageType == "Barcode") {
           return BarcodeNode/* BarcodeNode.json2Node */.T.json2Node(this._hoEditorFactoryID, temp, rootNodes, parentNode);
@@ -224988,6 +225342,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);
@@ -230279,6 +230638,23 @@ var VueController = /*#__PURE__*/function () {
       var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID);
       hoEditorFactory.docController.updateSignNode(node, type, name, signor, signTime, imgSrc, imgWidth, imgHeight, customProperty, fingerPrintSrc);
     }
+    /**
+     * 修改空签名
+     * @param node 签名节点
+     * @param name 签名名称
+     * @param attribute 签名属性
+     */
+
+  }, {
+    key: "updateEmptySignNode",
+    value: function updateEmptySignNode(node, name, attribute, connectChar) {
+      if (node.type !== 0) {
+        return;
+      }
+
+      var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID);
+      hoEditorFactory.docController.updateEmptySignNode(node, name, attribute, connectChar);
+    }
     /**
      * 更新签名时间
      * @param node 签名节点
@@ -232724,6 +233100,10 @@ var message_default = /*#__PURE__*/__webpack_require__.n(message);
 
 
 
+
+
+
+
 
 
 
@@ -233059,10 +233439,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 +235707,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 +235758,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 +235785,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 +235845,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 +235934,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 +236027,8 @@ var HOEditorFactory = /*#__PURE__*/function () {
     this._lastSaveTime = new Date(Date.now());
     this._superiorSigns = []; //上级医生签名
 
+    this._notAllowCrossPatiPaste = false; //不允许跨病人复制粘贴
+
     this._hoEditorFactoryId = id;
   }
   /**
@@ -236181,6 +236585,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() {