hoeditor-web 3.1.160 → 3.1.162

package/lib/hoeditor.umd.js

@@ -33321,22 +33321,24 @@ var Caret = /*#__PURE__*/function () {
     value: function setPage(pageIndex) {
       var hoeditorfacotry = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_3__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditoryFactoryID);
       var newPage = hoeditorfacotry.drawTree.drawPages[pageIndex];
-      if (this._pageIndex !== pageIndex) {
-        if (this._pageIndex >= 0) {
-          var oldPage = hoeditorfacotry.drawTree.drawPages[this._pageIndex];
-          if (oldPage && oldPage.drawSelectLevel) {
-            var canvas = oldPage.drawSelectLevel.selectCanvas;
-            if (canvas.parentNode && this.div_cursor.parentNode === canvas.parentNode) {
-              canvas.parentNode.removeChild(this.div_cursor);
+      if (newPage) {
+        if (this._pageIndex !== pageIndex) {
+          if (this._pageIndex >= 0) {
+            var oldPage = hoeditorfacotry.drawTree.drawPages[this._pageIndex];
+            if (oldPage && oldPage.drawSelectLevel) {
+              var canvas = oldPage.drawSelectLevel.selectCanvas;
+              if (canvas.parentNode && this.div_cursor.parentNode === canvas.parentNode) {
+                canvas.parentNode.removeChild(this.div_cursor);
+              }
             }
           }
+          this._pageIndex = pageIndex;
         }
-        this._pageIndex = pageIndex;
-      }
-      if (pageIndex >= 0 && newPage.drawSelectLevel) {
-        var _canvas = newPage.drawSelectLevel.selectCanvas;
-        if (_canvas.parentNode) {
-          _canvas.parentNode.appendChild(this.div_cursor);
+        if (pageIndex >= 0 && newPage.drawSelectLevel) {
+          var _canvas = newPage.drawSelectLevel.selectCanvas;
+          if (_canvas.parentNode) {
+            _canvas.parentNode.appendChild(this.div_cursor);
+          }
         }
       }
     }
@@ -36058,13 +36060,11 @@ var Print = /*#__PURE__*/function () {
               }
               return _context4.abrupt("continue", 40);
             case 32:
-              // if(hoEditorFactory.vueController.isEmptyPage(index)) {
-              //     console.log(`第${index + 1}页 ==> ???`);
-              //     continue;
-              // }
               if (cpage.drawDomLevel && !cpage.drawDomLevel.stage) {
                 cpage.drawDomLevel.bindStage();
                 cpage.needUpdateStage = true;
+              } else if (cpage.drawDomLevel && cpage.drawDomLevel.stage) {
+                cpage.drawDomLevel.bindStage();
               }
               // 合并续打： 上一页还有空余时续打起始页隐藏页脚
               if (index === hoEditorFactory.startPageNum && positionY) {
@@ -36336,6 +36336,8 @@ var Print = /*#__PURE__*/function () {
               if (cpage.drawDomLevel && !cpage.drawDomLevel.stage) {
                 cpage.drawDomLevel.bindStage();
                 cpage.needUpdateStage = true;
+              } else if (cpage.drawDomLevel && cpage.drawDomLevel.stage) {
+                cpage.drawDomLevel.bindStage();
               }
               if (cpage.needUpdateStage && cpage.drawDomLevel && cpage.drawDomLevel.stage) {
                 cpage.drawDomLevel.stage.update();
@@ -36424,6 +36426,8 @@ var Print = /*#__PURE__*/function () {
               if (cpage.drawDomLevel && !cpage.drawDomLevel.stage) {
                 cpage.drawDomLevel.bindStage();
                 cpage.needUpdateStage = true;
+              } else if (cpage.drawDomLevel && cpage.drawDomLevel.stage) {
+                cpage.drawDomLevel.bindStage();
               }
               if (cpage.needUpdateStage && cpage.drawDomLevel && cpage.drawDomLevel.stage) {
                 cpage.drawDomLevel.stage.update();
@@ -36543,6 +36547,8 @@ var Print = /*#__PURE__*/function () {
               if (cpage.drawDomLevel && !cpage.drawDomLevel.stage) {
                 cpage.drawDomLevel.bindStage();
                 cpage.needUpdateStage = true;
+              } else if (cpage.drawDomLevel && cpage.drawDomLevel.stage) {
+                cpage.drawDomLevel.bindStage();
               }
               if (cpage.needUpdateStage && cpage.drawDomLevel && cpage.drawDomLevel.stage) {
                 cpage.drawDomLevel.stage.update();
@@ -45405,7 +45411,6 @@ var PaintRowLineStyle;
   PaintRowLineStyle[PaintRowLineStyle["dot"] = 4] = "dot";
 })(PaintRowLineStyle || (PaintRowLineStyle = {})); //绘制行线样式{实线,虚线,点划线,双点划线,点线}
 var PageProperty = /*#__PURE__*/function () {
-  //批注宽度(像素)
   function PageProperty(hoEditorFactoryID) {
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_classCallCheck_js__WEBPACK_IMPORTED_MODULE_3__/* ["default"] */ .Z)(this, PageProperty);
     //private static _instance: PageProperty;
@@ -45420,17 +45425,17 @@ var PageProperty = /*#__PURE__*/function () {
     //打印方向
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_5__/* ["default"] */ .Z)(this, "_isPaintBorder", false);
     // 是否绘制边框
-    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_5__/* ["default"] */ .Z)(this, "_borderColor", "#000000");
+    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_5__/* ["default"] */ .Z)(this, "_borderColor", '#000000');
     //边框颜色
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_5__/* ["default"] */ .Z)(this, "_paintRowLine", PaintRowLineStyle.solid);
     //绘制行线样式
-    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_5__/* ["default"] */ .Z)(this, "_pageSize", "A4");
+    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_5__/* ["default"] */ .Z)(this, "_pageSize", 'A4');
     //纸张大小
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_5__/* ["default"] */ .Z)(this, "_widthMm", 210);
     //页宽(毫米)
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_5__/* ["default"] */ .Z)(this, "_heightMm", 297);
     //页高(毫米)
-    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_5__/* ["default"] */ .Z)(this, "_source", "");
+    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_5__/* ["default"] */ .Z)(this, "_source", '');
     //来源
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_5__/* ["default"] */ .Z)(this, "_topMarginMm", 25);
     //页上边距(毫米)
@@ -45458,13 +45463,13 @@ var PageProperty = /*#__PURE__*/function () {
     // 监听画布宽高变化
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_5__/* ["default"] */ .Z)(this, "_canvasHeadFootPos", void 0);
     // 监听页眉页脚 Y 坐标
-    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_5__/* ["default"] */ .Z)(this, "_fontFormat", "宋体");
+    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_5__/* ["default"] */ .Z)(this, "_fontFormat", '宋体');
     //字体
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_5__/* ["default"] */ .Z)(this, "_fontSize", 14);
     //字号
-    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_5__/* ["default"] */ .Z)(this, "_fontColor", "#000000");
+    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_5__/* ["default"] */ .Z)(this, "_fontColor", '#000000');
     //字体颜色
-    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_5__/* ["default"] */ .Z)(this, "_backColor", "transparent");
+    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_5__/* ["default"] */ .Z)(this, "_backColor", 'transparent');
     //字体背景颜色
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_5__/* ["default"] */ .Z)(this, "_paraAlign", _domNode_Paragraph__WEBPACK_IMPORTED_MODULE_13__/* .Align */ .xM.alSpaceEqually);
     //段落对齐方式
@@ -45490,6 +45495,10 @@ var PageProperty = /*#__PURE__*/function () {
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_5__/* ["default"] */ .Z)(this, "_footerYPixes", void 0);
     //页脚距页边距(像素)
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_5__/* ["default"] */ .Z)(this, "_commentWidthPixes", void 0);
+    //批注宽度(像素)
+    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_5__/* ["default"] */ .Z)(this, "_drawLineUnderline", false);
+    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_5__/* ["default"] */ .Z)(this, "_lineUnderlineColor", '#000000');
+    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_5__/* ["default"] */ .Z)(this, "_lineUnderlineStyle", 0);
     this._hoEditorFactoryID = hoEditorFactoryID;
     this.mmConversionPx();
   }
@@ -45510,16 +45519,16 @@ var PageProperty = /*#__PURE__*/function () {
   }, {
     key: "setPageProperty",
     value: function setPageProperty(objectValues) {
-      if (objectValues !== "") {
-        var valuesObj = eval("(" + objectValues + ")");
+      if (objectValues !== '') {
+        var valuesObj = eval('(' + objectValues + ')');
         var assignvalue = function assignvalue(target, source) {
           Object.keys(source).forEach(function (value) {
-            if ((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_typeof_js__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z)(target[value]) == "object") {
-              if (Object.prototype.toString.call(source[value]) === "[object Object]") {
+            if ((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_typeof_js__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z)(target[value]) == 'object') {
+              if (Object.prototype.toString.call(source[value]) === '[object Object]') {
                 assignvalue(target[value], source[value]);
               } else {
-                if (source[value] !== "" && source[value] !== null) {
-                  assignvalue(target[value], eval("(" + source[value] + ")"));
+                if (source[value] !== '' && source[value] !== null) {
+                  assignvalue(target[value], eval('(' + source[value] + ')'));
                 }
               }
             } else target[value] = source[value];
@@ -45539,7 +45548,7 @@ var PageProperty = /*#__PURE__*/function () {
           while (1) switch (_context.prev = _context.next) {
             case 0:
               hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_11__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID);
-              if (type === "text") {
+              if (type === 'text') {
                 defaultStyle = new _domNode_TextStyle__WEBPACK_IMPORTED_MODULE_14__/* .CombineStyle */ .xc(this._hoEditorFactoryID);
                 _domNode_TextStyle__WEBPACK_IMPORTED_MODULE_14__/* .CombineStyle */ .xc.makeDefaultStyle(this._hoEditorFactoryID, defaultStyle);
                 hoEditorFactory.docTree._defaultCombineStyle = defaultStyle;
@@ -45547,7 +45556,7 @@ var PageProperty = /*#__PURE__*/function () {
                 hoEditorFactory.docTree.styles.splice(0, 1);
                 hoEditorFactory.docTree.styles.splice(0, 0, firstStyle);
               }
-              if (type === "para") {
+              if (type === 'para') {
                 hoEditorFactory.docTree._defaultCombineParagraph = new _domNode_Paragraph__WEBPACK_IMPORTED_MODULE_13__/* .CombineParagraph */ .kh(this._hoEditorFactoryID, null);
                 hoEditorFactory.docTree._defaultCombineParagraph.defaultCombineParagraph(hoEditorFactory.docTree._defaultCombineParagraph);
                 paragraph = new _domNode_Paragraph__WEBPACK_IMPORTED_MODULE_13__/* .Paragraph */ .nv(this._hoEditorFactoryID);
@@ -45607,6 +45616,36 @@ var PageProperty = /*#__PURE__*/function () {
         this._paintRowLine = value;
       }
     }
+  }, {
+    key: "drawLineUnderline",
+    get: function get() {
+      return this._drawLineUnderline;
+    },
+    set: function set(value) {
+      if (value !== this._drawLineUnderline) {
+        this._drawLineUnderline = value;
+      }
+    }
+  }, {
+    key: "lineUnderlineColor",
+    get: function get() {
+      return this._lineUnderlineColor;
+    },
+    set: function set(value) {
+      if (value !== this._lineUnderlineColor) {
+        this._lineUnderlineColor = value;
+      }
+    }
+  }, {
+    key: "lineUnderlineStyle",
+    get: function get() {
+      return this._lineUnderlineStyle;
+    },
+    set: function set(value) {
+      if (value !== this._lineUnderlineStyle) {
+        this._lineUnderlineStyle = value;
+      }
+    }
   }, {
     key: "pageSize",
     get: function get() {
@@ -45799,7 +45838,7 @@ var PageProperty = /*#__PURE__*/function () {
     set: function set(value) {
       if (value !== this._fontFormat) {
         this._fontFormat = value;
-        this.setDefaultStyle("text");
+        this.setDefaultStyle('text');
       }
     }
   }, {
@@ -45810,7 +45849,7 @@ var PageProperty = /*#__PURE__*/function () {
     set: function set(value) {
       if (value !== this._fontSize) {
         this._fontSize = value;
-        this.setDefaultStyle("text");
+        this.setDefaultStyle('text');
         var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_11__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID);
         var defaultLineHeight = Math.round(hoEditorFactory.getFontHeightByFontSize(this.fontSize));
         hoEditorFactory.defaultLineHeight = defaultLineHeight;
@@ -45824,7 +45863,7 @@ var PageProperty = /*#__PURE__*/function () {
     set: function set(value) {
       if (value !== this._fontColor) {
         this._fontColor = value;
-        this.setDefaultStyle("text");
+        this.setDefaultStyle('text');
       }
     }
   }, {
@@ -45835,7 +45874,7 @@ var PageProperty = /*#__PURE__*/function () {
     set: function set(value) {
       if (value !== this._backColor) {
         this._backColor = value;
-        this.setDefaultStyle("text");
+        this.setDefaultStyle('text');
       }
     }
   }, {
@@ -45846,7 +45885,7 @@ var PageProperty = /*#__PURE__*/function () {
     set: function set(value) {
       if (value !== this._paraAlign) {
         this._paraAlign = value;
-        this.setDefaultStyle("para");
+        this.setDefaultStyle('para');
       }
     }
   }, {
@@ -45857,7 +45896,7 @@ var PageProperty = /*#__PURE__*/function () {
     set: function set(value) {
       if (value !== this._charSpace) {
         this._charSpace = value;
-        this.setDefaultStyle("para");
+        this.setDefaultStyle('para');
       }
     }
   }, {
@@ -45868,7 +45907,7 @@ var PageProperty = /*#__PURE__*/function () {
     set: function set(value) {
       if (value !== this._lineHeight) {
         this._lineHeight = value;
-        this.setDefaultStyle("para");
+        this.setDefaultStyle('para');
       }
     }
   }, {
@@ -45949,7 +45988,7 @@ var PageProperty = /*#__PURE__*/function () {
   }], [{
     key: "whiteList",
     value: function whiteList() {
-      return ["printDirection", "borderColor", "isPaintBorder", "paintRowLine", "pageSize", "widthMm", "heightMm", "source", "topMarginMm", "bottomMarginMm", "leftMarginMm", "rightMarginMm", "headerYMm", "footerYMm", "showFirstPageHead", "showFirstPageFoot", "pageNumber", "isHaveBgImage", "commentWidthMm", "fontFormat", "fontSize", "fontColor", "backColor", "paraAlign", "charSpace", "lineHeight"];
+      return ['drawLineUnderline', 'lineUnderlineColor', 'lineUnderlineStyle', 'printDirection', 'borderColor', 'isPaintBorder', 'paintRowLine', 'pageSize', 'widthMm', 'heightMm', 'source', 'topMarginMm', 'bottomMarginMm', 'leftMarginMm', 'rightMarginMm', 'headerYMm', 'footerYMm', 'showFirstPageHead', 'showFirstPageFoot', 'pageNumber', 'isHaveBgImage', 'commentWidthMm', 'fontFormat', 'fontSize', 'fontColor', 'backColor', 'paraAlign', 'charSpace', 'lineHeight'];
     }
   }]);
   return PageProperty;
@@ -59004,9 +59043,10 @@ var RadioAndCheckBoxNode = /*#__PURE__*/function (_ControlNode) {
       //this.name,
       this.isSelected, this.boxAlign, this.numericValue, dHeight, cbStyle);
       this._drawNodes.push(dNode);
+      var dBoxWidth = dNode.dBoxWidth || dHeight;
       var dNodePrint = new _editor_draw_drawNode_DrawRadioAndCheckBoxPrint__WEBPACK_IMPORTED_MODULE_16__/* .DrawRadioAndCheckBoxPrint */ .w(this._hoEditorFactoryID, this._rootPath, this, 0, this.controlStyle,
       //this.name,
-      this.isSelected, this.boxAlign, this.numericValue, dHeight, cbStyle);
+      this.isSelected, this.boxAlign, this.numericValue, dHeight, cbStyle, dBoxWidth);
       this._drawNodes.push(dNodePrint);
     }
   }, {
@@ -61046,7 +61086,8 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
                     _this$getCellNumber2 = (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)(_this$getCellNumber, 2),
                     bret = _this$getCellNumber2[0],
                     value = _this$getCellNumber2[1];
-                  if (cell.cellProperty.downListProperty) {
+                  var downListProperty = cell.cellProperty.downListProperty;
+                  if (downListProperty) {
                     if (bret) {
                       //total+=value;
                       if (value !== "") {
@@ -61054,7 +61095,6 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
                       }
                     } else {
                       var cellText = cell.getCellText();
-                      var downListProperty = cell.cellProperty.downListProperty;
                       var listItems = JSON.parse(downListProperty.listItems);
                       if (listItems.length === undefined) {
                         listItems = Array(JSON.parse(downListProperty.listItems));
@@ -61111,6 +61151,7 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
   }, {
     key: "getCellNumber",
     value: function getCellNumber(tb, irow, icol) {
+      var _cell$getCellText;
       var ret = "";
       var bret = false;
       var cell = tb.rows[irow][icol];
@@ -61124,6 +61165,7 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
       // }
       //const strValue = cell.getCellText().replaceAll('\n', '').replaceAll(' ', '').replaceAll('\b', '').replaceAll('\r', '');
       var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_35__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID);
+      var cellText = ((_cell$getCellText = cell.getCellText()) === null || _cell$getCellText === void 0 ? void 0 : _cell$getCellText.replace(/\n/g, '')) || '';
       var strValue = hoEditorFactory.unitConvert.replaceAll(cell.getCellText(), '\n', '');
       //如果单元格存在下拉项,取值为下拉项的value，而非节点的text
       if (cell.cellProperty.downListProperty) {
@@ -61146,10 +61188,6 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
               }
             });
             strValue = String(value);
-            // strValue = itemObject.value
-            // if(strValue === ''){
-            //     strValue = itemObject.text
-            // }
           }
         }
         //针对单元格childNodes节点下嵌套的下拉选择处理
@@ -61182,6 +61220,9 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
           }
         }
       }
+      if (strValue == '' && !isNaN(Number(cellText))) {
+        strValue = cellText;
+      }
       strValue = hoEditorFactory.unitConvert.replaceAll(strValue, ' ', '');
       strValue = hoEditorFactory.unitConvert.replaceAll(strValue, '\b', '');
       strValue = hoEditorFactory.unitConvert.replaceAll(strValue, '\r', '');
@@ -70356,6 +70397,12 @@ var es_array_concat = __webpack_require__(92222);
 var es_array_splice = __webpack_require__(40561);
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.slice.js
 var es_array_slice = __webpack_require__(47042);
+// EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.includes.js
+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);
+// EXTERNAL MODULE: ./node_modules/core-js/modules/es.function.name.js
+var es_function_name = __webpack_require__(68309);
 // EXTERNAL MODULE: ./src/yuki-createjs/index.ts
 var yuki_createjs = __webpack_require__(38205);
 // EXTERNAL MODULE: ./src/editor/draw/drawNode/DrawContainer.ts
@@ -70448,6 +70495,8 @@ var TextInputFieldNode = __webpack_require__(65043);
 var DrawRadioAndCheckBox = __webpack_require__(88666);
 // EXTERNAL MODULE: ./src/editor/draw/drawNode/DrawRadioAndCheckBoxPrint.ts
 var DrawRadioAndCheckBoxPrint = __webpack_require__(91757);
+// EXTERNAL MODULE: ./src/editor/draw/drawNode/DrawPageCell.ts + 1 modules
+var DrawPageCell = __webpack_require__(59105);
 ;// CONCATENATED MODULE: ./src/editor/draw/DrawLine.ts
 
 
@@ -70470,6 +70519,10 @@ var DrawRadioAndCheckBoxPrint = __webpack_require__(91757);
 
 
 
+
+
+
+
 
 
 
@@ -70493,11 +70546,12 @@ var DrawLine = /*#__PURE__*/function (_DrawContainer) {
     (0,defineProperty/* default */.Z)((0,assertThisInitialized/* default */.Z)(_this), "_docHeight", void 0);
     (0,defineProperty/* default */.Z)((0,assertThisInitialized/* default */.Z)(_this), "_dBaseY", void 0);
     (0,defineProperty/* default */.Z)((0,assertThisInitialized/* default */.Z)(_this), "_maxFontHeight", void 0);
+    (0,defineProperty/* default */.Z)((0,assertThisInitialized/* default */.Z)(_this), "_underlineShape", void 0);
     _this._paragraphNode = node;
     var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(node.hoEditorFactoryID);
     _this._dWidth = width;
     _this._actualWidth = 0;
-    _this._dHeight = hoEditorFactory.defaultLineHeight;
+    // this._dHeight = hoEditorFactory.defaultLineHeight;
     var paraFontstyle = hoEditorFactory.docTree.styles[node.styleIndex];
     var size = paraFontstyle && paraFontstyle.size ? paraFontstyle.size : hoEditorFactory.docTree.defaultCombineStyle.size;
     _this._maxFontHeight = hoEditorFactory.getFontHeightByFontSize(size);
@@ -70688,9 +70742,7 @@ var DrawLine = /*#__PURE__*/function (_DrawContainer) {
       for (var i = 0; i < this._drawItems.length; i++) {
         var _dItem = this._drawItems[i];
         var dx = _dItem.x;
-        var dy = 0;
         var dWidth = _dItem.dWidth + this.charSpace;
-        var dBottom = this._dHeight;
         if (x >= dx && x <= dx + dWidth) {
           if (_dItem instanceof DrawTextNode/* DrawTextNode */.v) {
             if (_dItem.node instanceof TextNode/* TextNode */.R) {
@@ -70828,6 +70880,7 @@ var DrawLine = /*#__PURE__*/function (_DrawContainer) {
       this._charSpace = this._paragraphNode.combineParagraph.charSpace;
       this.dWidth = this._dWidth;
       this.dHeight = this._dHeight;
+      this.createdUnderline();
     }
   }, {
     key: "updateLineStyle",
@@ -70906,6 +70959,9 @@ var DrawLine = /*#__PURE__*/function (_DrawContainer) {
         this._dHeight = aHeight + this._maxFontHeight * (this.paragraphNode.combineParagraph.lineSpace - 1);
       }
       this.dHeight = this._dHeight;
+      if (this._underlineShape) {
+        this._underlineShape.y = this.dHeight + 1;
+      }
       var bottompos = dHeight + (this._dHeight - dHeight) / 2;
       for (var j = 0; j < this.drawItems.length; j++) {
         if (this.drawItems[j] instanceof DrawContainer/* DrawContainer */.H) {
@@ -70955,6 +71011,37 @@ var DrawLine = /*#__PURE__*/function (_DrawContainer) {
     get: function get() {
       return this._docHeight;
     }
+  }, {
+    key: "isInTable",
+    value: function isInTable() {
+      var _this$paragraphNode;
+      if (this.parent instanceof DrawPageCell/* DrawPageCell */.k || ((_this$paragraphNode = this.paragraphNode) === null || _this$paragraphNode === void 0 ? void 0 : _this$paragraphNode.parentNode) instanceof CellNode/* CellNode */.D) {
+        return true;
+      }
+      return false;
+    }
+  }, {
+    key: "createdUnderline",
+    value: function createdUnderline() {
+      var _this$paragraphNode2;
+      var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this._paragraphNode.hoEditorFactoryID);
+      var isDraw = hoEditorFactory.pageProperty.drawLineUnderline && !this._underlineShape && this.rootPath.includes('main') && !(this.parent instanceof DrawPageCell/* DrawPageCell */.k) && !(((_this$paragraphNode2 = this.paragraphNode) === null || _this$paragraphNode2 === void 0 ? void 0 : _this$paragraphNode2.parentNode) instanceof CellNode/* CellNode */.D);
+      // const isPrint = hoEditorFactory.drawTree.paintStatus == PaintState.psPreview || hoEditorFactory.drawTree.paintStatus == PaintState.psPrint;
+      if (isDraw) {
+        var shape = new createjs.Shape();
+        shape.graphics.clear();
+        var width = Math.max(this.actualWidth, this.dWidth);
+        if (hoEditorFactory.pageProperty.lineUnderlineStyle === 0) {
+          shape.graphics.beginFill(hoEditorFactory.pageProperty.lineUnderlineColor || '#000000').drawRect(0, 0, width, 1).endFill();
+        } else {
+          shape.graphics.beginStroke(hoEditorFactory.pageProperty.lineUnderlineColor || '#000000').setStrokeDash([2, 2]).moveTo(0, 0).lineTo(width, 1).endStroke();
+        }
+        shape.name = 'dline_underline';
+        shape.y = this.dHeight;
+        this._underlineShape = shape;
+        this.addChild(this._underlineShape);
+      }
+    }
   }], [{
     key: "inSameLine",
     value: function inSameLine(dobj1, dobj2) {
@@ -79029,6 +79116,7 @@ var DrawRadioAndCheckBox = /*#__PURE__*/function (_DrawCombineNode) {
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_5__/* ["default"] */ .Z)((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z)(_this), "_dAppendText", void 0);
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_5__/* ["default"] */ .Z)((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z)(_this), "_dUnderLine", void 0);
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_5__/* ["default"] */ .Z)((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z)(_this), "_charCount", void 0);
+    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_5__/* ["default"] */ .Z)((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z)(_this), "dBoxWidth", 0);
     _this._controlStyle = controlStyle;
     if (node.isTransToText) {
       _this._charCount = 1;
@@ -79063,6 +79151,7 @@ var DrawRadioAndCheckBox = /*#__PURE__*/function (_DrawCombineNode) {
     }
     var textWidth = _this._dText.getMeasuredWidth();
     var boxwidth = _this._dBox.getMeasuredWidth();
+    _this.dBoxWidth = boxwidth;
     _this.dWidth = textWidth + boxwidth + blockWidth;
     if (node.isEditText) {
       var underLineLen = 40;
@@ -79076,10 +79165,6 @@ var DrawRadioAndCheckBox = /*#__PURE__*/function (_DrawCombineNode) {
     }
     _this.dHeight = height;
     _this._textStyle = textStyle;
-    // this._border = new createjs.Shape();
-    // this._border.graphics.beginFill("red").drawRect(0, 0, this.dWidth, this.dHeight);
-    // this._border.y = - this.dHeight;
-    //this._mouseOverShape = new createjs.Shape();
     _this.drawRadioAndCheckBox();
     return _this;
   }
@@ -79140,14 +79225,6 @@ var DrawRadioAndCheckBox = /*#__PURE__*/function (_DrawCombineNode) {
     key: "drawRadioAndCheckBox",
     value: function drawRadioAndCheckBox() {
       this.clear();
-      // const backColor = new createjs.Shape();
-      // backColor.graphics.clear();
-      // backColor.graphics
-      //   .beginFill("#ADD8E6")
-      //   .drawRect(0, 0, this.dWidth, -this.dHeight);
-      // backColor.alpha = 0.01;
-      // backColor.name = "backColor";
-      // this.addChildAt(backColor, 0);
       if (this.boxAlign) {
         this.drawBox();
         if (!this.node.isTransToText && this.text.length > 0) {
@@ -79279,9 +79356,10 @@ var DrawRadioAndCheckBox = /*#__PURE__*/function (_DrawCombineNode) {
 var DrawRadioAndCheckBoxPrint = /*#__PURE__*/function (_DrawCombineNode) {
   (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_inherits_js__WEBPACK_IMPORTED_MODULE_3__/* ["default"] */ .Z)(DrawRadioAndCheckBoxPrint, _DrawCombineNode);
   var _super = (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createSuper_js__WEBPACK_IMPORTED_MODULE_4__/* ["default"] */ .Z)(DrawRadioAndCheckBoxPrint);
+  //   public dBoxWidth: number = 0;
   function DrawRadioAndCheckBoxPrint(hoeditfactoryID, rootPath, node, index, controlStyle,
   //name: string,
-  isSelected, boxAlign, numericValue, height, textStyle) {
+  isSelected, boxAlign, numericValue, height, textStyle, dBoxWidth) {
     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, DrawRadioAndCheckBoxPrint);
     _this = _super.call(this, hoeditfactoryID, rootPath, node, index);
@@ -79317,12 +79395,12 @@ var DrawRadioAndCheckBoxPrint = /*#__PURE__*/function (_DrawCombineNode) {
       _this._dBox.graphics.clear().setStrokeStyle(1, 'round', 'round').beginStroke("#000").drawCircle((height - 2) / 2, -height / 2 + 2, (height - 2) / 2).endStroke();
     }
     var textWidth = _this._dText.getMeasuredWidth();
-    var boxwidth = height;
     var blockWidth = 0;
     if (_this.text !== "") {
       blockWidth = 6;
     }
-    _this.dWidth = textWidth + boxwidth + blockWidth;
+    // this.dBoxWidth = dBoxWidth;
+    _this.dWidth = textWidth + dBoxWidth + blockWidth;
     if (node.isEditText) {
       var underLineLen = 40;
       if (node.appendText.length > 0) {
@@ -79415,54 +79493,57 @@ var DrawRadioAndCheckBoxPrint = /*#__PURE__*/function (_DrawCombineNode) {
     value: function drawBox() {
       var drawBox;
       drawBox = new createjs.Shape();
+      var textWidth = this._dText.getMeasuredWidth();
+      var x = 0;
+      if (this.boxAlign) {
+        // if(this.controlStyle === "CheckBox"){
+        //     x = Math.max(1, this.dBoxWidth - this.dHeight);
+        // } else {
+        x = 1;
+        // }
+      } else {
+        x = textWidth;
+      }
       if (this.controlStyle === "CheckBox") {
         //复选框
         if (this.isSelected) {
           drawBox.graphics.clear().beginStroke(this._textStyle.color).drawRect(0, -this.dHeight + 2, this.dHeight - 2, this.dHeight - 2).endStroke();
-          this.addChild(drawBox);
           var line1 = new createjs.Shape();
           var line2 = new createjs.Shape();
           if (this.boxAlign) {
             line1.graphics.beginStroke(this._textStyle.color).moveTo(3, -this.dHeight / 2 + 2).lineTo(this.dHeight / 2 - 1, -2).endStroke();
-            this.addChild(line1);
             line2.graphics.beginStroke(this._textStyle.color).moveTo(this.dHeight / 2 - 1, -2).lineTo(this.dHeight - 3, -this.dHeight + 4).endStroke();
-            this.addChild(line2);
+            line1.x = x;
+            line2.x = x;
           } else {
-            var textWidth = this._dText.getMeasuredWidth();
             line1.graphics.beginStroke(this._textStyle.color).moveTo(3 + textWidth, -this.dHeight / 2 + 2).lineTo(this.dHeight / 2 - 1 + textWidth, -2).endStroke();
-            this.addChild(line1);
             line2.graphics.beginStroke(this._textStyle.color).moveTo(this.dHeight / 2 - 1 + textWidth, -2).lineTo(this.dHeight - 3 + textWidth, -this.dHeight + 4).endStroke();
-            this.addChild(line2);
           }
+          this.addChild(line1);
+          this.addChild(line2);
         } else {
           drawBox.graphics.clear().beginStroke(this._textStyle.color).drawRect(0, -this.dHeight + 2, this.dHeight - 2, this.dHeight - 2).endStroke();
-          this.addChild(drawBox);
         }
       } else {
         //单选框
         if (this.isSelected) {
           drawBox.graphics.clear().setStrokeStyle(1, 'round', 'round').beginStroke(this._textStyle.color).drawCircle((this.dHeight - 2) / 2, -this.dHeight / 2 + 2, (this.dHeight - 2) / 2).endStroke();
-          this.addChild(drawBox);
           var dot = new createjs.Shape();
           if (this.boxAlign) {
-            dot.graphics.clear().beginStroke(this._textStyle.color).beginFill(this._textStyle.color).drawCircle((this.dHeight - 2) / 2 + 1, -this.dHeight / 2 + 2, 1).endStroke();
+            dot.graphics.clear().beginStroke(this._textStyle.color).beginFill(this._textStyle.color).drawCircle((this.dHeight - 2) / 2 + x, -this.dHeight / 2 + 2, 1).endStroke();
             this.addChild(dot);
           } else {
-            dot.graphics.clear().beginStroke(this._textStyle.color).beginFill(this._textStyle.color).drawCircle((this.dHeight - 2) / 2 + this._dText.getMeasuredWidth(), -this.dHeight / 2 + 2, 1).endStroke();
+            dot.graphics.clear().beginStroke(this._textStyle.color).beginFill(this._textStyle.color).drawCircle((this.dHeight - 2) / 2 + textWidth, -this.dHeight / 2 + 2, 1).endStroke();
             this.addChild(dot);
           }
         } else {
           drawBox.graphics.clear().setStrokeStyle(1, 'round', 'round').beginStroke(this._textStyle.color).drawCircle((this.dHeight - 2) / 2, -this.dHeight / 2 + 2, (this.dHeight - 2) / 2).endStroke();
-          this.addChild(drawBox);
         }
       }
       drawBox.name = "box";
-      if (this.boxAlign) {
-        drawBox.x = 1;
-      } else {
-        drawBox.x = this._dText.getMeasuredWidth();
-      }
+      drawBox.x = x;
       drawBox.y = this.y;
+      this.addChild(drawBox);
     }
   }, {
     key: "drawText",
@@ -84032,6 +84113,8 @@ var PageProperty = __webpack_require__(65847);
 
 
 
+
+
 var DrawPage = /*#__PURE__*/function () {
   function DrawPage(hoeditorfacotryID, index //,
   //doc: DocTree,
@@ -84400,21 +84483,11 @@ var DrawPage = /*#__PURE__*/function () {
         return (0,regeneratorRuntime/* default */.Z)().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
-              // const isHaveBgImage = HOEditorFactorys.instance().getFactory(this._hoEditorFactoryID).pageProperty.isHaveBgImage;
-              // if (!isHaveBgImage) {
               //TODO:如果没有设置背景或者背景为空时绘制白色背景
               if (!this._background) this._background = new createjs.Shape();
               hoEditorFactory = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this._hoEditorFactoryID);
               this._background.graphics.clear();
-              backColor = hoEditorFactory.drawTree.paintStatus === PaintState.psPreview ? '#FFFFFF' : '#FFFFFF'; // this._background.graphics
-              //   .beginFill(backColor)
-              //   .drawRect(
-              //     0,
-              //     0,
-              //     hoEditorFactory.pageProperty.widthPixes,
-              //     hoEditorFactory.pageProperty.heightPixes
-              //   )
-              //   .closePath();
+              backColor = hoEditorFactory.drawTree.paintStatus === PaintState.psPreview ? '#FFFFFF' : '#FFFFFF';
               this._background.graphics.beginFill(backColor).drawRect(0, 0, hoEditorFactory.pageProperty.canvasParams.width, hoEditorFactory.pageProperty.canvasParams.height).closePath();
               if (this._domLevel && this._domLevel.stage) {
                 this.drawDocContainer.addChildAt(this._background, 0);
@@ -84430,6 +84503,20 @@ var DrawPage = /*#__PURE__*/function () {
       }
       return paintBackGround;
     }()
+  }, {
+    key: "paintChild",
+    value: function paintChild(paintStatus) {
+      var dline = this.drawMainDoc.children[this.drawMainDoc.children.length - 1];
+      if (dline instanceof DrawLine/* DrawLine */.a) {
+        if (dline.children.length == 1 && dline.children[0].name == 'dline_underline') {
+          if (paintStatus === PaintState.psPreview || paintStatus === PaintState.psPrint) {
+            dline.children[0].alpha = 0;
+          } else {
+            dline.children[0].alpha = 1;
+          }
+        }
+      }
+    }
   }, {
     key: "removeBackGroud",
     value: function removeBackGroud() {
@@ -85558,6 +85645,10 @@ var DrawTree = /*#__PURE__*/function () {
           _aCell$table$getCellI2 = (0,slicedToArray/* default */.Z)(_aCell$table$getCellI, 2),
           r = _aCell$table$getCellI2[0],
           c = _aCell$table$getCellI2[1];
+        if (!aCell.table.rowInfos[r + aCell.rowSpan - 1]) {
+          console.warn("行信息不存在", r, c);
+          return null;
+        }
         if (r >= 0) {
           var rowPorperty = aCell.table.rowInfos[r + aCell.rowSpan - 1].rowProperty;
           if (rowPorperty.rowHeight > 0 && rowPorperty.isLockRowHeight) {
@@ -87228,13 +87319,9 @@ var DrawTree = /*#__PURE__*/function () {
     value: function getStagePosition(dPage, dPlace, x, y) {
       var hoeditfactory = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this._hoEditorFactoryID);
       if (dPage.drawDomLevel) {
-        // const dPlace = dPage.drawDomLevel.activeDrawRect;
-        // console.log("x:" + x + ";y:" + y);
-        var stage = dPage.drawDomLevel.stage;
         //转换为区域坐标
         var pt = dPlace.globalToLocal(x, y);
         var aPage = dPage;
-        // const dItems = dPlace.drawLines;
         //处理跨页空单元格
         if (dPlace instanceof DrawPageCell/* DrawPageCell */.k && dPlace.isEmpty()) {
           var aPrevPlace;
@@ -87265,11 +87352,6 @@ var DrawTree = /*#__PURE__*/function () {
             }
           }
         }
-        // if (dPlace instanceof DrawCell) {
-        //   dItems = (dPlace as DrawCell).drawLxines;
-        // } else {
-        //   dItems = dPlace.children;
-        // }
         var dLine = dPlace.getDlineByPos(dPlace.children, pt.x, pt.y);
         if (!dLine) {
           return null;
@@ -87279,8 +87361,6 @@ var DrawTree = /*#__PURE__*/function () {
           var aPlace = dLine.getDrawPageCellByPos(newPt.x, newPt.y);
           return this.getStagePosition(dPage, aPlace, x, y);
         }
-        var dNode;
-        var node;
         var linePt = dLine.globalToLocal(x, y);
         var index;
         if (pt.y > dLine.y + dLine.dHeight + dLine.paragraphNode.combineParagraph.lineSpace) {
@@ -208365,14 +208445,17 @@ var DrawDomLevel = /*#__PURE__*/function () {
   }, {
     key: "bindStage",
     value: function bindStage(isPrint) {
+      var hoeditorfactory = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this._hoEditorFactoryID);
+      var dPage = hoeditorfactory.drawTree.drawPages[this._pageIndex];
+      if (this._pageIndex == hoeditorfactory.drawTree.drawPages.length - 1) {
+        dPage.paintChild(hoeditorfactory.drawTree.paintStatus);
+      }
       if (!this._domStage) {
-        var hoeditorfactory = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this._hoEditorFactoryID);
         this._domCanvas.width = hoeditorfactory.pageProperty.canvasParams.width;
         this._domCanvas.height = hoeditorfactory.pageProperty.canvasParams.height;
         this._domStage = new createjs.Stage(this._domCanvas);
         this._domStage.scaleX = DrawConfig/* DrawConfig */.f.instance().scale;
         this._domStage.scaleY = DrawConfig/* DrawConfig */.f.instance().scale;
-        var dPage = hoeditorfactory.drawTree.drawPages[this._pageIndex];
         var keys = (0,esm_toConsumableArray/* default */.Z)(hoeditorfactory.drawPageTree.needUpdateMainDocInfo.keys()).sort(function (a, b) {
           if (a > b) {
             return 1;
@@ -208396,21 +208479,12 @@ var DrawDomLevel = /*#__PURE__*/function () {
         hoeditorfactory.subDocManger.repaintPageMarkNodes(dPage.drawHeader, SubDocManger/* HeaderFooterType */.pi.hftHead);
         hoeditorfactory.subDocManger.paintSubDoc(dPage.pageIndex, SubDocManger/* HeaderFooterType */.pi.hftFoot);
         hoeditorfactory.subDocManger.repaintPageMarkNodes(dPage.drawFooter, SubDocManger/* HeaderFooterType */.pi.hftFoot);
-        // dPage.drawDocContainer.addChild(dPage.drawHeader);
         dPage.drawHeader.x = hoeditorfactory.pageProperty.leftMarginPixes;
-        // dPage.drawHeader.y = hoeditorfactory.pageProperty.headerYPixes;
-        // // this._domStage.addChildAt(this._drawMainDoc, 0);
         dPage.drawMainDoc.x = hoeditorfactory.pageProperty.leftMarginPixes;
-        // dPage.drawMainDoc.y = this._mainDocTop; // HOEditorFactorys.instance().getFactory(this._hoEditorFactoryID).pageProperty.topMarginPixes +
-        // HOEditorFactorys.instance().getFactory(this._hoEditorFactoryID).pageProperty.headerYPixes;
-        // dPage.drawDocContainer.addChild(dPage.drawFooter);
         dPage.drawFooter.x = hoeditorfactory.pageProperty.leftMarginPixes;
-        // dPage.drawFooter.y =
-        //   hoeditorfactory.pageProperty.heightPixes -
-        //   hoeditorfactory.pageProperty.bottomMarginPixes;
         dPage.drawDocContainer.addChild(dPage.drawMainDoc);
-      } else {
-        if (isPrint) this._domStage.update();
+      } else if (isPrint) {
+        this._domStage.update();
       }
     }
   }, {
@@ -210502,7 +210576,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.160');
+/* harmony default export */ var version = ('3.1.162');
 // EXTERNAL MODULE: ./src/components/controls/poperTipText/PoperTipText.vue + 5 modules
 var PoperTipText = __webpack_require__(84531);
 ;// CONCATENATED MODULE: ./src/components/controls/poperTipText/index.ts
@@ -216025,6 +216099,9 @@ var StructureConvert = /*#__PURE__*/function () {
         pageProperty.paraAlign = pageSettings.paraAlign ? Number(pageSettings.paraAlign) : 3;
         pageProperty.charSpace = pageSettings.charSpace ? Number(pageSettings.charSpace) : 0;
         pageProperty.lineHeight = pageSettings.lineHeight ? Number(pageSettings.lineHeight) : 1.25;
+        pageProperty.drawLineUnderline = pageSettings.drawLineUnderline === "true" ? true : false;
+        pageProperty.lineUnderlineColor = pageSettings.lineUnderlineColor || '#000000';
+        pageProperty.lineUnderlineStyle = pageSettings.lineUnderlineStyle == 1 ? 1 : 0;
         //  hoEditorFactory.pageProperty = pageProperty;
       }
 
@@ -220936,12 +221013,14 @@ var VueController = /*#__PURE__*/function () {
       var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this._hoEditorFactoryID);
       var scaleXY = DrawConfig/* DrawConfig */.f.instance().scale;
       var drawPage = hoEditorFactory.drawTree.drawPages[pageIndex];
-      for (var j = 0; j < drawPage.selectContainer.children.length; j++) {
-        var child = drawPage.selectContainer.children[j];
-        if (child.name && child.name.includes("mask")) {
-          var bounds = child.getBounds();
-          if (stageY > bounds.y * scaleXY && stageY < bounds.y * scaleXY + bounds.height * scaleXY) {
-            return false;
+      if (drawPage) {
+        for (var j = 0; j < drawPage.selectContainer.children.length; j++) {
+          var child = drawPage.selectContainer.children[j];
+          if (child.name && child.name.includes("mask")) {
+            var bounds = child.getBounds();
+            if (stageY > bounds.y * scaleXY && stageY < bounds.y * scaleXY + bounds.height * scaleXY) {
+              return false;
+            }
           }
         }
       }
@@ -239649,7 +239728,7 @@ var localforage_default = /*#__PURE__*/__webpack_require__.n(localforage);
 var HoLocalStorage = /*#__PURE__*/function () {
   // 增加页面刷新时缓存未保存的病历数据
   function HoLocalStorage(hoEditorFactoryID) {
-    var _window;
+    var _this$getChromeWebvie;
     (0,esm_classCallCheck/* default */.Z)(this, HoLocalStorage);
     (0,esm_defineProperty/* default */.Z)(this, "_hoEditorFactoryID", void 0);
     (0,esm_defineProperty/* default */.Z)(this, "_key", void 0);
@@ -239693,7 +239772,7 @@ var HoLocalStorage = /*#__PURE__*/function () {
     // 	name: "_ho_web",
     // 	storeName: this._storeName,
     // });
-    (_window = window) === null || _window === void 0 || (_window = _window.chrome) === null || _window === void 0 || (_window = _window.webview) === null || _window === void 0 ? void 0 : _window.addEventListener('message', function (e) {
+    (_this$getChromeWebvie = this.getChromeWebview()) === null || _this$getChromeWebvie === void 0 ? void 0 : _this$getChromeWebvie.addEventListener('message', function (e) {
       if (e && e.data) {
         var res = JSON.parse(e.data);
         // console.log('res-----', res);
@@ -239717,10 +239796,25 @@ var HoLocalStorage = /*#__PURE__*/function () {
       }
     });
   }
-  // set ho_web(value: any) {
-  //     this._ho_web = value;
-  // }
   (0,esm_createClass/* default */.Z)(HoLocalStorage, [{
+    key: "getChromeWebview",
+    value: function getChromeWebview() {
+      var _chromes;
+      var chromes;
+      try {
+        if (window.top) {
+          chromes = window.top.chrome;
+        }
+      } catch (error) {
+        console.error(error);
+        chromes = undefined;
+      }
+      return (_chromes = chromes) === null || _chromes === void 0 ? void 0 : _chromes.webview;
+    }
+    // set ho_web(value: any) {
+    //     this._ho_web = value;
+    // }
+  }, {
     key: "initHoWebSql",
     value: function initHoWebSql() {
       localforage_default().config({
@@ -239752,7 +239846,7 @@ var HoLocalStorage = /*#__PURE__*/function () {
   }, {
     key: "getLocalXmlList",
     value: function getLocalXmlList(callBack) {
-      var _window2;
+      var _this$getChromeWebvie2;
       this.callBack = callBack;
       var hoEditfactory = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this._hoEditorFactoryID);
       var data = {
@@ -239765,7 +239859,7 @@ var HoLocalStorage = /*#__PURE__*/function () {
           }
         }
       };
-      (_window2 = window) === null || _window2 === void 0 || (_window2 = _window2.chrome) === null || _window2 === void 0 || (_window2 = _window2.webview) === null || _window2 === void 0 ? void 0 : _window2.postMessage(data);
+      (_this$getChromeWebvie2 = this.getChromeWebview()) === null || _this$getChromeWebvie2 === void 0 ? void 0 : _this$getChromeWebvie2.postMessage(data);
     }
     // 获取key的数据 => { data, keyInfo }
   }, {
@@ -239779,7 +239873,7 @@ var HoLocalStorage = /*#__PURE__*/function () {
   }, {
     key: "loadLocalXml",
     value: function loadLocalXml(item, callBack) {
-      var _window3;
+      var _this$getChromeWebvie3;
       this.callBackForLoad = callBack;
       var data = {
         exec: 'emr',
@@ -239791,7 +239885,7 @@ var HoLocalStorage = /*#__PURE__*/function () {
           }
         }
       };
-      (_window3 = window) === null || _window3 === void 0 || (_window3 = _window3.chrome) === null || _window3 === void 0 || (_window3 = _window3.webview) === null || _window3 === void 0 ? void 0 : _window3.postMessage(data);
+      (_this$getChromeWebvie3 = this.getChromeWebview()) === null || _this$getChromeWebvie3 === void 0 ? void 0 : _this$getChromeWebvie3.postMessage(data);
     }
   }, {
     key: "removeLocalStorage",
@@ -239822,18 +239916,19 @@ var HoLocalStorage = /*#__PURE__*/function () {
   }, {
     key: "autoSaveLocalStorage",
     value: function autoSaveLocalStorage() {
-      var _window4,
+      var _this$getChromeWebvie4,
         _this4 = this;
       if (this._lastSaveTime && new Date().getTime() - this._lastSaveTime <= this._intervalsTime) {
         return;
       }
-      var HoBrowser = (_window4 = window) === null || _window4 === void 0 || (_window4 = _window4.chrome) === null || _window4 === void 0 ? void 0 : _window4.webview;
+      var HoBrowser = (_this$getChromeWebvie4 = this.getChromeWebview()) === null || _this$getChromeWebvie4 === void 0 ? void 0 : _this$getChromeWebvie4.webview;
       var saveTime = (0,plugins_util/* dateFormat */.vc)(new Date());
       var hoEditfactory = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this._hoEditorFactoryID);
       this._key = hoEditfactory.userInfo.id + hoEditfactory.docTree.docProperty.patientID + hoEditfactory.docTree.docProperty.title;
       if (HoBrowser) {
         this._lastSaveTime = new Date(saveTime).getTime();
         if (hoEditfactory && hoEditfactory.vueController.isModifyDoc()) {
+          var _this$getChromeWebvie5;
           var data = {
             exec: 'emr',
             data: {
@@ -239846,7 +239941,7 @@ var HoLocalStorage = /*#__PURE__*/function () {
             }
           };
           // console.log('SaveEmrData', data);
-          window.chrome.webview.postMessage(data);
+          (_this$getChromeWebvie5 = this.getChromeWebview()) === null || _this$getChromeWebvie5 === void 0 ? void 0 : _this$getChromeWebvie5.postMessage(data);
         }
       } else if (this._networkConnectionStatus) {
         // 网络连接正常情况下正常缓存
@@ -243740,8 +243835,8 @@ var UpdateDocument_component = (0,componentNormalizer/* default */.Z)(
 )
 
 /* harmony default export */ var UpdateDocument = (UpdateDocument_component.exports);
-;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/toolbar/PageSetting.vue?vue&type=template&id=4294664e&
-var PageSettingvue_type_template_id_4294664e_render = function render() {
+;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/toolbar/PageSetting.vue?vue&type=template&id=077d9a5e&
+var PageSettingvue_type_template_id_077d9a5e_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -243787,7 +243882,11 @@ var PageSettingvue_type_template_id_4294664e_render = function render() {
     staticStyle: {
       "margin": "0 10px 10px 10px"
     }
-  }, [_c('legend', [_vm._v("页边距    毫米")]), _c('ul', {
+  }, [_c('legend', {
+    staticStyle: {
+      "width": "81px"
+    }
+  }, [_vm._v("页边距    毫米")]), _c('ul', {
     staticClass: "page-spacing"
   }, [_c('li', {
     staticClass: "page-spacing-item",
@@ -243819,7 +243918,7 @@ var PageSettingvue_type_template_id_4294664e_render = function render() {
     staticClass: "page-spacing-form"
   }, [_c('span', {
     staticClass: "labels"
-  }, [_vm._v("左(L)")]), _c('a-input-number', {
+  }, [_vm._v("下(B)")]), _c('a-input-number', {
     staticStyle: {
       "text-align": "left"
     },
@@ -243830,22 +243929,17 @@ var PageSettingvue_type_template_id_4294664e_render = function render() {
       "min": 0
     },
     model: {
-      value: _vm.property.leftMarginMm,
+      value: _vm.property.bottomMarginMm,
       callback: function callback($$v) {
-        _vm.$set(_vm.property, "leftMarginMm", $$v);
+        _vm.$set(_vm.property, "bottomMarginMm", $$v);
       },
-      expression: "property.leftMarginMm"
-    }
-  })], 1)]), _c('li', {
-    staticClass: "page-spacing-item",
-    staticStyle: {
-      "justify-content": "space-between"
+      expression: "property.bottomMarginMm"
     }
-  }, [_c('div', {
+  })], 1), _c('div', {
     staticClass: "page-spacing-form"
   }, [_c('span', {
     staticClass: "labels"
-  }, [_vm._v("下(B)")]), _c('a-input-number', {
+  }, [_vm._v("左(L)")]), _c('a-input-number', {
     staticStyle: {
       "text-align": "left"
     },
@@ -243856,11 +243950,11 @@ var PageSettingvue_type_template_id_4294664e_render = function render() {
       "min": 0
     },
     model: {
-      value: _vm.property.bottomMarginMm,
+      value: _vm.property.leftMarginMm,
       callback: function callback($$v) {
-        _vm.$set(_vm.property, "bottomMarginMm", $$v);
+        _vm.$set(_vm.property, "leftMarginMm", $$v);
       },
-      expression: "property.bottomMarginMm"
+      expression: "property.leftMarginMm"
     }
   })], 1), _c('div', {
     staticClass: "page-spacing-form"
@@ -243887,7 +243981,11 @@ var PageSettingvue_type_template_id_4294664e_render = function render() {
     staticClass: "print-settings"
   }, [_c('fieldset', {
     staticClass: "fieldset print-direction-item"
-  }, [_c('legend', [_vm._v("打印方向")]), _c('div', {
+  }, [_c('legend', {
+    staticStyle: {
+      "width": "50px"
+    }
+  }, [_vm._v("打印方向")]), _c('div', {
     class: _vm.property.printDirection === 0 ? 'print-direction is-actived' : 'print-direction',
     on: {
       "click": function click($event) {
@@ -243937,7 +244035,8 @@ var PageSettingvue_type_template_id_4294664e_render = function render() {
     staticClass: "control-item",
     staticStyle: {
       "padding": "0",
-      "margin-left": "10px"
+      "margin-left": "10px",
+      "justify-content": "space-between"
     }
   }, [_c('fieldset', {
     staticClass: "fieldset",
@@ -243946,7 +244045,11 @@ var PageSettingvue_type_template_id_4294664e_render = function render() {
       "padding": "0 10px",
       "margin": "0"
     }
-  }, [_c('legend', [_vm._v("纸张    毫米")]), _c('ul', {
+  }, [_c('legend', {
+    staticStyle: {
+      "width": "64px"
+    }
+  }, [_vm._v("纸张    毫米")]), _c('ul', {
     staticClass: "control-list"
   }, [_c('li', {
     staticClass: "control-item"
@@ -244040,7 +244143,11 @@ var PageSettingvue_type_template_id_4294664e_render = function render() {
       "width": "250px",
       "padding": "0 10px 10px"
     }
-  }, [_c('legend', [_vm._v("边框")]), _c('div', {
+  }, [_c('legend', {
+    staticStyle: {
+      "width": "28px"
+    }
+  }, [_vm._v("边框")]), _c('div', {
     staticClass: "control-item"
   }, [_c('a-checkbox', {
     model: {
@@ -244069,11 +244176,55 @@ var PageSettingvue_type_template_id_4294664e_render = function render() {
     attrs: {
       "labelWidth": "64px",
       "defaultStyle": _vm.property.paintRowLine,
-      "placeholder": "绘制行线"
+      "placeholder": "边框样式"
     },
     on: {
       "change": _vm.printStyleChange
     }
+  })], 1), _c('fieldset', {
+    staticClass: "fieldset",
+    staticStyle: {
+      "width": "250px",
+      "padding": "0 10px 10px"
+    }
+  }, [_c('legend', {
+    staticStyle: {
+      "width": "28px"
+    }
+  }, [_vm._v("行线")]), _c('div', {
+    staticClass: "control-item"
+  }, [_c('a-checkbox', {
+    model: {
+      value: _vm.property.drawLineUnderline,
+      callback: function callback($$v) {
+        _vm.$set(_vm.property, "drawLineUnderline", $$v);
+      },
+      expression: "property.drawLineUnderline"
+    }
+  }, [_vm._v("绘制行线")])], 1), _c('div', {
+    staticClass: "control-item"
+  }, [_c('span', {
+    staticClass: "label",
+    staticStyle: {
+      "width": "64px"
+    }
+  }, [_vm._v("线条颜色")]), _c('ho-color-picker', {
+    model: {
+      value: _vm.property.lineUnderlineColor,
+      callback: function callback($$v) {
+        _vm.$set(_vm.property, "lineUnderlineColor", $$v);
+      },
+      expression: "property.lineUnderlineColor"
+    }
+  })], 1), _c('PrintLineStyle', {
+    attrs: {
+      "labelWidth": "64px",
+      "defaultStyle": _vm.property.lineUnderlineStyle,
+      "placeholder": "线条样式"
+    },
+    on: {
+      "change": _vm.underlineStyleChange
+    }
   })], 1)])])])]), _c('a-tab-pane', {
     key: "second",
     attrs: {
@@ -244084,7 +244235,11 @@ var PageSettingvue_type_template_id_4294664e_render = function render() {
     staticStyle: {
       "padding": "0 10px 10px"
     }
-  }, [_c('legend', [_vm._v("页眉    毫米")]), _c('div', {
+  }, [_c('legend', {
+    staticStyle: {
+      "width": "72px"
+    }
+  }, [_vm._v("页眉    毫米")]), _c('div', {
     staticClass: "control-item"
   }, [_vm._v("距页边界：")]), _c('div', {
     staticClass: "control-item"
@@ -244130,7 +244285,11 @@ var PageSettingvue_type_template_id_4294664e_render = function render() {
     staticStyle: {
       "padding": "0 10px 10px"
     }
-  }, [_c('legend', [_vm._v("页脚    毫米")]), _c('div', {
+  }, [_c('legend', {
+    staticStyle: {
+      "width": "72px"
+    }
+  }, [_vm._v("页脚    毫米")]), _c('div', {
     staticClass: "control-item"
   }, [_vm._v("距页边界：")]), _c('div', {
     staticClass: "control-item"
@@ -244176,7 +244335,11 @@ var PageSettingvue_type_template_id_4294664e_render = function render() {
     staticStyle: {
       "padding": "0 10px 10px"
     }
-  }, [_c('legend', [_vm._v("页数")]), _c('div', {
+  }, [_c('legend', {
+    staticStyle: {
+      "width": "28px"
+    }
+  }, [_vm._v("页数")]), _c('div', {
     staticClass: "control-item"
   }, [_c('span', {
     staticClass: "label",
@@ -244217,7 +244380,7 @@ var PageSettingvue_type_template_id_4294664e_render = function render() {
     }
   }, [_vm._v("取消")])], 1)])]);
 };
-var PageSettingvue_type_template_id_4294664e_staticRenderFns = [];
+var PageSettingvue_type_template_id_077d9a5e_staticRenderFns = [];
 
 // EXTERNAL MODULE: ./src/components/mixins/appendToBody.ts
 var appendToBody = __webpack_require__(95677);
@@ -244258,7 +244421,7 @@ var HoColorPicker = __webpack_require__(10306);
       alignList: ['left', 'both', 'right', 'both'],
       lineHeightList: [1.25, 1.5, 2, 2.5, 3],
       fontSpacingList: [0, 1, 2, 3],
-      paperStyle: [['自定义', [210, 297]], ['A3', [297, 420]], ['A4', [210, 297]], ['A5', [148, 210]], ['A6', [105, 148]], ['B4', [250, 353]], ['B5', [176, 250]], ['B6', [125, 176]], ['16K', [195, 270]], ['16K', [185, 265]]],
+      paperStyle: [['自定义', [210, 297]], ['A3', [297, 420]], ['A4', [210, 297]], ['A5', [148, 210]], ['A6', [105, 148]], ['B4', [250, 353]], ['B5', [176, 250]], ['B6', [125, 176]], ['16K', [195, 270]], ['16K-1', [185, 265]]],
       property: {
         pageSize: 'A4',
         source: '0',
@@ -244276,8 +244439,7 @@ var HoColorPicker = __webpack_require__(10306);
         pageNumber: 1,
         borderColor: '#FFFFFF',
         paintRowLine: 0,
-        isPaintBorder: false
-
+        isPaintBorder: false,
         // fontFormat: "微软雅黑",
         // fontSize: 14,
         // fontColor: "#000000",
@@ -244286,8 +244448,11 @@ var HoColorPicker = __webpack_require__(10306);
         // paraAlign: 3,
         // charSpace: 1,
         // lineHeight: 1.25,
-      },
 
+        drawLineUnderline: false,
+        lineUnderlineColor: '#000000',
+        lineUnderlineStyle: 0
+      },
       textActiveName: 'first',
       backFile: null,
       backImgUrl: '',
@@ -244341,6 +244506,9 @@ var HoColorPicker = __webpack_require__(10306);
     printStyleChange: function printStyleChange(style) {
       this.property.paintRowLine = style;
     },
+    underlineStyleChange: function underlineStyleChange(style) {
+      this.property.lineUnderlineStyle = style;
+    },
     handleClose: function handleClose() {
       this.$emit('closePageSetting', false);
     },
@@ -244355,7 +244523,7 @@ var HoColorPicker = __webpack_require__(10306);
         params.fontColor = 'transparent';
       }
       this.vueController.setPageProperty(JSON.stringify((0,objectSpread2/* default */.Z)({}, params)));
-      this.vueController.fullRedraw();
+      this.vueController.rebuildAll();
       this.handleClose();
     },
     toolModalDown: function toolModalDown(e) {
@@ -244365,10 +244533,10 @@ var HoColorPicker = __webpack_require__(10306);
 });
 ;// CONCATENATED MODULE: ./src/components/toolbar/PageSetting.vue?vue&type=script&lang=js&
  /* harmony default export */ var toolbar_PageSettingvue_type_script_lang_js_ = (PageSettingvue_type_script_lang_js_); 
-;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-32.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-32.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-32.use[2]!./node_modules/less-loader/dist/cjs.js??clonedRuleSet-32.use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/toolbar/PageSetting.vue?vue&type=style&index=0&id=4294664e&prod&lang=less&
+;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-32.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-32.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-32.use[2]!./node_modules/less-loader/dist/cjs.js??clonedRuleSet-32.use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/toolbar/PageSetting.vue?vue&type=style&index=0&id=077d9a5e&prod&lang=less&
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./src/components/toolbar/PageSetting.vue?vue&type=style&index=0&id=4294664e&prod&lang=less&
+;// CONCATENATED MODULE: ./src/components/toolbar/PageSetting.vue?vue&type=style&index=0&id=077d9a5e&prod&lang=less&
 
 ;// CONCATENATED MODULE: ./src/components/toolbar/PageSetting.vue
 
@@ -244381,8 +244549,8 @@ var HoColorPicker = __webpack_require__(10306);
 
 var PageSetting_component = (0,componentNormalizer/* default */.Z)(
   toolbar_PageSettingvue_type_script_lang_js_,
-  PageSettingvue_type_template_id_4294664e_render,
-  PageSettingvue_type_template_id_4294664e_staticRenderFns,
+  PageSettingvue_type_template_id_077d9a5e_render,
+  PageSettingvue_type_template_id_077d9a5e_staticRenderFns,
   false,
   null,
   null,