hoeditor-web 3.1.144 → 3.1.146

package/lib/hoeditor.umd.js

@@ -39386,7 +39386,7 @@ var DocController = /*#__PURE__*/function () {
                     var spath = sCell.childNodes[0].getNodePath();
                     var epath = hoEditorFactory.docTree.getNodeLastPath(sCell.childNodes[sCell.childNodes.length - 1]);
                     var domRange = new _DomRange__WEBPACK_IMPORTED_MODULE_38__/* .DomRange */ .a(this._hoEditorFactoryID, spath, epath);
-                    var jsonData = hoEditorFactory.structureNode.Copy(domRange, null, false);
+                    var jsonData = hoEditorFactory.structureNode.Copy(domRange, null, false, '', true);
                     hoEditorFactory.docTree.curDomRange.setSamePath(tCell.childNodes[0].getNodePath());
                     var nodes = hoEditorFactory.structureNode.Parse(_utils_StructureNode__WEBPACK_IMPORTED_MODULE_97__/* .ClipboardType */ .Y6.ctJSON, jsonData);
                     for (var n = 0; n < nodes.length; n++) {
@@ -39540,7 +39540,7 @@ var DocController = /*#__PURE__*/function () {
                     var spath = sCell.childNodes[0].getNodePath();
                     var epath = hoEditorFactory.docTree.getNodeLastPath(sCell.childNodes[sCell.childNodes.length - 1]);
                     var domRange = new _DomRange__WEBPACK_IMPORTED_MODULE_38__/* .DomRange */ .a(this._hoEditorFactoryID, spath, epath);
-                    var jsonData = hoEditorFactory.structureNode.Copy(domRange, null, false);
+                    var jsonData = hoEditorFactory.structureNode.Copy(domRange, null, false, '', true);
                     var nodes = hoEditorFactory.structureNode.Parse(_utils_StructureNode__WEBPACK_IMPORTED_MODULE_97__/* .ClipboardType */ .Y6.ctJSON, jsonData);
                     hoEditorFactory.docTree.curDomRange.setSamePath(tCell.childNodes[0].getNodePath());
                     for (var n = 0; n < nodes.length; n++) {
@@ -40252,6 +40252,8 @@ var DocController = /*#__PURE__*/function () {
       if (returnPath === '-1') {
         this._count = 0;
         returnPath = this.find(curDomRange, findContent, direction, matchCase);
+      } else if (returnPath === '') {
+        return;
       }
       var path = returnPath;
       var nodeLastPath = returnPath;
@@ -40341,15 +40343,17 @@ var DocController = /*#__PURE__*/function () {
               for (_iterator.s(); !(_step = _iterator.n()).done;) {
                 var item = _step.value;
                 var getArr1 = hoEditorFactory.docTree.allReplace(nodesMap, item, findContent, replaceContent);
-                var startPath = getArr1[0];
-                var endPath1 = getArr1[1];
-                var newTextNode1 = getArr1[2];
-                hoEditorFactory.undoService.begin();
-                hoEditorFactory.undoService.add(new _undoRedo_NodesDeleteUndoUnit__WEBPACK_IMPORTED_MODULE_43__/* .NodesDeleteUndoUnit */ .F(this._hoEditorFactoryID, startPath, endPath1));
-                if (replaceContent !== '') {
-                  hoEditorFactory.undoService.add(new _undoRedo_NodeInsertUndoUnit__WEBPACK_IMPORTED_MODULE_33__/* .NodeInsertUndoUnit */ .R(this._hoEditorFactoryID, startPath, newTextNode1));
+                if (getArr1[2]) {
+                  var startPath = getArr1[0];
+                  var endPath1 = getArr1[1];
+                  var newTextNode1 = getArr1[2];
+                  hoEditorFactory.undoService.begin();
+                  hoEditorFactory.undoService.add(new _undoRedo_NodesDeleteUndoUnit__WEBPACK_IMPORTED_MODULE_43__/* .NodesDeleteUndoUnit */ .F(this._hoEditorFactoryID, startPath, endPath1));
+                  if (replaceContent !== '') {
+                    hoEditorFactory.undoService.add(new _undoRedo_NodeInsertUndoUnit__WEBPACK_IMPORTED_MODULE_33__/* .NodeInsertUndoUnit */ .R(this._hoEditorFactoryID, startPath, newTextNode1));
+                  }
+                  hoEditorFactory.undoService.commit();
                 }
-                hoEditorFactory.undoService.commit();
               }
             } catch (err) {
               _iterator.e(err);
@@ -40368,20 +40372,22 @@ var DocController = /*#__PURE__*/function () {
           var getArr2 = hoEditorFactory.docTree.singleReplace(path, findContent, replaceContent);
           var endPath2 = getArr2[0];
           var newTextNode2 = getArr2[1];
-          hoEditorFactory.undoService.begin();
-          hoEditorFactory.undoService.add(new _undoRedo_NodesDeleteUndoUnit__WEBPACK_IMPORTED_MODULE_43__/* .NodesDeleteUndoUnit */ .F(this._hoEditorFactoryID, path, endPath2));
-          if (replaceContent !== '') {
-            hoEditorFactory.undoService.add(new _undoRedo_NodeInsertUndoUnit__WEBPACK_IMPORTED_MODULE_33__/* .NodeInsertUndoUnit */ .R(this._hoEditorFactoryID, path, newTextNode2));
-          }
-          hoEditorFactory.undoService.commit();
-          var oldRange = hoEditorFactory.docTree.curDomRange;
-          var endPath = path;
-          if (replaceContent !== '') {
-            endPath = hoEditorFactory.docTree.getNodeLastPath(newTextNode2);
+          if (getArr2[3]) {
+            hoEditorFactory.undoService.begin();
+            hoEditorFactory.undoService.add(new _undoRedo_NodesDeleteUndoUnit__WEBPACK_IMPORTED_MODULE_43__/* .NodesDeleteUndoUnit */ .F(this._hoEditorFactoryID, path, endPath2));
+            if (replaceContent !== '') {
+              hoEditorFactory.undoService.add(new _undoRedo_NodeInsertUndoUnit__WEBPACK_IMPORTED_MODULE_33__/* .NodeInsertUndoUnit */ .R(this._hoEditorFactoryID, path, newTextNode2));
+            }
+            hoEditorFactory.undoService.commit();
+            var oldRange = hoEditorFactory.docTree.curDomRange;
+            var endPath = path;
+            if (replaceContent !== '') {
+              endPath = hoEditorFactory.docTree.getNodeLastPath(newTextNode2);
+            }
+            var newRange = new _DomRange__WEBPACK_IMPORTED_MODULE_38__/* .DomRange */ .a(this._hoEditorFactoryID, path, endPath);
+            var cgEvent = new _events_SelectionChangeEvent__WEBPACK_IMPORTED_MODULE_42__/* .SelectionChangeEvent */ .r(oldRange, newRange); //选中范围变化事件
+            hoEditorFactory.docTree.selectChange(cgEvent);
           }
-          var newRange = new _DomRange__WEBPACK_IMPORTED_MODULE_38__/* .DomRange */ .a(this._hoEditorFactoryID, path, endPath);
-          var cgEvent = new _events_SelectionChangeEvent__WEBPACK_IMPORTED_MODULE_42__/* .SelectionChangeEvent */ .r(oldRange, newRange); //选中范围变化事件
-          hoEditorFactory.docTree.selectChange(cgEvent);
         }
       }
     }
@@ -41107,7 +41113,7 @@ var DocController = /*#__PURE__*/function () {
             }
           });
           if (isChange) {
-            var sMarkNodePath = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_84__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID).docTree.getNodeLastPath(parentNode.childNodes[0]);
+            var sMarkNodePath = hoeditorfactory.docTree.getNodeLastPath(parentNode.childNodes[0]);
             hoeditorfactory.docTree.curDomRange = new _DomRange__WEBPACK_IMPORTED_MODULE_38__/* .DomRange */ .a(this._hoEditorFactoryID, sMarkNodePath, sMarkNodePath);
           }
         }
@@ -41817,7 +41823,7 @@ 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__(24492);
+/* harmony import */ var _draw_drawNode_DrawTextNode__WEBPACK_IMPORTED_MODULE_44__ = __webpack_require__(96610);
 /* 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);
@@ -42873,6 +42879,7 @@ var DocTree = /*#__PURE__*/function () {
   }, {
     key: "getNodeFirstPath",
     value: function getNodeFirstPath(node) {
+      if (!node) return "";
       var strPath = node.rootPath;
       var aNode = node;
       var pNodes = aNode.rootNodes;
@@ -43334,7 +43341,7 @@ var DocTree = /*#__PURE__*/function () {
         var textCount = 1; //该段的第几个文本串（其它节点隔开的）
         do {
           if (aNode) {
-            if (aNode instanceof _treeNode_TextNode__WEBPACK_IMPORTED_MODULE_29__/* .TextNode */ .R) {
+            if (aNode instanceof _treeNode_TextNode__WEBPACK_IMPORTED_MODULE_29__/* .TextNode */ .R || aNode instanceof _treeNode_DateTimeNode__WEBPACK_IMPORTED_MODULE_46__/* .DateTimeNode */ .Z || aNode instanceof _treeNode_DownListNode__WEBPACK_IMPORTED_MODULE_47__/* .DownListNode */ .yF) {
               if (mark === -1) {
                 if (content.length > 0) {
                   if (matchCase) {
@@ -43423,7 +43430,7 @@ var DocTree = /*#__PURE__*/function () {
               if (key.split("|")[0] === paraIndex && key.split("|")[1] === textCount && strIndex >= startIndex) {
                 var np = this.findNodePositionByPath(value);
                 if (np && np.node) {
-                  if (np.node instanceof _treeNode_TextNode__WEBPACK_IMPORTED_MODULE_29__/* .TextNode */ .R) {
+                  if (np.node instanceof _treeNode_TextNode__WEBPACK_IMPORTED_MODULE_29__/* .TextNode */ .R || np.node instanceof _treeNode_DateTimeNode__WEBPACK_IMPORTED_MODULE_46__/* .DateTimeNode */ .Z || np.node instanceof _treeNode_DownListNode__WEBPACK_IMPORTED_MODULE_47__/* .DownListNode */ .yF) {
                     if (strIndex < startIndex + np.node.text.length) {
                       var lastPath = strIndex - startIndex - 1;
                       if (lastPath >= 0) {
@@ -43496,7 +43503,7 @@ var DocTree = /*#__PURE__*/function () {
       var styleIndex = 0;
       var np = this.findNodePositionByPath(sPath);
       if (np && np.node) {
-        if (np.node instanceof _treeNode_TextNode__WEBPACK_IMPORTED_MODULE_29__/* .TextNode */ .R) {
+        if (np.node instanceof _treeNode_TextNode__WEBPACK_IMPORTED_MODULE_29__/* .TextNode */ .R || np.node instanceof _treeNode_DateTimeNode__WEBPACK_IMPORTED_MODULE_46__/* .DateTimeNode */ .Z || np.node instanceof _treeNode_DownListNode__WEBPACK_IMPORTED_MODULE_47__/* .DownListNode */ .yF) {
           styleIndex = np.node.styleIndex;
         }
       }
@@ -43529,12 +43536,20 @@ var DocTree = /*#__PURE__*/function () {
           //}
         }
       }
-
-      var parentNode = this.getParentNode(sPath);
-      var textNode = new _treeNode_TextNode__WEBPACK_IMPORTED_MODULE_29__/* .TextNode */ .R(this._hoEditorFactoryID, np.roots, parentNode, _treeNode_BaseNode__WEBPACK_IMPORTED_MODULE_26__/* .NodeType */ .Jq.ntText, replaceContent, styleIndex);
-      retArray[0] = startPath;
-      retArray[1] = endPath;
-      retArray[2] = textNode;
+      // const parentNode = this.getParentNode(sPath);
+      var node = this.getFindPathNode(sPath);
+      if (node instanceof _treeNode_TextInputFieldNode__WEBPACK_IMPORTED_MODULE_36__/* .TextInputFieldNode */ .re) {
+        var textNode = new _treeNode_TextNode__WEBPACK_IMPORTED_MODULE_29__/* .TextNode */ .R(this._hoEditorFactoryID, np.roots, node, _treeNode_BaseNode__WEBPACK_IMPORTED_MODULE_26__/* .NodeType */ .Jq.ntText, replaceContent, styleIndex);
+        retArray[0] = startPath;
+        retArray[1] = endPath;
+        retArray[2] = textNode;
+      } else if (node instanceof _treeNode_DateTimeNode__WEBPACK_IMPORTED_MODULE_46__/* .DateTimeNode */ .Z) {
+        var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_45__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID);
+        hoEditorFactory.elementController.updateDateTimeText(node, replaceContent);
+      } else if (node instanceof _treeNode_DownListNode__WEBPACK_IMPORTED_MODULE_47__/* .DownListNode */ .yF) {
+        var _hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_45__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID);
+        _hoEditorFactory.elementController.updateDownListText(node, replaceContent);
+      }
       return retArray;
     }
   }, {
@@ -43590,10 +43605,24 @@ var DocTree = /*#__PURE__*/function () {
           }
         }
       }
-      var parentNode = this.getParentNode(startPath);
-      var newTextNode = new _treeNode_TextNode__WEBPACK_IMPORTED_MODULE_29__/* .TextNode */ .R(this._hoEditorFactoryID, np.roots, parentNode, _treeNode_BaseNode__WEBPACK_IMPORTED_MODULE_26__/* .NodeType */ .Jq.ntText, replaceContent, styleIndex);
-      retArray[0] = endPath;
-      retArray[1] = newTextNode;
+      var snode = this.getFindPathNode(startPath);
+      if (snode instanceof _treeNode_TextInputFieldNode__WEBPACK_IMPORTED_MODULE_36__/* .TextInputFieldNode */ .re) {
+        var textNode = new _treeNode_TextNode__WEBPACK_IMPORTED_MODULE_29__/* .TextNode */ .R(this._hoEditorFactoryID, np.roots, snode, _treeNode_BaseNode__WEBPACK_IMPORTED_MODULE_26__/* .NodeType */ .Jq.ntText, replaceContent, styleIndex);
+        retArray[0] = startPath;
+        retArray[1] = endPath;
+        retArray[2] = textNode;
+        retArray[3] = true;
+      } else if (snode instanceof _treeNode_DateTimeNode__WEBPACK_IMPORTED_MODULE_46__/* .DateTimeNode */ .Z) {
+        var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_45__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID);
+        hoEditorFactory.elementController.updateDateTimeText(snode, replaceContent);
+        // retArray[2] = snode;
+        retArray[3] = false;
+      } else if (snode instanceof _treeNode_DownListNode__WEBPACK_IMPORTED_MODULE_47__/* .DownListNode */ .yF) {
+        var _hoEditorFactory2 = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_45__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID);
+        _hoEditorFactory2.elementController.updateDownListText(snode, replaceContent);
+        // retArray[2] = snode;
+        retArray[3] = false;
+      }
       return retArray;
     }
   }, {
@@ -43894,6 +43923,24 @@ var DocTree = /*#__PURE__*/function () {
       }
       return parentNode;
     }
+  }, {
+    key: "getFindPathNode",
+    value: function getFindPathNode(startPath) {
+      var node = null;
+      var np = this.findNodePositionByPath(startPath);
+      if (!(np && np.node)) {
+        throw _events_Exception__WEBPACK_IMPORTED_MODULE_42__/* .Exception */ .P.NodeNotFound();
+      }
+      if (np.node instanceof _treeNode_DateTimeNode__WEBPACK_IMPORTED_MODULE_46__/* .DateTimeNode */ .Z || np.node instanceof _treeNode_DownListNode__WEBPACK_IMPORTED_MODULE_47__/* .DownListNode */ .yF) {
+        return np.node;
+      } else {
+        node = np.node.parentNode;
+        if (node && node instanceof _treeNode_TextInputFieldNode__WEBPACK_IMPORTED_MODULE_36__/* .TextInputFieldNode */ .re && node.last() == np.node) {
+          node = node.parentNode;
+        }
+        return node;
+      }
+    }
   }, {
     key: "getFinalParentNode",
     value: function getFinalParentNode(path) {
@@ -49282,6 +49329,7 @@ var NodeType;
   NodeType[NodeType["ntGestation"] = 16] = "ntGestation";
   NodeType[NodeType["ntRareChar"] = 17] = "ntRareChar";
   NodeType[NodeType["ntJumpButton"] = 18] = "ntJumpButton";
+  NodeType[NodeType["ntTextBorder"] = 19] = "ntTextBorder";
 })(NodeType || (NodeType = {}));
 var ChildIndexRange = /*#__PURE__*/function () {
   function ChildIndexRange(start, end) {
@@ -49306,21 +49354,21 @@ var ChildIndexRange = /*#__PURE__*/function () {
 }();
 var BaseNode = /*#__PURE__*/function () {
   /**
-  * @author xyl
-  * @param rootPath 根节点路径
-  * @param rootNodes 根节点数组
-  * @param pNode 父节点
-  * @param nodeType 节点类型
-  * @description rootPath未例  main\表示主文档节点  header\0 表示首页页眉   header\1 表示次页页眉   header\3 表示第三页页眉
-  */
+   * @author xyl
+   * @param rootPath 根节点路径
+   * @param rootNodes 根节点数组
+   * @param pNode 父节点
+   * @param nodeType 节点类型
+   * @description rootPath未例  main\表示主文档节点  header\0 表示首页页眉   header\1 表示次页页眉   header\3 表示第三页页眉
+   */
   function BaseNode(hoEditorFactoryID, rootNodes, pNode, nodeType) {
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_classCallCheck_js__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z)(this, BaseNode);
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_4__/* ["default"] */ .Z)(this, "_parentNode", void 0);
-    //父节点 
+    //父节点
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_4__/* ["default"] */ .Z)(this, "_nodeType", void 0);
-    //节点类型 
+    //节点类型
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_4__/* ["default"] */ .Z)(this, "_drawNodes", void 0);
-    //绘制对象数组   
+    //绘制对象数组
     // protected rootNodes: BaseNode[]; //所在根节点数组
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_4__/* ["default"] */ .Z)(this, "_rootPath", void 0);
     //根节点路径
@@ -49342,7 +49390,7 @@ var BaseNode = /*#__PURE__*/function () {
     /**
      *@author xyl
      *@returns 返回父节点列表
-    */
+     */
   }, {
     key: "getParentNodes",
     value: function getParentNodes() {
@@ -49354,13 +49402,13 @@ var BaseNode = /*#__PURE__*/function () {
     }
     // /**
     // *@author xyl
-    // *@returns 返回当前节点的层级    
-    // */    
+    // *@returns 返回当前节点的层级
+    // */
     // public getNodeLevel(): number{
     //   let iret=-1;
     //   let node: BaseNode ;
     //   let pnode: BaseNode|null=this._parentNode;
-    //    do{       
+    //    do{
     //     iret=iret+1;
     //     if (pnode){
     //       node=pnode as BaseNode;
@@ -49371,9 +49419,9 @@ var BaseNode = /*#__PURE__*/function () {
     //   return iret;
     // }
     /**
-    *@author xyl
-    *@returns 根据节点路径，得到一个位置值 比较节点顺序用
-    */
+     *@author xyl
+     *@returns 根据节点路径，得到一个位置值 比较节点顺序用
+     */
   }, {
     key: "getNodePath",
     value: function getNodePath() {
@@ -49394,9 +49442,9 @@ var BaseNode = /*#__PURE__*/function () {
       return this.rootPath + '/' + strRet;
     }
     /**
-    *@author xyl
-    *@returns 返回文档中的第一层节点
-    */
+     *@author xyl
+     *@returns 返回文档中的第一层节点
+     */
   }, {
     key: "getRootNode",
     value: function getRootNode() {
@@ -49411,9 +49459,9 @@ var BaseNode = /*#__PURE__*/function () {
       return node;
     }
     /**
-    *@author xyl
-    *@returns 检查当前节点是否是复合节点
-    */
+     *@author xyl
+     *@returns 检查当前节点是否是复合节点
+     */
   }, {
     key: "isCombineNode",
     value: function isCombineNode() {
@@ -49494,7 +49542,7 @@ var BaseNode = /*#__PURE__*/function () {
             //fixme  此处返回-1时会造成死循环，需要查找原因
             if (hoEditorFactory.isThrowError) {
               //throw new Error("此处返回0时会造成死循环，需要查找原因")
-              ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_15__/* ["default"] */ .Z.warn("经检测，病历元素“" + parentNode.name + "”的模板格式有问题，可能会导致死循环，请联系工程师进行处理(1)。");
+              ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_15__/* ["default"] */ .Z.warn('经检测，病历元素“' + parentNode.name + '”的模板格式有问题，可能会导致死循环，请联系工程师进行处理(1)。');
               return null;
             }
           }
@@ -49511,9 +49559,9 @@ var BaseNode = /*#__PURE__*/function () {
       return null;
     }
     /**
-      *@author xyl
-      *@returns 获取前一个兄弟节点，用于递归树节点
-      */
+     *@author xyl
+     *@returns 获取前一个兄弟节点，用于递归树节点
+     */
   }, {
     key: "prevSibling",
     value: function prevSibling() {
@@ -49547,9 +49595,9 @@ var BaseNode = /*#__PURE__*/function () {
       return null;
     }
     /**
-      *@author xyl
-      *@returns 获取下一个紧邻的子节点
-      */
+     *@author xyl
+     *@returns 获取下一个紧邻的子节点
+     */
   }, {
     key: "nextLeaf",
     value: function nextLeaf() {
@@ -49593,7 +49641,7 @@ var BaseNode = /*#__PURE__*/function () {
             //fixme  此处返回-1时会造成死循环，需要查找原因
             if (hoEditorFactory.isThrowError) {
               //throw new Error("此处返回0时会造成死循环，需要查找原因")
-              ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_15__/* ["default"] */ .Z.warn("经检测，病历元素“" + parentNode.name + "”的模板格式有问题，可能会导致死循环，请联系工程师进行处理(2)。");
+              ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_15__/* ["default"] */ .Z.warn('经检测，病历元素“' + parentNode.name + '”的模板格式有问题，可能会导致死循环，请联系工程师进行处理(2)。');
               return null;
             }
           }
@@ -49602,7 +49650,7 @@ var BaseNode = /*#__PURE__*/function () {
             //fixme  此处返回-1时会造成死循环，需要查找原因
             if (hoEditorFactory.isThrowError) {
               //throw new Error("此处返回-1时会造成死循环，需要查找原因(1)")
-              ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_15__/* ["default"] */ .Z.warn("经检测，该病历的模板格式有问题，可能会导致死循环，请联系工程师进行处理(1)。");
+              ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_15__/* ["default"] */ .Z.warn('经检测，该病历的模板格式有问题，可能会导致死循环，请联系工程师进行处理(1)。');
               return null;
             }
           }
@@ -49613,7 +49661,7 @@ var BaseNode = /*#__PURE__*/function () {
             //fixme  此处返回-1时会造成死循环，需要查找原因
             if (hoEditorFactory.isThrowError) {
               //throw new Error("此处返回-1时会造成死循环，需要查找原因(2)")
-              ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_15__/* ["default"] */ .Z.warn("经检测，该病历的模板格式有问题，可能会导致死循环，请联系工程师进行处理(2)。");
+              ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_15__/* ["default"] */ .Z.warn('经检测，该病历的模板格式有问题，可能会导致死循环，请联系工程师进行处理(2)。');
               return null;
             }
           }
@@ -49643,9 +49691,9 @@ var BaseNode = /*#__PURE__*/function () {
       return null;
     }
     /**
-        *@author xyl
-        *@returns 获取前一个紧邻的子节点
-        */
+     *@author xyl
+     *@returns 获取前一个紧邻的子节点
+     */
   }, {
     key: "previousLeaf",
     value: function previousLeaf() {
@@ -49729,7 +49777,7 @@ var BaseNode = /*#__PURE__*/function () {
       var hoeditfactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_14__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID);
       var roots = hoeditfactory.docTree.getPathRoots(this._rootPath);
       if (!roots) {
-        throw new Error("无法取到指定路径的根" + this._rootPath);
+        throw new Error('无法取到指定路径的根' + this._rootPath);
       }
       return roots;
       // return this.rootNodes;
@@ -49824,9 +49872,9 @@ var BaseNode = /*#__PURE__*/function () {
       this._drawNodes.splice(startIndex, endIndex - startIndex + 1);
     }
     /**
-    *@author xyl
-    *@returns 获取子节点长度，由于文本节点需要特殊处理（返回字符串长度），故改成方法，
-    */
+     *@author xyl
+     *@returns 获取子节点长度，由于文本节点需要特殊处理（返回字符串长度），故改成方法，
+     */
   }, {
     key: "getLength",
     value: function getLength() {
@@ -49835,11 +49883,11 @@ var BaseNode = /*#__PURE__*/function () {
     //  /**
     //   *@author xyl
     //   *@returns 根据索引查找绘制节点，二分查找算法，以优化查找速度
-    //   */    
+    //   */
     //   public findDrawNode(index: number): DrawContainer |null {
     //     //选取查找区间
     //       let low = 0;
-    //       let  high = this.drawNodes.length - 1; 
+    //       let  high = this.drawNodes.length - 1;
     //       let  mid: number;
     //       let curItemIndex = 0;
     //       let midItem: createjs.DisplayObject;
@@ -49869,11 +49917,11 @@ var BaseNode = /*#__PURE__*/function () {
       }
     }
     /**
-    *@author xyl
-    *@param arange 选择范围
-    *@returns 如当前被选中 ，返回当前选中的子节点索引范围
-    *@description  检查当前选择范围是否包含
-    */
+     *@author xyl
+     *@param arange 选择范围
+     *@returns 如当前被选中 ，返回当前选中的子节点索引范围
+     *@description  检查当前选择范围是否包含
+     */
   }, {
     key: "getIndexsByRange",
     value: function getIndexsByRange(arange) {
@@ -49896,10 +49944,10 @@ var BaseNode = /*#__PURE__*/function () {
       return new ChildIndexRange(start, end);
     }
     /**
-    *@author xyl
-    *@param arange
-    *@returns 如当前被选中 ，返回当前选中的子节点索引范围
-    */
+     *@author xyl
+     *@param arange
+     *@returns 如当前被选中 ，返回当前选中的子节点索引范围
+     */
   }, {
     key: "isTotalSelected",
     value: function isTotalSelected(range, bNormalized) {
@@ -50046,7 +50094,7 @@ var BaseNode = /*#__PURE__*/function () {
      * @returns  返回节点内容
      */
     function toString() {
-      return "";
+      return '';
     }
     /**
      *
@@ -50055,7 +50103,7 @@ var BaseNode = /*#__PURE__*/function () {
   }, {
     key: "getTagNameCn",
     value: function getTagNameCn() {
-      return "基础节点";
+      return '基础节点';
     }
   }], [{
     key: "transType",
@@ -51675,12 +51723,11 @@ var DateTimeNode = /*#__PURE__*/function (_ControlNode) {
       this.node2DrawNode();
       changeEvent.afterChangePath = ePath;
       hoEditorFactory.docTree.change(changeEvent);
-      if (hoEditorFactory.drawTree.paintStatus !== _editor_draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_19__/* .PaintState */ .Dh.psPrint) {
-        hoEditorFactory.contentIsModify.isModify = true;
-        hoEditorFactory.cachedModify = false;
-        hoEditorFactory.hoLocalStorage.autoSaveLocalStorage();
-      }
-      ;
+      // if (hoEditorFactory.drawTree.paintStatus !== PaintState.psPrint) {
+      //     hoEditorFactory.contentIsModify.isModify = true;
+      //     hoEditorFactory.cachedModify = false;
+      //     hoEditorFactory.hoLocalStorage.autoSaveLocalStorage();
+      // };
     }
   }, {
     key: "getDateTimeText",
@@ -53041,7 +53088,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__(24492);
+/* harmony import */ var _editor_draw_drawNode_DrawTextNode__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(96610);
 /* 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);
@@ -54597,7 +54644,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__(24492);
+/* harmony import */ var _editor_draw_drawNode_DrawTextNode__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(96610);
 /* 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);
@@ -60281,7 +60328,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__(24492);
+/* harmony import */ var _editor_draw_drawNode_DrawTextNode__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(96610);
 /* 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);
@@ -67975,10 +68022,7 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
       this._childNodes2.push(this.StartMarkNode);
       if (this.labelText.length != 0) {
         this._childNodes2.push(new MarkNode/* MarkNode */.j(this._hoEditorFactoryID, this.rootNodes, this, BaseNode/* NodeType */.Jq.ntText, this.labelText, index, MarkNode/* MarkNodeType */.q.mtContent));
-        // this._labelNode = new MarkNode(this._rootNodes, this, NodeType.ntText, this.labelText, 0);
-        // this._childNodes2.push(this._labelNode);
       }
-
       this._childNodes2.push(this.EndMarkNode);
       this._childNodes = (0,toConsumableArray/* default */.Z)(this._childNodes2);
       if (this.text != '') {
@@ -69074,7 +69118,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__(24492);
+/* harmony import */ var _editor_draw_drawNode_DrawTextNode__WEBPACK_IMPORTED_MODULE_25__ = __webpack_require__(96610);
 /* 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);
@@ -69919,8 +69963,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 + 1 modules
-var DrawTextNode = __webpack_require__(24492);
+// EXTERNAL MODULE: ./src/editor/draw/drawNode/DrawTextNode.ts + 2 modules
+var DrawTextNode = __webpack_require__(96610);
 ;// CONCATENATED MODULE: ./src/editor/events/DrawChangeEvent.ts
 
 
@@ -81395,7 +81439,7 @@ var DrawTableFormular = /*#__PURE__*/function (_DrawSimpleNode) {
 
 /***/ }),
 
-/***/ 24492:
+/***/ 96610:
 /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -81831,6 +81875,200 @@ 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
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+/*
+ * @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
 
 
@@ -81858,6 +82096,7 @@ var GestationNode = __webpack_require__(73632);
 
 
 
+
 var DrawTextNode = /*#__PURE__*/function (_DrawCombineNode) {
   (0,inherits/* default */.Z)(DrawTextNode, _DrawCombineNode);
   var _super = (0,createSuper/* default */.Z)(DrawTextNode);
@@ -81887,7 +82126,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) {
+    if (node instanceof SpecialCharsNode/* SpecialCharsNode */.y || node instanceof GestationNode/* GestationNode */.G || node instanceof TextBorderNode) {
       _this._text = node.text;
       if (endIndex) _this._endIndex = endIndex;else _this._endIndex = _this._text.length - 1;
     } else {
@@ -82364,17 +82603,15 @@ var DrawTextNode = /*#__PURE__*/function (_DrawCombineNode) {
       if (!this._bd) this._bd = new createjs.Shape();
       this._dWidth = this._dWidth + 20;
       this.dWidth = this._dWidth;
-      this.setBounds(0, -this.dHeight - 5, this._dWidth * 2, this.dHeight * 2);
-      // console.log(this.dWidth, this.dHeight, '---');
-      // console.log(this._textNode.dCombineStyle);
-      // console.log(this._text);
+      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(5,
+      this._bd.graphics.beginStroke(this._textNode.dCombineStyle.color).drawRect(0,
       //x
-      -this.dHeight - 5,
+      -this.dHeight - 4,
       //y
-      this.dWidth - 5, this.dHeight * 2);
-      this._dText.x = 5;
+      this._dWidth, this.dHeight * 2);
+      this._dText.x = 10;
       this._dText.y = 0;
       this.addChild(this._bd);
     }
@@ -84517,8 +84754,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 + 1 modules
-var DrawTextNode = __webpack_require__(24492);
+// EXTERNAL MODULE: ./src/editor/draw/drawNode/DrawTextNode.ts + 2 modules
+var DrawTextNode = __webpack_require__(96610);
 // EXTERNAL MODULE: ./src/editor/dom/treeNode/TableFormula.ts
 var TableFormula = __webpack_require__(90832);
 // EXTERNAL MODULE: ./src/editor/draw/drawNode/DrawSignNode.ts
@@ -90091,6 +90328,7 @@ var NodeDeleteUndoUnit = /*#__PURE__*/function (_UndoInfo) {
 /* harmony import */ var _draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_29__ = __webpack_require__(51760);
 /* harmony import */ var _dom_treeNode_DateTimeNode__WEBPACK_IMPORTED_MODULE_30__ = __webpack_require__(92501);
 /* harmony import */ var _dom_TableProperty__WEBPACK_IMPORTED_MODULE_31__ = __webpack_require__(79546);
+/* harmony import */ var _dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_32__ = __webpack_require__(24701);
 
 
 
@@ -90131,6 +90369,7 @@ var NodeDeleteUndoUnit = /*#__PURE__*/function (_UndoInfo) {
 
 
 
+
 var NodeInsertUndoUnit = /*#__PURE__*/function (_UndoInfo) {
   (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_inherits_js__WEBPACK_IMPORTED_MODULE_5__/* ["default"] */ .Z)(NodeInsertUndoUnit, _UndoInfo);
   var _super = (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createSuper_js__WEBPACK_IMPORTED_MODULE_6__/* ["default"] */ .Z)(NodeInsertUndoUnit);
@@ -90178,27 +90417,33 @@ var NodeInsertUndoUnit = /*#__PURE__*/function (_UndoInfo) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
               changeEvent = new _events_NodeChangeEvent__WEBPACK_IMPORTED_MODULE_16__/* .NodeChangeEvent */ .G(this._hoEditorFactoryID, _editor_dom_DocTree__WEBPACK_IMPORTED_MODULE_15__/* .DocAction */ .gk.daUndoInsert, this.strBeforePath, "");
+              hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_26__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID);
               if (!(this.node instanceof _dom_treeNode_MarkNode__WEBPACK_IMPORTED_MODULE_27__/* .MarkNode */ .j && this.node.MarkNodeType === 1)) {
-                _context.next = 3;
+                _context.next = 6;
                 break;
               }
               return _context.abrupt("return");
-            case 3:
-              hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_26__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID);
+            case 6:
+              if (!(this.node instanceof _dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_32__/* .SignNode */ .N && hoEditorFactory.drawTree.paintStatus != _draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_29__/* .PaintState */ .Dh.psDesign)) {
+                _context.next = 8;
+                break;
+              }
+              return _context.abrupt("return");
+            case 8:
               changeEvent.oldEndPath = hoEditorFactory.docTree.getNodeLastPath(this.node);
               changeEvent.oldDrawTreeLines = new _draw_SelectRange__WEBPACK_IMPORTED_MODULE_25__/* .SelectRange */ .E(this._hoEditorFactoryID).getRangeDrawTreeLines(this.strBeforePath, changeEvent.oldEndPath);
               ret = hoEditorFactory.docTree.deleteNode(this.node, "update");
               if (ret) {
-                _context.next = 9;
+                _context.next = 13;
                 break;
               }
               throw new Error('删除失败');
-            case 9:
+            case 13:
               changeEvent.afterChangePath = this.strBeforePath;
               changeEvent.repaintImmediate = this.repaintImmediate;
-              _context.next = 13;
+              _context.next = 17;
               return hoEditorFactory.docTree.change(changeEvent);
-            case 13:
+            case 17:
               hoEditorFactory.docTree.curDomRange.setSamePath(this.strBeforePath);
               while (!this._undo.atBottom()) {
                 this._undo.undo();
@@ -90208,7 +90453,7 @@ var NodeInsertUndoUnit = /*#__PURE__*/function (_UndoInfo) {
               hoEditorFactory.docTree.curDomRange.setSamePath(this.strBeforePath);
               hoEditorFactory.drawTree.moveCaretToPath(this.strBeforePath);
               this.ParentRepaint();
-            case 20:
+            case 24:
             case "end":
               return _context.stop();
           }
@@ -207170,8 +207415,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=4751bfc2&
-var HoDocvue_type_template_id_4751bfc2_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=90411248&
+var HoDocvue_type_template_id_90411248_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -207372,7 +207617,7 @@ var HoDocvue_type_template_id_4751bfc2_render = function render() {
     }
   }, [_vm._v("v " + _vm._s(_vm.version))])])])], 1);
 };
-var HoDocvue_type_template_id_4751bfc2_staticRenderFns = [];
+var HoDocvue_type_template_id_90411248_staticRenderFns = [];
 
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.filter.js
 var es_array_filter = __webpack_require__(57327);
@@ -210363,7 +210608,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.144');
+/* harmony default export */ var version = ('3.1.146');
 // EXTERNAL MODULE: ./src/components/controls/poperTipText/PoperTipText.vue + 5 modules
 var PoperTipText = __webpack_require__(84531);
 ;// CONCATENATED MODULE: ./src/components/controls/poperTipText/index.ts
@@ -210728,9 +210973,10 @@ var defaultHeight = Math.floor(1122 * scaleXY) % 2 === 1 ? Math.floor(1122 * sca
         (_hoParagrapghTipEleme = hoParagrapghTipElementNode.parentNode) === null || _hoParagrapghTipEleme === void 0 ? void 0 : _hoParagrapghTipEleme.removeChild(hoParagrapghTipElementNode);
       }
       var node = e.node;
+      var paintStatus = hoEditorFactory.drawTree.paintStatus;
       this.selectMarkStyle.display = 'none';
       this.poperClose();
-      if (hoEditorFactory.drawTree.paintStatus == DrawTree/* PaintState */.Dh.psEdit || hoEditorFactory.drawTree.paintStatus == DrawTree/* PaintState */.Dh.psTrace) {
+      if (paintStatus == DrawTree/* PaintState */.Dh.psEdit || paintStatus == DrawTree/* PaintState */.Dh.psTrace) {
         if (this.isCanEdit()) return;
       }
       if (node && node !== null) {
@@ -210745,7 +210991,7 @@ var defaultHeight = Math.floor(1122 * scaleXY) % 2 === 1 ? Math.floor(1122 * sca
           this.selectMarkStyle = {
             display: 'none'
           };
-          if (hoEditorFactory.drawTree.paintStatus === 5) {
+          if (paintStatus === DrawTree/* PaintState */.Dh.psReadOnly) {
             return false;
           }
           this.textStyles.changeCount++;
@@ -210756,7 +211002,7 @@ var defaultHeight = Math.floor(1122 * scaleXY) % 2 === 1 ? Math.floor(1122 * sca
             isInTable = _domRange$inSameTable2[0],
             tableNode = _domRange$inSameTable2[1];
           this.nextCellButton = false;
-          if (isInTable) {
+          if (isInTable && (paintStatus == DrawTree/* PaintState */.Dh.psDesign || paintStatus == DrawTree/* PaintState */.Dh.psEdit || paintStatus == DrawTree/* PaintState */.Dh.psTrace)) {
             if (!this.cellButton) {
               this.createAddCellButton(node, pageIndex);
             }
@@ -210764,7 +211010,7 @@ var defaultHeight = Math.floor(1122 * scaleXY) % 2 === 1 ? Math.floor(1122 * sca
           } else {
             this.cellButton = false;
           }
-          if (hoEditorFactory.drawTree.paintStatus == 1) {
+          if (paintStatus == DrawTree/* PaintState */.Dh.psEdit || paintStatus == DrawTree/* PaintState */.Dh.psTrace) {
             if (node.nodeType == 18) {
               // 跳转元素
               this.$emit('leftclick', {
@@ -211168,6 +211414,12 @@ var defaultHeight = Math.floor(1122 * scaleXY) % 2 === 1 ? Math.floor(1122 * sca
     },
     addNextCellRow: function addNextCellRow() {
       var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this.hoEditorProvider.activeDocId);
+      var paintStatus = hoEditorFactory.drawTree.paintStatus;
+      if (paintStatus == DrawTree/* PaintState */.Dh.psReadOnly || paintStatus == DrawTree/* PaintState */.Dh.psPreview || paintStatus == DrawTree/* PaintState */.Dh.psReview || paintStatus == DrawTree/* PaintState */.Dh.psPrint) {
+        this.cellButton = false;
+        this.nextCellButton = false;
+        return;
+      }
       var curDomRange = hoEditorFactory.docTree.curDomRange.normalize();
       var node = hoEditorFactory.docTree.findNodePositionByPath(curDomRange.startPath);
       var table = null;
@@ -211395,10 +211647,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=4751bfc2&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=90411248&prod&lang=less&
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./src/components/HoDoc.vue?vue&type=style&index=0&id=4751bfc2&prod&lang=less&
+;// CONCATENATED MODULE: ./src/components/HoDoc.vue?vue&type=style&index=0&id=90411248&prod&lang=less&
 
 ;// CONCATENATED MODULE: ./src/components/HoDoc.vue
 
@@ -211411,8 +211663,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_4751bfc2_render,
-  HoDocvue_type_template_id_4751bfc2_staticRenderFns,
+  HoDocvue_type_template_id_90411248_render,
+  HoDocvue_type_template_id_90411248_staticRenderFns,
   false,
   null,
   null,
@@ -215422,7 +215674,7 @@ var StructureConvert = /*#__PURE__*/function () {
     key: "replaceNodesName",
     value: function replaceNodesName(xml) {
       var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this._hoEditorFactoryID);
-      var reg = new RegExp(/\<\*([A-z]*)\>\/|TextNode|ParagraphNode|TableNode|ImageNode|BarcodeNode|QrcodeNode|DateTimeNode|DownListNode|RadioAndCheckBoxNode|TextInputFieldNode|SpecialCharsNode|MarkNode|PageCountNode|PageNumNode|CellNode|SeparateCharNode|LabelNode|SignNode|GestationNode|RareCharNode|JumpButtonNode|PopQScoreNode/g);
+      var reg = new RegExp(/\<\*([A-z]*)\>\/|TextNode|ParagraphNode|TableNode|ImageNode|BarcodeNode|QrcodeNode|DateTimeNode|DownListNode|RadioAndCheckBoxNode|TextInputFieldNode|SpecialCharsNode|MarkNode|PageCountNode|PageNumNode|CellNode|SeparateCharNode|LabelNode|SignNode|GestationNode|TextBorderNode|RareCharNode|JumpButtonNode|PopQScoreNode/g);
       xml = xml.replace(reg, "node");
       xml = hoEditorFactory.unitConvert.replaceAll(xml, '<TableFormula>', "<node>");
       xml = hoEditorFactory.unitConvert.replaceAll(xml, '</TableFormula>', "</node>");
@@ -224201,8 +224453,8 @@ var VueController = /*#__PURE__*/function () {
       if (node instanceof SignNode/* SignNode */.N && node !== null && node !== void 0 && node.drawNodes[0]) {
         var drawNode = node === null || node === void 0 ? void 0 : node.drawNodes[0];
         result = (0,objectSpread2/* default */.Z)((0,objectSpread2/* default */.Z)({}, result), {}, {
-          ptLeft: hoEditorFactory.unitConvert.pxToPt(x - drawNode.dWidth),
-          ptRight: result.ptX
+          ptRight: hoEditorFactory.unitConvert.pxToPt(caret.stageX + drawNode.dWidth),
+          ptLeft: result.ptX
         });
         if (node.number == 0) {
           result.ptTop = result.ptY;