hoeditor-web 3.0.99 → 3.0.101

package/lib/hoeditor.umd.js

@@ -5699,7 +5699,7 @@ var component = (0,componentNormalizer/* default */.Z)(
 
 /***/ }),
 
-/***/ 31861:
+/***/ 215:
 /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -5711,7 +5711,7 @@ __webpack_require__.d(__webpack_exports__, {
   "default": function() { return /* binding */ Delimiter; }
 });
 
-;// 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/delimiter/Delimiter.vue?vue&type=template&id=5174d02a&
+;// 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/delimiter/Delimiter.vue?vue&type=template&id=e42af306&
 var render = function render() {
   var _vm = this,
     _c = _vm._self._c;
@@ -5736,6 +5736,16 @@ var render = function render() {
     staticClass: "control-list"
   }, [_c('li', {
     staticClass: "control-item"
+  }, [_c('PrintLineStyle', {
+    attrs: {
+      "defaultStyle": 0,
+      "placeholder": "样式"
+    },
+    on: {
+      "change": _vm.styleChange
+    }
+  })], 1), _c('li', {
+    staticClass: "control-item"
   }, [_c('span', {
     staticClass: "label"
   }, [_vm._v("宽度")]), _c('a-input-number', {
@@ -5793,17 +5803,22 @@ var staticRenderFns = [];
 
 // EXTERNAL MODULE: ./src/components/controls/colorPicker/HoColorPicker.vue + 5 modules
 var HoColorPicker = __webpack_require__(91351);
+// EXTERNAL MODULE: ./src/components/controls/printstyle/PrintLineStyle.vue + 3 modules
+var PrintLineStyle = __webpack_require__(51484);
 ;// 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/delimiter/Delimiter.vue?vue&type=script&lang=js&
 
+
 /* harmony default export */ var Delimitervue_type_script_lang_js_ = ({
   name: 'Delimiter',
   components: {
-    HoColorPicker: HoColorPicker["default"]
+    HoColorPicker: HoColorPicker["default"],
+    PrintLineStyle: PrintLineStyle["default"]
   },
   data: function data() {
     return {
       width: 1,
       color: '#000',
+      line: '0',
       animationClassNames: 'control-modal-contents delimiter-modal animation-in'
     };
   },
@@ -5818,21 +5833,24 @@ var HoColorPicker = __webpack_require__(91351);
      * 插入分割福
      */
     insertDelimiter: function insertDelimiter() {
-      this.vueController.insertSeparateChar(this.width, this.color);
+      this.vueController.insertSeparateChar(this.width, this.color, this.line);
       this.handleClose();
     },
     handleClose: function handleClose() {
       this.animationClassNames = 'control-modal-contents delimiter-modal animation-out';
       this.$emit('closed');
+    },
+    styleChange: function styleChange(style) {
+      this.line = style;
     }
   }
 });
 ;// CONCATENATED MODULE: ./src/components/controls/delimiter/Delimiter.vue?vue&type=script&lang=js&
  /* harmony default export */ var delimiter_Delimitervue_type_script_lang_js_ = (Delimitervue_type_script_lang_js_); 
-;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/delimiter/Delimiter.vue?vue&type=style&index=0&id=5174d02a&prod&lang=scss&
+;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/delimiter/Delimiter.vue?vue&type=style&index=0&id=e42af306&prod&lang=scss&
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./src/components/controls/delimiter/Delimiter.vue?vue&type=style&index=0&id=5174d02a&prod&lang=scss&
+;// CONCATENATED MODULE: ./src/components/controls/delimiter/Delimiter.vue?vue&type=style&index=0&id=e42af306&prod&lang=scss&
 
 // EXTERNAL MODULE: ./node_modules/@vue/vue-loader-v15/lib/runtime/componentNormalizer.js
 var componentNormalizer = __webpack_require__(70713);
@@ -16713,7 +16731,7 @@ var component = (0,componentNormalizer/* default */.Z)(
 
 /***/ }),
 
-/***/ 47585:
+/***/ 69086:
 /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -16729,7 +16747,7 @@ __webpack_require__.d(__webpack_exports__, {
 var es_array_includes = __webpack_require__(26699);
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.string.includes.js
 var es_string_includes = __webpack_require__(32023);
-;// 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/table/TableCellProperty.vue?vue&type=template&id=9af121a8&
+;// 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/table/TableCellProperty.vue?vue&type=template&id=7506defc&
 
 
 var render = function render() {
@@ -16773,32 +16791,6 @@ var render = function render() {
     staticClass: "control-item"
   }, [_c('span', {
     staticClass: "label"
-  }, [_vm._v("编号")]), _c('span', {
-    staticClass: "readonly-value"
-  }, [_vm._v(_vm._s(_vm.id))])]), _c('div', {
-    staticClass: "control-item"
-  }, [_c('span', {
-    staticClass: "label",
-    staticStyle: {
-      "margin-left": "10px"
-    }
-  }, [_vm._v("标题")]), _c('a-input', {
-    attrs: {
-      "placeholder": "标题"
-    },
-    model: {
-      value: _vm.title,
-      callback: function callback($$v) {
-        _vm.title = $$v;
-      },
-      expression: "title"
-    }
-  })], 1)]), _c('li', {
-    staticClass: "control-item"
-  }, [_c('div', {
-    staticClass: "control-item"
-  }, [_c('span', {
-    staticClass: "label"
   }, [_vm._v("自定义属性")]), _c('a-button', {
     on: {
       "click": _vm.openCustomsModal
@@ -17563,7 +17555,7 @@ var render = function render() {
 };
 var staticRenderFns = [];
 
-;// CONCATENATED MODULE: ./src/components/controls/table/TableCellProperty.vue?vue&type=template&id=9af121a8&
+;// CONCATENATED MODULE: ./src/components/controls/table/TableCellProperty.vue?vue&type=template&id=7506defc&
 
 // EXTERNAL MODULE: ./node_modules/@babel/runtime/helpers/esm/slicedToArray.js + 3 modules
 var slicedToArray = __webpack_require__(27222);
@@ -17947,7 +17939,7 @@ var columns = [{
       var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this.hoEditorFactoryId);
       var domRange = hoEditorFactory.docTree.curDomRange;
       var table = hoEditorFactory.docTree.curDomRange.normalize().inSameTable()[1];
-      var cellNodeList = table.getTableSelectCells(domRange, true);
+      var cellNodeList = table.getTableSelectCells(domRange, false);
       var cellNode = this.getCellNodes();
       if (cellNodeList.length === 0 && cellNode !== null) {
         cellNodeList.push(cellNode);
@@ -17964,10 +17956,10 @@ var columns = [{
 });
 ;// CONCATENATED MODULE: ./src/components/controls/table/TableCellProperty.vue?vue&type=script&lang=js&
  /* harmony default export */ var table_TableCellPropertyvue_type_script_lang_js_ = (TableCellPropertyvue_type_script_lang_js_); 
-;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/table/TableCellProperty.vue?vue&type=style&index=0&id=9af121a8&prod&lang=scss&
+;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/table/TableCellProperty.vue?vue&type=style&index=0&id=7506defc&prod&lang=scss&
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./src/components/controls/table/TableCellProperty.vue?vue&type=style&index=0&id=9af121a8&prod&lang=scss&
+;// CONCATENATED MODULE: ./src/components/controls/table/TableCellProperty.vue?vue&type=style&index=0&id=7506defc&prod&lang=scss&
 
 // EXTERNAL MODULE: ./node_modules/@vue/vue-loader-v15/lib/runtime/componentNormalizer.js
 var componentNormalizer = __webpack_require__(70713);
@@ -40137,7 +40129,7 @@ var DocController = /*#__PURE__*/function () {
     key: "deleteTextBeforePath",
     value: function () {
       var _deleteTextBeforePath = (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_asyncToGenerator_js__WEBPACK_IMPORTED_MODULE_3__/* ["default"] */ .Z)( /*#__PURE__*/(0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_regeneratorRuntime_js__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z)().mark(function _callee(startPath) {
-        var hoEditorFactory, domRange, nodePosition, childIndex, node, ret, topath, arr, tmp, aRange, endPath, _topath, _aRange, isError, prevNode, cellNode, tableNode, tIndex, cIndex, preParaNode, newpath, signUserId, preNode, nextNode, path, signNode, spath, epath, newSignNode, pNode;
+        var hoEditorFactory, domRange, nodePosition, childIndex, node, ret, topath, arr, tmp, aRange, endPath, _topath, _aRange, isError, prevNode, cellNode, tableNode, tIndex, cIndex, preParaNode, newpath, signUserId, preNode, nextNode, path, signNode, spath, epath, newSignNode, nodesDeleteUndoUnit, pNode;
         return (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_regeneratorRuntime_js__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z)().wrap(function _callee$(_context) {
           while (1) {
             switch (_context.prev = _context.next) {
@@ -40159,18 +40151,18 @@ var DocController = /*#__PURE__*/function () {
                 //   )
                 // );
                 // hoEditorFactory.undoService.commit();
-                _context.next = 124;
+                _context.next = 125;
                 break;
               case 6:
                 nodePosition = hoEditorFactory.docTree.findNodePositionByPath(startPath);
                 childIndex = nodePosition.childIndex;
                 node = nodePosition.node;
                 if (!node) {
-                  _context.next = 124;
+                  _context.next = 125;
                   break;
                 }
                 if (!domRange.isEmpty) {
-                  _context.next = 124;
+                  _context.next = 125;
                   break;
                 }
                 if (!(node instanceof _treeNode_TextNode__WEBPACK_IMPORTED_MODULE_26__/* .TextNode */ .R)) {
@@ -40226,7 +40218,7 @@ var DocController = /*#__PURE__*/function () {
                 aRange = new _DomRange__WEBPACK_IMPORTED_MODULE_30__/* .DomRange */ .a(this._hoEditorFactoryID, startPath, topath).normalize();
                 this.deleteRange(aRange, true);
                 hoEditorFactory.docTree.curDomRange = new _DomRange__WEBPACK_IMPORTED_MODULE_30__/* .DomRange */ .a(this._hoEditorFactoryID, topath, topath);
-                _context.next = 124;
+                _context.next = 125;
                 break;
               case 36:
                 if (!(node instanceof _treeNode_MarkNode__WEBPACK_IMPORTED_MODULE_46__/* .MarkNode */ .j)) {
@@ -40278,7 +40270,7 @@ var DocController = /*#__PURE__*/function () {
                 //   )
                 // );
                 // hoEditorFactory.undoService.commit();
-                _context.next = 124;
+                _context.next = 125;
                 break;
               case 56:
                 if (!(node instanceof _treeNode_ParagraphNode__WEBPACK_IMPORTED_MODULE_29__/* .ParagraphNode */ .C)) {
@@ -40365,7 +40357,7 @@ var DocController = /*#__PURE__*/function () {
                 return _context.abrupt("return");
               case 98:
                 if (!(node instanceof _treeNode_SignNode__WEBPACK_IMPORTED_MODULE_83__/* .SignNode */ .N)) {
-                  _context.next = 119;
+                  _context.next = 120;
                   break;
                 }
                 preNode = node.previousLeaf();
@@ -40383,7 +40375,7 @@ var DocController = /*#__PURE__*/function () {
                 return _context.abrupt("return");
               case 109:
                 if (!(preNode instanceof _treeNode_SignNode__WEBPACK_IMPORTED_MODULE_83__/* .SignNode */ .N)) {
-                  _context.next = 119;
+                  _context.next = 120;
                   break;
                 }
                 spath = "";
@@ -40398,13 +40390,14 @@ var DocController = /*#__PURE__*/function () {
                 //node.isTemplate,
                 node.styleIndex, preNode.connectMode, preNode.isFront, preNode.allowEditSignTime, preNode.fingerPrintSrc, preNode.fingerPosition, preNode.attribute, preNode.connectChar, preNode.otherProperties);
                 hoEditorFactory.undoService.begin();
-                hoEditorFactory.undoService.add(new _undoRedo_NodesDeleteUndoUnit__WEBPACK_IMPORTED_MODULE_35__/* .NodesDeleteUndoUnit */ .F(this._hoEditorFactoryID, spath, epath));
-                if (node.number === 2 || node.number === 1 && node.isTemplate) {
+                nodesDeleteUndoUnit = new _undoRedo_NodesDeleteUndoUnit__WEBPACK_IMPORTED_MODULE_35__/* .NodesDeleteUndoUnit */ .F(this._hoEditorFactoryID, spath, epath, true);
+                hoEditorFactory.undoService.add(nodesDeleteUndoUnit);
+                if (!nodesDeleteUndoUnit.isError && (node.number === 2 || node.number === 1 && node.isTemplate)) {
                   hoEditorFactory.undoService.add(new _undoRedo_NodeInsertUndoUnit__WEBPACK_IMPORTED_MODULE_24__/* .NodeInsertUndoUnit */ .R(this._hoEditorFactoryID, spath, newSignNode));
                 }
                 hoEditorFactory.undoService.commit();
                 return _context.abrupt("return");
-              case 119:
+              case 120:
                 pNode = node.parentNode;
                 hoEditorFactory.undoService.begin();
                 hoEditorFactory.undoService.add(new _undoRedo_NodeDeleteUndoUnit__WEBPACK_IMPORTED_MODULE_36__/* .NodeDeleteUndoUnit */ .w(this._hoEditorFactoryID, node, startPath));
@@ -40412,7 +40405,7 @@ var DocController = /*#__PURE__*/function () {
                 if (pNode && pNode instanceof _treeNode_TextInputFieldNode__WEBPACK_IMPORTED_MODULE_45__/* .TextInputFieldNode */ .re && pNode.childNodes.length === 2) {
                   this.resetEmptyInputFieldNode(hoEditorFactory, pNode);
                 }
-              case 124:
+              case 125:
               case "end":
                 return _context.stop();
             }
@@ -42077,6 +42070,7 @@ var DocController = /*#__PURE__*/function () {
       var domRange = curDomRange.normalize();
       var startPath = domRange.endPath;
       var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_76__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
+      var oldIsTransToText = false;
       if (operType === "update") {
         var np = hoEditorFactory.docTree.findNodePositionByPath(startPath);
         if (np) {
@@ -42084,6 +42078,7 @@ var DocController = /*#__PURE__*/function () {
           if (node instanceof _treeNode_RadioAndCheckBoxNode__WEBPACK_IMPORTED_MODULE_52__/* .RadioAndCheckBoxNode */ .Yh) {
             hoEditorFactory.undoService.begin();
             hoEditorFactory.undoService.add(new _undoRedo_NodeDeleteUndoUnit__WEBPACK_IMPORTED_MODULE_36__/* .NodeDeleteUndoUnit */ .w(this._hoEditorFactoryID, node, startPath, "update"));
+            oldIsTransToText = node.isTransToText;
             //hoEditorFactory.undoService.commit();
             //startPath = hoEditorFactory.docTree.curDomRange.startPath;
             startPath = hoEditorFactory.docTree.getNodeLastPath(node.previousLeaf());
@@ -42105,7 +42100,7 @@ var DocController = /*#__PURE__*/function () {
       }
       hoEditorFactory.undoService.add(new _undoRedo_NodeInsertUndoUnit__WEBPACK_IMPORTED_MODULE_24__/* .NodeInsertUndoUnit */ .R(this._hoEditorFactoryID, startPath, radioAndCheckBoxNode));
       hoEditorFactory.undoService.commit();
-      if (isTransToText && operType === "add") {
+      if (isTransToText && (operType === "add" || operType === "update" && !oldIsTransToText)) {
         var path = radioAndCheckBoxNode.getNodePath();
         var textNode = new _treeNode_TextNode__WEBPACK_IMPORTED_MODULE_26__/* .TextNode */ .R(this._hoEditorFactoryID, domRange.npStart.roots, parentNode, _treeNode_BaseNode__WEBPACK_IMPORTED_MODULE_23__/* .NodeType.ntText */ .Jq.ntText, text, styleIndex);
         hoEditorFactory.undoService.begin();
@@ -42988,7 +42983,7 @@ var DocController = /*#__PURE__*/function () {
       */
   }, {
     key: "insertSeparateChar",
-    value: function insertSeparateChar(range, width, color) {
+    value: function insertSeparateChar(range, width, color, line) {
       var hoeditorfactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_76__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
       var np = range.normalize().npStart;
       if (np && np.node) {
@@ -43011,7 +43006,7 @@ var DocController = /*#__PURE__*/function () {
         }
         hoeditorfactory.undoService.begin();
         var newParaPath = paraNode.getNodePath();
-        var separateCharNode = new _treeNode_SeparateCharNode__WEBPACK_IMPORTED_MODULE_80__/* .SeparateCharNode */ .O(this._hoEditorFactoryID, np.roots, parentNode, _treeNode_BaseNode__WEBPACK_IMPORTED_MODULE_23__/* .NodeType.ntSeparateChar */ .Jq.ntSeparateChar, width, color);
+        var separateCharNode = new _treeNode_SeparateCharNode__WEBPACK_IMPORTED_MODULE_80__/* .SeparateCharNode */ .O(this._hoEditorFactoryID, np.roots, parentNode, _treeNode_BaseNode__WEBPACK_IMPORTED_MODULE_23__/* .NodeType.ntSeparateChar */ .Jq.ntSeparateChar, width, color, line);
         hoeditorfactory.undoService.add(new _undoRedo_NodeInsertUndoUnit__WEBPACK_IMPORTED_MODULE_24__/* .NodeInsertUndoUnit */ .R(this._hoEditorFactoryID, newParaPath, separateCharNode));
         hoeditorfactory.undoService.commit();
       }
@@ -60501,22 +60496,24 @@ var RectNode = /*#__PURE__*/function (_BaseCombineNode) {
 /*
  * @Author: your name
  * @Date: 2021-08-10 11:37:56
- * @LastEditTime: 2022-03-14 09:04:58
- * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2023-08-08 17:09:26
+ * @LastEditors: liyanan 2441631434@qq.com
  * @Description: In User Settings Edit
  * @FilePath: \hoeditor-web\src\editor\dom\treeNode\SeparateChar.ts
  */
 var SeparateCharNode = /*#__PURE__*/function (_BaseNode) {
   (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_inherits_js__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z)(SeparateCharNode, _BaseNode);
   var _super = (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createSuper_js__WEBPACK_IMPORTED_MODULE_3__/* ["default"] */ .Z)(SeparateCharNode);
-  function SeparateCharNode(hoEditorFactoryID, rootNodes, pNode, nodeType, width, color) {
+  function SeparateCharNode(hoEditorFactoryID, rootNodes, pNode, nodeType, width, color, line) {
     var _this;
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_classCallCheck_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z)(this, SeparateCharNode);
     _this = _super.call(this, hoEditorFactoryID, rootNodes, pNode, nodeType);
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_9__/* ["default"] */ .Z)((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)(_this), "_width", 0);
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_9__/* ["default"] */ .Z)((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)(_this), "_color", "#000000");
+    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_9__/* ["default"] */ .Z)((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)(_this), "_line", '0');
     _this._width = width;
     _this._color = color;
+    _this._line = line;
     _this.node2DrawNodeRange();
     return _this;
   }
@@ -60531,6 +60528,7 @@ var SeparateCharNode = /*#__PURE__*/function (_BaseNode) {
     get:
     //宽度
     //颜色
+    //0实线 1虚线
     function get() {
       return this._width;
     },
@@ -60549,6 +60547,16 @@ var SeparateCharNode = /*#__PURE__*/function (_BaseNode) {
         this._color = val;
       }
     }
+  }, {
+    key: "line",
+    get: function get() {
+      return this._line;
+    },
+    set: function set(val) {
+      if (val !== this._line) {
+        this._line = val;
+      }
+    }
   }, {
     key: "node2DrawNodeRange",
     value: function node2DrawNodeRange() {
@@ -60561,7 +60569,7 @@ var SeparateCharNode = /*#__PURE__*/function (_BaseNode) {
       } else {
         cbStyle = hoEditorFactory.docTree.styles[0].combineStyle;
       }
-      var dNode = new _editor_draw_drawNode_DrawMedicalExpression__WEBPACK_IMPORTED_MODULE_6__/* .DrawMedicalExpression */ .T(this._hoEditorFactoryID, this._rootPath, this, 0, "5", [this.color], cbStyle, this.width, hoEditorFactory.pageProperty.widthPixes - hoEditorFactory.pageProperty.leftMarginPixes - hoEditorFactory.pageProperty.rightMarginPixes);
+      var dNode = new _editor_draw_drawNode_DrawMedicalExpression__WEBPACK_IMPORTED_MODULE_6__/* .DrawMedicalExpression */ .T(this._hoEditorFactoryID, this._rootPath, this, 0, "5", [this.color], cbStyle, this.width, hoEditorFactory.pageProperty.widthPixes - hoEditorFactory.pageProperty.leftMarginPixes - hoEditorFactory.pageProperty.rightMarginPixes, this.line);
       this._drawNodes.push(dNode);
     }
   }, {
@@ -60601,7 +60609,8 @@ var SeparateCharNode = /*#__PURE__*/function (_BaseNode) {
       var retObj = {
         nodeType: _BaseNode__WEBPACK_IMPORTED_MODULE_8__/* .NodeType */ .Jq[this.nodeType],
         width: this.width,
-        color: this.color
+        color: this.color,
+        line: this.line
       };
       if (isCopy) {
         return retObj;
@@ -60618,7 +60627,7 @@ var SeparateCharNode = /*#__PURE__*/function (_BaseNode) {
   }], [{
     key: "json2Node",
     value: function json2Node(hoEditorFactoryID, json, rootNodes, pNode) {
-      return new SeparateCharNode(hoEditorFactoryID, rootNodes, pNode ? pNode : null, _BaseNode__WEBPACK_IMPORTED_MODULE_8__/* .NodeType.ntSeparateChar */ .Jq.ntSeparateChar, Number(json.width), json.color);
+      return new SeparateCharNode(hoEditorFactoryID, rootNodes, pNode ? pNode : null, _BaseNode__WEBPACK_IMPORTED_MODULE_8__/* .NodeType.ntSeparateChar */ .Jq.ntSeparateChar, Number(json.width), json.color, json.line ? json.line : '0');
     }
   }]);
   return SeparateCharNode;
@@ -73965,7 +73974,7 @@ var DrawMarkNode = /*#__PURE__*/function (_DrawCombineNode) {
 /*
  * @Author: your name
  * @Date: 2020-10-29 15:22:36
- * @LastEditTime: 2023-07-06 16:13:56
+ * @LastEditTime: 2023-08-08 17:34:32
  * @LastEditors: liyanan 2441631434@qq.com
  * @Description: In User Settings Edit
  * @FilePath: \hoeditor-web\src\editor\draw\drawNode\DrawMedicalExpression.ts
@@ -73975,7 +73984,7 @@ var DrawMarkNode = /*#__PURE__*/function (_DrawCombineNode) {
 var DrawMedicalExpression = /*#__PURE__*/function (_DrawCombineNode) {
   (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_inherits_js__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z)(DrawMedicalExpression, _DrawCombineNode);
   var _super = (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createSuper_js__WEBPACK_IMPORTED_MODULE_3__/* ["default"] */ .Z)(DrawMedicalExpression);
-  function DrawMedicalExpression(hoeditfactoryID, rootPath, node, index, expressionStyle, arrValues, textStyle, dHeight, dWidth) {
+  function DrawMedicalExpression(hoeditfactoryID, rootPath, node, index, expressionStyle, arrValues, textStyle, dHeight, dWidth, line) {
     var _this;
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_classCallCheck_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z)(this, DrawMedicalExpression);
     _this = _super.call(this, hoeditfactoryID, rootPath, node, index);
@@ -73984,6 +73993,7 @@ var DrawMedicalExpression = /*#__PURE__*/function (_DrawCombineNode) {
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_7__/* ["default"] */ .Z)((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)(_this), "_textStyle", void 0);
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_7__/* ["default"] */ .Z)((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)(_this), "_w", 0);
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_7__/* ["default"] */ .Z)((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)(_this), "_h", 0);
+    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_7__/* ["default"] */ .Z)((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)(_this), "_line", void 0);
     _this._expressionStyle = expressionStyle;
     _this._arrValues = arrValues;
     _this.dWidth = dWidth;
@@ -74005,6 +74015,9 @@ var DrawMedicalExpression = /*#__PURE__*/function (_DrawCombineNode) {
     }
     _this.dHeight = dHeight;
     _this._textStyle = textStyle;
+    if (expressionStyle === "5") {
+      _this._line = line ? line : '0';
+    }
     _this.drawMedicalExpression(expressionStyle);
     return _this;
   }
@@ -74117,7 +74130,7 @@ var DrawMedicalExpression = /*#__PURE__*/function (_DrawCombineNode) {
       menseDays.textBaseline = "alphabetic";
       this.addChild(menseDays);
       var lineX = new createjs.Shape();
-      lineX.graphics.beginStroke(this._textStyle.color).moveTo(0, -this.dHeight / 2).lineTo(this.dWidth, -this.dHeight / 2);
+      lineX.graphics.beginStroke(this._textStyle.color).moveTo(0, -this.dHeight / 2).lineTo(this.dWidth, -this.dHeight / 2).endStroke();
       this.addChild(lineX);
       var menoPauseAge = new createjs.Text(this._arrValues[3], this._textStyle.getStyleKey(), this._textStyle.color);
       menoPauseAge.y = 0;
@@ -74132,7 +74145,7 @@ var DrawMedicalExpression = /*#__PURE__*/function (_DrawCombineNode) {
       cycleDays.textBaseline = "alphabetic";
       this.addChild(cycleDays);
       var lineY = new createjs.Shape();
-      lineY.graphics.beginStroke(this._textStyle.color).moveTo(this.dWidth / 2, -this.dHeight).lineTo(this.dWidth / 2, 0);
+      lineY.graphics.beginStroke(this._textStyle.color).moveTo(this.dWidth / 2, -this.dHeight).lineTo(this.dWidth / 2, 0).endStroke();
       this.addChild(lineY);
     }
   }, {
@@ -74163,10 +74176,10 @@ var DrawMedicalExpression = /*#__PURE__*/function (_DrawCombineNode) {
       menoPauseAge.textBaseline = "alphabetic";
       this.addChild(menoPauseAge);
       var line1 = new createjs.Shape();
-      line1.graphics.beginStroke(this._textStyle.color).moveTo(0, -this.dHeight - 2).lineTo(this.dWidth - 2, 2);
+      line1.graphics.beginStroke(this._textStyle.color).moveTo(0, -this.dHeight - 2).lineTo(this.dWidth - 2, 2).endStroke();
       this.addChild(line1);
       var line2 = new createjs.Shape();
-      line2.graphics.beginStroke(this._textStyle.color).moveTo(0, 2).lineTo(this.dWidth - 2, -this.dHeight - 2);
+      line2.graphics.beginStroke(this._textStyle.color).moveTo(0, 2).lineTo(this.dWidth - 2, -this.dHeight - 2).endStroke();
       this.addChild(line2);
     }
   }, {
@@ -74185,10 +74198,10 @@ var DrawMedicalExpression = /*#__PURE__*/function (_DrawCombineNode) {
       menseDays.textBaseline = "alphabetic";
       this.addChild(menseDays);
       var line1 = new createjs.Shape();
-      line1.graphics.beginStroke(this._textStyle.color).moveTo(menarcheAge.getMeasuredWidth() + 4, -this.dHeight / 2).lineTo(this.dWidth, -this.dHeight / 2);
+      line1.graphics.beginStroke(this._textStyle.color).moveTo(menarcheAge.getMeasuredWidth() + 4, -this.dHeight / 2).lineTo(this.dWidth, -this.dHeight / 2).endStroke();
       this.addChild(line1);
       var line2 = new createjs.Shape();
-      line2.graphics.beginStroke(this._textStyle.color).moveTo(menarcheAge.getMeasuredWidth(), menarcheAge.y + 3).lineTo(menarcheAge.getMeasuredWidth() + 4, menseDays.y - 4);
+      line2.graphics.beginStroke(this._textStyle.color).moveTo(menarcheAge.getMeasuredWidth(), menarcheAge.y + 3).lineTo(menarcheAge.getMeasuredWidth() + 4, menseDays.y - 4).endStroke();
       this.addChild(line2);
       var cycleDays = new createjs.Text(this._arrValues[1], this._textStyle.getStyleKey(), this._textStyle.color);
       cycleDays.y = 0;
@@ -74344,13 +74357,13 @@ var DrawMedicalExpression = /*#__PURE__*/function (_DrawCombineNode) {
       value6.textBaseline = "alphabetic";
       this.addChild(value6);
       var line2 = new createjs.Shape();
-      line2.graphics.beginStroke(this._textStyle.color).moveTo(value3.x + value3.getMeasuredWidth(), -this._dHeight / 2).lineTo(value4.x, -this._dHeight / 2);
+      line2.graphics.beginStroke(this._textStyle.color).moveTo(value3.x + value3.getMeasuredWidth(), -this._dHeight / 2).lineTo(value4.x, -this._dHeight / 2).endStroke();
       this.addChild(line2);
       var line3 = new createjs.Shape();
-      line3.graphics.beginStroke(this._textStyle.color).moveTo(this.dWidth - 5, -this._dHeight / 2).lineTo(this.dWidth, -this._dHeight / 2);
+      line3.graphics.beginStroke(this._textStyle.color).moveTo(this.dWidth - 5, -this._dHeight / 2).lineTo(this.dWidth, -this._dHeight / 2).endStroke();
       this.addChild(line3);
       var line4 = new createjs.Shape();
-      line4.graphics.beginStroke(this._textStyle.color).moveTo(this.dWidth / 2, -this._dHeight).lineTo(this.dWidth / 2, 0);
+      line4.graphics.beginStroke(this._textStyle.color).moveTo(this.dWidth / 2, -this._dHeight).lineTo(this.dWidth / 2, 0).endStroke();
       this.addChild(line4);
     }
   }, {
@@ -74401,8 +74414,8 @@ var DrawMedicalExpression = /*#__PURE__*/function (_DrawCombineNode) {
       if (this.dHeight < maxHeight) {
         this.dHeight = maxHeight;
       }
-      lineX.graphics.beginStroke(this._textStyle.color).moveTo(0, -this._dHeight / 2).lineTo(this.dWidth, -this._dHeight / 2);
-      lineY.graphics.beginStroke(this._textStyle.color).moveTo(leftMaxWidth + 6 - 0.5, -this._dHeight).lineTo(leftMaxWidth + 6 - 0.5, 0);
+      lineX.graphics.beginStroke(this._textStyle.color).moveTo(0, -this._dHeight / 2).lineTo(this.dWidth, -this._dHeight / 2).endStroke();
+      lineY.graphics.beginStroke(this._textStyle.color).moveTo(leftMaxWidth + 6 - 0.5, -this._dHeight).lineTo(leftMaxWidth + 6 - 0.5, 0).endStroke();
       topLeft.y = -this.dHeight / 2 - topLeft.getMeasuredHeight() / 2;
       topLeft.x = 4;
       topLeft.textAlign = "left";
@@ -74530,10 +74543,10 @@ var DrawMedicalExpression = /*#__PURE__*/function (_DrawCombineNode) {
         }
       }
       var lineX = new createjs.Shape();
-      lineX.graphics.beginStroke(this._textStyle.color).moveTo(0, -this._dHeight / 2).lineTo(this.dWidth, -this._dHeight / 2);
+      lineX.graphics.beginStroke(this._textStyle.color).moveTo(0, -this._dHeight / 2).lineTo(this.dWidth, -this._dHeight / 2).endStroke();
       this.addChild(lineX);
       var lineY = new createjs.Shape();
-      lineY.graphics.beginStroke(this._textStyle.color).moveTo(this.dWidth / 2, -this._dHeight).lineTo(this.dWidth / 2, 0);
+      lineY.graphics.beginStroke(this._textStyle.color).moveTo(this.dWidth / 2, -this._dHeight).lineTo(this.dWidth / 2, 0).endStroke();
       this.addChild(lineY);
     }
   }, {
@@ -74541,7 +74554,11 @@ var DrawMedicalExpression = /*#__PURE__*/function (_DrawCombineNode) {
     value: function drawSeparateChar() {
       var shape = new createjs.Shape();
       shape.graphics.clear();
-      shape.graphics.beginFill(this.arrValues[0]).drawRect(0, 0, this.dWidth, this.dHeight);
+      if (this._line === '0') {
+        shape.graphics.beginFill(this.arrValues[0]).drawRect(0, 0, this.dWidth, this.dHeight).endFill();
+      } else {
+        shape.graphics.beginStroke(this.arrValues[0]).setStrokeDash([2, 2]).moveTo(0, 0).lineTo(this.dWidth, this.dHeight).endStroke();
+      }
       this.addChild(shape);
     }
   }]);
@@ -85143,7 +85160,7 @@ var DrawTree = /*#__PURE__*/function () {
       var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID);
       if (e.node) {
         if (e.node instanceof RadioAndCheckBoxNode/* RadioAndCheckBoxNode */.Yh) {
-          if (hoEditorFactory.drawTree.paintStatus === PaintState.psReview) {
+          if (hoEditorFactory.drawTree.paintStatus === PaintState.psReview || hoEditorFactory.drawTree.paintStatus === PaintState.psReadOnly || hoEditorFactory.drawTree.paintStatus === PaintState.psPreview || hoEditorFactory.drawTree.paintStatus === PaintState.psPrint) {
             return true;
           }
           var aNode = e.node;
@@ -200517,7 +200534,7 @@ var map = {
 	"./customAttributes/CustomAttributes.vue": 78869,
 	"./dataSource/DataSource.vue": 9238,
 	"./dateDialog/DateDialog.vue": 49145,
-	"./delimiter/Delimiter.vue": 31861,
+	"./delimiter/Delimiter.vue": 215,
 	"./expressionForm/ExpressionForm.vue": 44603,
 	"./findReplace/FindReplace.vue": 25918,
 	"./gestation/Gestation.vue": 6251,
@@ -200537,7 +200554,7 @@ var map = {
 	"./selectDialog/SelectDialog.vue": 59075,
 	"./sign/Sign.vue": 28715,
 	"./table/TableCellPoper.vue": 61917,
-	"./table/TableCellProperty.vue": 47585,
+	"./table/TableCellProperty.vue": 69086,
 	"./table/TableColProperty.vue": 17857,
 	"./table/TableForm.vue": 19064,
 	"./table/TableFormTree.vue": 39703,
@@ -239944,7 +239961,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.0.99');
+/* harmony default export */ var version = ('3.0.101');
 // EXTERNAL MODULE: ./src/components/controls/poperTipText/PoperTipText.vue + 5 modules
 var PoperTipText = __webpack_require__(36081);
 ;// CONCATENATED MODULE: ./src/components/controls/poperTipText/index.ts
@@ -246759,8 +246776,8 @@ var commonParamList = new Map();
 
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.from.js
 var es_array_from = __webpack_require__(91038);
-;// 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/common/history/index.vue?vue&type=template&id=3f7f61ba&
-var historyvue_type_template_id_3f7f61ba_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/common/history/index.vue?vue&type=template&id=73c58cef&
+var historyvue_type_template_id_73c58cef_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -246772,11 +246789,11 @@ var historyvue_type_template_id_3f7f61ba_render = function render() {
     on: {
       "click": _vm.selectComment
     }
-  }, [_c('section', [_c('header'), _c('section', {
+  }, [_c('section', [_c('header', [_c('span', [_vm._v(_vm._s(_vm.userName))]), _vm._v(" "), _c('span', [_vm._v(_vm._s(_vm.date))])]), _c('section', {
     staticClass: "comemnt-content"
-  }, [_vm._v(_vm._s(_vm.text))])])]);
+  }, [_vm._v("修改前：" + _vm._s(_vm.text))])])]);
 };
-var historyvue_type_template_id_3f7f61ba_staticRenderFns = [];
+var historyvue_type_template_id_73c58cef_staticRenderFns = [];
 
 ;// 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/common/history/index.vue?vue&type=script&lang=js&
 
@@ -246792,6 +246809,8 @@ var historyvue_type_template_id_3f7f61ba_staticRenderFns = [];
       endNodeY: 0,
       lineHeight: 0,
       text: '',
+      userName: '',
+      date: '',
       pageIndex: 0,
       openCommentModal: null,
       selectedColor: '#aaa'
@@ -246869,10 +246888,10 @@ var historyvue_type_template_id_3f7f61ba_staticRenderFns = [];
 });
 ;// CONCATENATED MODULE: ./src/components/common/history/index.vue?vue&type=script&lang=js&
  /* harmony default export */ var common_historyvue_type_script_lang_js_ = (historyvue_type_script_lang_js_); 
-;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/common/history/index.vue?vue&type=style&index=0&id=3f7f61ba&prod&lang=scss&
+;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/common/history/index.vue?vue&type=style&index=0&id=73c58cef&prod&lang=scss&
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./src/components/common/history/index.vue?vue&type=style&index=0&id=3f7f61ba&prod&lang=scss&
+;// CONCATENATED MODULE: ./src/components/common/history/index.vue?vue&type=style&index=0&id=73c58cef&prod&lang=scss&
 
 ;// CONCATENATED MODULE: ./src/components/common/history/index.vue
 
@@ -246885,8 +246904,8 @@ var historyvue_type_template_id_3f7f61ba_staticRenderFns = [];
 
 var history_component = (0,componentNormalizer/* default */.Z)(
   common_historyvue_type_script_lang_js_,
-  historyvue_type_template_id_3f7f61ba_render,
-  historyvue_type_template_id_3f7f61ba_staticRenderFns,
+  historyvue_type_template_id_73c58cef_render,
+  historyvue_type_template_id_73c58cef_staticRenderFns,
   false,
   null,
   null,
@@ -246923,7 +246942,6 @@ var createHistoryInstance = function createHistoryInstance(options) {
 };
 var hoCreateHistory = {
   open: function open(options) {
-    this.clear();
     return createHistoryInstance(options);
   },
   clearLine: function clearLine() {
@@ -251120,13 +251138,14 @@ var VueController = /*#__PURE__*/function () {
             spath = hoEditorFactory.docTree.getNodeLastPath(preNode);
           }
           //const spath = hoEditorFactory.docTree.getNodeLastPath(preNode as BaseNode);
-          var epath = hoEditorFactory.docTree.getNodeLastPath(node);
+          //const epath = hoEditorFactory.docTree.getNodeLastPath(node);
           var newSignNode = new SignNode/* SignNode */.N(this._hoEditorFactoryID, preNode.rootNodes, preNode.parentNode, BaseNode/* NodeType.ntSign */.Jq.ntSign, 1, preNode.type, preNode.name === '' ? '签名' : preNode.name, preNode.signType, preNode.signFormat, preNode.signor, preNode.signTime, preNode.signTimeFormat, preNode.imgSrc, preNode.imgWidth, preNode.imgHeight, preNode.customProperty, preNode.isTemplate ? preNode.isTemplate : node.isTemplate,
           //node.isTemplate,
           node.styleIndex, preNode.connectMode, preNode.isFront, preNode.allowEditSignTime, preNode.fingerPrintSrc, preNode.fingerPosition, preNode.attribute, preNode.connectChar, preNode.otherProperties);
           hoEditorFactory.undoService.begin();
-          hoEditorFactory.undoService.add(new NodesDeleteUndoUnit/* NodesDeleteUndoUnit */.F(this._hoEditorFactoryID, spath, ePath));
-          if (node.number === 2 || node.number === 1 && node.isTemplate) {
+          var nodesDeleteUndoUnit = new NodesDeleteUndoUnit/* NodesDeleteUndoUnit */.F(this._hoEditorFactoryID, spath, ePath, true);
+          hoEditorFactory.undoService.add(nodesDeleteUndoUnit);
+          if (!nodesDeleteUndoUnit.isError && (node.number === 2 || node.number === 1 && node.isTemplate)) {
             hoEditorFactory.undoService.add(new NodeInsertUndoUnit/* NodeInsertUndoUnit */.R(this._hoEditorFactoryID, spath, newSignNode));
           }
           hoEditorFactory.undoService.commit();
@@ -251149,7 +251168,7 @@ var VueController = /*#__PURE__*/function () {
      */
   }, {
     key: "insertSeparateChar",
-    value: function insertSeparateChar(width, color) {
+    value: function insertSeparateChar(width, color, line) {
       var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID);
       if (hoEditorFactory.editController.canIsEdit(hoEditorFactory)) {
         var _curDomRange = hoEditorFactory.docTree.curDomRange; //获取当前选中区域
@@ -251157,7 +251176,7 @@ var VueController = /*#__PURE__*/function () {
         var endPath = _curDomRange.normalize().endPath;
         var changingEvent = new NodeChangingEvent/* NodeChangingEvent */.Q(DocTree/* DocAction.daInsert */.gk.daInsert, startPath, endPath, NodeChangingEvent/* OperType.insertSeparateChar */.y.insertSeparateChar);
         if (hoEditorFactory.docTree.changing(changingEvent)) {
-          hoEditorFactory.docController.insertSeparateChar(_curDomRange, width, color);
+          hoEditorFactory.docController.insertSeparateChar(_curDomRange, width, color, line);
         }
       }
     }
@@ -253064,11 +253083,15 @@ var VueController = /*#__PURE__*/function () {
           if (element instanceof TextInputFieldNode/* TextInputFieldNode */.re) {
             comment = new Comment/* Comment */.s(this._hoEditorFactoryID, commentID, oldValue, element.EndMarkNode);
             comment.lineHeight = comment.lineHeight - 20;
+            comment.userName = "".concat(object.afterByName, "(").concat(object.afterBy, ")");
+            comment.date = object.createdDate;
             comments.push(comment);
           }
           if (element instanceof DateTimeNode/* DateTimeNode */.Z || element instanceof DownListNode/* DownListNode */.yF) {
             comment = new Comment/* Comment */.s(this._hoEditorFactoryID, commentID, oldValue, element);
             comment.lineHeight = comment.lineHeight - 20;
+            comment.userName = "".concat(object.afterByName, "(").concat(object.afterBy, ")");
+            comment.date = object.createdDate;
             comments.push(comment);
           }
         }
@@ -253103,6 +253126,7 @@ var VueController = /*#__PURE__*/function () {
         return v;
       });
       var list = arr.flat();
+      hoCreateHistory.clear();
       list.forEach(function (comment) {
         hoCreateHistory.open(comment);
       });
@@ -255956,7 +255980,7 @@ var ElementController = /*#__PURE__*/function () {
 /*
  * @Author: your name
  * @Date: 2021-07-31 10:10:30
- * @LastEditTime: 2023-07-13 10:04:37
+ * @LastEditTime: 2023-08-08 18:09:19
  * @LastEditors: liyanan 2441631434@qq.com
  * @Description: In User Settings Edit
  * @FilePath: \hoeditor-web\src\editor\externalCall\NodeController.ts
@@ -256546,9 +256570,9 @@ var NodeController = /*#__PURE__*/function () {
      */
   }, {
     key: "insertSeparateChar",
-    value: function insertSeparateChar(width, color) {
+    value: function insertSeparateChar(width, color, line) {
       var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID);
-      hoEditorFactory.vueController.insertSeparateChar(width, color);
+      hoEditorFactory.vueController.insertSeparateChar(width, color, line);
     }
     /**
      * 插入孕周
@@ -259058,18 +259082,22 @@ var PrintController = /*#__PURE__*/function () {
                                 });
                               }
                             } else if (xmlIndex > xmlList.length - 1) {
-                              hoEditorFactory.drawTree.paintStatus = beforePrintStatus;
-                              hoEditorFactory.vueController.openXml(xml);
                               if (params && params.mergePDF) {
                                 (_this7$PDF2 = _this7.PDF) === null || _this7$PDF2 === void 0 ? void 0 : _this7$PDF2.deletePage(1);
-                                callback && callback({
-                                  pdf: _this7.PDF.output('datauristring')
-                                });
+                                setTimeout(function () {
+                                  callback && callback({
+                                    pdf: _this7.PDF.output('datauristring')
+                                  });
+                                }, 0);
                               } else {
-                                callback && callback({
-                                  pdfList: pdfList
-                                });
+                                setTimeout(function () {
+                                  callback && callback({
+                                    pdfList: pdfList
+                                  });
+                                }, 0);
                               }
+                              hoEditorFactory.drawTree.paintStatus = beforePrintStatus;
+                              hoEditorFactory.vueController.openXml(xml);
                               setTimeout(function () {
                                 _this7.clearJsPDF();
                               }, 1000);
@@ -262310,8 +262338,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=529bb754&
-var ToolBarvue_type_template_id_529bb754_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=367b0d47&
+var ToolBarvue_type_template_id_367b0d47_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -262475,7 +262503,7 @@ var ToolBarvue_type_template_id_529bb754_render = function render() {
     }
   }, [_c('div', {
     staticClass: "ho-emr-tool-list"
-  }, [_vm.defaultReviewJson.insertComment ? _c('div', {
+  }, [_vm._t("insertReviewBefore"), _vm.defaultReviewJson.insertComment ? _c('div', {
     staticClass: "ho-emr-tool-item"
   }, [_c('span', {
     staticClass: "review",
@@ -262519,7 +262547,7 @@ var ToolBarvue_type_template_id_529bb754_render = function render() {
     on: {
       "click": _vm.reviewPrintStatus
     }
-  }, [_vm._v(_vm._s(_vm.isPrinted ? '显示批注' : '隐藏批注'))])]) : _vm._e()], 2)]) : _vm._e(), _vm._t("afterReview")], 2), _vm.tabStyle == 'select' ? _c('div', {
+  }, [_vm._v(_vm._s(_vm.isPrinted ? '显示批注' : ''))])]) : _vm._e()], 2)]) : _vm._e(), _vm._t("afterReview")], 2), _vm.tabStyle == 'select' ? _c('div', {
     staticClass: "ho-emr-tool-select"
   }, [_c('a-select', {
     attrs: {
@@ -262544,7 +262572,7 @@ var ToolBarvue_type_template_id_529bb754_render = function render() {
     }, [_vm._v(_vm._s(item.title))]);
   }), 1)], 1) : _vm._e()], 1);
 };
-var ToolBarvue_type_template_id_529bb754_staticRenderFns = [];
+var ToolBarvue_type_template_id_367b0d47_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=48e0dd30&
 var HoMedicalExpressionvue_type_template_id_48e0dd30_render = function render() {
@@ -267766,10 +267794,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-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.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=529bb754&prod&lang=scss&
+;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.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=367b0d47&prod&lang=scss&
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./src/components/toolbar/ToolBar.vue?vue&type=style&index=0&id=529bb754&prod&lang=scss&
+;// CONCATENATED MODULE: ./src/components/toolbar/ToolBar.vue?vue&type=style&index=0&id=367b0d47&prod&lang=scss&
 
 ;// CONCATENATED MODULE: ./src/components/toolbar/ToolBar.vue
 
@@ -267782,8 +267810,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_529bb754_render,
-  ToolBarvue_type_template_id_529bb754_staticRenderFns,
+  ToolBarvue_type_template_id_367b0d47_render,
+  ToolBarvue_type_template_id_367b0d47_staticRenderFns,
   false,
   null,
   null,