hoeditor-web 3.1.219 → 3.1.221

package/lib/hoeditor.umd.js

@@ -86817,7 +86817,7 @@ var component = (0,componentNormalizer/* default */.A)(
 
 /***/ }),
 
-/***/ 28140:
+/***/ 29731:
 /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -86829,7 +86829,7 @@ __webpack_require__.d(__webpack_exports__, {
   "default": function() { return /* binding */ PoperTipText; }
 });
 
-;// ./node_modules/babel-loader/lib/index.js??ruleSet[1].rules[3].use[0]!./node_modules/unplugin/dist/webpack/loaders/transform.js?unpluginName=vite-plugin-i18n-helper!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[5]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/poperTipText/PoperTipText.vue?vue&type=template&id=17849594
+;// ./node_modules/babel-loader/lib/index.js??ruleSet[1].rules[3].use[0]!./node_modules/unplugin/dist/webpack/loaders/transform.js?unpluginName=vite-plugin-i18n-helper!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[5]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/poperTipText/PoperTipText.vue?vue&type=template&id=62f4863b
 var render = function render() {
   var _vm = this,
     _c = _vm._self._c;
@@ -86964,6 +86964,7 @@ var popper = __webpack_require__(98234);
         };
         this.poppernIstance = (0,popper/* createPopper */.n4)(virtualElement, this.poperTextNode, {
           placement: 'bottom-start',
+          strategy: "fixed",
           modifiers: [{
             name: 'flip',
             options: {
@@ -86998,10 +86999,10 @@ var popper = __webpack_require__(98234);
 
 /* harmony default export */ var poperTipText_PoperTipTextvue_type_script_lang_js = (PoperTipTextvue_type_script_lang_js);
 
-;// ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-32.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-32.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-32.use[2]!./node_modules/less-loader/dist/cjs.js??clonedRuleSet-32.use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/poperTipText/PoperTipText.vue?vue&type=style&index=0&id=17849594&prod&lang=less
+;// ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-32.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-32.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-32.use[2]!./node_modules/less-loader/dist/cjs.js??clonedRuleSet-32.use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/poperTipText/PoperTipText.vue?vue&type=style&index=0&id=62f4863b&prod&lang=less
 // extracted by mini-css-extract-plugin
 
-;// ./src/components/controls/poperTipText/PoperTipText.vue?vue&type=style&index=0&id=17849594&prod&lang=less
+;// ./src/components/controls/poperTipText/PoperTipText.vue?vue&type=style&index=0&id=62f4863b&prod&lang=less
 
 // EXTERNAL MODULE: ./node_modules/@vue/vue-loader-v15/lib/runtime/componentNormalizer.js
 var componentNormalizer = __webpack_require__(81656);
@@ -104403,7 +104404,7 @@ const textParams = {
 /***/ (function(__unused_webpack_module, __webpack_exports__) {
 
 "use strict";
-/* harmony default export */ __webpack_exports__.A = ('3.1.219');
+/* harmony default export */ __webpack_exports__.A = ('3.1.221');
 
 /***/ }),
 
@@ -107176,7 +107177,10 @@ class Print {
     let heightPixes = hoEditorFactory.unitConvert.mmConversionPx(hoEditorFactory.pageProperty.heightMm, true);
     let orientation = widthPixes > heightPixes ? 'l' : 'p';
     let formats = [widthPixes, heightPixes];
-    let format = a4Size[orientation];
+    let format = [widthPixes, heightPixes];
+    if (hoEditorFactory.isFixedPrintToA4 == '1') {
+      format = a4Size[orientation];
+    }
     const svg2pdfOptions = {
       x: 0,
       y: 0
@@ -112844,39 +112848,11 @@ class DocTree {
     const paragraph = new _domNode_Paragraph__WEBPACK_IMPORTED_MODULE_12__/* .Paragraph */ .fz(this._hoEditorFactoryID);
     this._paragraphs.splice(0, this._paragraphs.length);
     this._paragraphs.push(paragraph);
-    // const hoEditorFactory = HOEditorFactorys.instance().getFactory(this._hoEditorFactoryID);
-    // this.headerNodes.push(new Array<BaseNode>());
-    // const index = this.headerNodes.length - 1;
-    // const paraHeader = new ParagraphNode(this.headerNodes[index], null, 0);
-    // this.headerNodes[index].push(paraHeader);
-    //this.addHeader(0);
-    // this.footerNodes.push(new Array<BaseNode>());
-    // const index1 = this.footerNodes.length - 1;
-    // const paraFooter = new ParagraphNode(this.footerNodes[index], null, 0);
-    // this.footerNodes[index].push(paraFooter);
-    //this.addFooter(0);
     const paraNode = new _treeNode_ParagraphNode__WEBPACK_IMPORTED_MODULE_18__/* .ParagraphNode */ .f(this._hoEditorFactoryID, this._mainNodes, null, 0);
     this._mainNodes.push(paraNode);
     const curPath = paraNode.getNodePath();
-    // this._curNodePosition= new NodePosition(this._mainNodes,paraNode,-1);
     this._curDomRange = new _DomRange__WEBPACK_IMPORTED_MODULE_14__/* .DomRange */ .g(this._hoEditorFactoryID, curPath, curPath); //new DomRange(this._curNodePosition,this._curNodePosition);
   }
-  // public addHeader(index: number) {
-  //   if (index > this.headerNodes.length - 1) {
-  //     this.headerNodes.push(new Array<BaseNode>());
-  //     const end = this.headerNodes.length - 1;
-  //     const paraNode = new ParagraphNode(this.headerNodes[end], null, 0);
-  //     this.headerNodes[end].push(paraNode);
-  //   }
-  // }
-  // public addFooter(index: number) {
-  //   if (index > this.footerNodes.length - 1) {
-  //     this.footerNodes.push(new Array<BaseNode>());
-  //     const end = this.footerNodes.length - 1;
-  //     const paraNode = new ParagraphNode(this.footerNodes[end], null, 0);
-  //     this.footerNodes[end].push(paraNode);
-  //   }
-  // }
   //根据文档节点数组，返回文档节点的路径
   getRootPathByNodes(roots) {
     if (roots === this._mainNodes) {
@@ -114135,35 +114111,44 @@ class DocTree {
   clearDocTree() {
     this._styles.splice(0, this._styles.length);
     const style = new _domNode_TextStyle__WEBPACK_IMPORTED_MODULE_17__/* .TextStyle */ .xJ(this._hoEditorFactoryID);
+    this._defaultCombineStyle = new _domNode_TextStyle__WEBPACK_IMPORTED_MODULE_17__/* .CombineStyle */ .Ti(this._hoEditorFactoryID);
     this._styles.push(style);
     this._paragraphs.splice(0, this._paragraphs.length);
     const param = new _domNode_Paragraph__WEBPACK_IMPORTED_MODULE_12__/* .Paragraph */ .fz(this._hoEditorFactoryID);
     this._paragraphs.push(param);
     const hoeditfactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_35__/* .HOEditorFactorys */ .O.instance().getFactory(this._hoEditorFactoryID);
-    for (let i = hoeditfactory.subDocManger.headerDocTree.length - 1; i >= 0; i--) {
-      const rootNodes = hoeditfactory.subDocManger.headerDocTree[i].subDocNodes;
-      if (rootNodes) this.clear(rootNodes);
+    const footerDocTree = hoeditfactory.subDocManger.footerDocTree;
+    const headerDocTree = hoeditfactory.subDocManger.headerDocTree;
+    for (let i = headerDocTree.length - 1; i >= 0; i--) {
+      if (headerDocTree[i] && headerDocTree[i].subDocNodes) {
+        this.clear(headerDocTree[i].subDocNodes);
+      }
     }
-    for (let i = hoeditfactory.subDocManger.footerDocTree.length - 1; i >= 0; i--) {
-      const rootNodes = hoeditfactory.subDocManger.footerDocTree[i].subDocNodes;
-      if (rootNodes) this.clear(rootNodes);
+    for (let i = footerDocTree.length - 1; i >= 0; i--) {
+      const rootNodes = footerDocTree[i].subDocNodes;
+      if (footerDocTree[i] && footerDocTree[i].subDocNodes) {
+        this.clear(rootNodes);
+      }
     }
-    const rootNodes = this._mainNodes;
-    this.clear(rootNodes);
+    this.clear(this._mainNodes);
     this._mainNodes.splice(1, this._mainNodes.length);
-    this._mainNodes[0].paraNo = 0;
-    const headerDocTree = hoeditfactory.subDocManger.headerDocTree;
+    if (this._mainNodes[0]) {
+      this._mainNodes[0].paraNo = 0;
+    }
     headerDocTree.splice(1, headerDocTree.length);
-    headerDocTree[0].subDocNodes.splice(1, headerDocTree[0].subDocNodes.length);
-    headerDocTree[0].subDocNodes[0].paraNo = 0;
-    headerDocTree[0].pageIndex = 0;
-    headerDocTree[0].beginPath = "";
-    const footerDocTree = hoeditfactory.subDocManger.footerDocTree;
+    if (headerDocTree[0]) {
+      headerDocTree[0].subDocNodes.splice(1, headerDocTree[0].subDocNodes.length);
+      headerDocTree[0].subDocNodes[0].paraNo = 0;
+      headerDocTree[0].pageIndex = 0;
+      headerDocTree[0].beginPath = "";
+    }
     footerDocTree.splice(1, footerDocTree.length);
-    footerDocTree[0].subDocNodes.splice(1, footerDocTree[0].subDocNodes.length);
-    footerDocTree[0].subDocNodes[0].paraNo = 0;
-    footerDocTree[0].pageIndex = 0;
-    footerDocTree[0].beginPath = "";
+    if (footerDocTree[0]) {
+      footerDocTree[0].subDocNodes.splice(1, footerDocTree[0].subDocNodes.length);
+      footerDocTree[0].subDocNodes[0].paraNo = 0;
+      footerDocTree[0].pageIndex = 0;
+      footerDocTree[0].beginPath = "";
+    }
     this._nodeChangedHandlers.splice(1, this._nodeChangedHandlers.length);
     this._nodeChangingHandlers.splice(1, this._nodeChangingHandlers.length);
     this._nodeClickHandlers.splice(1, this._nodeChangingHandlers.length);
@@ -114178,8 +114163,10 @@ class DocTree {
     this._userHistories = new Array();
     this._elementChangeRecords = new Map();
     this._redrawHiddenParas = [];
-    const curPath = this._mainNodes[0].getNodePath();
-    this._curDomRange = new _DomRange__WEBPACK_IMPORTED_MODULE_14__/* .DomRange */ .g(this._hoEditorFactoryID, curPath, curPath);
+    if (this._mainNodes[0]) {
+      const curPath = this._mainNodes[0].getNodePath();
+      this._curDomRange = new _DomRange__WEBPACK_IMPORTED_MODULE_14__/* .DomRange */ .g(this._hoEditorFactoryID, curPath, curPath);
+    }
   }
   getNodesText(nodes) {
     let nodeText = "";
@@ -119888,11 +119875,6 @@ class DateTimeNode extends _ControlNode__WEBPACK_IMPORTED_MODULE_15__/* .Control
     this.node2DrawNode();
     changeEvent.afterChangePath = ePath;
     hoEditorFactory.docTree.change(changeEvent);
-    // if (hoEditorFactory.drawTree.paintStatus !== PaintState.psPrint) {
-    //     hoEditorFactory.contentIsModify.isModify = true;
-    //     hoEditorFactory.cachedModify = false;
-    //     hoEditorFactory.hoLocalStorage.autoSaveLocalStorage();
-    // };
   }
   getDateTimeText() {
     if (this.text == this.name) {
@@ -141459,7 +141441,6 @@ class DrawPageCell extends DrawArea/* DrawArea */.y {
   paintCellBackground(newHeight, r, c) {
     this._backImg.x = 0;
     this._backImg.y = 0;
-    // this._backImg.uncache();
     // 白色背景转透明 处理转换pdf生成的多余线
     this._backImg.graphics.beginFill(this._cell.cellProperty.backColor === '#FFFFFF' ? 'transparent' : this._cell.cellProperty.backColor);
     this._backImg.graphics.rect(1, 1, this.dWidth - 1, this.dHeight - 1);
@@ -147451,30 +147432,20 @@ class EditorController {
           }
         } else if (keyCode === 33) {
           if (shiftKey) {
-            // this._textModel.moveCursor("line", this.size.line.toString(), "previous", shiftKey);
-            // this.updateScrollPosition();
             return true;
           } else {
             return true;
-            // this.scroll(-this.size.line, 0);
           }
           return true;
         } else if (keyCode === 34) {
           if (shiftKey) {
             return true;
-            // this._textModel.moveCursor("line", this.size.line.toString(), "next", shiftKey);
-            // this.updateScrollPosition();
           } else {
             return true;
-            // this.scroll(+this.size.line, 0);
           }
         } else if (keyCode === 35) {
-          // this._textModel.moveCursor("column", "boundary", "next", shiftKey);
-          // this.updateScrollPosition();
           return true;
         } else if (keyCode === 36) {
-          // this._textModel.moveCursor("column", "boundary", "previous", shiftKey);
-          // this.updateScrollPosition();
           return true;
         } else if (keyCode === 108) {
           return;
@@ -158413,7 +158384,7 @@ var map = {
 	"./paragraph/ParagraphDialog.vue": 88281,
 	"./poperSelect/PoperMark.vue": 11382,
 	"./poperSelect/PoperSelect.vue": 49524,
-	"./poperTipText/PoperTipText.vue": 28140,
+	"./poperTipText/PoperTipText.vue": 29731,
 	"./popers/Poper.vue": 77363,
 	"./popers/Title.vue": 25562,
 	"./printstyle/PrintLineStyle.vue": 27705,
@@ -213955,7 +213926,7 @@ var entry_lib_ParagraphNode = __webpack_require__(40504);
 // EXTERNAL MODULE: ./src/components/version.ts
 var entry_lib_version = __webpack_require__(41063);
 // EXTERNAL MODULE: ./src/components/controls/poperTipText/PoperTipText.vue + 5 modules
-var entry_lib_PoperTipText = __webpack_require__(28140);
+var entry_lib_PoperTipText = __webpack_require__(29731);
 ;// ./src/components/controls/poperTipText/index.ts
 
 /* harmony default export */ var entry_lib_poperTipText = (entry_lib_PoperTipText["default"]);
@@ -227105,7 +227076,7 @@ class entry_lib_VueController {
         } else if (node instanceof entry_lib_ParagraphNode/* ParagraphNode */.f) {
           docText += '\n';
         } else if (node instanceof entry_lib_SignNode/* SignNode */.u && node.customProperty && node.customProperty.bce03) {
-          docText += node.customProperty.bce03;
+          // docText += node.customProperty.bce03;
         }
       }
     };
@@ -228365,12 +228336,9 @@ class entry_lib_VueController {
   }
   moveCaret(path) {
     const hoEditorFactory = entry_lib_HOEditorFactorys/* HOEditorFactorys */.O.instance().getFactory(this._hoEditorFactoryID);
-    setTimeout(() => {
-      hoEditorFactory.docTree.curDomRange.setSamePath(path);
-      hoEditorFactory.drawTree.moveCaretToPath(path);
-      hoEditorFactory.drawTree.caret.visible = true;
-      hoEditorFactory.drawTree.editor.input.focus();
-    }, 200);
+    hoEditorFactory.drawTree.caret.visible = true;
+    hoEditorFactory.docTree.curDomRange.setSamePath(path);
+    hoEditorFactory.drawTree.moveCaretToPath(path);
   }
   search(node, text) {
     const hoEditorFactory = entry_lib_HOEditorFactorys/* HOEditorFactorys */.O.instance().getFactory(this._hoEditorFactoryID);
@@ -228857,9 +228825,17 @@ class entry_lib_VueController {
   /**
    * 清理病历文档树 触发浏览器内存回收
    */
-  destoryEditor() {
-    this.newFile('caseHistory');
+  async destoryEditor() {
+    // this.newFile('caseHistory');
     let hoEditorFactory = entry_lib_HOEditorFactorys/* HOEditorFactorys */.O.instance().getFactory(this._hoEditorFactoryID);
+    hoEditorFactory.docTree.docProperty.type = entry_lib_DocTree/* EmrType */.n8.etCaseHistory;
+    const _curDomRange = hoEditorFactory.docTree.curDomRange; //获取当前选中区域
+    const startPath = _curDomRange.normalize().startPath;
+    const endPath = _curDomRange.normalize().endPath;
+    const changingEvent = new entry_lib_NodeChangingEvent/* NodeChangingEvent */.k(entry_lib_DocTree/* DocAction */.LC.daUnkown, startPath, endPath, entry_lib_NodeChangingEvent/* OperType */.j.newFile);
+    if (hoEditorFactory.docTree.changing(changingEvent)) {
+      await hoEditorFactory.docController.initBlankDoc();
+    }
     if (hoEditorFactory._docTree) {
       hoEditorFactory._docTree.clearDocTree();
       delete hoEditorFactory._docTree;
@@ -228896,13 +228872,12 @@ class entry_lib_VueController {
     delete hoEditorFactory._tableController;
     delete hoEditorFactory._formatPainter;
     delete hoEditorFactory._hoLocalStorage;
-    if (hoEditorFactory._drawTree) {
+    if (hoEditorFactory._drawTree && hoEditorFactory._drawTree.drawPages[0]) {
       hoEditorFactory._drawTree.drawPages[0].destory();
       hoEditorFactory._drawTree.drawPageCount.count = 0;
       hoEditorFactory._drawTree.drawPages.splice(0, hoEditorFactory._drawTree.drawPages.length);
-      delete hoEditorFactory._drawTree;
     }
-    // hoEditorFactory.clear();
+    delete hoEditorFactory._drawTree;
     hoEditorFactory = null;
   }
   /**