hoeditor-web 3.1.156 → 3.1.158

package/lib/hoeditor.umd.js

@@ -9653,7 +9653,7 @@ var component = (0,componentNormalizer/* default */.Z)(
 
 /***/ }),
 
-/***/ 40769:
+/***/ 10812:
 /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -9673,7 +9673,7 @@ var es_string_includes = __webpack_require__(32023);
 var es_regexp_exec = __webpack_require__(74916);
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.string.replace.js
 var es_string_replace = __webpack_require__(15306);
-;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/poperSelect/PoperSelect.vue?vue&type=template&id=2229ef1c&
+;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/poperSelect/PoperSelect.vue?vue&type=template&id=039de5ee&
 
 
 
@@ -10139,7 +10139,7 @@ var render = function render() {
 };
 var staticRenderFns = [];
 
-;// CONCATENATED MODULE: ./src/components/controls/poperSelect/PoperSelect.vue?vue&type=template&id=2229ef1c&
+;// CONCATENATED MODULE: ./src/components/controls/poperSelect/PoperSelect.vue?vue&type=template&id=039de5ee&
 
 // EXTERNAL MODULE: ./node_modules/@babel/runtime/helpers/esm/toConsumableArray.js + 3 modules
 var toConsumableArray = __webpack_require__(61748);
@@ -13040,10 +13040,10 @@ var columns = [{
 });
 ;// 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-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/poperSelect/PoperSelect.vue?vue&type=style&index=0&id=2229ef1c&prod&lang=less&
+;// CONCATENATED MODULE: ./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/poperSelect/PoperSelect.vue?vue&type=style&index=0&id=039de5ee&prod&lang=less&
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./src/components/controls/poperSelect/PoperSelect.vue?vue&type=style&index=0&id=2229ef1c&prod&lang=less&
+;// CONCATENATED MODULE: ./src/components/controls/poperSelect/PoperSelect.vue?vue&type=style&index=0&id=039de5ee&prod&lang=less&
 
 // EXTERNAL MODULE: ./node_modules/@vue/vue-loader-v15/lib/runtime/componentNormalizer.js
 var componentNormalizer = __webpack_require__(70713);
@@ -22932,7 +22932,7 @@ var component = (0,componentNormalizer/* default */.Z)(
 
 /***/ }),
 
-/***/ 68035:
+/***/ 52023:
 /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -22944,7 +22944,7 @@ __webpack_require__.d(__webpack_exports__, {
   "default": function() { return /* binding */ TextBorderDialog; }
 });
 
-;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/textDialog/TextBorderDialog.vue?vue&type=template&id=59e28661&
+;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/textDialog/TextBorderDialog.vue?vue&type=template&id=726226fa&
 var render = function render() {
   var _vm = this,
     _c = _vm._self._c;
@@ -22972,7 +22972,7 @@ var render = function render() {
     ref: "textBorderInput",
     attrs: {
       "size": "small",
-      "placeholder": "内部标识符"
+      "placeholder": "文本内容"
     },
     model: {
       value: _vm.text,
@@ -23029,7 +23029,8 @@ var TextBorderNode = __webpack_require__(11596);
   data: function data() {
     return {
       animationClassNames: 'control-modal-contents label-to-text-modal animation-in',
-      text: ''
+      text: '',
+      endPath: ''
     };
   },
   props: {
@@ -23044,6 +23045,10 @@ var TextBorderNode = __webpack_require__(11596);
     }
   },
   inject: ['hoEditorProvider'],
+  created: function created() {
+    var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this.hoEditorFactoryId);
+    this.endPath = hoEditorFactory.docTree.curDomRange.normalize().endPath;
+  },
   mounted: function mounted() {
     var node = this.getTextBorderNode();
     if (node) {
@@ -23053,10 +23058,9 @@ var TextBorderNode = __webpack_require__(11596);
   },
   methods: {
     getTextBorderNode: function getTextBorderNode() {
-      var node = this.hoEditorProvider.getUpdateNode();
-      var hoEditor = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this.hoEditorProvider.activeDocId);
-      var currentDomRange = hoEditor.vueController.getDomRange();
-      if (!(currentDomRange !== null && currentDomRange !== void 0 && currentDomRange.isEmpty) && node instanceof TextBorderNode/* TextBorderNode */.D) {
+      var _this$vueController$f;
+      var node = (_this$vueController$f = this.vueController.findNodebyPath(this.endPath)) === null || _this$vueController$f === void 0 ? void 0 : _this$vueController$f.node;
+      if (node instanceof TextBorderNode/* TextBorderNode */.D) {
         return node;
       }
       return null;
@@ -23102,10 +23106,10 @@ var TextBorderNode = __webpack_require__(11596);
 });
 ;// CONCATENATED MODULE: ./src/components/controls/textDialog/TextBorderDialog.vue?vue&type=script&lang=js&
  /* harmony default export */ var textDialog_TextBorderDialogvue_type_script_lang_js_ = (TextBorderDialogvue_type_script_lang_js_); 
-;// CONCATENATED MODULE: ./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/textDialog/TextBorderDialog.vue?vue&type=style&index=0&id=59e28661&prod&lang=less&
+;// CONCATENATED MODULE: ./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/textDialog/TextBorderDialog.vue?vue&type=style&index=0&id=726226fa&prod&lang=less&
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./src/components/controls/textDialog/TextBorderDialog.vue?vue&type=style&index=0&id=59e28661&prod&lang=less&
+;// CONCATENATED MODULE: ./src/components/controls/textDialog/TextBorderDialog.vue?vue&type=style&index=0&id=726226fa&prod&lang=less&
 
 // EXTERNAL MODULE: ./node_modules/@vue/vue-loader-v15/lib/runtime/componentNormalizer.js
 var componentNormalizer = __webpack_require__(70713);
@@ -64228,19 +64232,12 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
       var mainArea = hoEditorFactory.drawPageTree.getMainRootArea(this.drawTable.drawPageTables[0]);
       if (mainArea) {
         var drawTop = this.drawTable.drawPageTables[0].y;
-        if (mainArea.contains(this.drawTable.drawPageTables[0]) && this.drawTable.drawPageTables[0] instanceof _editor_draw_drawNode_DrawPageTable__WEBPACK_IMPORTED_MODULE_43__/* .DrawPageTable */ .ox && this.drawTable.drawPageTables[0].table.drawTable.drawPageTables.indexOf(this.drawTable.drawPageTables[0]) > 0) {
+        var drawPageTable = this.drawTable.drawPageTables[0];
+        if (mainArea.contains(drawPageTable) && drawPageTable instanceof _editor_draw_drawNode_DrawPageTable__WEBPACK_IMPORTED_MODULE_43__/* .DrawPageTable */ .ox && drawPageTable.table.drawTable.drawPageTables.indexOf(drawPageTable) > 0) {
           drawTop = 0;
         }
         hoEditorFactory.drawPageTree.update(mainArea, dpos[0].drawRoots, drawTop, dpos[0].index, dpos[0].index);
       }
-      // HOEditorFactorys.instance().getFactory(this._hoEditorFactoryID).redrawManger.addRedrawRange(
-      //   dcell,
-      //   pageIndex,
-      //   droots,
-      //   index,
-      //   droots.length - 1,
-      //   this.getNodePath()
-      // );
     }
     // public getSelectMaxR(r: number): number {
     //   let maxR = r;
@@ -65034,13 +65031,10 @@ var DrawTextBorderNode = /*#__PURE__*/function (_DrawCombineNode) {
     (0,defineProperty/* default */.Z)((0,assertThisInitialized/* default */.Z)(_this), "_text", void 0);
     (0,defineProperty/* default */.Z)((0,assertThisInitialized/* default */.Z)(_this), "_dStyleKey", void 0);
     (0,defineProperty/* default */.Z)((0,assertThisInitialized/* default */.Z)(_this), "_dText", void 0);
-    (0,defineProperty/* default */.Z)((0,assertThisInitialized/* default */.Z)(_this), "_bitMap", void 0);
     (0,defineProperty/* default */.Z)((0,assertThisInitialized/* default */.Z)(_this), "_textStyle", void 0);
-    (0,defineProperty/* default */.Z)((0,assertThisInitialized/* default */.Z)(_this), "_charCount", void 0);
     (0,defineProperty/* default */.Z)((0,assertThisInitialized/* default */.Z)(_this), "_bd", void 0);
     _this._textStyle = textStyle;
     _this._text = text;
-    _this._charCount = _this._text.length;
     _this._dStyleKey = node.dStyleKey;
     _this._dText = new createjs.Text(text, _this._dStyleKey, node.dColor);
     _this.dWidth = _this._dText.getMeasuredWidth();
@@ -65061,7 +65055,6 @@ var DrawTextBorderNode = /*#__PURE__*/function (_DrawCombineNode) {
   }, {
     key: "drawRareChar",
     value: function drawRareChar() {
-      this._charCount = this._text.length;
       this.dWidth = this._dText.getMeasuredWidth();
       if (!this._bd) this._bd = new createjs.Shape();
       this._bd.graphics.clear();
@@ -65072,19 +65065,19 @@ var DrawTextBorderNode = /*#__PURE__*/function (_DrawCombineNode) {
         var currentWidthwidth = dText.getMeasuredWidth();
         dText.textBaseline = 'alphabetic';
         dText.textAlign = 'left';
-        var maxHeight = this.dHeight - 2;
-        var maxWidth = Math.max(currentWidthwidth, maxHeight);
+        var maxHeight = this.dHeight;
+        var maxWidth = Math.max(currentWidthwidth, maxHeight * 1.25);
         var rect = dText.getBounds().clone();
         if (rect) {
           dText.x = leftWidth + maxWidth * 0.25;
-          dText.y = -2;
+          dText.y = 0;
         }
         this.addChild(dText);
         this._bd.graphics.beginStroke(this._textStyle.color).drawRect(leftWidth,
         //x
         -maxHeight,
         //y
-        currentWidthwidth + maxWidth * 0.5, maxHeight);
+        currentWidthwidth + maxWidth * 0.5, maxHeight * 1.25);
         leftWidth = leftWidth + dText.getMeasuredWidth();
         if (i < this._text.length - 1) {
           leftWidth += maxWidth;
@@ -65248,7 +65241,7 @@ var TextBorderNode = /*#__PURE__*/function (_ControlNode) {
     key: "json2Node",
     value: function json2Node(hoEditorFactoryID, json, rootNodes, pNode) {
       var styleIndex = Number(json.styleIndex);
-      return new TextBorderNode(hoEditorFactoryID, rootNodes, pNode ? pNode : null, BaseNode/* NodeType */.Jq.ntRareChar, json.text, styleIndex);
+      return new TextBorderNode(hoEditorFactoryID, rootNodes, pNode ? pNode : null, BaseNode/* NodeType */.Jq.ntTextBorder, json.text, styleIndex);
     }
   }]);
   return TextBorderNode;
@@ -68137,7 +68130,6 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
       /**
        * 内容为空，显示一个点位符
        */
-      var ph = 0;
       var startPath = '';
       var endPath = '';
       var first = this.StartMarkNode;
@@ -68212,18 +68204,6 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
           pNode = pNode.parentNode;
         } while (pNode);
       }
-      // if (this.isEmpty()) {
-      //   //空时候，占位
-      //   if (this.childNodes.length == 3) {
-      //     lastWidth -= (this.childNodes[1] as MarkNode).width;
-      //     lastWidth = lastWidth > 0 ? lastWidth : 0;
-      //   }
-      //   last.width = lastWidth > 0 ? lastWidth : ph;
-      //   startPath = hoEditorFactory.docTree.getNodeLastPath(first);
-      //   endPath = hoEditorFactory.docTree.getNodeLastPath(last);
-      //   needPaint = true;
-      //   this.text = "";
-      // } else
       if (this.StartMarkNode.drawNodes.length > 0 && this.EndMarkNode.drawNodes.length > 0) {
         //不空，还原
         var bInSameLine = DrawLine/* DrawLine */.a.inSameLine(this.StartMarkNode.drawNodes[0], this.EndMarkNode.drawNodes[0]);
@@ -68271,8 +68251,6 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
         lastWidth -= this.childNodes[1].width;
         lastWidth = lastWidth > 0 ? lastWidth : 0;
       }
-      // this.StartMarkNode.paintMark(true)
-      // this.EndMarkNode.paintMark(true)
     }
     //获取域内文本串
   }, {
@@ -68418,9 +68396,7 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
                 this.customProperty = customProperty;
               }
               this.keyValue = keyValue || '';
-              if (value) {
-                this.value = value;
-              }
+              this.value = value || '';
               hoEditorFactory = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this._hoEditorFactoryID);
               startPath = this.StartMarkNode.getNodePath();
               if (!(text === '' && this.childNodes[1] instanceof MarkNode/* MarkNode */.j)) {
@@ -69610,13 +69586,13 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
   }, {
     key: "textInpubNodeRedraw",
     value: function textInpubNodeRedraw(hoEditorFactoryID, node) {
-      var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(hoEditorFactoryID);
+      var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(node._hoEditorFactoryID);
       var startPath = node.StartMarkNode.getNodePath();
       var paragraphNode = hoEditorFactory.docTree.getNodeParaNode(node.EndMarkNode);
       var endPath = hoEditorFactory.docTree.getNodeLastPath(paragraphNode);
-      var changeEvent = new NodeChangeEvent/* NodeChangeEvent */.G(hoEditorFactoryID, DocTree/* DocAction */.gk.daModifyStyle, startPath, endPath);
+      var changeEvent = new NodeChangeEvent/* NodeChangeEvent */.G(node._hoEditorFactoryID, DocTree/* DocAction */.gk.daModifyStyle, startPath, endPath);
       changeEvent.oldEndPath = endPath;
-      changeEvent.oldDrawLines = new SelectRange/* SelectRange */.E(hoEditorFactoryID).getRangeDrawLines(startPath, endPath, true, true);
+      changeEvent.oldDrawLines = new SelectRange/* SelectRange */.E(node._hoEditorFactoryID).getRangeDrawLines(startPath, endPath, true, true);
       hoEditorFactory.docTree.change(changeEvent);
     }
   }]);
@@ -89243,44 +89219,18 @@ var DrawTree = /*#__PURE__*/function () {
   }, {
     key: "updateDrawFormular",
     value: function updateDrawFormular(cell) {
-      // const hoeditfactory = HOEditorFactorys.instance().getFactory(this._hoEditorFactoryID);
-      // const [r, c] = cell.table.getCellInfos(cell);
       var isNeedUpdate = false;
       this.formularNodes.forEach(function (value, key) {
         var pnode = value.getParentCell();
         if (cell.table == pnode.table) {
-          // if (value.parentNode && value.parentNode instanceof TextInputFieldNode) {
-          //   if (value.parentNode.childNodes.length === 0) {
-          //     value.parentNode.node2DrawNode();
-          //   }
-          //   value.parentNode.update();
-          // }
-          //const isCellInFormula = value.isCellInFormula(cell, r, c);
           if (value.formularType === TableFormula/* FormularType */.a.ftSum || value.formularType === TableFormula/* FormularType */.a.ftFormular || value.formularType === TableFormula/* FormularType */.a.ftBMI || value.formularType === TableFormula/* FormularType */.a.ftLaborProcess || value.formularType === TableFormula/* FormularType */.a.ftExpectedBirthDate || value.formularType === TableFormula/* FormularType */.a.ftPregnantWeeks || value.formularType === TableFormula/* FormularType */.a.ftScoreMapping || value.formularType === TableFormula/* FormularType */.a.ftBodySurfaceArea || value.formularType === TableFormula/* FormularType */.a.ftCalcDays || value.formularType === TableFormula/* FormularType */.a.ftCalcTime || value.formularType === TableFormula/* FormularType */.a.ftIdealWeight || value.formularType === TableFormula/* FormularType */.a.ftISS) {
             //const str = value.formulaStr;
             value.updateResult();
             value.getParentCell().drawCell.needUpdate = true;
             isNeedUpdate = true;
-            // if (isCellInFormula) {
-            //   this.updateDrawFormular(value.getParentCell());
-            // }
-            // const prevNode = value.previousLeaf();
-            // if (!prevNode) {
-            //   throw new Error('错误的绘制位置');
-            // }
-            // const startPath = hoeditfactory.docTree.getNodeLastPath(prevNode);
-            // const changeEvent = new NodeChangeEvent(this._hoEditorFactoryID,
-            //   DocAction.daModifyStyle, startPath, startPath)
-            // changeEvent.oldEndPath = startPath;
-            // changeEvent.oldDrawLines = new SelectRange(this._hoEditorFactoryID).getRangeDrawLines(startPath, startPath, false)
-            // hoeditfactory.docTree.change(changeEvent);
-            // if (value.parentNode && value.parentNode instanceof TextInputFieldNode) {
-            //   value.parentNode.update();
-            // }
           }
         }
       });
-
       if (isNeedUpdate) {
         cell.table.update();
       }
@@ -95828,6 +95778,8 @@ var NodeConvert = /*#__PURE__*/function () {
               paragraphText += item.text;
             } else if (item.nodeType == _dom_treeNode_BaseNode__WEBPACK_IMPORTED_MODULE_19__/* .NodeType */ .Jq[_dom_treeNode_BaseNode__WEBPACK_IMPORTED_MODULE_19__/* .NodeType */ .Jq.ntRareChar]) {
               paragraphText += item.text;
+            } else if (item.nodeType == _dom_treeNode_BaseNode__WEBPACK_IMPORTED_MODULE_19__/* .NodeType */ .Jq[_dom_treeNode_BaseNode__WEBPACK_IMPORTED_MODULE_19__/* .NodeType */ .Jq.ntTextBorder]) {
+              paragraphText += item.text;
             } else if (item.nodeType == _dom_treeNode_BaseNode__WEBPACK_IMPORTED_MODULE_19__/* .NodeType */ .Jq[_dom_treeNode_BaseNode__WEBPACK_IMPORTED_MODULE_19__/* .NodeType */ .Jq.ntSpecialChar]) {
               paragraphText += item.text;
             } else if (item.nodeType == _dom_treeNode_BaseNode__WEBPACK_IMPORTED_MODULE_19__/* .NodeType */ .Jq[_dom_treeNode_BaseNode__WEBPACK_IMPORTED_MODULE_19__/* .NodeType */ .Jq.ntField]) {
@@ -170241,7 +170193,7 @@ var map = {
 	"./pageInfoes/PageInfoes.vue": 99749,
 	"./paragraph/ParagraphDialog.vue": 58874,
 	"./poperSelect/PoperMark.vue": 20734,
-	"./poperSelect/PoperSelect.vue": 40769,
+	"./poperSelect/PoperSelect.vue": 10812,
 	"./poperTipText/PoperTipText.vue": 84531,
 	"./popers/Poper.vue": 57937,
 	"./popers/Title.vue": 31276,
@@ -170260,7 +170212,7 @@ var map = {
 	"./table/TableFormula.vue": 80199,
 	"./table/TableProperty.vue": 98800,
 	"./table/TableRowProperty.vue": 55631,
-	"./textDialog/TextBorderDialog.vue": 68035,
+	"./textDialog/TextBorderDialog.vue": 52023,
 	"./textDialog/TextDialog.vue": 61911,
 	"./textDialog/TextToLabelDialog.vue": 2355,
 	"./textDialog/VerifyTip.vue": 74618,
@@ -207699,8 +207651,8 @@ var es_string_match = __webpack_require__(4723);
 var es_number_constructor = __webpack_require__(9653);
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.json.stringify.js
 var es_json_stringify = __webpack_require__(38862);
-;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/HoDoc.vue?vue&type=template&id=57443432&
-var HoDocvue_type_template_id_57443432_render = function render() {
+;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/HoDoc.vue?vue&type=template&id=3b58cf3f&
+var HoDocvue_type_template_id_3b58cf3f_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -207901,7 +207853,7 @@ var HoDocvue_type_template_id_57443432_render = function render() {
     }
   }, [_vm._v("v " + _vm._s(_vm.version))])])])], 1);
 };
-var HoDocvue_type_template_id_57443432_staticRenderFns = [];
+var HoDocvue_type_template_id_3b58cf3f_staticRenderFns = [];
 
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.filter.js
 var es_array_filter = __webpack_require__(57327);
@@ -209487,7 +209439,7 @@ var HoToPage_component = (0,componentNormalizer/* default */.Z)(
 // EXTERNAL MODULE: ./src/plugins/util.ts
 var plugins_util = __webpack_require__(62783);
 // EXTERNAL MODULE: ./src/components/controls/poperSelect/PoperSelect.vue + 9 modules
-var PoperSelect = __webpack_require__(40769);
+var PoperSelect = __webpack_require__(10812);
 // EXTERNAL MODULE: ./src/components/controls/poperSelect/PoperMark.vue + 5 modules
 var PoperMark = __webpack_require__(20734);
 ;// CONCATENATED MODULE: ./src/components/controls/poperSelect/index.ts
@@ -210892,7 +210844,7 @@ var TextNode = __webpack_require__(27198);
 // EXTERNAL MODULE: ./src/editor/dom/treeNode/ParagraphNode.ts
 var ParagraphNode = __webpack_require__(67945);
 ;// CONCATENATED MODULE: ./src/components/version.ts
-/* harmony default export */ var version = ('3.1.156');
+/* harmony default export */ var version = ('3.1.158');
 // EXTERNAL MODULE: ./src/components/controls/poperTipText/PoperTipText.vue + 5 modules
 var PoperTipText = __webpack_require__(84531);
 ;// CONCATENATED MODULE: ./src/components/controls/poperTipText/index.ts
@@ -211423,7 +211375,7 @@ var defaultHeight = Math.floor(1122 * scaleXY) % 2 === 1 ? Math.floor(1122 * sca
         return;
       } else if (node instanceof TextBorderNode/* TextBorderNode */.D) {
         this.hoEditorProvider.setControlProperty('text-border', 'update', '');
-        this.hoEditorProvider.setUpdateNodeValue(node);
+        // this.hoEditorProvider.setUpdateNodeValue(node);
         return;
       } else {
         if (paintStatus === DrawTree/* PaintState */.Dh.psReview) {
@@ -211938,10 +211890,10 @@ var defaultHeight = Math.floor(1122 * scaleXY) % 2 === 1 ? Math.floor(1122 * sca
 });
 ;// CONCATENATED MODULE: ./src/components/HoDoc.vue?vue&type=script&lang=js&
  /* harmony default export */ var components_HoDocvue_type_script_lang_js_ = (HoDocvue_type_script_lang_js_); 
-;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-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/HoDoc.vue?vue&type=style&index=0&id=57443432&prod&lang=less&
+;// CONCATENATED MODULE: ./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/HoDoc.vue?vue&type=style&index=0&id=3b58cf3f&prod&lang=less&
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./src/components/HoDoc.vue?vue&type=style&index=0&id=57443432&prod&lang=less&
+;// CONCATENATED MODULE: ./src/components/HoDoc.vue?vue&type=style&index=0&id=3b58cf3f&prod&lang=less&
 
 ;// CONCATENATED MODULE: ./src/components/HoDoc.vue
 
@@ -211954,8 +211906,8 @@ var defaultHeight = Math.floor(1122 * scaleXY) % 2 === 1 ? Math.floor(1122 * sca
 
 var HoDoc_component = (0,componentNormalizer/* default */.Z)(
   components_HoDocvue_type_script_lang_js_,
-  HoDocvue_type_template_id_57443432_render,
-  HoDocvue_type_template_id_57443432_staticRenderFns,
+  HoDocvue_type_template_id_3b58cf3f_render,
+  HoDocvue_type_template_id_3b58cf3f_staticRenderFns,
   false,
   null,
   null,
@@ -212816,27 +212768,11 @@ var DrawPageTree = /*#__PURE__*/function () {
             nextDlineTop = dobj.y;
           }
         }
-        //}
-        /*绘制优化
-        if (hoEditorFactory.isUseDrawingOptimization
-          && !callFromPaint
-          && drawArea instanceof DrawPageMainDoc
-          && dRoots.length > 1) {
-          startLine = this.calcStartLine(drawArea);
-          startIndex = startLine;
-          nextDlineTop = 0;
-          dTop = 0;
-          drawArea.removeAllChildren();
-        }
-        */
-        //----------
         var aEndLine = dRoots.length - 1;
         var restHeight = Infinity;
-        if (drawArea.allowAcrossPage) restHeight = drawArea.maxHeight - dTop;
-        // -
-        // startDline.dHeight -
-        // startDline.paragraphNode.combineParagraph.lineSpace;
-        // +
+        if (drawArea.allowAcrossPage) {
+          restHeight = drawArea.maxHeight - dTop;
+        }
         var prevArea = null;
         if (drawArea instanceof DrawPageMainDoc/* DrawPageMainDoc */.$) {
           var areaIndex = this._drawMainDocs.indexOf(drawArea);
@@ -212848,28 +212784,6 @@ var DrawPageTree = /*#__PURE__*/function () {
           if (!drawArea) {
             return;
           }
-          // if (aline instanceof DrawTable) {
-          //   dLine = aline.drawPageTables[aline.drawPageTables.length - 1];
-          // } else {
-          //   dLine = aline;
-          // }
-          // let dTop =
-          //   dLine.y +
-          //   dLine.dHeight +
-          //   dLine.paragraphNode.combineParagraph.lineSpace;
-          // startDline.dHeight +
-          // startDline.paragraphNode.combineParagraph.lineSpace;
-          //启用绘制优化，如果当前页不可见，则缓存绘制调用，当页可见时再调用
-          /*绘制优化
-          if (hoEditorFactory.isUseDrawingOptimization) { // 启用绘制优化 默认开启
-            if (drawArea instanceof DrawPageMainDoc && !(hoEditorFactory.drawTree.paintStatus === PaintState.psPreview || hoEditorFactory.drawTree.paintStatus === PaintState.psPrint)) {
-              if (drawArea.pageIndex > imaxViewPage) {
-                this.addNeedUpdateArea(drawArea.pageIndex, drawArea, dRoots, dTop, startIndex, dRoots.length - 1);
-                return;
-              }
-            }
-                    }
-          */
           //按区域调整区域内的所有坐标
           drawArea.update(prevArea, dRoots, startIndex, dTop, restHeight);
           this.afterAreaFinishPaint(drawArea);
@@ -212907,9 +212821,6 @@ var DrawPageTree = /*#__PURE__*/function () {
             }
           }
         } while (startIndex <= aEndLine);
-        // if (hoEditorFactory.drawTree.paintStatus === PaintState.psReview) {
-        //   drawArea.drawComments();
-        // }
         if (drawArea instanceof DrawPageMainDoc/* DrawPageMainDoc */.$ && aEndLine === dRoots.length - 1) {
           var _areaIndex2 = this._drawMainDocs.indexOf(drawArea);
           hoEditorFactory.drawTree.drawPages.splice(_areaIndex2 + 1, this._drawMainDocs.length);
@@ -217755,6 +217666,9 @@ var TOHTMLConverter = /*#__PURE__*/function () {
     this.convert.set(BaseNode/* NodeType */.Jq[BaseNode/* NodeType */.Jq.ntLabel], function (val) {
       return _this.TransText(val);
     });
+    this.convert.set(BaseNode/* NodeType */.Jq[BaseNode/* NodeType */.Jq.ntTextBorder], function (val) {
+      return _this.TransText(val);
+    });
     this.convert.set(BaseNode/* NodeType */.Jq[BaseNode/* NodeType */.Jq.ntSign], function (val) {
       return _this.TransText(val);
     });
@@ -217868,20 +217782,17 @@ var TOHTMLConverter = /*#__PURE__*/function () {
       var str = "";
       if (jnode.nodeType == BaseNode/* NodeType */.Jq[BaseNode/* NodeType */.Jq.ntText]) {
         str += jnode.text;
-      }
-      if (jnode.nodeType == BaseNode/* NodeType */.Jq[BaseNode/* NodeType */.Jq.ntLabel]) {
+      } else if (jnode.nodeType == BaseNode/* NodeType */.Jq[BaseNode/* NodeType */.Jq.ntLabel]) {
         str += jnode.text;
-      }
-      if (jnode.nodeType == BaseNode/* NodeType */.Jq[BaseNode/* NodeType */.Jq.ntRareChar]) {
+      } else if (jnode.nodeType == BaseNode/* NodeType */.Jq[BaseNode/* NodeType */.Jq.ntTextBorder]) {
         str += jnode.text;
-      }
-      if (jnode.nodeType == BaseNode/* NodeType */.Jq[BaseNode/* NodeType */.Jq.ntSpecialChar]) {
+      } else if (jnode.nodeType == BaseNode/* NodeType */.Jq[BaseNode/* NodeType */.Jq.ntRareChar]) {
         str += jnode.text;
-      }
-      if (jnode.nodeType == BaseNode/* NodeType */.Jq[BaseNode/* NodeType */.Jq.ntControl]) {
+      } else if (jnode.nodeType == BaseNode/* NodeType */.Jq[BaseNode/* NodeType */.Jq.ntSpecialChar]) {
         str += jnode.text;
-      }
-      if (jnode.nodeType == BaseNode/* NodeType */.Jq[BaseNode/* NodeType */.Jq.ntSign]) {
+      } else if (jnode.nodeType == BaseNode/* NodeType */.Jq[BaseNode/* NodeType */.Jq.ntControl]) {
+        str += jnode.text;
+      } else if (jnode.nodeType == BaseNode/* NodeType */.Jq[BaseNode/* NodeType */.Jq.ntSign]) {
         if (jnode.type == "2") {
           str += jnode.imgSrc;
         }
@@ -227235,6 +227146,28 @@ var VueController = /*#__PURE__*/function () {
         hoEditorFactory.drawTree.drawMultiCustomRange(selectRangeArr, true, true);
       }
     }
+  }, {
+    key: "findText",
+    value: function findText(findTextArr) {
+      var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this._hoEditorFactoryID);
+      var filterFunc = function filterFunc(node) {
+        var _nodeTypeO;
+        var nodeTypeO = (_nodeTypeO = {}, (0,esm_defineProperty/* default */.Z)(_nodeTypeO, BaseNode/* NodeType */.Jq.ntText, 1), (0,esm_defineProperty/* default */.Z)(_nodeTypeO, BaseNode/* NodeType */.Jq.ntTextBorder, 1), (0,esm_defineProperty/* default */.Z)(_nodeTypeO, BaseNode/* NodeType */.Jq.ntSeparateChar, 1), (0,esm_defineProperty/* default */.Z)(_nodeTypeO, BaseNode/* NodeType */.Jq.ntLabel, 1), (0,esm_defineProperty/* default */.Z)(_nodeTypeO, BaseNode/* NodeType */.Jq.ntGestation, 1), (0,esm_defineProperty/* default */.Z)(_nodeTypeO, BaseNode/* NodeType */.Jq.ntRareChar, 1), (0,esm_defineProperty/* default */.Z)(_nodeTypeO, BaseNode/* NodeType */.Jq.ntJumpButton, 1), (0,esm_defineProperty/* default */.Z)(_nodeTypeO, BaseNode/* NodeType */.Jq.ntControl, 2), (0,esm_defineProperty/* default */.Z)(_nodeTypeO, BaseNode/* NodeType */.Jq.ntField, 3), _nodeTypeO);
+        if (nodeTypeO[node.nodeType] == 1) {
+          return true;
+        } else if (nodeTypeO[node.nodeType] == 2 && node instanceof ControlNode/* ControlNode */.w) {
+          if (node.type == ControlNode/* ControlType */.C.ctDateTime || node.type == ControlNode/* ControlType */.C.ctDownList) {
+            return true;
+          }
+        } else if (nodeTypeO[node.nodeType] == 3) {
+          return true;
+        }
+        return false;
+      };
+      var nodeList = hoEditorFactory.docTree.mainNodes.filter(function (v) {
+        return filterFunc(v);
+      });
+    }
   }, {
     key: "getAllFindPath",
     value: function getAllFindPath(nodesMap, indexsMap) {
@@ -238516,8 +238449,8 @@ var PrintController = /*#__PURE__*/function () {
               });
               _context3.next = 20;
               return hPromise.then(function (pageNumber) {
-                // hoEditorFactory.drawTree.paintStatus = beforePrintStatus;
-                // hoEditorFactory.vueController.openXml(xml);
+                hoEditorFactory.drawTree.paintStatus = beforePrintStatus;
+                hoEditorFactory.vueController.openXml(xml);
                 // this.PDF.deletePage(1);
                 var otherPageNumber = _this2.PDF.internal.getNumberOfPages() - pageNumber;
                 if (otherPageNumber >= 2) {
@@ -238555,9 +238488,9 @@ var PrintController = /*#__PURE__*/function () {
                 break;
               }
               setTimeout(function () {
-                console.time('restore_time');
-                hoEditorFactory.drawTree.paintStatus = beforePrintStatus;
-                hoEditorFactory.vueController.openXml(xml);
+                // console.time('restore_time');
+                // hoEditorFactory.drawTree.paintStatus = beforePrintStatus;
+                // hoEditorFactory.vueController.openXml(xml);
                 hoEditorFactory.vueController.moveCaretToPath(path);
                 console.timeEnd('restore_time');
                 _this2.clearJsPDF();
@@ -244145,8 +244078,8 @@ var UpdateDocument_component = (0,componentNormalizer/* default */.Z)(
 )
 
 /* harmony default export */ var UpdateDocument = (UpdateDocument_component.exports);
-;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/toolbar/PageSetting.vue?vue&type=template&id=73d1e29e&
-var PageSettingvue_type_template_id_73d1e29e_render = function render() {
+;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/toolbar/PageSetting.vue?vue&type=template&id=4294664e&
+var PageSettingvue_type_template_id_4294664e_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -244622,7 +244555,7 @@ var PageSettingvue_type_template_id_73d1e29e_render = function render() {
     }
   }, [_vm._v("取消")])], 1)])]);
 };
-var PageSettingvue_type_template_id_73d1e29e_staticRenderFns = [];
+var PageSettingvue_type_template_id_4294664e_staticRenderFns = [];
 
 // EXTERNAL MODULE: ./src/components/mixins/appendToBody.ts
 var appendToBody = __webpack_require__(95677);
@@ -244663,7 +244596,7 @@ var HoColorPicker = __webpack_require__(10306);
       alignList: ['left', 'both', 'right', 'both'],
       lineHeightList: [1.25, 1.5, 2, 2.5, 3],
       fontSpacingList: [0, 1, 2, 3],
-      paperStyle: [['自定义', [210, 297]], ['A3', [297, 420]], ['A4', [210, 297]], ['A5', [148, 210]], ['A6', [105, 148]], ['B4', [250, 353]], ['B5', [176, 250]], ['B6', [125, 176]], ['16K', [195, 270]]],
+      paperStyle: [['自定义', [210, 297]], ['A3', [297, 420]], ['A4', [210, 297]], ['A5', [148, 210]], ['A6', [105, 148]], ['B4', [250, 353]], ['B5', [176, 250]], ['B6', [125, 176]], ['16K', [195, 270]], ['16K', [185, 265]]],
       property: {
         pageSize: 'A4',
         source: '0',
@@ -244770,10 +244703,10 @@ var HoColorPicker = __webpack_require__(10306);
 });
 ;// CONCATENATED MODULE: ./src/components/toolbar/PageSetting.vue?vue&type=script&lang=js&
  /* harmony default export */ var toolbar_PageSettingvue_type_script_lang_js_ = (PageSettingvue_type_script_lang_js_); 
-;// CONCATENATED MODULE: ./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/toolbar/PageSetting.vue?vue&type=style&index=0&id=73d1e29e&prod&lang=less&
+;// CONCATENATED MODULE: ./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/toolbar/PageSetting.vue?vue&type=style&index=0&id=4294664e&prod&lang=less&
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./src/components/toolbar/PageSetting.vue?vue&type=style&index=0&id=73d1e29e&prod&lang=less&
+;// CONCATENATED MODULE: ./src/components/toolbar/PageSetting.vue?vue&type=style&index=0&id=4294664e&prod&lang=less&
 
 ;// CONCATENATED MODULE: ./src/components/toolbar/PageSetting.vue
 
@@ -244786,8 +244719,8 @@ var HoColorPicker = __webpack_require__(10306);
 
 var PageSetting_component = (0,componentNormalizer/* default */.Z)(
   toolbar_PageSettingvue_type_script_lang_js_,
-  PageSettingvue_type_template_id_73d1e29e_render,
-  PageSettingvue_type_template_id_73d1e29e_staticRenderFns,
+  PageSettingvue_type_template_id_4294664e_render,
+  PageSettingvue_type_template_id_4294664e_staticRenderFns,
   false,
   null,
   null,