hoeditor-web 3.1.155 → 3.1.157

package/lib/hoeditor.umd.js

@@ -3363,7 +3363,7 @@ function _extends(){return _extends=Object.assign?Object.assign.bind():function(
 
 /***/ }),
 
-/***/ 27901:
+/***/ 10597:
 /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -3375,7 +3375,7 @@ __webpack_require__.d(__webpack_exports__, {
   "default": function() { return /* binding */ ControlModal; }
 });
 
-;// 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/ControlModal.vue?vue&type=template&id=6ac3b0e4&
+;// 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/ControlModal.vue?vue&type=template&id=bc7baef6&
 var render = function render() {
   var _vm = this,
     _c = _vm._self._c;
@@ -3494,6 +3494,7 @@ var HOEditorFactorys = __webpack_require__(74089);
         sign: 'sign/Sign',
         text: 'textDialog/TextDialog',
         'text-to-label': 'textDialog/TextToLabelDialog',
+        'text-border': 'textDialog/TextBorderDialog',
         date: 'dateDialog/DateDialog',
         select: 'selectDialog/SelectDialog',
         RadioBox: 'radioCheckBox/RadioCheckbox',
@@ -22931,6 +22932,211 @@ var component = (0,componentNormalizer/* default */.Z)(
 
 /***/ }),
 
+/***/ 52023:
+/***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+// ESM COMPAT FLAG
+__webpack_require__.r(__webpack_exports__);
+
+// EXPORTS
+__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=726226fa&
+var render = function render() {
+  var _vm = this,
+    _c = _vm._self._c;
+  return _c('div', {
+    class: _vm.animationClassNames
+  }, [_c('header', {
+    staticClass: "modal-title"
+  }, [_c('span', [_vm._v("文本框元素")]), _c('a-icon', {
+    staticClass: "modal-title-close",
+    attrs: {
+      "type": "close"
+    },
+    on: {
+      "click": _vm.handleClose
+    }
+  })], 1), _c('section', {
+    staticClass: "modal-content"
+  }, [_c('ul', {
+    staticClass: "control-list"
+  }, [_c('li', {
+    staticClass: "control-item"
+  }, [_c('span', {
+    staticClass: "label"
+  }, [_vm._v("文本")]), _c('a-input', {
+    ref: "textBorderInput",
+    attrs: {
+      "size": "small",
+      "placeholder": "文本内容"
+    },
+    model: {
+      value: _vm.text,
+      callback: function callback($$v) {
+        _vm.text = $$v;
+      },
+      expression: "text"
+    }
+  })], 1)])]), _c('footer', {
+    staticClass: "ho-modal-footer"
+  }, [_c('a-button', {
+    attrs: {
+      "type": "primary"
+    },
+    on: {
+      "click": _vm.sure
+    }
+  }, [_vm._v("确定")]), _c('a-button', {
+    staticStyle: {
+      "margin-left": "30px"
+    },
+    on: {
+      "click": _vm.handleClose
+    }
+  }, [_vm._v("取消")])], 1)]);
+};
+var staticRenderFns = [];
+
+// EXTERNAL MODULE: ./node_modules/core-js/modules/es.object.to-string.js
+var es_object_to_string = __webpack_require__(41539);
+// EXTERNAL MODULE: ./node_modules/core-js/modules/web.dom-collections.for-each.js
+var web_dom_collections_for_each = __webpack_require__(54747);
+// EXTERNAL MODULE: ./src/HOEditorFactorys.ts
+var HOEditorFactorys = __webpack_require__(74089);
+// EXTERNAL MODULE: ./src/editor/dom/treeNode/TextInputFieldNode.ts + 1 modules
+var TextInputFieldNode = __webpack_require__(65043);
+// EXTERNAL MODULE: ./src/editor/dom/treeNode/BaseCombineNode.ts
+var BaseCombineNode = __webpack_require__(4938);
+// EXTERNAL MODULE: ./src/editor/dom/DomRange.ts
+var DomRange = __webpack_require__(94639);
+// EXTERNAL MODULE: ./src/editor/dom/treeNode/TextBorderNode.ts + 1 modules
+var TextBorderNode = __webpack_require__(11596);
+;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/textDialog/TextBorderDialog.vue?vue&type=script&lang=js&
+
+
+
+
+
+
+
+/* harmony default export */ var TextBorderDialogvue_type_script_lang_js_ = ({
+  name: 'TextBorderDialog',
+  components: {},
+  data: function data() {
+    return {
+      animationClassNames: 'control-modal-contents label-to-text-modal animation-in',
+      text: '',
+      endPath: ''
+    };
+  },
+  props: {
+    hoEditorFactoryId: {
+      default: ''
+    },
+    controlStatus: {
+      default: ''
+    },
+    vueController: {
+      default: function _default() {}
+    }
+  },
+  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) {
+      this.text = node.text;
+      this.$refs.textBorderInput.focus();
+    }
+  },
+  methods: {
+    getTextBorderNode: function getTextBorderNode() {
+      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;
+    },
+    sure: function sure() {
+      var _this$labelTextId;
+      var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this.hoEditorFactoryId);
+      var arr = (_this$labelTextId = this.labelTextId) === null || _this$labelTextId === void 0 ? void 0 : _this$labelTextId.split('___');
+      var id = '';
+      if (arr && arr.length === 3) {
+        id = arr[1];
+      }
+      if (this.hoEditorProvider.controlStatus === 'update') {
+        var node = this.getTextBorderNode();
+        if (node) {
+          node.setTextBorderText(this.text);
+        }
+      } else {
+        hoEditorFactory.vueController.insertTextBorder(this.text);
+      }
+      this.handleClose();
+    },
+    textToLabel: function textToLabel() {
+      var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this.hoEditorFactoryId);
+      if (this.hoEditorProvider.controlStatus === 'update') {
+        var label = this.getTextBorderNode();
+        if (label.length > 0) {
+          label.forEach(function (v) {
+            hoEditorFactory.vueController.updateAssociatedElement(v, '');
+          });
+        }
+      } else {
+        hoEditorFactory.vueController.textToLabel();
+      }
+      this.handleClose();
+    },
+    handleClose: function handleClose() {
+      this.animationClassNames = 'control-modal-contents label-to-text-modal animation-out';
+      this.$emit('closed');
+      this.endPath = '';
+    }
+  }
+});
+;// 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=726226fa&prod&lang=less&
+// extracted by mini-css-extract-plugin
+
+;// 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);
+;// CONCATENATED MODULE: ./src/components/controls/textDialog/TextBorderDialog.vue
+
+
+
+;
+
+
+/* normalize component */
+
+var component = (0,componentNormalizer/* default */.Z)(
+  textDialog_TextBorderDialogvue_type_script_lang_js_,
+  render,
+  staticRenderFns,
+  false,
+  null,
+  null,
+  null
+  
+)
+
+/* harmony default export */ var TextBorderDialog = (component.exports);
+
+/***/ }),
+
 /***/ 61911:
 /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
@@ -36099,7 +36305,7 @@ var Print = /*#__PURE__*/function () {
     key: "createPDFBase64",
     value: function () {
       var _createPDFBase = (0,asyncToGenerator/* default */.Z)( /*#__PURE__*/(0,regeneratorRuntime/* default */.Z)().mark(function _callee4(hoEditorFactoryID, reslove, PDF) {
-        var hoEditorFactory, orientation, svgBox, last, pageNumber, _iterator2, _step2, _cpage$drawDomLevel7, _cpage$drawDomLevel8, index, cpage, children, ctx;
+        var hoEditorFactory, svgBox, last, pageNumber, _iterator2, _step2, _cpage$drawDomLevel7, _cpage$drawDomLevel8, index, cpage, children, ctx;
         return (0,regeneratorRuntime/* default */.Z)().wrap(function _callee4$(_context5) {
           while (1) switch (_context5.prev = _context5.next) {
             case 0:
@@ -36109,44 +36315,35 @@ var Print = /*#__PURE__*/function () {
               if (hoEditorFactory.printStatus.printRange == PrintRange.prContinue) {
                 hoEditorFactory.printStatus.DrawPrintRange().preparePrint();
               }
-              orientation = hoEditorFactory.pageProperty.widthMm > hoEditorFactory.pageProperty.heightMm ? 'l' : 'p';
               svgBox = document.createElement('div');
               svgBox.className = 'ho-print-svg-box';
               last = -1;
               pageNumber = 0;
               _iterator2 = (0,createForOfIteratorHelper/* default */.Z)(hoEditorFactory.printStatus.printProcess());
-              _context5.prev = 10;
+              _context5.prev = 9;
               _iterator2.s();
-            case 12:
+            case 11:
               if ((_step2 = _iterator2.n()).done) {
-                _context5.next = 33;
+                _context5.next = 32;
                 break;
               }
               index = _step2.value;
               if (!(index == -1)) {
-                _context5.next = 17;
+                _context5.next = 16;
                 break;
               }
               message/* default */.Z.info('请进行翻页');
-              return _context5.abrupt("continue", 31);
-            case 17:
+              return _context5.abrupt("continue", 30);
+            case 16:
               last = index;
-              cpage = hoEditorFactory.drawTree.drawPages[index]; // if (
-              //     index === hoEditorFactory.drawTree.drawPages.length - 1 &&
-              //     cpage.drawMainDoc.children.length === 2 &&
-              //     !(cpage.drawMainDoc.children[0] instanceof DrawPageTable) &&
-              //     cpage.drawMainDoc.children[1] &&
-              //     (cpage.drawMainDoc.children[1] as any).drawItems.length === 0
-              // ) {
-              //     break;
-              // }
+              cpage = hoEditorFactory.drawTree.drawPages[index];
               children = cpage.drawMainDoc.children;
               if (!(children.length == 2 && !(children[0] instanceof DrawPageTable/* DrawPageTable */.ox) && children[1] && children[1].drawItems.length == 0 || children.length == 1 && children[0] instanceof DrawLine/* DrawLine */.a && children[0].drawItems.length == 0)) {
-                _context5.next = 22;
+                _context5.next = 21;
                 break;
               }
-              return _context5.abrupt("continue", 31);
-            case 22:
+              return _context5.abrupt("continue", 30);
+            case 21:
               if (cpage.drawDomLevel && !cpage.drawDomLevel.stage) {
                 cpage.drawDomLevel.bindStage();
                 cpage.needUpdateStage = true;
@@ -36162,31 +36359,31 @@ var Print = /*#__PURE__*/function () {
               ctx && ((_cpage$drawDomLevel7 = cpage.drawDomLevel) === null || _cpage$drawDomLevel7 === void 0 || (_cpage$drawDomLevel7 = _cpage$drawDomLevel7.stage) === null || _cpage$drawDomLevel7 === void 0 ? void 0 : _cpage$drawDomLevel7.draw(ctx));
               ctx = null;
               index > 0 && ((_cpage$drawDomLevel8 = cpage.drawDomLevel) === null || _cpage$drawDomLevel8 === void 0 ? void 0 : _cpage$drawDomLevel8.clearStage());
-            case 31:
-              _context5.next = 12;
+            case 30:
+              _context5.next = 11;
               break;
-            case 33:
-              _context5.next = 38;
+            case 32:
+              _context5.next = 37;
               break;
-            case 35:
-              _context5.prev = 35;
-              _context5.t0 = _context5["catch"](10);
+            case 34:
+              _context5.prev = 34;
+              _context5.t0 = _context5["catch"](9);
               _iterator2.e(_context5.t0);
-            case 38:
-              _context5.prev = 38;
+            case 37:
+              _context5.prev = 37;
               _iterator2.f();
-              return _context5.finish(38);
-            case 41:
+              return _context5.finish(37);
+            case 40:
               if (hoEditorFactory.printStatus.printRange !== PrintRange.prSelected) {
                 hoEditorFactory.printStatus.recordLastPosByPageIndex(last);
               }
               hoEditorFactory.printStatus.DrawPrintRange().PrintOver();
               reslove && reslove(pageNumber);
-            case 44:
+            case 43:
             case "end":
               return _context5.stop();
           }
-        }, _callee4, null, [[10, 35, 38, 41]]);
+        }, _callee4, null, [[9, 34, 37, 40]]);
       }));
       function createPDFBase64(_x12, _x13, _x14) {
         return _createPDFBase.apply(this, arguments);
@@ -37316,7 +37513,7 @@ var SubDocManger = /*#__PURE__*/function () {
 /* harmony import */ var D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_regeneratorRuntime_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(80543);
 /* harmony import */ var D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_asyncToGenerator_js__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(81448);
 /* harmony import */ var ant_design_vue_es_message_style__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(94310);
-/* harmony import */ var ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_101__ = __webpack_require__(40735);
+/* harmony import */ var ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_102__ = __webpack_require__(40735);
 /* harmony import */ var D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_classCallCheck_js__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(70280);
 /* harmony import */ var D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(66298);
 /* harmony import */ var D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(78255);
@@ -37434,6 +37631,8 @@ var SubDocManger = /*#__PURE__*/function () {
 /* harmony import */ var _draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_98__ = __webpack_require__(51760);
 /* harmony import */ var _plugins_util__WEBPACK_IMPORTED_MODULE_99__ = __webpack_require__(62783);
 /* harmony import */ var _treeNode_PopQScoreNode__WEBPACK_IMPORTED_MODULE_100__ = __webpack_require__(12790);
+/* harmony import */ var _treeNode_TextBorderNode__WEBPACK_IMPORTED_MODULE_101__ = __webpack_require__(11596);
+
 
 
 
@@ -37681,7 +37880,7 @@ var DocController = /*#__PURE__*/function () {
       var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_84__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID);
       var domRange = hoEditorFactory.docTree.curDomRange;
       if (hoEditorFactory.notAllowEditInReview && hoEditorFactory.drawTree.paintStatus === _draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_98__/* .PaintState */ .Dh.psReview) {
-        ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_101__/* ["default"] */ .Z.warn('质控医生站的病历只可进行批注不可编辑修改');
+        ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_102__/* ["default"] */ .Z.warn('质控医生站的病历只可进行批注不可编辑修改');
         return;
       }
       //  alert(text);
@@ -37718,7 +37917,7 @@ var DocController = /*#__PURE__*/function () {
             var isAllowEdit = colProperty.downListProperty.canModifyContent;
             //const cellText = cellNode.getCellText();
             if (!isAllowEdit) {
-              ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_101__/* ["default"] */ .Z.warn('不允许用户直接编辑，请双击单元格进行选择.');
+              ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_102__/* ["default"] */ .Z.warn('不允许用户直接编辑，请双击单元格进行选择.');
               return;
             }
           }
@@ -37726,7 +37925,7 @@ var DocController = /*#__PURE__*/function () {
             var _isAllowEdit = cellProperty.downListProperty.canModifyContent;
             //const cellText = cellNode.getCellText();
             if (!_isAllowEdit) {
-              ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_101__/* ["default"] */ .Z.warn('不允许用户直接编辑，请双击单元格进行选择.');
+              ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_102__/* ["default"] */ .Z.warn('不允许用户直接编辑，请双击单元格进行选择.');
               return;
             }
           }
@@ -38155,7 +38354,7 @@ var DocController = /*#__PURE__*/function () {
         domRange = domRange.normalize();
       } else if ((hoEditorFactory.drawTree.paintStatus === _draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_98__/* .PaintState */ .Dh.psReview || hoEditorFactory.drawTree.paintStatus === _draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_98__/* .PaintState */ .Dh.psTrace) && !(domRange.npStart.node instanceof _treeNode_SignNode__WEBPACK_IMPORTED_MODULE_91__/* .SignNode */ .N)) {
         if (domRange.npStart.node instanceof _treeNode_TextNode__WEBPACK_IMPORTED_MODULE_35__/* .TextNode */ .R && hoEditorFactory.docTree.styles[domRange.npStart.node.styleIndex].creatorIndex !== undefined && hoEditorFactory.docTree.styles[domRange.npStart.node.styleIndex].creatorIndex !== -1) {} else {
-          ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_101__/* ["default"] */ .Z.warn('审阅模式下，只能选中文档内容进行删除');
+          ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_102__/* ["default"] */ .Z.warn('审阅模式下，只能选中文档内容进行删除');
           return;
         }
       }
@@ -38380,7 +38579,7 @@ var DocController = /*#__PURE__*/function () {
                 _context.next = 86;
                 break;
               }
-              ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_101__/* ["default"] */ .Z.warn('审阅模式下，只能对文本内容进行删除');
+              ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_102__/* ["default"] */ .Z.warn('审阅模式下，只能对文本内容进行删除');
               return _context.abrupt("return");
             case 86:
               if (!((hoEditorFactory.drawTree.paintStatus === _draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_98__/* .PaintState */ .Dh.psReview || hoEditorFactory.drawTree.paintStatus === _draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_98__/* .PaintState */ .Dh.psTrace) && node instanceof _treeNode_SignNode__WEBPACK_IMPORTED_MODULE_91__/* .SignNode */ .N)) {
@@ -38392,21 +38591,21 @@ var DocController = /*#__PURE__*/function () {
                 _context.next = 91;
                 break;
               }
-              ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_101__/* ["default"] */ .Z.warn('不是本人签名，不允许删除！');
+              ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_102__/* ["default"] */ .Z.warn('不是本人签名，不允许删除！');
               return _context.abrupt("return");
             case 91:
               if (!(hoEditorFactory.drawTree.paintStatus !== _draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_98__/* .PaintState */ .Dh.psDesign && node instanceof _treeNode_SignNode__WEBPACK_IMPORTED_MODULE_91__/* .SignNode */ .N)) {
                 _context.next = 94;
                 break;
               }
-              ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_101__/* ["default"] */ .Z.warn('不允许使用删除键删除签名，请右键删除元素');
+              ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_102__/* ["default"] */ .Z.warn('不允许使用删除键删除签名，请右键删除元素');
               return _context.abrupt("return");
             case 94:
               if (!(hoEditorFactory.drawTree.paintStatus !== _draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_98__/* .PaintState */ .Dh.psDesign && node instanceof _treeNode_SignNode__WEBPACK_IMPORTED_MODULE_91__/* .SignNode */ .N && node.isTemplate && node.number === 0)) {
                 _context.next = 97;
                 break;
               }
-              ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_101__/* ["default"] */ .Z.warn('该签名元素不允许删除！');
+              ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_102__/* ["default"] */ .Z.warn('该签名元素不允许删除！');
               return _context.abrupt("return");
             case 97:
               if (!(node instanceof _treeNode_SignNode__WEBPACK_IMPORTED_MODULE_91__/* .SignNode */ .N)) {
@@ -39337,11 +39536,11 @@ var DocController = /*#__PURE__*/function () {
       var np = hoEditorFactory.docTree.findNodePositionByPath(arange.startPath);
       var parentNode = hoEditorFactory.docTree.getParentNode(arange.startPath);
       if (parentNode instanceof _treeNode_TextInputFieldNode__WEBPACK_IMPORTED_MODULE_53__/* .TextInputFieldNode */ .re) {
-        ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_101__/* ["default"] */ .Z.warn('不允许在文本域内插入表格');
+        ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_102__/* ["default"] */ .Z.warn('不允许在文本域内插入表格');
         return;
       }
       if (parentNode instanceof _treeNode_CellNode__WEBPACK_IMPORTED_MODULE_64__/* .CellNode */ .D) {
-        ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_101__/* ["default"] */ .Z.warn('不允许在表格内再插入表格');
+        ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_102__/* ["default"] */ .Z.warn('不允许在表格内再插入表格');
         return;
       }
       // const nextParaNode = new ParagraphNode(
@@ -39401,7 +39600,7 @@ var DocController = /*#__PURE__*/function () {
               c = _cell$table$getCellIn2[1];
             if (hoEditorFactory.drawTree.paintStatus == _draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_98__/* .PaintState */ .Dh.psEdit && r > 0) {
               if (cell.table.rowInfos[r].rowProperty.repeatAsTitleAtPageTop && cell.table.rowInfos[r - 1].rowProperty.repeatAsTitleAtPageTop) {
-                ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_101__/* ["default"] */ .Z.warn('不允许在表头行中间插入行');
+                ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_102__/* ["default"] */ .Z.warn('不允许在表头行中间插入行');
                 return;
               }
             }
@@ -39534,7 +39733,7 @@ var DocController = /*#__PURE__*/function () {
               hoEditorFactory.docTree.curDomRange = newRange;
             }
           } else {
-            ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_101__/* ["default"] */ .Z.warn('表格已设置不允许新增行');
+            ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_102__/* ["default"] */ .Z.warn('表格已设置不允许新增行');
             return;
           }
         }
@@ -39555,7 +39754,7 @@ var DocController = /*#__PURE__*/function () {
               c = _cell$table$getCellIn4[1];
             if (hoEditorFactory.drawTree.paintStatus == _draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_98__/* .PaintState */ .Dh.psEdit) {
               if (cell.table.rowInfos[r].rowProperty.repeatAsTitleAtPageTop && cell.table.rowInfos[r + 1].rowProperty.repeatAsTitleAtPageTop) {
-                ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_101__/* ["default"] */ .Z.warn('不允许在表头行中间插入行');
+                ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_102__/* ["default"] */ .Z.warn('不允许在表头行中间插入行');
                 return;
               }
             }
@@ -39656,7 +39855,7 @@ var DocController = /*#__PURE__*/function () {
             //   );
             // }
           } else {
-            ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_101__/* ["default"] */ .Z.warn('表格已设置不允许新增行');
+            ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_102__/* ["default"] */ .Z.warn('表格已设置不允许新增行');
             return;
           }
         }
@@ -39717,7 +39916,7 @@ var DocController = /*#__PURE__*/function () {
             //   );
             // }
           } else {
-            ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_101__/* ["default"] */ .Z.warn('表格已设置不允许新增列');
+            ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_102__/* ["default"] */ .Z.warn('表格已设置不允许新增列');
             return;
           }
         }
@@ -39775,7 +39974,7 @@ var DocController = /*#__PURE__*/function () {
             //   );
             // }
           } else {
-            ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_101__/* ["default"] */ .Z.warn('表格已设置不允许新增列');
+            ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_102__/* ["default"] */ .Z.warn('表格已设置不允许新增列');
             return;
           }
         }
@@ -39792,7 +39991,7 @@ var DocController = /*#__PURE__*/function () {
         r2 = _TableNode$getSelectT2[3],
         c2 = _TableNode$getSelectT2[4];
       if (!table) {
-        ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_101__/* ["default"] */ .Z.warn('选中区域在表格内，且为同一个表格才能删除');
+        ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_102__/* ["default"] */ .Z.warn('选中区域在表格内，且为同一个表格才能删除');
         return;
       }
       // const eParentNode = (aRange.npEnd.node as BaseNode).parentNode;
@@ -39804,7 +40003,7 @@ var DocController = /*#__PURE__*/function () {
         for (var i = r1; i <= r2; i++) {
           var rowInfo = table.rowInfos[i];
           if (rowInfo.rowProperty.repeatAsTitleAtPageTop) {
-            ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_101__/* ["default"] */ .Z.warn('表头行不允许删除');
+            ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_102__/* ["default"] */ .Z.warn('表头行不允许删除');
             return;
           }
         }
@@ -39863,7 +40062,7 @@ var DocController = /*#__PURE__*/function () {
         r2 = _TableNode$getSelectT4[3],
         c2 = _TableNode$getSelectT4[4];
       if (!table) {
-        ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_101__/* ["default"] */ .Z.warn('选中区域在表格内，且为同一个表格才能删除');
+        ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_102__/* ["default"] */ .Z.warn('选中区域在表格内，且为同一个表格才能删除');
         return;
       }
       var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_84__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID);
@@ -39916,7 +40115,7 @@ var DocController = /*#__PURE__*/function () {
         var cell1 = hoEditorFactory.docTree.getParentRectNode(np1.node);
         var cell2 = hoEditorFactory.docTree.getParentRectNode(np2.node);
         if (!(cell1 instanceof _treeNode_CellNode__WEBPACK_IMPORTED_MODULE_64__/* .CellNode */ .D) || !(cell2 instanceof _treeNode_CellNode__WEBPACK_IMPORTED_MODULE_64__/* .CellNode */ .D) || cell1.table !== cell2.table || cell1 === cell2) {
-          ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_101__/* ["default"] */ .Z.warn('选中区域在表格内，且为同一个表格的不同单元格才能合并');
+          ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_102__/* ["default"] */ .Z.warn('选中区域在表格内，且为同一个表格的不同单元格才能合并');
           return;
         }
         var _cell1$table$getCellI = cell1.table.getCellInfos(cell1),
@@ -39968,7 +40167,7 @@ var DocController = /*#__PURE__*/function () {
         var cell1 = hoEditorFactory.docTree.getParentRectNode(np1.node);
         var cell2 = hoEditorFactory.docTree.getParentRectNode(np2.node);
         if (!(cell1 instanceof _treeNode_CellNode__WEBPACK_IMPORTED_MODULE_64__/* .CellNode */ .D) || !(cell2 instanceof _treeNode_CellNode__WEBPACK_IMPORTED_MODULE_64__/* .CellNode */ .D) || cell1.table !== cell2.table) {
-          ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_101__/* ["default"] */ .Z.warn('选中区域在表格内，且为同一个表格的单元格才能取消合并');
+          ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_102__/* ["default"] */ .Z.warn('选中区域在表格内，且为同一个表格的单元格才能取消合并');
           return;
         }
         var endPath = cell1.table.getNodePath();
@@ -40276,7 +40475,7 @@ var DocController = /*#__PURE__*/function () {
       }
       var object = hoEditorFactory.docTree.findNodes(sNode, findContent, direction, matchCase);
       if (object.obj2.size === 0) {
-        ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_101__/* ["default"] */ .Z.warn('未能找到指定内容。');
+        ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_102__/* ["default"] */ .Z.warn('未能找到指定内容。');
       } else {
         var nodesMap = object.obj1;
         var indexsMap = object.obj2;
@@ -40339,7 +40538,7 @@ var DocController = /*#__PURE__*/function () {
           sNode = startNode.rootNodes[0];
           var object = hoEditorFactory.docTree.findNodes(sNode, findContent, direction, matchCase);
           if (object.obj2.size === 0) {
-            ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_101__/* ["default"] */ .Z.warn('未能找到指定内容。');
+            ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_102__/* ["default"] */ .Z.warn('未能找到指定内容。');
           } else {
             var nodesMap = object.obj1;
             var indexsMap = object.obj2;
@@ -40393,7 +40592,7 @@ var DocController = /*#__PURE__*/function () {
             } finally {
               _iterator.f();
             }
-            ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_101__/* ["default"] */ .Z.info('成功替换了' + indexsMap.size.toString() + '处文档内容。');
+            ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_102__/* ["default"] */ .Z.info('成功替换了' + indexsMap.size.toString() + '处文档内容。');
             var toPath = hoEditorFactory.docTree.curDomRange.endPath;
             hoEditorFactory.drawTree.moveCaretToPath(toPath);
           }
@@ -40659,6 +40858,26 @@ var DocController = /*#__PURE__*/function () {
       hoEditorFactory.undoService.add(new _undoRedo_NodeInsertUndoUnit__WEBPACK_IMPORTED_MODULE_33__/* .NodeInsertUndoUnit */ .R(this._hoEditorFactoryID, startPath, rareCharNode));
       hoEditorFactory.undoService.commit();
     }
+    /**
+     * 插入文本框
+     * @param 操作类型
+     * @param 选区
+     * @param 符号串
+     * @param 样式索引
+     */
+  }, {
+    key: "insertTextBorder",
+    value: function insertTextBorder(operType, curDomRange, text, styleIndex) {
+      var domRange = curDomRange.normalize();
+      var startPath = domRange.endPath;
+      var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_84__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID);
+      var parentNode = hoEditorFactory.docTree.getParentNode(startPath);
+      var rareCharNode = new _treeNode_TextBorderNode__WEBPACK_IMPORTED_MODULE_101__/* .TextBorderNode */ .D(this._hoEditorFactoryID, domRange.npStart.roots, parentNode, _treeNode_BaseNode__WEBPACK_IMPORTED_MODULE_32__/* .NodeType */ .Jq.ntTextBorder, text, styleIndex);
+      //插入该表达式节点
+      hoEditorFactory.undoService.begin();
+      hoEditorFactory.undoService.add(new _undoRedo_NodeInsertUndoUnit__WEBPACK_IMPORTED_MODULE_33__/* .NodeInsertUndoUnit */ .R(this._hoEditorFactoryID, startPath, rareCharNode));
+      hoEditorFactory.undoService.commit();
+    }
     /**
      * 插入链接按钮
      * @param operType 操作类型 "add"新增
@@ -40799,7 +41018,7 @@ var DocController = /*#__PURE__*/function () {
           } else {
             var _comment = hoEditorFactory.drawTree.curOnSelectedComment;
             if (_comment.userID != hoEditorFactory.userInfo.id) {
-              ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_101__/* ["default"] */ .Z.warn('不允许删除其他用户创建的批注！');
+              ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_102__/* ["default"] */ .Z.warn('不允许删除其他用户创建的批注！');
               return;
             }
             del(_comment);
@@ -41796,7 +42015,7 @@ var DocController = /*#__PURE__*/function () {
 /* harmony export */   x_: function() { return /* binding */ ctlKey; }
 /* harmony export */ });
 /* harmony import */ var ant_design_vue_es_message_style__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(94310);
-/* harmony import */ var ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_51__ = __webpack_require__(40735);
+/* harmony import */ var ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_52__ = __webpack_require__(40735);
 /* harmony import */ var D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(27222);
 /* harmony import */ var D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createForOfIteratorHelper_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(17519);
 /* harmony import */ var D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_classCallCheck_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(70280);
@@ -41856,13 +42075,15 @@ var DocController = /*#__PURE__*/function () {
 /* harmony import */ var _treeNode_TableNode__WEBPACK_IMPORTED_MODULE_41__ = __webpack_require__(5010);
 /* harmony import */ var _events_Exception__WEBPACK_IMPORTED_MODULE_42__ = __webpack_require__(8277);
 /* harmony import */ var _treeNode_CellNode__WEBPACK_IMPORTED_MODULE_43__ = __webpack_require__(68598);
-/* harmony import */ var _draw_drawNode_DrawTextNode__WEBPACK_IMPORTED_MODULE_44__ = __webpack_require__(96610);
+/* harmony import */ var _draw_drawNode_DrawTextNode__WEBPACK_IMPORTED_MODULE_44__ = __webpack_require__(24492);
 /* harmony import */ var _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_45__ = __webpack_require__(74089);
 /* harmony import */ var _treeNode_DateTimeNode__WEBPACK_IMPORTED_MODULE_46__ = __webpack_require__(92501);
 /* harmony import */ var _treeNode_DownListNode__WEBPACK_IMPORTED_MODULE_47__ = __webpack_require__(45712);
 /* harmony import */ var _treeNode_LabelNode__WEBPACK_IMPORTED_MODULE_48__ = __webpack_require__(95089);
 /* harmony import */ var _draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_49__ = __webpack_require__(51760);
 /* harmony import */ var _treeNode_ControlNode__WEBPACK_IMPORTED_MODULE_50__ = __webpack_require__(91105);
+/* harmony import */ var _treeNode_TextBorderNode__WEBPACK_IMPORTED_MODULE_51__ = __webpack_require__(11596);
+
 
 
 
@@ -42486,6 +42707,8 @@ var DocTree = /*#__PURE__*/function () {
         nodeType = "DownList";
       } else if (node instanceof _treeNode_LabelNode__WEBPACK_IMPORTED_MODULE_48__/* .LabelNode */ .P) {
         nodeType = "LabelNode";
+      } else if (node instanceof _treeNode_TextBorderNode__WEBPACK_IMPORTED_MODULE_51__/* .TextBorderNode */ .D) {
+        nodeType = "TextBorderNode";
       }
       return node.delete(operType, nodeType, isForceDelete);
     }
@@ -43490,7 +43713,7 @@ var DocTree = /*#__PURE__*/function () {
         }
       } else {
         if (count === indexsMap.size + 1) {
-          ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_51__/* ["default"] */ .Z.info("已完成对文档的搜索。");
+          ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_52__/* ["default"] */ .Z.info("已完成对文档的搜索。");
           return "";
         } else {
           return "-1";
@@ -51513,21 +51736,20 @@ var ControlNode = /*#__PURE__*/function (_BaseNode) {
           var tip = "";
           if (nodeType === "RadioBox") {
             tip = "单选框";
-          }
-          if (nodeType === "CheckBox") {
+          } else if (nodeType === "CheckBox") {
             tip = "复选框";
-          }
-          if (nodeType === "DateTime") {
+          } else if (nodeType === "DateTime") {
             tip = "日期时间";
-          }
-          if (nodeType === "DownList") {
+          } else if (nodeType === "DownList") {
             tip = "下拉列表";
           }
           if (nodeType === "LabelNode") {
-            ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_12__/* ["default"] */ .Z.warn("不允许删除标签文本。");
+            ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_12__/* ["default"] */ .Z.warn("不允许删除标签元素文本内容。");
             return false;
-          }
-          if (nodeType) {
+          } else if (nodeType === "TextBorderNode") {
+            ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_12__/* ["default"] */ .Z.warn("不允许删除文本框元素文本内容。");
+            return false;
+          } else if (nodeType) {
             ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_12__/* ["default"] */ .Z.warn(tip + "元素已设置为不允许删除。");
           } else {
             return (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_get_js__WEBPACK_IMPORTED_MODULE_4__/* ["default"] */ .Z)((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_getPrototypeOf_js__WEBPACK_IMPORTED_MODULE_5__/* ["default"] */ .Z)(ControlNode.prototype), "delete", this).call(this);
@@ -53121,7 +53343,7 @@ var FetalHeartMapNode = /*#__PURE__*/function (_MedicalExpressionNod) {
 /* harmony import */ var core_js_modules_es_regexp_to_string_js__WEBPACK_IMPORTED_MODULE_8___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_regexp_to_string_js__WEBPACK_IMPORTED_MODULE_8__);
 /* harmony import */ var core_js_modules_es_array_push_js__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(57658);
 /* harmony import */ var core_js_modules_es_array_push_js__WEBPACK_IMPORTED_MODULE_9___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_push_js__WEBPACK_IMPORTED_MODULE_9__);
-/* harmony import */ var _editor_draw_drawNode_DrawTextNode__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(96610);
+/* harmony import */ var _editor_draw_drawNode_DrawTextNode__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(24492);
 /* harmony import */ var _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(74089);
 /* harmony import */ var _plugins_util__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(62783);
 /* harmony import */ var _BaseNode__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(62358);
@@ -54677,7 +54899,7 @@ var LightLocationMapNode = /*#__PURE__*/function (_MedicalExpressionNod) {
 /* harmony import */ var core_js_modules_es_object_assign_js__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(19601);
 /* harmony import */ var core_js_modules_es_object_assign_js__WEBPACK_IMPORTED_MODULE_14___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_object_assign_js__WEBPACK_IMPORTED_MODULE_14__);
 /* harmony import */ var _BaseNode__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(62358);
-/* harmony import */ var _editor_draw_drawNode_DrawTextNode__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(96610);
+/* harmony import */ var _editor_draw_drawNode_DrawTextNode__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(24492);
 /* harmony import */ var _editor_draw_drawNode_DrawMarkNode__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(57732);
 /* harmony import */ var _domNode_TextStyle__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(29899);
 /* harmony import */ var _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_19__ = __webpack_require__(74089);
@@ -60361,7 +60583,7 @@ var SignNode = /*#__PURE__*/function (_BaseNode) {
 /* harmony import */ var core_js_modules_es_number_constructor_js__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_number_constructor_js__WEBPACK_IMPORTED_MODULE_4__);
 /* harmony import */ var core_js_modules_es_array_push_js__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(57658);
 /* harmony import */ var core_js_modules_es_array_push_js__WEBPACK_IMPORTED_MODULE_5___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_push_js__WEBPACK_IMPORTED_MODULE_5__);
-/* harmony import */ var _editor_draw_drawNode_DrawTextNode__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(96610);
+/* harmony import */ var _editor_draw_drawNode_DrawTextNode__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(24492);
 /* harmony import */ var _BaseNode__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(62358);
 /* harmony import */ var _ControlNode__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(91105);
 /* harmony import */ var _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(74089);
@@ -61066,14 +61288,13 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
       strValue = hoEditorFactory.unitConvert.replaceAll(strValue, '\r', '');
       if (strValue === '') {
         bret = true;
+        ret = "";
         for (var i = 1; i < cell.childNodes.length; i++) {
           var aNode = cell.childNodes[i];
           if (aNode instanceof _RadioAndCheckBoxNode__WEBPACK_IMPORTED_MODULE_41__/* .RadioAndCheckBoxNode */ .Yh) {
             bret = true;
             if (aNode.isSelected && aNode.numericValue !== "") {
-              ret = aNode.numericValue;
-            } else {
-              ret = "";
+              ret += Number(aNode.numericValue);
             }
           }
         }
@@ -61083,14 +61304,13 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
           bret = true;
           ret = strValue;
         } else {
+          ret = "";
           for (var j = 1; j < cell.childNodes.length; j++) {
             var bNode = cell.childNodes[j];
             if (bNode instanceof _RadioAndCheckBoxNode__WEBPACK_IMPORTED_MODULE_41__/* .RadioAndCheckBoxNode */ .Yh) {
               bret = true;
               if (bNode.isSelected && bNode.numericValue !== "") {
-                ret = bNode.numericValue;
-              } else {
-                ret = "";
+                ret += Number(bNode.numericValue);
               }
             }
           }
@@ -64763,6 +64983,279 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
 
 /***/ }),
 
+/***/ 11596:
+/***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+
+// EXPORTS
+__webpack_require__.d(__webpack_exports__, {
+  D: function() { return /* binding */ TextBorderNode; }
+});
+
+// EXTERNAL MODULE: ./node_modules/@babel/runtime/helpers/esm/classCallCheck.js
+var classCallCheck = __webpack_require__(70280);
+// EXTERNAL MODULE: ./node_modules/@babel/runtime/helpers/esm/createClass.js
+var createClass = __webpack_require__(66298);
+// EXTERNAL MODULE: ./node_modules/@babel/runtime/helpers/esm/inherits.js + 1 modules
+var inherits = __webpack_require__(11651);
+// EXTERNAL MODULE: ./node_modules/@babel/runtime/helpers/esm/createSuper.js + 2 modules
+var createSuper = __webpack_require__(19593);
+// EXTERNAL MODULE: ./node_modules/core-js/modules/es.number.constructor.js
+var es_number_constructor = __webpack_require__(9653);
+// EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.push.js
+var es_array_push = __webpack_require__(57658);
+// EXTERNAL MODULE: ./src/HOEditorFactorys.ts
+var HOEditorFactorys = __webpack_require__(74089);
+// EXTERNAL MODULE: ./src/editor/dom/treeNode/BaseNode.ts
+var BaseNode = __webpack_require__(62358);
+// EXTERNAL MODULE: ./src/editor/dom/treeNode/ControlNode.ts
+var ControlNode = __webpack_require__(91105);
+// EXTERNAL MODULE: ./node_modules/@babel/runtime/helpers/esm/assertThisInitialized.js
+var assertThisInitialized = __webpack_require__(75808);
+// EXTERNAL MODULE: ./node_modules/@babel/runtime/helpers/esm/defineProperty.js
+var defineProperty = __webpack_require__(78255);
+// EXTERNAL MODULE: ./src/editor/utils/DrawSimpleText.ts
+var DrawSimpleText = __webpack_require__(57590);
+// EXTERNAL MODULE: ./src/editor/draw/drawNode/DrawCombineNode.ts
+var DrawCombineNode = __webpack_require__(66114);
+;// CONCATENATED MODULE: ./src/editor/draw/drawNode/DrawTextBorderNode.ts
+
+
+
+
+
+
+
+
+var DrawTextBorderNode = /*#__PURE__*/function (_DrawCombineNode) {
+  (0,inherits/* default */.Z)(DrawTextBorderNode, _DrawCombineNode);
+  var _super = (0,createSuper/* default */.Z)(DrawTextBorderNode);
+  function DrawTextBorderNode(hoeditfactoryID, rootPath, node, index, text, textStyle) {
+    var _this;
+    (0,classCallCheck/* default */.Z)(this, DrawTextBorderNode);
+    _this = _super.call(this, hoeditfactoryID, rootPath, node, index);
+    (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), "_textStyle", void 0);
+    (0,defineProperty/* default */.Z)((0,assertThisInitialized/* default */.Z)(_this), "_bd", void 0);
+    _this._textStyle = textStyle;
+    _this._text = text;
+    _this._dStyleKey = node.dStyleKey;
+    _this._dText = new createjs.Text(text, _this._dStyleKey, node.dColor);
+    _this.dWidth = _this._dText.getMeasuredWidth();
+    _this.dHeight = node.dHeight;
+    _this.drawRareChar();
+    return _this;
+  }
+  (0,createClass/* default */.Z)(DrawTextBorderNode, [{
+    key: "text",
+    get: function get() {
+      return this._text;
+    }
+  }, {
+    key: "dStyleKey",
+    get: function get() {
+      return this._dStyleKey;
+    }
+  }, {
+    key: "drawRareChar",
+    value: function drawRareChar() {
+      this.dWidth = this._dText.getMeasuredWidth();
+      if (!this._bd) this._bd = new createjs.Shape();
+      this._bd.graphics.clear();
+      var leftWidth = 0;
+      for (var i = 0; i < this._text.length; i++) {
+        var text = this._text[i];
+        var dText = new DrawSimpleText/* DrawSimpleText */.b(text, this._textStyle.getStyleKey(), '#000');
+        var currentWidthwidth = dText.getMeasuredWidth();
+        dText.textBaseline = 'alphabetic';
+        dText.textAlign = 'left';
+        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 = 0;
+        }
+        this.addChild(dText);
+        this._bd.graphics.beginStroke(this._textStyle.color).drawRect(leftWidth,
+        //x
+        -maxHeight,
+        //y
+        currentWidthwidth + maxWidth * 0.5, maxHeight * 1.25);
+        leftWidth = leftWidth + dText.getMeasuredWidth();
+        if (i < this._text.length - 1) {
+          leftWidth += maxWidth;
+        } else {
+          leftWidth += maxWidth * 0.75;
+        }
+      }
+      this.addChild(this._bd);
+      this.dWidth = leftWidth;
+    }
+  }]);
+  return DrawTextBorderNode;
+}(DrawCombineNode/* DrawCombineNode */.o);
+// EXTERNAL MODULE: ./src/editor/events/NodeChangeEvent.ts
+var NodeChangeEvent = __webpack_require__(2613);
+// EXTERNAL MODULE: ./src/editor/draw/SelectRange.ts
+var SelectRange = __webpack_require__(53901);
+// EXTERNAL MODULE: ./src/editor/dom/DocTree.ts
+var DocTree = __webpack_require__(32629);
+;// CONCATENATED MODULE: ./src/editor/dom/treeNode/TextBorderNode.ts
+
+
+
+
+
+
+
+
+
+
+
+
+
+var TextBorderNode = /*#__PURE__*/function (_ControlNode) {
+  (0,inherits/* default */.Z)(TextBorderNode, _ControlNode);
+  var _super = (0,createSuper/* default */.Z)(TextBorderNode);
+  function TextBorderNode(hoEditorFactoryID, rootNodes, pNode, nodeType, text, styleIndex) {
+    var _this;
+    (0,classCallCheck/* default */.Z)(this, TextBorderNode);
+    _this = _super.call(this, hoEditorFactoryID, rootNodes, pNode, nodeType);
+    _this._text = text;
+    _this._styleIndex = styleIndex;
+    _this.node2DrawNodeRange();
+    return _this;
+  }
+  (0,createClass/* default */.Z)(TextBorderNode, [{
+    key: "text",
+    get: function get() {
+      return this._text;
+    },
+    set: function set(val) {
+      if (val !== this._text) {
+        this._text = val;
+      }
+    }
+  }, {
+    key: "styleIndex",
+    get: function get() {
+      return this._styleIndex;
+    },
+    set: function set(val) {
+      if (this._styleIndex !== Number(val)) {
+        this._styleIndex = Number(val);
+        var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this._hoEditorFactoryID);
+        if (!hoEditorFactory.docTree.isSaveValid) {
+          this.node2DrawNode();
+        }
+      }
+    }
+  }, {
+    key: "refreshDrawStyle",
+    value: function refreshDrawStyle() {
+      var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this._hoEditorFactoryID);
+      var textStyle = hoEditorFactory.docTree.styles[this._styleIndex];
+      var cbStyle;
+      if (textStyle) {
+        cbStyle = textStyle.combineStyle;
+      } else {
+        cbStyle = hoEditorFactory.docTree.styles[0].combineStyle;
+        this.styleIndex = 0;
+      }
+      this.dStyleKey = cbStyle.getStyleKey();
+      this.dColor = cbStyle.color;
+      this.dHeight = hoEditorFactory.getFontHeightByFontSize(cbStyle.size);
+      this.dCombineStyle = cbStyle;
+    }
+    //根据可放置的宽度，将普通组件转换成绘制组件
+  }, {
+    key: "node2DrawNodeRange",
+    value: function node2DrawNodeRange() {
+      this.refreshDrawStyle();
+      var dNode = new DrawTextBorderNode(this._hoEditorFactoryID, this._rootPath, this, 0, this.text, this.dCombineStyle);
+      this._drawNodes.push(dNode);
+    }
+  }, {
+    key: "node2DrawNode",
+    value: function node2DrawNode() {
+      this.clearDrawNodes(0, 0);
+      this.node2DrawNodeRange();
+    }
+    /**
+    * @author xyl
+    * @param dRoots 绘制根数组
+    * @param paragraphNode 对应的段落
+    * @param start  当前起始位置，绘制时不应含入
+    * @param endIndex  结束位置 ，包含入
+    */
+    //根据可放置的宽度，将普通组件转换成绘制组件
+  }, {
+    key: "placeDNode2DrawLine",
+    value: function placeDNode2DrawLine(droots, paragraphNode, dline, start, endIndex) {
+      var startIndex = start;
+      if (startIndex >= 1) {
+        return dline;
+      }
+      dline.addChild(this._drawNodes[0]);
+      dline.drawItems.push(this._drawNodes[0]);
+      dline.fitLines();
+      return dline.paragraphNode.getLastDrawline();
+    }
+  }, {
+    key: "setTextBorderText",
+    value: function setTextBorderText(text) {
+      var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this._hoEditorFactoryID);
+      var sPath = hoEditorFactory.docTree.getNodeLastPath(this.previousLeaf());
+      var ePath = hoEditorFactory.docTree.getNodeLastPath(this);
+      var changeEvent = new NodeChangeEvent/* NodeChangeEvent */.G(this.hoEditorFactoryID, DocTree/* DocAction */.gk.daModifyStyle, sPath, ePath);
+      changeEvent.oldEndPath = ePath;
+      changeEvent.oldDrawLines = new SelectRange/* SelectRange */.E(this.hoEditorFactoryID).getRangeDrawLines(sPath, ePath, true, true);
+      this.text = text;
+      this.node2DrawNode();
+      changeEvent.afterChangePath = ePath;
+      hoEditorFactory.docTree.change(changeEvent);
+    }
+  }, {
+    key: "hasChildPath",
+    value: function hasChildPath() {
+      return false;
+    }
+  }, {
+    key: "node2Json",
+    value: function node2Json(range, isCopy) {
+      var retObj = {
+        nodeType: BaseNode/* NodeType */.Jq[this.nodeType],
+        text: this.text,
+        styleIndex: this.styleIndex
+      };
+      if (isCopy) {
+        return retObj;
+      }
+      return {
+        "TextBorderNode": retObj
+      };
+    }
+  }, {
+    key: "getTagNameCn",
+    value: function getTagNameCn() {
+      return "文本框";
+    }
+  }], [{
+    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.ntTextBorder, json.text, styleIndex);
+    }
+  }]);
+  return TextBorderNode;
+}(ControlNode/* ControlNode */.w);
+
+/***/ }),
+
 /***/ 65043:
 /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
@@ -69180,7 +69673,7 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
 /* harmony import */ var _BaseNode__WEBPACK_IMPORTED_MODULE_22__ = __webpack_require__(62358);
 /* harmony import */ var _editor_draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_23__ = __webpack_require__(51760);
 /* harmony import */ var _editor_draw_DrawLine__WEBPACK_IMPORTED_MODULE_24__ = __webpack_require__(96635);
-/* harmony import */ var _editor_draw_drawNode_DrawTextNode__WEBPACK_IMPORTED_MODULE_25__ = __webpack_require__(96610);
+/* harmony import */ var _editor_draw_drawNode_DrawTextNode__WEBPACK_IMPORTED_MODULE_25__ = __webpack_require__(24492);
 /* harmony import */ var _domNode_TextStyle__WEBPACK_IMPORTED_MODULE_26__ = __webpack_require__(29899);
 /* harmony import */ var _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_27__ = __webpack_require__(74089);
 /* harmony import */ var _editor_utils_UnitConvert__WEBPACK_IMPORTED_MODULE_28__ = __webpack_require__(91404);
@@ -70025,8 +70518,8 @@ var DrawContainer = __webpack_require__(47535);
 var DrawCombineNode = __webpack_require__(66114);
 // EXTERNAL MODULE: ./src/editor/dom/domNode/Paragraph.ts
 var Paragraph = __webpack_require__(53474);
-// EXTERNAL MODULE: ./src/editor/draw/drawNode/DrawTextNode.ts + 2 modules
-var DrawTextNode = __webpack_require__(96610);
+// EXTERNAL MODULE: ./src/editor/draw/drawNode/DrawTextNode.ts + 1 modules
+var DrawTextNode = __webpack_require__(24492);
 ;// CONCATENATED MODULE: ./src/editor/events/DrawChangeEvent.ts
 
 
@@ -73107,52 +73600,9 @@ var DrawFooter = /*#__PURE__*/function (_DrawPageHeaderFooter) {
       }
       return Math.max(Math.min(docHeight, this.maxHeight), hoeditfactory.pageProperty.bottomMarginPixes - hoeditfactory.pageProperty.footerYPixes);
     }
-    // public AddPage(aPage: DrawPage) {
-    //   if (this._pages.indexOf(aPage) == -1) {
-    //     this._pages.push(aPage);
-    //     const dlevel = aPage.drawDomLevel;
-    //     if (dlevel) {
-    //       dlevel.drawFooter = this;
-    //       aPage.repaint();
-    //     }
-    //   }
-    // }
-    // public DeletePage(aPage: DrawPage) {
-    //   const index = this._pages.indexOf(aPage);
-    //   if (index == -1) return;
-    //   this._pages[index]?.drawDomLevel?.stage.removeChild(this);
-    //   this._pages.splice(index, 1);
-    // }
-    // public nodify() {
-    //   if (this.rootPath != "") {
-    //     const arr = this.rootPath.split("/");
-    //     // this.drawLines = [...HOEditorFactorys.instance().getFactory(this._hoEditorFactoryID).drawTree.footerDNodes[parseInt(arr[1])]];
-    //   }
-    //   this._pages.forEach((value) => {
-    //     value.refresh();
-    //   });
-    // }
   }, {
     key: "paintBackground",
     value: function paintBackground() {
-      // if (this.rootPath != '') {
-      //     const arr = this.rootPath.split('/')
-      //     this.drawLines = [...HOEditorFactorys.instance().getFactory(this._hoEditorFactoryID).drawTree.headerDNodes[parseInt(arr[1])]];
-      //     // HOEditorFactorys.instance().getFactory(this._hoEditorFactoryID).drawTree.buildDrawTree(this.rootPath);
-      // }
-      // const dWidth =
-      //   HOEditorFactorys.instance().getFactory(this._hoEditorFactoryID).pageProperty.widthPixes -
-      //   HOEditorFactorys.instance().getFactory(this._hoEditorFactoryID).pageProperty.leftMarginPixes -
-      //   HOEditorFactorys.instance().getFactory(this._hoEditorFactoryID).pageProperty.rightMarginPixes;
-      // if (!this._sharp) this._sharp = new createjs.Shape();
-      // this._sharp.graphics.clear();
-      // this._sharp.graphics.beginFill("#FF0000").drawRect(
-      //   -1, //x
-      //   0, //y
-      //   dWidth,
-      //   1 //Math.max(this.dHeight, this.docHeight)
-      // );
-      // this.addChildAt(this._sharp, this.numChildren);
       (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_get_js__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z)((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_getPrototypeOf_js__WEBPACK_IMPORTED_MODULE_3__/* ["default"] */ .Z)(DrawFooter.prototype), "paintBackground", this).call(this);
     }
   }, {
@@ -73233,62 +73683,9 @@ var DrawHeader = /*#__PURE__*/function (_DrawPageHeaderFooter) {
     get: function get() {
       return Infinity;
     }
-    // public AddPage(aPage: DrawPage) {
-    //   if (this._pages.indexOf(aPage) == -1) {
-    //     this._pages.push(aPage);
-    //     const dlevel = aPage.drawDomLevel;
-    //     if (dlevel) {
-    //       dlevel.drawHeader = this;
-    //       aPage.repaint();
-    //     }
-    //   }
-    // }
-    // public DeletePage(aPage: DrawPage) {
-    //   const index = this._pages.indexOf(aPage);
-    //   if (index == -1) return;
-    //   this._pages[index]?.drawDomLevel?.stage.removeChild(this);
-    //   this._pages.splice(index, 1);
-    // }
-    // public nodify() {
-    //   if (this.rootPath != "") {
-    //     const arr = this.rootPath.split("/");
-    //     // this.drawLines = [...HOEditorFactorys.instance().getFactory(this._hoEditorFactoryID).drawTree.headerDNodes[parseInt(arr[1])]];
-    //   }
-    //   this._pages.forEach((value) => {
-    //     value.refresh();
-    //   });
-    // }
-    // constructor(path: string, index: number, drawPage: DrawPage) {
-    //     const dTop = 0;// HOEditorFactorys.instance().getFactory(this._hoEditorFactoryID).pageProperty.headerYPixes;
-    //     const dLeft = HOEditorFactorys.instance().getFactory(this._hoEditorFactoryID).pageProperty.leftMarginPixes;
-    //     const dWidth = HOEditorFactorys.instance().getFactory(this._hoEditorFactoryID).pageProperty.widthPixes - dLeft - HOEditorFactorys.instance().getFactory(this._hoEditorFactoryID).pageProperty.rightMarginMm;
-    //     const dHeight = HOEditorFactorys.instance().getFactory(this._hoEditorFactoryID).pageProperty.topMarginPixes - dTop;
-    //     const maxHeight = Math.floor((HOEditorFactorys.instance().getFactory(this._hoEditorFactoryID).pageProperty.heightPixes - dTop) / 2 - HOEditorFactorys.instance().getFactory(this._hoEditorFactoryID).pageProperty.heightPixes / 5);
-    //     const maxWidth = dWidth;
-    //     super(path, index, dLeft, dTop, dWidth, dHeight, maxWidth, maxHeight)
-    //     this._allowAcrossPage = false;
-    //     this._drawPage = drawPage;
-    //     this.drawHeader();
-    // }
   }, {
     key: "paintBackground",
     value: function paintBackground() {
-      // const hoEditorFactory = HOEditorFactorys.instance().getFactory(this._hoEditorFactoryID);
-      // const dWidth =
-      //   hoEditorFactory.pageProperty.widthPixes -
-      //   hoEditorFactory.pageProperty.leftMarginPixes -
-      //   hoEditorFactory.pageProperty.rightMarginPixes;
-      // if (hoEditorFactory.drawTree.activePage?.drawDomLevel?.activeDrawRect != this)
-      //     return
-      // if (!this._sharp) this._sharp = new createjs.Shape();
-      // this._sharp.graphics.clear();
-      // this._sharp.graphics.beginFill("#FF0000").drawRect(
-      //   -1, //x
-      //   Math.max(this.dHeight, this.actualHeight),
-      //   dWidth,
-      //   1 //Math.max(this.dHeight, this.docHeight)
-      // );
-      // this.addChildAt(this._sharp, this.numChildren);
       (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_get_js__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z)((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_getPrototypeOf_js__WEBPACK_IMPORTED_MODULE_3__/* ["default"] */ .Z)(DrawHeader.prototype), "paintBackground", this).call(this);
     }
   }, {
@@ -81513,7 +81910,7 @@ var DrawTableFormular = /*#__PURE__*/function (_DrawSimpleNode) {
 
 /***/ }),
 
-/***/ 96610:
+/***/ 24492:
 /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -81543,6 +81940,12 @@ var es_object_keys = __webpack_require__(47941);
 var es_string_ends_with = __webpack_require__(27852);
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.function.name.js
 var es_function_name = __webpack_require__(68309);
+// EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.filter.js
+var es_array_filter = __webpack_require__(57327);
+// EXTERNAL MODULE: ./node_modules/core-js/modules/es.object.to-string.js
+var es_object_to_string = __webpack_require__(41539);
+// EXTERNAL MODULE: ./node_modules/core-js/modules/web.dom-collections.for-each.js
+var web_dom_collections_for_each = __webpack_require__(54747);
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.string.italics.js
 var es_string_italics = __webpack_require__(58734);
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.string.bold.js
@@ -81949,19 +82352,9 @@ var TextInputFieldNode = __webpack_require__(65043);
 var DrawSimpleText = __webpack_require__(57590);
 // EXTERNAL MODULE: ./src/editor/dom/treeNode/GestationNode.ts
 var GestationNode = __webpack_require__(73632);
-// EXTERNAL MODULE: ./node_modules/core-js/modules/es.object.to-string.js
-var es_object_to_string = __webpack_require__(41539);
-// EXTERNAL MODULE: ./node_modules/core-js/modules/es.regexp.to-string.js
-var es_regexp_to_string = __webpack_require__(39714);
-// EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.push.js
-var es_array_push = __webpack_require__(57658);
-// EXTERNAL MODULE: ./src/plugins/util.ts
-var util = __webpack_require__(62783);
-// EXTERNAL MODULE: ./src/editor/dom/treeNode/BaseNode.ts
-var BaseNode = __webpack_require__(62358);
-// EXTERNAL MODULE: ./src/editor/dom/treeNode/ControlNode.ts
-var ControlNode = __webpack_require__(91105);
-;// CONCATENATED MODULE: ./src/editor/dom/treeNode/TextBorderNode.ts
+// EXTERNAL MODULE: ./src/editor/dom/treeNode/TextBorderNode.ts + 1 modules
+var TextBorderNode = __webpack_require__(11596);
+;// CONCATENATED MODULE: ./src/editor/draw/drawNode/DrawTextNode.ts
 
 
 
@@ -81977,185 +82370,6 @@ var ControlNode = __webpack_require__(91105);
 
 
 
-/*
- * @Author: liyanan 2441631434@qq.com
- * @Date: 2022-05-11 17:07:13
- * @LastEditors: liyanan 2441631434@qq.com
- * @LastEditTime: 2022-05-12 08:30:21
- * @FilePath: \hoeditor-web\src\editor\dom\treeNode\GestationNode.ts
- * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
- */
-var TextBorderNode = /*#__PURE__*/function (_ControlNode) {
-  (0,inherits/* default */.Z)(TextBorderNode, _ControlNode);
-  var _super = (0,createSuper/* default */.Z)(TextBorderNode);
-  //用来计算的日期
-  function TextBorderNode(hoEditorFactoryID, rootNodes, pNode, nodeType, lastMenstruationDate, usedDate, styleIndex) {
-    var _this;
-    (0,classCallCheck/* default */.Z)(this, TextBorderNode);
-    _this = _super.call(this, hoEditorFactoryID, rootNodes, pNode, nodeType);
-    (0,defineProperty/* default */.Z)((0,assertThisInitialized/* default */.Z)(_this), "_lastMenstruationDate", "");
-    //末次月经日期
-    (0,defineProperty/* default */.Z)((0,assertThisInitialized/* default */.Z)(_this), "_usedDate", "");
-    _this._lastMenstruationDate = lastMenstruationDate;
-    _this._usedDate = usedDate;
-    _this._styleIndex = styleIndex;
-    _this._text = _this.clacGestation();
-    _this.node2DrawNodeRange(0, 0);
-    return _this;
-  }
-  (0,createClass/* default */.Z)(TextBorderNode, [{
-    key: "lastMenstruationDate",
-    get: function get() {
-      return this._lastMenstruationDate;
-    },
-    set: function set(val) {
-      if (this._lastMenstruationDate !== val) {
-        this._lastMenstruationDate = val;
-      }
-    }
-  }, {
-    key: "usedDate",
-    get: function get() {
-      return this._usedDate;
-    },
-    set: function set(val) {
-      if (this._usedDate !== val) {
-        this._usedDate = val;
-      }
-    }
-  }, {
-    key: "styleIndex",
-    get: function get() {
-      return this._styleIndex;
-    },
-    set: function set(val) {
-      if (this._styleIndex !== Number(val)) {
-        this._styleIndex = Number(val);
-        var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this._hoEditorFactoryID);
-        if (!hoEditorFactory.docTree.isSaveValid) {
-          this.node2DrawNode();
-        }
-      }
-    }
-  }, {
-    key: "clacGestation",
-    value: function clacGestation() {
-      var strRet = "";
-      if ((0,util/* isDate */.J_)(this.lastMenstruationDate) && (0,util/* isDate */.J_)(this.usedDate)) {
-        var sDate = new Date(this.lastMenstruationDate);
-        var sTime = sDate.getTime();
-        var eDate = new Date(this.usedDate);
-        var eTime = eDate.getTime();
-        var subTime = ((eTime - sTime + 1) / (1000 * 3600 * 24 * 7)).toString();
-        var weekData = subTime.split('.');
-        var week = Number(weekData[0]);
-        var days = 0;
-        if (weekData.length > 1) {
-          days = parseInt((Number("0." + weekData[1]) * 7).toString());
-        }
-        strRet = week.toString() + "周+" + days.toString() + "天";
-      }
-      return strRet;
-    }
-  }, {
-    key: "refreshDrawStyle",
-    value: function refreshDrawStyle() {
-      var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this._hoEditorFactoryID);
-      var textStyle = hoEditorFactory.docTree.styles[this._styleIndex];
-      var cbStyle;
-      if (textStyle) {
-        cbStyle = textStyle.combineStyle;
-      } else {
-        cbStyle = hoEditorFactory.docTree.styles[0].combineStyle;
-        this.styleIndex = 0;
-      }
-      this.dStyleKey = cbStyle.getStyleKey();
-      this.dColor = cbStyle.color;
-      this.dHeight = hoEditorFactory.getFontHeightByFontSize(cbStyle.size);
-      this.dCombineStyle = cbStyle;
-    }
-    //根据可放置的宽度，将普通组件转换成绘制组件
-  }, {
-    key: "node2DrawNodeRange",
-    value: function node2DrawNodeRange(startIndex, endIndex) {
-      this.refreshDrawStyle();
-      var dNode = new DrawTextNode(this._hoEditorFactoryID, this._rootPath, this, 0);
-      this._drawNodes.push(dNode);
-    }
-  }, {
-    key: "node2DrawNode",
-    value: function node2DrawNode() {
-      this.clearDrawNodes(0, 0);
-      this.node2DrawNodeRange(0, 0);
-    }
-    /**
-    * @author xyl
-    * @param dRoots 绘制根数组
-    * @param paragraphNode 对应的段落
-    * @param start  当前起始位置，绘制时不应含入
-    * @param endIndex  结束位置 ，包含入
-    */
-    //根据可放置的宽度，将普通组件转换成绘制组件
-  }, {
-    key: "placeDNode2DrawLine",
-    value: function placeDNode2DrawLine(droots, paragraphNode, dline, start, endIndex) {
-      var startIndex = start;
-      if (startIndex >= 1) {
-        return dline;
-      }
-      dline.addChild(this._drawNodes[0]);
-      dline.drawItems.push(this._drawNodes[0]);
-      dline.fitLines();
-      return dline.paragraphNode.getLastDrawline();
-    }
-  }, {
-    key: "hasChildPath",
-    value: function hasChildPath() {
-      return false;
-    }
-  }, {
-    key: "node2Json",
-    value: function node2Json(range, isCopy) {
-      var retObj = {
-        nodeType: BaseNode/* NodeType */.Jq[this.nodeType],
-        lastMenstruationDate: this.lastMenstruationDate,
-        usedDate: this.usedDate,
-        styleIndex: this.styleIndex
-      };
-      if (isCopy) {
-        return retObj;
-      }
-      return {
-        "GestationNode": retObj
-      };
-    }
-  }, {
-    key: "getTagNameCn",
-    value: function getTagNameCn() {
-      return "孕周";
-    }
-  }], [{
-    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.ntGestation, json.lastMenstruationDate, json.usedDate, styleIndex);
-    }
-  }]);
-  return TextBorderNode;
-}(ControlNode/* ControlNode */.w);
-;// CONCATENATED MODULE: ./src/editor/draw/drawNode/DrawTextNode.ts
-
-
-
-
-
-
-
-
-
-
-
-
 
 // import {DrawNode} from "./DrawSimpleNode"
 
@@ -82200,7 +82414,7 @@ var DrawTextNode = /*#__PURE__*/function (_DrawCombineNode) {
     _this._textNode = node;
     _this._dTextShape = new createjs.Shape();
     // this.redraw();
-    if (node instanceof SpecialCharsNode/* SpecialCharsNode */.y || node instanceof GestationNode/* GestationNode */.G || node instanceof TextBorderNode) {
+    if (node instanceof SpecialCharsNode/* SpecialCharsNode */.y || node instanceof GestationNode/* GestationNode */.G || node instanceof TextBorderNode/* TextBorderNode */.D) {
       _this._text = node.text;
       if (endIndex) _this._endIndex = endIndex;else _this._endIndex = _this._text.length - 1;
     } else {
@@ -82383,7 +82597,6 @@ var DrawTextNode = /*#__PURE__*/function (_DrawCombineNode) {
           }
         }
       }
-      // this.setBounds(0, 0, this.dWidth + this._wspace, Math.max(this.dHeight, this._lineheight));
       return true;
     }
     /**
@@ -82394,9 +82607,7 @@ var DrawTextNode = /*#__PURE__*/function (_DrawCombineNode) {
     value: function drawBackColor() {
       var backColor = this._textNode.dCombineStyle.backColor;
       var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this._hoEditorFactoryID);
-      if (hoEditorFactory.drawTree.paintStatus !== DrawTree/* PaintState */.Dh.psPreview && hoEditorFactory.drawTree.paintStatus !== DrawTree/* PaintState */.Dh.psPrint
-      //&& hoEditorFactory.drawTree.paintStatus !== PaintState.psTrace
-      ) {
+      if (hoEditorFactory.drawTree.paintStatus !== DrawTree/* PaintState */.Dh.psPreview && hoEditorFactory.drawTree.paintStatus !== DrawTree/* PaintState */.Dh.psPrint) {
         if (this.node.parentNode instanceof TextInputFieldNode/* TextInputFieldNode */.re) {
           var parentNode = this.node.parentNode;
           if (parentNode.inputFieldType === 0) {
@@ -82452,7 +82663,6 @@ var DrawTextNode = /*#__PURE__*/function (_DrawCombineNode) {
               }
             }
           }
-          //hoEditorFactory.isEnabledGlobalColor = true;
           if (hoEditorFactory.isEnabledGlobalColor) {
             if (!(this.node instanceof MarkNode/* MarkNode */.j) && this.node.parentNode.inputFieldType === 0) {
               backColor = "transparent";
@@ -82464,9 +82674,7 @@ var DrawTextNode = /*#__PURE__*/function (_DrawCombineNode) {
         }
       }
       var isReviewColor = false;
-      if (hoEditorFactory.drawTree.paintStatus === DrawTree/* PaintState */.Dh.psReview
-      //|| (hoEditorFactory.drawTree.paintStatus === PaintState.psReadOnly && !hoEditorFactory.isHideComments)
-      || !hoEditorFactory.isHideComments) {
+      if (hoEditorFactory.drawTree.paintStatus === DrawTree/* PaintState */.Dh.psReview || !hoEditorFactory.isHideComments) {
         var commentID = this._textNode.dCombineStyle.commentID;
         var createID = this._textNode.dCombineStyle.creatorIndex;
         var deleteID = this._textNode.dCombineStyle.deleterIndex;
@@ -82481,17 +82689,6 @@ var DrawTextNode = /*#__PURE__*/function (_DrawCombineNode) {
           var createLevel = createHistory ? createHistory.permissionLevel : -1;
           var deleteLevel = deleteHistory ? deleteHistory.permissionLevel : -1;
           var ilevel = Math.max(comLevel, createLevel, deleteLevel);
-          // if (commentID !== "0") {
-          //   backColor = "#ffce7b";
-          // } else if (deleteLevel >= 0) {
-          //   backColor = "#f3715c";
-          // } else if (ilevel === 0) {
-          //   backColor = "#abc88b";
-          // } else if (ilevel === 1) {
-          //   backColor = "#90d7ec";
-          // } else {
-          //   backColor = "#f3715c";
-          // }
           if (ilevel > 0) {
             isReviewColor = true;
           }
@@ -82592,20 +82789,6 @@ var DrawTextNode = /*#__PURE__*/function (_DrawCombineNode) {
           this.addChildAt(markLine, 0);
         }
       }
-      // const line1 = new createjs.Shape();
-      // line1.graphics.clear();
-      // line1.graphics
-      //   .beginStroke("#F31A1A")
-      //   .moveTo(x, 1 + 2 * h)
-      //   .lineTo(x + w + this._wspace + 1, 1 + 2 * h);
-      // this.addChild(line1);
-      // const line2 = new createjs.Shape();
-      // line2.graphics.clear();
-      // line2.graphics
-      //   .beginStroke("#F31A1A")
-      //   .moveTo(x, 8 * h)
-      //   .lineTo(x + w + this._wspace + 1, 8 * h);
-      // this.addChild(line2);
     }
     /**
      * 下划线
@@ -82618,13 +82801,8 @@ var DrawTextNode = /*#__PURE__*/function (_DrawCombineNode) {
         if (!this._ul) this._ul = new createjs.Shape();
         this._ul.graphics.clear();
         this._ul.graphics.beginStroke(this._textNode.dCombineStyle.color).moveTo(0, 0 + 2 * h).lineTo(this.dWidth + this._wspace + 1, 0 + 2 * h);
-        // this._ul.graphics.clear();
-        // this._ul.graphics
-        //   .beginFill(this._textNode.dCombineStyle.color) //"black")
-        //   .drawRect(0, 0 + 2 * h, this.dWidth + this._wspace + 1, h);
         this.addChild(this._ul);
         this._ul.x = -1;
-        // srec.y = 2;
       }
     }
     /**
@@ -82648,14 +82826,9 @@ var DrawTextNode = /*#__PURE__*/function (_DrawCombineNode) {
     key: "updateStyleByScript",
     value: function updateStyleByScript() {
       var tmp = null;
-      // let rect = null;
       if (this._textNode.dCombineStyle.script !== TextStyle/* StyleScriptType */.n$.sstnormal) {
         tmp = this._dText.clone();
         tmp.font = this.getStyle(this._textNode.dCombineStyle);
-        //   console.log(this._dText.getBounds());
-        //   console.log(this._wspace, this._dWidth, this._dHeight);
-        //   console.log(tmp);
-        // rect = tmp.getBounds(); //实际大小
         this.setBounds(0, 0, this._dWidth + this._wspace, this.dHeight);
         switch (this._textNode.dCombineStyle.script) {
           case TextStyle/* StyleScriptType */.n$.sstsub:
@@ -82674,20 +82847,34 @@ var DrawTextNode = /*#__PURE__*/function (_DrawCombineNode) {
   }, {
     key: "updateBorder",
     value: function updateBorder() {
+      var _this2 = this;
       if (!this._bd) this._bd = new createjs.Shape();
-      this._dWidth = this._dWidth + 20;
-      this.dWidth = this._dWidth;
-      this.setBounds(0, -this.dHeight - 4, this._dWidth * 4, this.dHeight * 2);
-      this._textNode.dCombineStyle.chineseWidth = this._dWidth;
-      this._bd.graphics.clear();
-      this._bd.graphics.beginStroke(this._textNode.dCombineStyle.color).drawRect(0,
-      //x
-      -this.dHeight - 4,
-      //y
-      this._dWidth, this.dHeight * 2);
-      this._dText.x = 10;
-      this._dText.y = 0;
-      this.addChild(this._bd);
+      var textList = this._textNode.text.split("").filter(function (v) {
+        return v != '';
+      });
+      if (textList.length) {
+        this._bd.graphics.clear();
+        var x = 0;
+        var width = 0;
+        textList.forEach(function (v, i) {
+          var currentWidth = _this2._dText._getMeasuredWidth(v);
+          _this2._bd.graphics.beginStroke(_this2._textNode.dCombineStyle.color).drawRect(x,
+          //x
+          -_this2.dHeight,
+          //y
+          currentWidth, _this2.dHeight);
+          x = currentWidth + x;
+          width += x;
+        });
+        this.dWidth = width;
+        // this.space = 4;
+        this._dText.letterSpacing = this.space;
+        this.setBounds(0, -this.dHeight, this._dWidth, this.dHeight);
+        // this._textNode.dCombineStyle.chineseWidth = this._dWidth;
+        this._dText.x = 0;
+        this._dText.y = 0;
+        this.addChild(this._bd);
+      }
     }
     /**
      * 功能：同getStyleKey()
@@ -84545,7 +84732,6 @@ var DrawPage = /*#__PURE__*/function () {
       hoEditorFactory.pageProperty.canvasHeadFootPos.headerY = dhheight;
       hoEditorFactory.pageProperty.canvasHeadFootPos.footerY = dfheight;
       // }
-      // this.refresh();
     }
     /**
      * 隐藏此页面上的表格边框
@@ -84821,8 +85007,8 @@ var DrawPageCell = __webpack_require__(59105);
 var PrintStatus = __webpack_require__(82215);
 // EXTERNAL MODULE: ./src/editor/draw/drawArea/DrawPageMainDoc.ts
 var DrawPageMainDoc = __webpack_require__(77441);
-// EXTERNAL MODULE: ./src/editor/draw/drawNode/DrawTextNode.ts + 2 modules
-var DrawTextNode = __webpack_require__(96610);
+// EXTERNAL MODULE: ./src/editor/draw/drawNode/DrawTextNode.ts + 1 modules
+var DrawTextNode = __webpack_require__(24492);
 // EXTERNAL MODULE: ./src/editor/dom/treeNode/TableFormula.ts
 var TableFormula = __webpack_require__(90832);
 // EXTERNAL MODULE: ./src/editor/draw/drawNode/DrawSignNode.ts
@@ -87900,7 +88086,6 @@ var DrawTree = /*#__PURE__*/function () {
       }
       var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this._hoEditorFactoryID);
       var dLine = hoEditorFactory.docTree.getNodeParaNode(dNode.node).getLastDrawline();
-      if (dLine == undefined) {}
       return dLine;
       //  throw new Error(`未找到路径${((dNode as unknown) as  DrawInfos).node.getNodePath()}的绘制行`)
     }
@@ -88523,10 +88708,37 @@ var DrawTree = /*#__PURE__*/function () {
     key: "rebuildAllDrawLine",
     value: function () {
       var _rebuildAllDrawLine = (0,asyncToGenerator/* default */.Z)( /*#__PURE__*/(0,regeneratorRuntime/* default */.Z)().mark(function _callee2(needUpdateParaStyle, resolve) {
-        var hoEditorFactory, headerDocTree, i, _nodes3, dline, _startPath, _endPath, _cgEvent, footerDocTree, j, _nodes4, _dline4, _startPath2, _endPath2, _cgEvent2, nodes, _dline5, startPath, endPath, lastNode, lastNodeStyle, newParaNode, cgEvent, lastPath, selChangeEvent;
+        var moveCaret,
+          hoEditorFactory,
+          headerDocTree,
+          i,
+          _nodes3,
+          dline,
+          _startPath,
+          _endPath,
+          _cgEvent,
+          footerDocTree,
+          j,
+          _nodes4,
+          _dline4,
+          _startPath2,
+          _endPath2,
+          _cgEvent2,
+          nodes,
+          _dline5,
+          startPath,
+          endPath,
+          lastNode,
+          lastNodeStyle,
+          newParaNode,
+          cgEvent,
+          lastPath,
+          selChangeEvent,
+          _args3 = arguments;
         return (0,regeneratorRuntime/* default */.Z)().wrap(function _callee2$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
+              moveCaret = _args3.length > 2 && _args3[2] !== undefined ? _args3[2] : true;
               // HOEditorFactorys.instance().getFactory(this._hoEditorFactoryID).drawPageTree.clear;
               // HOEditorFactorys.instance().getFactory(this._hoEditorFactoryID).drawPageTree.initDoc();
               hoEditorFactory = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this._hoEditorFactoryID);
@@ -88539,14 +88751,14 @@ var DrawTree = /*#__PURE__*/function () {
               }
               headerDocTree = hoEditorFactory.subDocManger.headerDocTree;
               i = 0;
-            case 4:
+            case 5:
               if (!(i < headerDocTree.length)) {
-                _context3.next = 20;
+                _context3.next = 21;
                 break;
               }
               _nodes3 = headerDocTree[i].subDocNodes;
               if (!(_nodes3 && _nodes3.length > 0)) {
-                _context3.next = 17;
+                _context3.next = 18;
                 break;
               }
               if (this._headerChildNodes[i].length > 0) {
@@ -88559,27 +88771,27 @@ var DrawTree = /*#__PURE__*/function () {
               _cgEvent.needUpdateParaStyle = needUpdateParaStyle;
               _cgEvent.oldEndPath = _endPath;
               _cgEvent.oldDrawLines = new SelectRange/* SelectRange */.E(this._hoEditorFactoryID).getRangeDrawLines(_startPath, _endPath, true, true);
-              _context3.next = 16;
+              _context3.next = 17;
               return hoEditorFactory.docTree.change(_cgEvent);
-            case 16:
+            case 17:
               if (i <= hoEditorFactory.drawTree.drawPages.length - 1) {
                 hoEditorFactory.subDocManger.updateAllSameSubDoc(i, SubDocManger/* HeaderFooterType */.pi.hftHead, false, true);
               }
-            case 17:
+            case 18:
               i++;
-              _context3.next = 4;
+              _context3.next = 5;
               break;
-            case 20:
+            case 21:
               footerDocTree = hoEditorFactory.subDocManger.footerDocTree;
               j = 0;
-            case 22:
+            case 23:
               if (!(j < footerDocTree.length)) {
-                _context3.next = 38;
+                _context3.next = 39;
                 break;
               }
               _nodes4 = footerDocTree[j].subDocNodes;
               if (!(_nodes4 && _nodes4.length > 0)) {
-                _context3.next = 35;
+                _context3.next = 36;
                 break;
               }
               if (this._footerChildNodes[j].length > 0) {
@@ -88592,17 +88804,17 @@ var DrawTree = /*#__PURE__*/function () {
               _cgEvent2.oldEndPath = _endPath2;
               _cgEvent2.needUpdateParaStyle = needUpdateParaStyle;
               _cgEvent2.oldDrawLines = new SelectRange/* SelectRange */.E(this._hoEditorFactoryID).getRangeDrawLines(_startPath2, _endPath2, true, true);
-              _context3.next = 34;
+              _context3.next = 35;
               return hoEditorFactory.docTree.change(_cgEvent2);
-            case 34:
+            case 35:
               if (j <= hoEditorFactory.drawTree.drawPages.length - 1) {
                 hoEditorFactory.subDocManger.updateAllSameSubDoc(j, SubDocManger/* HeaderFooterType */.pi.hftFoot, false, true);
               }
-            case 35:
+            case 36:
               j++;
-              _context3.next = 22;
+              _context3.next = 23;
               break;
-            case 38:
+            case 39:
               nodes = hoEditorFactory.docTree.mainNodes;
               if (this._mainChildNodes.length > 0) {
                 _dline5 = this._mainChildNodes[0];
@@ -88623,16 +88835,20 @@ var DrawTree = /*#__PURE__*/function () {
               cgEvent.oldEndPath = endPath;
               cgEvent.needUpdateParaStyle = needUpdateParaStyle;
               cgEvent.oldDrawLines = new SelectRange/* SelectRange */.E(this._hoEditorFactoryID).getRangeDrawLines(startPath, endPath, true, true);
-              _context3.next = 50;
+              _context3.next = 51;
               return hoEditorFactory.docTree.change(cgEvent);
-            case 50:
-              if (hoEditorFactory.docTree.curDomRange.startPath != "") this.moveCaretToPath(hoEditorFactory.docTree.curDomRange.startPath);else {
+            case 51:
+              if (hoEditorFactory.docTree.curDomRange.startPath != "") {
+                if (moveCaret) {
+                  this.moveCaretToPath(hoEditorFactory.docTree.curDomRange.startPath);
+                }
+              } else {
                 lastPath = hoEditorFactory.docTree.getNodeLastPath(hoEditorFactory.docTree.mainNodes[hoEditorFactory.docTree.mainNodes.length - 1]);
                 selChangeEvent = new SelectionChangeEvent/* SelectionChangeEvent */.r(hoEditorFactory.docTree.curDomRange, new DomRange/* DomRange */.a(this._hoEditorFactoryID, lastPath, lastPath));
                 hoEditorFactory.docTree.selectChange(selChangeEvent);
               }
               resolve && resolve(true);
-            case 52:
+            case 53:
             case "end":
               return _context3.stop();
           }
@@ -95612,6 +95828,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]) {
@@ -170007,7 +170225,7 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
 /***/ (function(module, __unused_webpack_exports, __webpack_require__) {
 
 var map = {
-	"./ControlModal.vue": 27901,
+	"./ControlModal.vue": 10597,
 	"./barCode/BarCodes.vue": 39411,
 	"./colorPicker/HoColorPicker.vue": 10306,
 	"./colorPicker/HoColorPickers.vue": 98181,
@@ -170044,6 +170262,7 @@ var map = {
 	"./table/TableFormula.vue": 80199,
 	"./table/TableProperty.vue": 98800,
 	"./table/TableRowProperty.vue": 55631,
+	"./textDialog/TextBorderDialog.vue": 52023,
 	"./textDialog/TextDialog.vue": 61911,
 	"./textDialog/TextToLabelDialog.vue": 2355,
 	"./textDialog/VerifyTip.vue": 74618,
@@ -207482,8 +207701,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=1993340c&
-var HoDocvue_type_template_id_1993340c_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', {
@@ -207684,7 +207903,7 @@ var HoDocvue_type_template_id_1993340c_render = function render() {
     }
   }, [_vm._v("v " + _vm._s(_vm.version))])])])], 1);
 };
-var HoDocvue_type_template_id_1993340c_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);
@@ -208141,7 +208360,7 @@ var DrawSelectLevel = /*#__PURE__*/function () {
                 hoEditorFactory.docTree.selectChange(selectChangeEvent);
                 hoEditorFactory.docTree.curDomRange = newRange;
               }
-              if (!(np.node.nodeType === BaseNode/* NodeType */.Jq.ntMedicalExpression || np.node.nodeType === BaseNode/* NodeType */.Jq.ntControl && !(np.node instanceof RadioAndCheckBoxNode/* RadioAndCheckBoxNode */.Yh) || ((_np$node$parentNode = np.node.parentNode) === null || _np$node$parentNode === void 0 ? void 0 : _np$node$parentNode.nodeType) === BaseNode/* NodeType */.Jq.ntField || np.node.nodeType === BaseNode/* NodeType */.Jq.ntSign || np.node.nodeType === BaseNode/* NodeType */.Jq.ntGestation || np.node.nodeType === BaseNode/* NodeType */.Jq.ntImage)) {
+              if (!(np.node.nodeType === BaseNode/* NodeType */.Jq.ntMedicalExpression || np.node.nodeType === BaseNode/* NodeType */.Jq.ntControl && !(np.node instanceof RadioAndCheckBoxNode/* RadioAndCheckBoxNode */.Yh) || ((_np$node$parentNode = np.node.parentNode) === null || _np$node$parentNode === void 0 ? void 0 : _np$node$parentNode.nodeType) === BaseNode/* NodeType */.Jq.ntField || np.node.nodeType === BaseNode/* NodeType */.Jq.ntSign || np.node.nodeType === BaseNode/* NodeType */.Jq.ntGestation || np.node.nodeType === BaseNode/* NodeType */.Jq.ntImage || np.node.nodeType === BaseNode/* NodeType */.Jq.ntTextBorder)) {
                 _context.next = 39;
                 break;
               }
@@ -210675,7 +210894,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.155');
+/* harmony default export */ var version = ('3.1.157');
 // EXTERNAL MODULE: ./src/components/controls/poperTipText/PoperTipText.vue + 5 modules
 var PoperTipText = __webpack_require__(84531);
 ;// CONCATENATED MODULE: ./src/components/controls/poperTipText/index.ts
@@ -210685,6 +210904,8 @@ var PoperTipText = __webpack_require__(84531);
 var ImageNode = __webpack_require__(97186);
 // EXTERNAL MODULE: ./src/editor/dom/treeNode/TableNode.ts
 var TableNode = __webpack_require__(5010);
+// EXTERNAL MODULE: ./src/editor/dom/treeNode/TextBorderNode.ts + 1 modules
+var TextBorderNode = __webpack_require__(11596);
 ;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/HoDoc.vue?vue&type=script&lang=js&
 
 
@@ -210724,6 +210945,7 @@ var TableNode = __webpack_require__(5010);
 
 
 
+
 
 
 var scaleXY = DrawConfig/* DrawConfig */.f.instance().scale;
@@ -211201,6 +211423,10 @@ var defaultHeight = Math.floor(1122 * scaleXY) % 2 === 1 ? Math.floor(1122 * sca
         });
         this.poperType = '';
         return;
+      } else if (node instanceof TextBorderNode/* TextBorderNode */.D) {
+        this.hoEditorProvider.setControlProperty('text-border', 'update', '');
+        // this.hoEditorProvider.setUpdateNodeValue(node);
+        return;
       } else {
         if (paintStatus === DrawTree/* PaintState */.Dh.psReview) {
           if ((node instanceof TextNode/* TextNode */.R || node instanceof MarkNode/* MarkNode */.j) && node.parentNode instanceof TextInputFieldNode/* TextInputFieldNode */.re) {
@@ -211714,10 +211940,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=1993340c&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=1993340c&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
 
@@ -211730,8 +211956,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_1993340c_render,
-  HoDocvue_type_template_id_1993340c_staticRenderFns,
+  HoDocvue_type_template_id_3b58cf3f_render,
+  HoDocvue_type_template_id_3b58cf3f_staticRenderFns,
   false,
   null,
   null,
@@ -212813,7 +213039,6 @@ var DrawPageTree = /*#__PURE__*/function () {
       //   )
       // );
       // }
-      // this.refresh();
     }
   }, {
     key: "getMainRootArea",
@@ -212989,9 +213214,7 @@ var DrawPageTree = /*#__PURE__*/function () {
         // dPage.storeDrawHeader.dWidth = widthPixes;
         // dPage.storeDrawHeader.maxWidth = widthPixes;
         dPage.storeDrawHeader.docWidth = docWidth;
-        // dPage.reFreshBounds();
       }
-
       for (var _i3 = 0; _i3 < this._drawMainDocs.length; _i3++) {
         var _area2 = this._drawMainDocs[_i3];
         // area.dWidth = widthPixes;
@@ -214871,6 +215094,7 @@ var PopQScoreNode = __webpack_require__(12790);
 
 
 
+
 
 
 var StructureConvert = /*#__PURE__*/function () {
@@ -216642,6 +216866,8 @@ var StructureConvert = /*#__PURE__*/function () {
         return SeparateCharNode/* SeparateCharNode */.O.json2Node(this._hoEditorFactoryID, temp, rootNodes, parentNode);
       } else if (temp.nodeType == BaseNode/* NodeType */.Jq.ntLabel) {
         return LabelNode/* LabelNode */.P.json2Node(this._hoEditorFactoryID, temp, rootNodes, parentNode);
+      } else if (temp.nodeType == BaseNode/* NodeType */.Jq.ntTextBorder) {
+        return TextBorderNode/* TextBorderNode */.D.json2Node(this._hoEditorFactoryID, temp, rootNodes, parentNode);
       } else if (temp.nodeType == BaseNode/* NodeType */.Jq.ntSign) {
         return SignNode/* SignNode */.N.json2Node(this._hoEditorFactoryID, temp, rootNodes, parentNode, isClearSign, isPaste);
       } else if (temp.nodeType == BaseNode/* NodeType */.Jq.ntGestation) {
@@ -217531,6 +217757,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);
     });
@@ -217644,20 +217873,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;
         }
@@ -220243,7 +220469,7 @@ var VueController = /*#__PURE__*/function () {
       }
     }
     /**
-     * 插入特殊符号
+     * 插入生僻字
      * @param operType 操作类型 "add"新增
      * @param chars 字符
      */
@@ -220262,6 +220488,25 @@ var VueController = /*#__PURE__*/function () {
         }
       }
     }
+    /**
+     * 设置文本框元素
+     * @param text 文本内容
+     */
+  }, {
+    key: "insertTextBorder",
+    value: function insertTextBorder(text) {
+      var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this._hoEditorFactoryID);
+      var result = hoEditorFactory.editController.canIsEdit(hoEditorFactory);
+      if (result) {
+        var _curDomRange = hoEditorFactory.docTree.curDomRange; //获取当前选中区域
+        var startPath = _curDomRange.normalize().startPath;
+        var endPath = _curDomRange.normalize().endPath;
+        var changingEvent = new NodeChangingEvent/* NodeChangingEvent */.Q(DocTree/* DocAction */.gk.daInsert, startPath, endPath, NodeChangingEvent/* OperType */.y.insertRareChar);
+        if (hoEditorFactory.docTree.changing(changingEvent)) {
+          hoEditorFactory.docController.insertTextBorder('add', _curDomRange, text, hoEditorFactory.docTree.curStyleIndex);
+        }
+      }
+    }
     /**
      * 插入链接按钮
      * @param operType 操作类型 "add"新增
@@ -238239,6 +238484,7 @@ var PrintController = /*#__PURE__*/function () {
               }
               return _context3.abrupt("return");
             case 2:
+              console.time('create_base64_all_time');
               hoEditorFactory = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this._hoEditorFactoryID); // 保存打印前文档状态 和 内容
               path = hoEditorFactory.docTree.curDomRange.normalize().endPath;
               beforePrintStatus = hoEditorFactory.drawTree.paintStatus;
@@ -238255,23 +238501,25 @@ var PrintController = /*#__PURE__*/function () {
               this.PDF = null;
               this.PDF = new jspdf(options);
               hPromise = Promise.resolve();
+              console.time("rebuild_time");
               hPromise = hPromise.then(function () {
                 return new Promise(function (resolve) {
                   hoEditorFactory.printStatus.printMode = 0;
                   hoEditorFactory.drawTree.paintStatus = DrawTree/* PaintState */.Dh.psPreview;
-                  hoEditorFactory.drawTree.rebuildAllDrawLine(false, resolve);
+                  hoEditorFactory.drawTree.rebuildAllDrawLine(false, resolve, false);
                 });
               });
+              console.timeEnd("rebuild_time");
+              console.time("create_time");
               hPromise = hPromise.then(function () {
                 return new Promise(function (resolve) {
                   PrintStatus/* Print */.Kh.createPDFBase64(_this2._hoEditorFactoryID, resolve, _this2.PDF);
                 });
               });
-              _context3.next = 16;
+              _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) {
@@ -238292,6 +238540,7 @@ var PrintController = /*#__PURE__*/function () {
                   } else {
                     pdf = _this2.PDF.output('datauristring');
                   }
+                  console.timeEnd("create_time");
                   if (callback) {
                     callback && callback({
                       page: pageNumber,
@@ -238301,26 +238550,31 @@ var PrintController = /*#__PURE__*/function () {
                   resolves(pdf);
                 });
               });
-            case 16:
+            case 20:
               base64 = _context3.sent;
               if (!base64) {
-                _context3.next = 24;
+                _context3.next = 29;
                 break;
               }
               setTimeout(function () {
+                console.time('restore_time');
+                hoEditorFactory.drawTree.paintStatus = beforePrintStatus;
+                hoEditorFactory.vueController.openXml(xml);
                 hoEditorFactory.vueController.moveCaretToPath(path);
+                console.timeEnd('restore_time');
                 _this2.clearJsPDF();
               }, 0);
+              console.timeEnd('create_base64_all_time');
               if (!(pdfPath == 'url')) {
-                _context3.next = 23;
+                _context3.next = 28;
                 break;
               }
               return _context3.abrupt("return", base64);
-            case 23:
+            case 28:
               return _context3.abrupt("return", base64.replace(/^data:application\/pdf;filename=generated.pdf;base64,/, ''));
-            case 24:
+            case 29:
               return _context3.abrupt("return", null);
-            case 25:
+            case 30:
             case "end":
               return _context3.stop();
           }
@@ -241390,7 +241644,7 @@ var HoFooter_component = (0,componentNormalizer/* default */.Z)(
 
 /* harmony default export */ var HoFooter = (HoFooter_component.exports);
 // EXTERNAL MODULE: ./src/components/controls/ControlModal.vue + 3 modules
-var ControlModal = __webpack_require__(27901);
+var ControlModal = __webpack_require__(10597);
 // EXTERNAL MODULE: ./src/components/controls/findReplace/FindReplace.vue + 5 modules
 var FindReplace = __webpack_require__(98064);
 ;// CONCATENATED MODULE: ./src/components/controls/findReplace/index.ts
@@ -242551,8 +242805,8 @@ var HoDocs_component = (0,componentNormalizer/* default */.Z)(
 )
 
 /* harmony default export */ var HoDocs = (HoDocs_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/ToolBar.vue?vue&type=template&id=2bbec870&
-var ToolBarvue_type_template_id_2bbec870_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/ToolBar.vue?vue&type=template&id=595248f8&
+var ToolBarvue_type_template_id_595248f8_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -242785,7 +243039,7 @@ var ToolBarvue_type_template_id_2bbec870_render = function render() {
     }, [_vm._v(_vm._s(item.title))]);
   }), 1)], 1) : _vm._e()], 1);
 };
-var ToolBarvue_type_template_id_2bbec870_staticRenderFns = [];
+var ToolBarvue_type_template_id_595248f8_staticRenderFns = [];
 
 ;// 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/insert/HoMedicalExpression.vue?vue&type=template&id=079ade04&
 var HoMedicalExpressionvue_type_template_id_079ade04_render = function render() {
@@ -245137,8 +245391,8 @@ var ToolBarChild_component = (0,componentNormalizer/* default */.Z)(
 )
 
 /* harmony default export */ var ToolBarChild = (ToolBarChild_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/insert/ToolControl.vue?vue&type=template&id=5eea3dcd&
-var ToolControlvue_type_template_id_5eea3dcd_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/insert/ToolControl.vue?vue&type=template&id=2edb7b26&
+var ToolControlvue_type_template_id_2edb7b26_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -245389,7 +245643,14 @@ var ToolControlvue_type_template_id_5eea3dcd_render = function render() {
     attrs: {
       "d": "M761.417143 282.331429L416.182857 628.297143 223.817143 438.857143A58.514286 58.514286 0 0 0 146.285714 438.857143a58.514286 58.514286 0 0 0 0 73.142857l230.4 230.4a90.697143 90.697143 0 0 0 38.765715 13.165714 67.291429 67.291429 0 0 0 38.034285-13.165714l384-384a47.542857 47.542857 0 0 0 0-76.8 58.514286 58.514286 0 0 0-76.068571 0.731429z"
     }
-  })]), _c('span', [_vm._v("复选框")])]) : _vm._e(), _vm.insert.rareword ? _c('div', {
+  })]), _c('span', [_vm._v("复选框")])]) : _vm._e(), _vm.insert.textBorder ? _c('div', {
+    staticClass: "ho-emr-tool-item",
+    on: {
+      "click": function click($event) {
+        return _vm.createControl('text-border');
+      }
+    }
+  }, [_c('span', [_vm._v("文本框")])]) : _vm._e(), _vm.insert.rareword ? _c('div', {
     staticClass: "ho-emr-tool-item",
     on: {
       "click": _vm.createRarewords
@@ -245436,7 +245697,7 @@ var ToolControlvue_type_template_id_5eea3dcd_render = function render() {
     }
   }, [_c('span', [_vm._v("特殊字符")])]) : _vm._e()], 2);
 };
-var ToolControlvue_type_template_id_5eea3dcd_staticRenderFns = [];
+var ToolControlvue_type_template_id_2edb7b26_staticRenderFns = [];
 
 ;// 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/insert/HoDateTime.vue?vue&type=template&id=6b089050&
 var HoDateTimevue_type_template_id_6b089050_render = function render() {
@@ -245767,8 +246028,8 @@ var ajax = __webpack_require__(79969);
 ;
 var ToolControl_component = (0,componentNormalizer/* default */.Z)(
   insert_ToolControlvue_type_script_lang_js_,
-  ToolControlvue_type_template_id_5eea3dcd_render,
-  ToolControlvue_type_template_id_5eea3dcd_staticRenderFns,
+  ToolControlvue_type_template_id_2edb7b26_render,
+  ToolControlvue_type_template_id_2edb7b26_staticRenderFns,
   false,
   null,
   null,
@@ -246697,6 +246958,8 @@ var ToolTable_component = (0,componentNormalizer/* default */.Z)(
       // 特殊字符
       gestation: true,
       // 孕周
+      textBorder: true,
+      // 文本框
       rareword: true,
       // 生僻字
       link: true,
@@ -247177,10 +247440,10 @@ var ToolTable_component = (0,componentNormalizer/* default */.Z)(
 });
 ;// CONCATENATED MODULE: ./src/components/toolbar/ToolBar.vue?vue&type=script&lang=js&
  /* harmony default export */ var toolbar_ToolBarvue_type_script_lang_js_ = (ToolBarvue_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/ToolBar.vue?vue&type=style&index=0&id=2bbec870&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/ToolBar.vue?vue&type=style&index=0&id=595248f8&prod&lang=less&
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./src/components/toolbar/ToolBar.vue?vue&type=style&index=0&id=2bbec870&prod&lang=less&
+;// CONCATENATED MODULE: ./src/components/toolbar/ToolBar.vue?vue&type=style&index=0&id=595248f8&prod&lang=less&
 
 ;// CONCATENATED MODULE: ./src/components/toolbar/ToolBar.vue
 
@@ -247193,8 +247456,8 @@ var ToolTable_component = (0,componentNormalizer/* default */.Z)(
 
 var ToolBar_component = (0,componentNormalizer/* default */.Z)(
   toolbar_ToolBarvue_type_script_lang_js_,
-  ToolBarvue_type_template_id_2bbec870_render,
-  ToolBarvue_type_template_id_2bbec870_staticRenderFns,
+  ToolBarvue_type_template_id_595248f8_render,
+  ToolBarvue_type_template_id_595248f8_staticRenderFns,
   false,
   null,
   null,
@@ -248491,6 +248754,7 @@ var HoRightMenu_component = (0,componentNormalizer/* default */.Z)(
 
 
 
+
 
 
 /* harmony default export */ var HoDefaultProvidervue_type_script_lang_js_ = ({
@@ -248668,6 +248932,8 @@ var HoRightMenu_component = (0,componentNormalizer/* default */.Z)(
         }
       } else if (node instanceof LabelNode/* LabelNode */.P) {
         this.rightType = 'label';
+      } else if (node instanceof TextBorderNode/* TextBorderNode */.D) {
+        this.rightType = 'text-border';
       } else if (node instanceof SignNode/* SignNode */.N) {
         this.rightType = 'sign';
       } else if (node instanceof SeparateCharNode/* SeparateCharNode */.O) {
@@ -248735,11 +249001,13 @@ var HoRightMenu_component = (0,componentNormalizer/* default */.Z)(
       }
     },
     getCurrentSelectNode: function getCurrentSelectNode() {
-      var _hoEditorFactory$docT;
-      var value;
+      var _hoEditorFactory$docT, _hoEditorFactory$docT2;
+      var value = null;
       var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this.activeDocId);
       var startPos = hoEditorFactory.drawTree.selectRange.spStart;
+      var endPos = hoEditorFactory.drawTree.selectRange.spEnd;
       var node = (_hoEditorFactory$docT = hoEditorFactory.docTree.findNodePositionByPath(startPos.path)) === null || _hoEditorFactory$docT === void 0 ? void 0 : _hoEditorFactory$docT.node;
+      var endNode = (_hoEditorFactory$docT2 = hoEditorFactory.docTree.findNodePositionByPath(endPos.path)) === null || _hoEditorFactory$docT2 === void 0 ? void 0 : _hoEditorFactory$docT2.node;
       if (node instanceof MarkNode/* MarkNode */.j || node instanceof TextInputFieldNode/* TextInputFieldNode */.re) {
         var parentNode = node.parentNode;
         if (parentNode instanceof TextInputFieldNode/* TextInputFieldNode */.re) {
@@ -248756,7 +249024,9 @@ var HoRightMenu_component = (0,componentNormalizer/* default */.Z)(
         }
       } else if (node instanceof ParagraphNode/* ParagraphNode */.C && node.parentNode instanceof CellNode/* CellNode */.D) {
         value = node.parentNode;
-      } else if (node instanceof DateTimeNode/* DateTimeNode */.Z || node instanceof DownListNode/* DownListNode */.yF || node instanceof BarcodeNode/* BarcodeNode */.T || node instanceof QrcodeNode/* QrcodeNode */.d || node instanceof RadioAndCheckBoxNode/* RadioAndCheckBoxNode */.Yh || node instanceof ImageNode/* ImageNode */.H || node instanceof LabelNode/* LabelNode */.P || node instanceof SignNode/* SignNode */.N || node instanceof SeparateCharNode/* SeparateCharNode */.O || node instanceof TableFormula/* TableFormula */.N) {
+      } else if (node instanceof ParagraphNode/* ParagraphNode */.C && endNode instanceof TextBorderNode/* TextBorderNode */.D) {
+        value = endNode;
+      } else if (node instanceof DateTimeNode/* DateTimeNode */.Z || node instanceof DownListNode/* DownListNode */.yF || node instanceof BarcodeNode/* BarcodeNode */.T || node instanceof QrcodeNode/* QrcodeNode */.d || node instanceof RadioAndCheckBoxNode/* RadioAndCheckBoxNode */.Yh || node instanceof ImageNode/* ImageNode */.H || node instanceof LabelNode/* LabelNode */.P || node instanceof TextBorderNode/* TextBorderNode */.D || node instanceof SignNode/* SignNode */.N || node instanceof SeparateCharNode/* SeparateCharNode */.O || node instanceof TableFormula/* TableFormula */.N) {
         value = node;
       }
       return value;