hoeditor-web 3.0.58 → 3.0.60

package/lib/hoeditor.umd.js

@@ -18675,7 +18675,7 @@ var component = (0,componentNormalizer/* default */.Z)(
 
 /***/ }),
 
-/***/ 79032:
+/***/ 66591:
 /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -18687,7 +18687,7 @@ __webpack_require__.d(__webpack_exports__, {
   "default": function() { return /* binding */ table_TableFormula; }
 });
 
-;// 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/TableFormula.vue?vue&type=template&id=0f994c3d&
+;// 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/TableFormula.vue?vue&type=template&id=19467076&
 var render = function render() {
   var _vm = this,
     _c = _vm._self._c;
@@ -18916,7 +18916,9 @@ var render = function render() {
       "width": "152px"
     }
   }, [_vm._v("分值区间及映射值")]), _c('ul', [_vm._l(_vm.ftScoreMapping.items, function (item, index) {
-    return _c('li', [_c('a-input-number', {
+    return _c('li', {
+      key: index
+    }, [_c('a-input-number', {
       staticClass: "ft-score-mapping-input",
       attrs: {
         "controls": false,
@@ -19030,7 +19032,7 @@ var render = function render() {
       },
       expression: "form.columns"
     }
-  })], 1)]) : _vm._e(), _vm.formula === 'ftCalcDays' ? _c('section', {
+  })], 1)]) : _vm._e(), _vm.formula === 'ftCalcDays' || _vm.formula === 'ftCalcTime' ? _c('section', {
     staticClass: "costum-row-columns"
   }, [_c('div', {
     staticClass: "ho-table-features-list"
@@ -19250,7 +19252,7 @@ var TableFormula = __webpack_require__(90832);
                 console.warn("\u5206\u503C\u6620\u5C04\u516C\u5F0F\u89E3\u6790\u5931\u8D25\uFF1A".concat(node.formulaStr));
               }
             }
-          } else if (this.formula === 'ftCalcDays') {
+          } else if (this.formula === 'ftCalcDays' || this.formula === "ftCalcTime") {
             if (node.formulaStr) {
               this.startDateCode = node.formulaStr.split(',')[0];
               this.endDateCode = node.formulaStr.split(',')[1];
@@ -19311,6 +19313,8 @@ var TableFormula = __webpack_require__(90832);
         this.vueController.insertTableFormula("".concat(this.bodySurfaceAreaWeight).toLocaleLowerCase(), this.isHideZero, TableFormula/* FormularType.ftBodySurfaceArea */.a.ftBodySurfaceArea);
       } else if (this.formula === 'ftCalcDays') {
         this.vueController.insertTableFormula("".concat(this.startDateCode, ",").concat(this.endDateCode).toLocaleLowerCase(), this.isHideZero, TableFormula/* FormularType.ftCalcDays */.a.ftCalcDays);
+      } else if (this.formula === "ftCalcTime") {
+        this.vueController.insertTableFormula("".concat(this.startDateCode, ",").concat(this.endDateCode).toLocaleLowerCase(), this.isHideZero, TableFormula/* FormularType.ftCalcTime */.a.ftCalcTime);
       }
       this.handleClose();
     },
@@ -19332,10 +19336,10 @@ var TableFormula = __webpack_require__(90832);
 });
 ;// CONCATENATED MODULE: ./src/components/controls/table/TableFormula.vue?vue&type=script&lang=js&
  /* harmony default export */ var table_TableFormulavue_type_script_lang_js_ = (TableFormulavue_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/TableFormula.vue?vue&type=style&index=0&id=0f994c3d&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/TableFormula.vue?vue&type=style&index=0&id=19467076&prod&lang=scss&
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./src/components/controls/table/TableFormula.vue?vue&type=style&index=0&id=0f994c3d&prod&lang=scss&
+;// CONCATENATED MODULE: ./src/components/controls/table/TableFormula.vue?vue&type=style&index=0&id=19467076&prod&lang=scss&
 
 // EXTERNAL MODULE: ./node_modules/@vue/vue-loader-v15/lib/runtime/componentNormalizer.js
 var componentNormalizer = __webpack_require__(70713);
@@ -29109,7 +29113,11 @@ var Caret = /*#__PURE__*/function () {
         //   const g = this.cursor.graphics;
         //   g.clear();
         //   g.beginFill("black").rect(0, 0, 1, this._height);
-        this.div_cursor.style.height = Math.max(val, 12) * _draw_DrawConfig__WEBPACK_IMPORTED_MODULE_2__/* .DrawConfig.instance */ .f.instance().scaleXY + "px";
+        if (_draw_DrawConfig__WEBPACK_IMPORTED_MODULE_2__/* .DrawConfig.instance */ .f.instance().transformScale !== 1) {
+          this.div_cursor.style.height = Math.max(val, 12) + "px";
+        } else {
+          this.div_cursor.style.height = Math.max(val, 12) * _draw_DrawConfig__WEBPACK_IMPORTED_MODULE_2__/* .DrawConfig.instance */ .f.instance().scaleXY + "px";
+        }
         // this.updateCaret();
       }
     }
@@ -29302,8 +29310,8 @@ var es_array_includes = __webpack_require__(26699);
 var es_object_keys = __webpack_require__(47941);
 // EXTERNAL MODULE: ./src/editor/events/Exception.ts
 var Exception = __webpack_require__(8277);
-// EXTERNAL MODULE: ./src/editor/draw/drawTree/DrawTree.ts + 3 modules
-var DrawTree = __webpack_require__(48970);
+// EXTERNAL MODULE: ./src/editor/draw/drawTree/DrawTree.ts + 4 modules
+var DrawTree = __webpack_require__(51760);
 // EXTERNAL MODULE: ./src/editor/draw/DrawLine.ts + 1 modules
 var DrawLine = __webpack_require__(96635);
 // EXTERNAL MODULE: ./node_modules/@babel/runtime/helpers/esm/inherits.js + 1 modules
@@ -37596,7 +37604,7 @@ var SubDocManger = /*#__PURE__*/function () {
 /* harmony import */ var _undoRedo_NodeInsertUndoUnit__WEBPACK_IMPORTED_MODULE_24__ = __webpack_require__(64465);
 /* harmony import */ var _DocTree__WEBPACK_IMPORTED_MODULE_25__ = __webpack_require__(32629);
 /* harmony import */ var _treeNode_TextNode__WEBPACK_IMPORTED_MODULE_26__ = __webpack_require__(27198);
-/* harmony import */ var _draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_27__ = __webpack_require__(48970);
+/* harmony import */ var _draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_27__ = __webpack_require__(51760);
 /* harmony import */ var _undoRedo_TextInsertUndoUnit__WEBPACK_IMPORTED_MODULE_28__ = __webpack_require__(78560);
 /* harmony import */ var _treeNode_ParagraphNode__WEBPACK_IMPORTED_MODULE_29__ = __webpack_require__(67945);
 /* harmony import */ var _DomRange__WEBPACK_IMPORTED_MODULE_30__ = __webpack_require__(94639);
@@ -41485,7 +41493,7 @@ var DocController = /*#__PURE__*/function () {
 /* harmony import */ var _treeNode_DateTimeNode__WEBPACK_IMPORTED_MODULE_44__ = __webpack_require__(92501);
 /* harmony import */ var _treeNode_DownListNode__WEBPACK_IMPORTED_MODULE_45__ = __webpack_require__(45712);
 /* harmony import */ var _treeNode_LabelNode__WEBPACK_IMPORTED_MODULE_46__ = __webpack_require__(95089);
-/* harmony import */ var _draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_47__ = __webpack_require__(48970);
+/* harmony import */ var _draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_47__ = __webpack_require__(51760);
 /* harmony import */ var _treeNode_ControlNode__WEBPACK_IMPORTED_MODULE_48__ = __webpack_require__(91105);
 
 
@@ -44965,7 +44973,7 @@ var PageProperty = /*#__PURE__*/function () {
         this._widthPixes = hoEditorFactory.unitConvert.mmConversionPx(this._widthMm + this._commentWidthMm, true);
         this._commentWidthPixes = hoEditorFactory.unitConvert.mmConversionPx(this._commentWidthMm, true);
         this._rightMarginPixes = hoEditorFactory.unitConvert.mmConversionPx(this._rightMarginMm + this._commentWidthMm, true);
-        var scaleXY = _draw_DrawConfig__WEBPACK_IMPORTED_MODULE_9__/* .DrawConfig.instance */ .f.instance().scaleXY;
+        var scaleXY = Math.max(_draw_DrawConfig__WEBPACK_IMPORTED_MODULE_9__/* .DrawConfig.instance */ .f.instance().scaleXY, _draw_DrawConfig__WEBPACK_IMPORTED_MODULE_9__/* .DrawConfig.instance */ .f.instance().transformScale);
         var width = Math.floor(this._widthPixes * scaleXY) % 2 === 1 ? Math.floor(this._widthPixes * scaleXY) + 1 : Math.floor(this._widthPixes * scaleXY);
         this._canvasParams.width = width;
       }
@@ -44982,7 +44990,7 @@ var PageProperty = /*#__PURE__*/function () {
         this._widthPixes = hoeditorfacotry.unitConvert.mmConversionPx(this._widthMm + this._commentWidthMm, true);
         hoeditorfacotry.drawTree.updateDrawTreeFirstLine();
       }
-      var scaleXY = _draw_DrawConfig__WEBPACK_IMPORTED_MODULE_9__/* .DrawConfig.instance */ .f.instance().scaleXY;
+      var scaleXY = Math.max(_draw_DrawConfig__WEBPACK_IMPORTED_MODULE_9__/* .DrawConfig.instance */ .f.instance().scaleXY, _draw_DrawConfig__WEBPACK_IMPORTED_MODULE_9__/* .DrawConfig.instance */ .f.instance().transformScale);
       var width = Math.floor(this._widthPixes * scaleXY) % 2 === 1 ? Math.floor(this._widthPixes * scaleXY) + 1 : Math.floor(this._widthPixes * scaleXY);
       this._canvasParams.width = width;
     }
@@ -44996,7 +45004,7 @@ var PageProperty = /*#__PURE__*/function () {
         this._heightMm = value;
         this._heightPixes = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_8__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID).unitConvert.mmConversionPx(this._heightMm, false);
       }
-      var scaleXY = _draw_DrawConfig__WEBPACK_IMPORTED_MODULE_9__/* .DrawConfig.instance */ .f.instance().scaleXY;
+      var scaleXY = Math.max(_draw_DrawConfig__WEBPACK_IMPORTED_MODULE_9__/* .DrawConfig.instance */ .f.instance().scaleXY, _draw_DrawConfig__WEBPACK_IMPORTED_MODULE_9__/* .DrawConfig.instance */ .f.instance().transformScale);
       var height = Math.floor(this._heightPixes * scaleXY) % 2 === 1 ? Math.floor(this._heightPixes * scaleXY) + 1 : Math.floor(this._heightPixes * scaleXY);
       this._canvasParams.height = height;
     }
@@ -50547,7 +50555,7 @@ var CellNode = /*#__PURE__*/function (_RectNode) {
 /* harmony import */ var D_project_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_inherits_js__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(11651);
 /* harmony import */ var D_project_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createSuper_js__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(19593);
 /* harmony import */ var D_project_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(78255);
-/* harmony import */ var _editor_draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(48970);
+/* harmony import */ var _editor_draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(51760);
 /* harmony import */ var _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(74089);
 /* harmony import */ var _BaseNode__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(62358);
 
@@ -50953,7 +50961,7 @@ var ControlNode = /*#__PURE__*/function (_BaseNode) {
 /* harmony import */ var core_js_modules_es_json_stringify_js__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(38862);
 /* harmony import */ var core_js_modules_es_json_stringify_js__WEBPACK_IMPORTED_MODULE_15___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_json_stringify_js__WEBPACK_IMPORTED_MODULE_15__);
 /* harmony import */ var _editor_draw_drawNode_DrawDateTime__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(81304);
-/* harmony import */ var _editor_draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(48970);
+/* harmony import */ var _editor_draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(51760);
 /* harmony import */ var _editor_draw_SelectRange__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(53901);
 /* harmony import */ var _editor_events_NodeChangeEvent__WEBPACK_IMPORTED_MODULE_19__ = __webpack_require__(2613);
 /* harmony import */ var _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_20__ = __webpack_require__(74089);
@@ -51354,7 +51362,7 @@ var DateTimeNode = /*#__PURE__*/function (_ControlNode) {
 /* harmony import */ var core_js_modules_es_array_join_js__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(69600);
 /* harmony import */ var core_js_modules_es_array_join_js__WEBPACK_IMPORTED_MODULE_15___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_join_js__WEBPACK_IMPORTED_MODULE_15__);
 /* harmony import */ var _editor_draw_drawNode_DrawDownListNode__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(93541);
-/* harmony import */ var _editor_draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(48970);
+/* harmony import */ var _editor_draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(51760);
 /* harmony import */ var _editor_draw_SelectRange__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(53901);
 /* harmony import */ var _editor_events_NodeChangeEvent__WEBPACK_IMPORTED_MODULE_19__ = __webpack_require__(2613);
 /* harmony import */ var _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_20__ = __webpack_require__(74089);
@@ -53175,8 +53183,8 @@ var DrawJumpButton = /*#__PURE__*/function (_DrawCombineNode) {
   }]);
   return DrawJumpButton;
 }(DrawCombineNode/* DrawCombineNode */.o);
-// EXTERNAL MODULE: ./src/editor/draw/drawTree/DrawTree.ts + 3 modules
-var DrawTree = __webpack_require__(48970);
+// EXTERNAL MODULE: ./src/editor/draw/drawTree/DrawTree.ts + 4 modules
+var DrawTree = __webpack_require__(51760);
 ;// CONCATENATED MODULE: ./src/editor/dom/treeNode/JumpButtonNode.ts
 
 
@@ -53348,7 +53356,7 @@ var JumpButtonNode = /*#__PURE__*/function (_BaseNode) {
 /* harmony import */ var core_js_modules_es_array_splice_js__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(40561);
 /* harmony import */ var core_js_modules_es_array_splice_js__WEBPACK_IMPORTED_MODULE_7___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_splice_js__WEBPACK_IMPORTED_MODULE_7__);
 /* harmony import */ var _editor_draw_drawNode_DrawDownListNode__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(93541);
-/* harmony import */ var _editor_draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(48970);
+/* harmony import */ var _editor_draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(51760);
 /* harmony import */ var _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(74089);
 /* harmony import */ var _BaseNode__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(62358);
 /* harmony import */ var _ControlNode__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(91105);
@@ -53833,7 +53841,7 @@ var LightLocationMapNode = /*#__PURE__*/function (_MedicalExpressionNod) {
 /* harmony import */ var _editor_draw_drawNode_DrawMarkNode__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(57732);
 /* harmony import */ var _domNode_TextStyle__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(29899);
 /* harmony import */ var _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(74089);
-/* harmony import */ var _editor_draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(48970);
+/* harmony import */ var _editor_draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(51760);
 /* harmony import */ var jquery__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(19755);
 /* harmony import */ var jquery__WEBPACK_IMPORTED_MODULE_17___default = /*#__PURE__*/__webpack_require__.n(jquery__WEBPACK_IMPORTED_MODULE_17__);
 
@@ -56962,7 +56970,7 @@ var QrcodeNode = /*#__PURE__*/function (_BaseNode) {
 /* harmony import */ var core_js_modules_es_json_stringify_js__WEBPACK_IMPORTED_MODULE_11___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_json_stringify_js__WEBPACK_IMPORTED_MODULE_11__);
 /* harmony import */ var _editor_draw_drawNode_DrawRadioAndCheckBox__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(88666);
 /* harmony import */ var _editor_draw_drawNode_DrawRadioAndCheckBoxPrint__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(91757);
-/* harmony import */ var _editor_draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(48970);
+/* harmony import */ var _editor_draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(51760);
 /* harmony import */ var _editor_events_DmouseEvent__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(48541);
 /* harmony import */ var _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(74089);
 /* harmony import */ var _BaseNode__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(62358);
@@ -58041,8 +58049,8 @@ var DrawRareCharNode = /*#__PURE__*/function (_DrawCombineNode) {
   }]);
   return DrawRareCharNode;
 }(DrawCombineNode/* DrawCombineNode */.o);
-// EXTERNAL MODULE: ./src/editor/draw/drawTree/DrawTree.ts + 3 modules
-var DrawTree = __webpack_require__(48970);
+// EXTERNAL MODULE: ./src/editor/draw/drawTree/DrawTree.ts + 4 modules
+var DrawTree = __webpack_require__(51760);
 // EXTERNAL MODULE: ./src/editor/dom/treeNode/TextInputFieldNode.ts
 var TextInputFieldNode = __webpack_require__(90161);
 ;// CONCATENATED MODULE: ./src/editor/dom/treeNode/RareCharNode.ts
@@ -58494,7 +58502,7 @@ var SeparateCharNode = /*#__PURE__*/function (_BaseNode) {
 /* harmony import */ var core_js_modules_es_number_constructor_js__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(9653);
 /* harmony import */ var core_js_modules_es_number_constructor_js__WEBPACK_IMPORTED_MODULE_11___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_number_constructor_js__WEBPACK_IMPORTED_MODULE_11__);
 /* harmony import */ var _editor_draw_drawNode_DrawSignNode__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(75638);
-/* harmony import */ var _editor_draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(48970);
+/* harmony import */ var _editor_draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(51760);
 /* harmony import */ var _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(74089);
 /* harmony import */ var _BaseNode__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(62358);
 
@@ -59354,6 +59362,7 @@ var FormularType;
   FormularType[FormularType["ftScoreMapping"] = 6] = "ftScoreMapping";
   FormularType[FormularType["ftBodySurfaceArea"] = 7] = "ftBodySurfaceArea";
   FormularType[FormularType["ftCalcDays"] = 8] = "ftCalcDays";
+  FormularType[FormularType["ftCalcTime"] = 9] = "ftCalcTime";
 })(FormularType || (FormularType = {}));
 var TableFormula = /*#__PURE__*/function (_ControlNode) {
   (0,D_project_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_inherits_js__WEBPACK_IMPORTED_MODULE_7__/* ["default"] */ .Z)(TableFormula, _ControlNode);
@@ -59464,6 +59473,9 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
         if (this.formularType === FormularType.ftCalcDays) {
           this.clacDays();
         }
+        if (this.formularType === FormularType.ftCalcTime) {
+          this.clacTime();
+        }
       }
     }
   }, {
@@ -60253,6 +60265,82 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
       }
       return strRet;
     }
+  }, {
+    key: "clacTime",
+    value: function clacTime() {
+      var strRet = " ";
+      var table = this.getParentCell().table;
+      var arrStr = this.formulaStr.split(",");
+      if (arrStr.length < 2) {
+        ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_38__/* ["default"].warn */ .Z.warn("开始时间和结束时间对应的单元格编号传入有误:" + this.formulaStr);
+        return strRet;
+      }
+      var _this$getRowColByCell29 = this.getRowColByCellAdress(arrStr[0]),
+        _this$getRowColByCell30 = (0,D_project_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)(_this$getRowColByCell29, 2),
+        rysjRow = _this$getRowColByCell30[0],
+        rysjCol = _this$getRowColByCell30[1];
+      var _this$getRowColByCell31 = this.getRowColByCellAdress(arrStr[1]),
+        _this$getRowColByCell32 = (0,D_project_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)(_this$getRowColByCell31, 2),
+        cysjRow = _this$getRowColByCell32[0],
+        cysjCol = _this$getRowColByCell32[1];
+      if (rysjRow >= 0 && rysjCol >= 0 && cysjRow >= 0 && cysjCol >= 0) {
+        if (!table.rows[rysjRow]) return strRet;
+        if (!table.rows[cysjRow]) return strRet;
+        var rCell = table.rows[rysjRow][rysjCol];
+        var cCell = table.rows[cysjRow][cysjCol];
+        if (rCell && cCell) {
+          var rysj = rCell.getCellText();
+          var cysj = cCell.getCellText();
+          if (!rysj || !cysj) return strRet;
+          if ((0,_plugins_util__WEBPACK_IMPORTED_MODULE_30__/* .isDate */ .J_)(rysj) && (0,_plugins_util__WEBPACK_IMPORTED_MODULE_30__/* .isDate */ .J_)(cysj)) {
+            var rDate = new Date(rysj);
+            var cDate = new Date(cysj);
+            var rHour = rDate.getHours();
+            var cHour = cDate.getHours();
+            if (rHour === 0 && cHour === 0) {
+              // 将日期转换为 UTC 时间戳
+              var rTime = Date.UTC(rDate.getFullYear(), rDate.getMonth(), rDate.getDate());
+              var cTime = Date.UTC(cDate.getFullYear(), cDate.getMonth(), cDate.getDate());
+              // 计算日期相差的毫秒数
+              var diff = Math.abs(cTime - rTime);
+              // 将毫秒数转换为天数
+              var subTime = Math.floor(diff / (1000 * 60 * 60 * 24));
+              if (subTime == 0) subTime = 1;
+              return subTime.toString() + "天";
+            } else {
+              var _rTime = rDate.getTime();
+              var _cTime = cDate.getTime();
+              // 计算日期相差的毫秒数
+              var _subTime = ((_cTime - _rTime + 1) / (1000 * 3600 * 24)).toString();
+              var dayData = _subTime.split('.');
+              var day = Number(dayData[0]);
+              var hour = 0;
+              var minute = 0;
+              if (dayData.length > 1) {
+                var hourData = (Number("0." + dayData[1]) * 24).toFixed(10).toString().split('.');
+                hour = Number(hourData[0]);
+                if (hourData.length > 1) {
+                  var minuteData = (Number("0." + hourData[1]) * 60).toFixed(5).toString().split('.');
+                  minute = Number(minuteData[0]);
+                }
+              }
+              if (day > 0) {
+                hour += day * 24;
+              }
+              var timeStr = "";
+              if (hour > 0) {
+                timeStr += hour.toString() + "小时";
+              }
+              if (minute > 0) {
+                timeStr += minute.toString() + "分";
+              }
+              return timeStr;
+            }
+          }
+        }
+      }
+      return strRet;
+    }
   }, {
     key: "isCellInFormula",
     value: function isCellInFormula(acell, r, c) {
@@ -60326,6 +60414,8 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
         this._text = this.clacBodySurfaceArea();
       } else if (this.formularType === FormularType.ftCalcDays) {
         this._text = this.clacDays();
+      } else if (this.formularType === FormularType.ftCalcTime) {
+        this._text = this.clacTime();
       }
       this.node2DrawNode();
     }
@@ -60421,7 +60511,7 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
 /* harmony import */ var _editor_events_NodeChangeEvent__WEBPACK_IMPORTED_MODULE_33__ = __webpack_require__(2613);
 /* harmony import */ var _DocTree__WEBPACK_IMPORTED_MODULE_34__ = __webpack_require__(32629);
 /* harmony import */ var _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_35__ = __webpack_require__(74089);
-/* harmony import */ var _editor_draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_36__ = __webpack_require__(48970);
+/* harmony import */ var _editor_draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_36__ = __webpack_require__(51760);
 /* harmony import */ var _editor_utils_UnitConvert__WEBPACK_IMPORTED_MODULE_37__ = __webpack_require__(91404);
 /* harmony import */ var _editor_draw_drawNode_DrawPageTable__WEBPACK_IMPORTED_MODULE_38__ = __webpack_require__(15694);
 
@@ -63165,7 +63255,7 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
 /* harmony import */ var core_js_modules_es_error_cause_js__WEBPACK_IMPORTED_MODULE_26__ = __webpack_require__(21703);
 /* harmony import */ var core_js_modules_es_error_cause_js__WEBPACK_IMPORTED_MODULE_26___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_error_cause_js__WEBPACK_IMPORTED_MODULE_26__);
 /* harmony import */ var _editor_draw_DrawLine__WEBPACK_IMPORTED_MODULE_27__ = __webpack_require__(96635);
-/* harmony import */ var _editor_draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_28__ = __webpack_require__(48970);
+/* harmony import */ var _editor_draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_28__ = __webpack_require__(51760);
 /* harmony import */ var _editor_draw_SelectRange__WEBPACK_IMPORTED_MODULE_29__ = __webpack_require__(53901);
 /* harmony import */ var _editor_events_DmouseEvent__WEBPACK_IMPORTED_MODULE_30__ = __webpack_require__(48541);
 /* harmony import */ var _editor_events_Exception__WEBPACK_IMPORTED_MODULE_31__ = __webpack_require__(8277);
@@ -65672,7 +65762,7 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
 /* harmony import */ var core_js_modules_es_string_replace_all_js__WEBPACK_IMPORTED_MODULE_19__ = __webpack_require__(68757);
 /* harmony import */ var core_js_modules_es_string_replace_all_js__WEBPACK_IMPORTED_MODULE_19___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_string_replace_all_js__WEBPACK_IMPORTED_MODULE_19__);
 /* harmony import */ var _BaseNode__WEBPACK_IMPORTED_MODULE_20__ = __webpack_require__(62358);
-/* harmony import */ var _editor_draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_21__ = __webpack_require__(48970);
+/* harmony import */ var _editor_draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_21__ = __webpack_require__(51760);
 /* harmony import */ var _editor_draw_DrawLine__WEBPACK_IMPORTED_MODULE_22__ = __webpack_require__(96635);
 /* harmony import */ var _editor_draw_drawNode_DrawTextNode__WEBPACK_IMPORTED_MODULE_23__ = __webpack_require__(24492);
 /* harmony import */ var _domNode_TextStyle__WEBPACK_IMPORTED_MODULE_24__ = __webpack_require__(29899);
@@ -66422,6 +66512,7 @@ var DrawConfig = /*#__PURE__*/function () {
   function DrawConfig() {
     (0,D_project_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_classCallCheck_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z)(this, DrawConfig);
     (0,D_project_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)(this, "_scaleXY", void 0);
+    (0,D_project_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)(this, "_transformScale", 1);
     this._scaleXY = 1;
   }
   (0,D_project_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z)(DrawConfig, [{
@@ -66432,6 +66523,14 @@ var DrawConfig = /*#__PURE__*/function () {
     set: function set(scaleXY) {
       this._scaleXY = scaleXY;
     }
+  }, {
+    key: "transformScale",
+    get: function get() {
+      return this._transformScale;
+    },
+    set: function set(scale) {
+      this._transformScale = scale;
+    }
   }], [{
     key: "instance",
     value: function instance() {
@@ -69687,496 +69786,6 @@ var DrawHeader = /*#__PURE__*/function (_DrawPageHeaderFooter) {
 
 /***/ }),
 
-/***/ 72722:
-/***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export */ __webpack_require__.d(__webpack_exports__, {
-/* harmony export */   "h": function() { return /* binding */ DrawPage; }
-/* harmony export */ });
-/* harmony import */ var D_project_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_regeneratorRuntime_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(80543);
-/* harmony import */ var D_project_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_asyncToGenerator_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(81448);
-/* harmony import */ var D_project_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_classCallCheck_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(70280);
-/* harmony import */ var D_project_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(66298);
-/* harmony import */ var D_project_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(78255);
-/* harmony import */ var core_js_modules_es_array_concat_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(92222);
-/* harmony import */ var core_js_modules_es_array_concat_js__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_concat_js__WEBPACK_IMPORTED_MODULE_3__);
-/* harmony import */ var core_js_modules_es_error_cause_js__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(21703);
-/* harmony import */ var core_js_modules_es_error_cause_js__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_error_cause_js__WEBPACK_IMPORTED_MODULE_4__);
-/* harmony import */ var _yuki_createjs__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(38205);
-/* harmony import */ var _yuki_createjs__WEBPACK_IMPORTED_MODULE_5___default = /*#__PURE__*/__webpack_require__.n(_yuki_createjs__WEBPACK_IMPORTED_MODULE_5__);
-/* harmony import */ var _dom_DocTree__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(32629);
-/* harmony import */ var _drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(48970);
-/* harmony import */ var _DrawHeader__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(5328);
-/* harmony import */ var _DrawFooter__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(114);
-/* harmony import */ var _editor_SubDocManger__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(80556);
-/* harmony import */ var _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(74089);
-/* harmony import */ var _editor_dom_PageProperty__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(65847);
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-var DrawPage = /*#__PURE__*/function () {
-  function DrawPage(hoeditorfacotryID, index //,
-  //doc: DocTree,
-  //drawTree: DrawTree
-  ) {
-    (0,D_project_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_classCallCheck_js__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z)(this, DrawPage);
-    (0,D_project_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_13__/* ["default"] */ .Z)(this, "_active", void 0);
-    (0,D_project_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_13__/* ["default"] */ .Z)(this, "_pageIndex", void 0);
-    (0,D_project_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_13__/* ["default"] */ .Z)(this, "_name", void 0);
-    (0,D_project_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_13__/* ["default"] */ .Z)(this, "_domLevel", void 0);
-    (0,D_project_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_13__/* ["default"] */ .Z)(this, "_selectLevel", void 0);
-    (0,D_project_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_13__/* ["default"] */ .Z)(this, "_background", void 0);
-    (0,D_project_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_13__/* ["default"] */ .Z)(this, "_hoEditorFactoryID", void 0);
-    (0,D_project_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_13__/* ["default"] */ .Z)(this, "_drawDocContainer", void 0);
-    (0,D_project_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_13__/* ["default"] */ .Z)(this, "_headerLeftTag", void 0);
-    (0,D_project_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_13__/* ["default"] */ .Z)(this, "_headerRightTag", void 0);
-    (0,D_project_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_13__/* ["default"] */ .Z)(this, "_footerLeftTag", void 0);
-    (0,D_project_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_13__/* ["default"] */ .Z)(this, "_footerRightTag", void 0);
-    (0,D_project_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_13__/* ["default"] */ .Z)(this, "_drawHeader", void 0);
-    (0,D_project_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_13__/* ["default"] */ .Z)(this, "_drawFooter", void 0);
-    (0,D_project_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_13__/* ["default"] */ .Z)(this, "_storeDrawHeader", void 0);
-    (0,D_project_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_13__/* ["default"] */ .Z)(this, "_storeDrawFooter", void 0);
-    (0,D_project_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_13__/* ["default"] */ .Z)(this, "_needUpdateStage", void 0);
-    (0,D_project_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_13__/* ["default"] */ .Z)(this, "_selectContainer", void 0);
-    (0,D_project_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_13__/* ["default"] */ .Z)(this, "_mainDocBorder", void 0);
-    (0,D_project_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_13__/* ["default"] */ .Z)(this, "_drawMainDoc", void 0);
-    (0,D_project_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_13__/* ["default"] */ .Z)(this, "_activeDrawRect", void 0);
-    this._hoEditorFactoryID = hoeditorfacotryID;
-    this._selectContainer = new createjs.Container();
-    this._selectContainer.id = index;
-    // this._docTree = doc;
-    // this._drawTree = drawTree;
-    // this._docTree = hoeditorfacotry.docTree;
-    // this._drawTree = hoeditorfacotry.drawTree;
-    this._active = false;
-    this._pageIndex = index;
-    this._name = 'vuePage';
-    this._domLevel = null;
-    this._selectLevel = null;
-    this._needUpdateStage = true;
-    //左上角分隔标记
-    this._headerLeftTag = this.addAreaSplitTag(19.5, -0.5, 19.5, 19.5, 0, 19.5);
-    //右上角分隔标记
-    this._headerRightTag = this.addAreaSplitTag(0.5, -0.5, 0.5, 19.5, 19.5, 19.5);
-    //左下角分隔标记
-    this._footerLeftTag = this.addAreaSplitTag(19.5, 19.5, 19.5, 0.5, 0.5, 0.5);
-    //右下角分隔标记
-    this._footerRightTag = this.addAreaSplitTag(0.5, 20.5, 0.5, 0.5, 20.5, 0.5);
-    this._drawDocContainer = new createjs.Container();
-  }
-  (0,D_project_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_14__/* ["default"] */ .Z)(DrawPage, [{
-    key: "needUpdateStage",
-    get:
-    //当前页的激活状态
-    // private _docTree: DocTree;
-    // private _drawTree: DrawTree;
-    //页码
-
-    function get() {
-      return this._needUpdateStage;
-    },
-    set: function set(needUpdateStage) {
-      this._needUpdateStage = needUpdateStage;
-    }
-  }, {
-    key: "storeDrawHeader",
-    get: function get() {
-      return this._storeDrawHeader;
-    },
-    set: function set(storeDrawHeader) {
-      this._storeDrawHeader = storeDrawHeader;
-    }
-  }, {
-    key: "storeDrawFooter",
-    get: function get() {
-      return this._storeDrawFooter;
-    },
-    set: function set(storeDrawFooter) {
-      this._storeDrawFooter = storeDrawFooter;
-    }
-  }, {
-    key: "drawMainDoc",
-    get: function get() {
-      return this._drawMainDoc;
-    }
-  }, {
-    key: "drawHeader",
-    get: function get() {
-      return this._drawHeader;
-    },
-    set: function set(drawHeader) {
-      this._drawHeader = drawHeader;
-    }
-  }, {
-    key: "drawFooter",
-    get: function get() {
-      return this._drawFooter;
-    },
-    set: function set(drawFooter) {
-      this._drawFooter = drawFooter;
-    }
-  }, {
-    key: "headerLeftTag",
-    get: function get() {
-      return this._headerLeftTag;
-    }
-  }, {
-    key: "headerRightTag",
-    get: function get() {
-      return this._headerRightTag;
-    }
-    //当前激活的编辑器
-  }, {
-    key: "activeDrawRect",
-    get: function get() {
-      return this._activeDrawRect;
-    },
-    set: function set(val) {
-      if (this._activeDrawRect != val) {
-        this._activeDrawRect = val;
-      }
-    }
-  }, {
-    key: "footerLeftTag",
-    get: function get() {
-      return this._footerLeftTag;
-    }
-  }, {
-    key: "footerRightTag",
-    get: function get() {
-      return this._footerRightTag;
-    }
-  }, {
-    key: "mainDocBorder",
-    get: function get() {
-      return this._mainDocBorder;
-    }
-  }, {
-    key: "selectContainer",
-    get: function get() {
-      return this._selectContainer;
-    }
-  }, {
-    key: "afterCreate",
-    value: function afterCreate() {
-      var index = this._pageIndex;
-      var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_11__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
-      this._drawMainDoc = hoEditorFactory.drawPageTree.drawMainDocs[index];
-      var headerIndex = hoEditorFactory.subDocManger.getSubDocIndex(index, _editor_SubDocManger__WEBPACK_IMPORTED_MODULE_10__/* .HeaderFooterType.hftHead */ .pi.hftHead)[0];
-      this._storeDrawHeader = new _DrawHeader__WEBPACK_IMPORTED_MODULE_8__/* .DrawHeader */ .g(this._hoEditorFactoryID, "".concat(_dom_DocTree__WEBPACK_IMPORTED_MODULE_6__/* .gHeaderPath */ .Yh, "/").concat(headerIndex), index);
-      var footerIndex = hoEditorFactory.subDocManger.getSubDocIndex(index, _editor_SubDocManger__WEBPACK_IMPORTED_MODULE_10__/* .HeaderFooterType.hftFoot */ .pi.hftFoot)[0];
-      this._storeDrawFooter = new _DrawFooter__WEBPACK_IMPORTED_MODULE_9__/* .DrawFooter */ .d(this._hoEditorFactoryID, "".concat(_dom_DocTree__WEBPACK_IMPORTED_MODULE_6__/* .gFooterPath */ .LE, "/").concat(footerIndex), index);
-      this._drawHeader = this._storeDrawHeader;
-      this._drawFooter = this._storeDrawFooter;
-      // hoEditorFactory.subDocManger.copySubDocToPages(
-      //   hoEditorFactory.drawPageTree.drawHeaders[headerIndex],
-      //   index,
-      //   HeaderFooterType.hftHead
-      // );
-      // hoEditorFactory.subDocManger.repaintPageMarkNodes(
-      //   this._drawHeader,
-      //   HeaderFooterType.hftHead
-      // );
-      // hoEditorFactory.subDocManger.copySubDocToPages(
-      //   hoEditorFactory.drawPageTree.drawHeaders[footerIndex],
-      //   index,
-      //   HeaderFooterType.hftFoot
-      // );
-      // hoEditorFactory.subDocManger.repaintPageMarkNodes(
-      //   this._drawFooter,
-      //   HeaderFooterType.hftFoot
-      // );
-      this._activeDrawRect = this._drawMainDoc;
-    }
-    /**
-     * @author xyl
-     * @param domLevel  文档绘制层
-     * @param selectLevel 选区绘制层
-     * @description 初始化绘制页
-     */
-  }, {
-    key: "init",
-    value: function init(domLevel, selectLevel) {
-      this._domLevel = domLevel;
-      this._selectLevel = selectLevel;
-      // this.repaint();
-    }
-  }, {
-    key: "setEnableMouseOver",
-    value: function setEnableMouseOver(count) {
-      var selectLevel = this._selectLevel;
-      var domLevel = this._domLevel;
-      if (selectLevel.stage && domLevel.stage) {
-        selectLevel.stage.enableMouseOver(count);
-        selectLevel.stage.nextStage = domLevel.stage;
-        domLevel.stage.enableMouseOver(count);
-      }
-    }
-  }, {
-    key: "addMainDocBorder",
-    value: function addMainDocBorder(topY) {
-      var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_11__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
-      var leftX = hoEditorFactory.pageProperty.leftMarginPixes;
-      var rightX = hoEditorFactory.pageProperty.widthPixes - hoEditorFactory.pageProperty.rightMarginPixes;
-      var bottomY = topY + this._drawMainDoc.dHeight;
-      var aTag = new createjs.Container();
-      var ashape = new createjs.Shape();
-      var color = hoEditorFactory.pageProperty.borderColor;
-      var paintLineStyle = hoEditorFactory.pageProperty.paintRowLine;
-      ashape.graphics.beginStroke(color);
-      if (paintLineStyle == _editor_dom_PageProperty__WEBPACK_IMPORTED_MODULE_12__/* .PaintRowLineStyle.solid */ .kd.solid) {
-        ashape.graphics.setStrokeStyle(1);
-      } else if (paintLineStyle == _editor_dom_PageProperty__WEBPACK_IMPORTED_MODULE_12__/* .PaintRowLineStyle.dot */ .kd.dot) {
-        ashape.graphics.setStrokeDash([3, 3], 0);
-      } else if (paintLineStyle == _editor_dom_PageProperty__WEBPACK_IMPORTED_MODULE_12__/* .PaintRowLineStyle.dash */ .kd.dash) {
-        ashape.graphics.setStrokeDash([9, 9], 0);
-      } else if (paintLineStyle == _editor_dom_PageProperty__WEBPACK_IMPORTED_MODULE_12__/* .PaintRowLineStyle.dashdot */ .kd.dashdot) {
-        ashape.graphics.setStrokeDash([9, 3, 3, 9], 0);
-      } else if (paintLineStyle == _editor_dom_PageProperty__WEBPACK_IMPORTED_MODULE_12__/* .PaintRowLineStyle.dashdotdo */ .kd.dashdotdo) {
-        ashape.graphics.setStrokeDash([9, 3, 3, 3, 3, 9], 0);
-      }
-      ashape.graphics.moveTo(leftX - 0.5, topY - 0.5);
-      ashape.graphics.lineTo(rightX + 0.5, topY - 0.5);
-      ashape.graphics.moveTo(rightX + 0.5, topY - 0.5);
-      ashape.graphics.lineTo(rightX + 0.5, bottomY + 0.5);
-      ashape.graphics.moveTo(rightX + 0.5, bottomY + 0.5);
-      ashape.graphics.lineTo(leftX - 0.5, bottomY + 0.5);
-      ashape.graphics.moveTo(leftX - 0.5, bottomY + 0.5);
-      ashape.graphics.lineTo(leftX - 0.5, topY - 0.5);
-      ashape.x = 0;
-      ashape.y = 0;
-      aTag.addChild(ashape);
-      return aTag;
-    }
-  }, {
-    key: "addAreaSplitTag",
-    value: function addAreaSplitTag(x1, y1, x2, y2, x3, y3) {
-      var aTag = new createjs.Container();
-      var ashape = new createjs.Shape();
-      ashape.graphics.beginStroke('#000').setStrokeStyle(1);
-      ashape.graphics.moveTo(x1, y1);
-      ashape.graphics.lineTo(x2, y2);
-      ashape.graphics.moveTo(x2, y2);
-      ashape.graphics.lineTo(x3, y3);
-      ashape.x = 0;
-      ashape.y = 0;
-      aTag.addChild(ashape);
-      return aTag;
-    }
-  }, {
-    key: "drawSelectLevel",
-    get: function get() {
-      return this._selectLevel;
-    }
-  }, {
-    key: "drawDomLevel",
-    get: function get() {
-      return this._domLevel;
-    }
-    // get docTree() {
-    //   return this._docTree;
-    // }
-    // get drawTree() {
-    //   return this._drawTree;
-    // }
-  }, {
-    key: "pageIndex",
-    get: function get() {
-      return this._pageIndex;
-    }
-  }, {
-    key: "name",
-    get: function get() {
-      return this._name;
-    }
-    /**
-     *
-     * @param mode 0:清空selectlevel  1:清空DomLevel
-     */
-  }, {
-    key: "clear",
-    value: function clear(mode) {
-      var lm = typeof mode != 'number' ? 2 : mode;
-      if (lm != 1) {
-        this._selectContainer.removeAllChildren();
-      }
-      if (this._domLevel && this._domLevel.stage && lm != 0) {
-        this._domLevel.stage.clear();
-      }
-    }
-  }, {
-    key: "destory",
-    value: function destory() {
-      this._domLevel = null;
-      this._selectLevel = null;
-    }
-    /**
-     * 更新页面绘制范围
-     */
-  }, {
-    key: "reFreshBounds",
-    value: function reFreshBounds() {
-      if (!this._domLevel) return;
-      var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_11__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
-      this.pageIndex;
-      var dhheight = Math.max(this._drawHeader.actualHeight + hoEditorFactory.pageProperty.headerYPixes, hoEditorFactory.pageProperty.topMarginPixes);
-      var dfheight = Math.max(this._drawFooter.actualHeight + hoEditorFactory.pageProperty.footerYPixes, hoEditorFactory.pageProperty.bottomMarginPixes); // Math.max(
-      //   hoEditorFactory.pageProperty.topMarginPixes,
-      //   wHeaderthis._domLevel.dra.actualHeight
-      // );
-      // const dfheight = Math.max(
-      //   hoEditorFactory.pageProperty.topMarginPixes,
-      //    this._drawFooter.actualHeight
-      // );
-      // console.log(dhheight);
-      // if (path.startsWith('header') || path.startsWith('footer')) {
-      //根据页眉，页脚高度重新设置正文位置和高度
-      this._domLevel.mainDocTop = dhheight;
-      this.drawMainDoc.maxHeight = hoEditorFactory.pageProperty.heightPixes - dhheight - dfheight;
-      this.drawMainDoc.dHeight = hoEditorFactory.pageProperty.heightPixes - dhheight - dfheight;
-      //TODO:正文重新绘制，还可能创建新的页面，等其他操作 this._domLevel.drawMainDoc.paintArea();
-      // }
-      // if (path.startsWith('footer')) {
-      this._drawHeader.y = hoEditorFactory.pageProperty.headerYPixes;
-      this._drawFooter.dTop = hoEditorFactory.pageProperty.heightPixes - dfheight;
-      this._drawFooter.y = this._drawFooter.dTop;
-      this._domLevel.footerTop = this._drawFooter.dTop;
-      this._headerLeftTag.y = dhheight - 20;
-      this._headerLeftTag.x = hoEditorFactory.pageProperty.leftMarginPixes - 20;
-      this._headerRightTag.x = hoEditorFactory.pageProperty.widthPixes - hoEditorFactory.pageProperty.rightMarginPixes;
-      this._headerRightTag.y = dhheight - 20;
-      this._footerLeftTag.y = this._drawFooter.y;
-      this._footerLeftTag.x = this._headerLeftTag.x;
-      this._footerRightTag.x = this._headerRightTag.x;
-      this._footerRightTag.y = this._drawFooter.y;
-      this._drawMainDoc.x = hoEditorFactory.pageProperty.leftMarginPixes;
-      this._mainDocBorder && (this._mainDocBorder.children = []);
-      if (hoEditorFactory.pageProperty.borderColor !== '#FFFFFF' && hoEditorFactory.pageProperty.isPaintBorder) {
-        var _this$_domLevel$stage;
-        this._mainDocBorder = this.addMainDocBorder(dhheight);
-        (_this$_domLevel$stage = this._domLevel.stage) === null || _this$_domLevel$stage === void 0 ? void 0 : _this$_domLevel$stage.addChild(this._mainDocBorder);
-      }
-      this._drawHeader.paintMask(dhheight);
-      this._drawFooter.paintMask(dfheight);
-      hoEditorFactory.pageProperty.canvasHeadFootPos.headerY = dhheight;
-      hoEditorFactory.pageProperty.canvasHeadFootPos.footerY = dfheight;
-      // }
-      // this.refresh();
-    }
-    /**
-     * 隐藏此页面上的表格边框
-     */
-    // public hideCellBorder() {
-    //   const maindoc = this.drawDomLevel?.drawMainDoc;
-    //   if (maindoc) {
-    //     maindoc.drawLines.forEach((value) => {
-    //       if (value instanceof DrawPageCell) {
-    //         //TODO：隐藏边框
-    //         console.log("隐藏边框");
-    //       }
-    //     });
-    //   }
-    // }
-  }, {
-    key: "paintBackGround",
-    value: function () {
-      var _paintBackGround = (0,D_project_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_asyncToGenerator_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)( /*#__PURE__*/(0,D_project_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_regeneratorRuntime_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z)().mark(function _callee() {
-        var hoEditorFactory, backColor;
-        return (0,D_project_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_regeneratorRuntime_js__WEBPACK_IMPORTED_MODULE_0__/* ["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__WEBPACK_IMPORTED_MODULE_11__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
-                this._background.graphics.clear();
-                backColor = hoEditorFactory.drawTree.paintStatus === _drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_7__/* .PaintState.psPreview */ .Dh.psPreview ? '#FFFFFF' : '#FFFFFF'; // this._background.graphics
-                //   .beginFill(backColor)
-                //   .drawRect(
-                //     0,
-                //     0,
-                //     hoEditorFactory.pageProperty.widthPixes,
-                //     hoEditorFactory.pageProperty.heightPixes
-                //   )
-                //   .closePath();
-                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);
-                }
-              case 6:
-              case "end":
-                return _context.stop();
-            }
-          }
-        }, _callee, this);
-      }));
-      function paintBackGround() {
-        return _paintBackGround.apply(this, arguments);
-      }
-      return paintBackGround;
-    }()
-  }, {
-    key: "removeBackGroud",
-    value: function removeBackGroud() {
-      if (this._background && this._domLevel && this._domLevel.stage) {
-        this.drawDocContainer.removeChild(this._background);
-      }
-    }
-  }, {
-    key: "BackGround",
-    get: function get() {
-      return this._background;
-    }
-    /**
-     * @author xyl
-     * @param path 路径
-     * @returns 根据文档路径获取当前所在的绘制区域对象
-     *
-     */
-  }, {
-    key: "getDrawAreaByPath",
-    value: function getDrawAreaByPath(path) {
-      var arr = path.split('/');
-      if (arr[0] === _dom_DocTree__WEBPACK_IMPORTED_MODULE_6__/* .gMainPath */ .d9) {
-        return this._drawMainDoc;
-      } else if (arr[0] === _dom_DocTree__WEBPACK_IMPORTED_MODULE_6__/* .gHeaderPath */ .Yh) {
-        //FIXME:这样返回是过渡，因为hodoc.vue返回的pagepos不对
-        //   return hoEditorFactory.drawTree.getHeaderByPath(path);
-        return this._drawHeader;
-      } else if (arr[0] === _dom_DocTree__WEBPACK_IMPORTED_MODULE_6__/* .gFooterPath */ .LE) {
-        //FIXME:这样返回是过渡，因为hodoc.vue返回的pagepos不对
-        //   return hoEditorFactory.drawTree.getFooterByPath(path);
-        return this._drawFooter;
-      } else {
-        throw new Error("\u9519\u8BEF\u7684\u6587\u6863\u8DEF\u5F84:".concat(path));
-      }
-    }
-  }, {
-    key: "drawDocContainer",
-    get: function get() {
-      return this._drawDocContainer;
-    }
-  }]);
-  return DrawPage;
-}();
-
-/***/ }),
-
 /***/ 56128:
 /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
@@ -71077,7 +70686,7 @@ var DrawCell = /*#__PURE__*/function (_DrawRect) {
 /* harmony import */ var _IDrawInfos__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(78632);
 /* harmony import */ var _editor_events_DmouseEvent__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(48541);
 /* harmony import */ var _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(74089);
-/* harmony import */ var _drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(48970);
+/* harmony import */ var _drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(51760);
 /* harmony import */ var _editor_dom_treeNode_TextInputFieldNode__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(90161);
 
 
@@ -71839,7 +71448,7 @@ var DrawDownListNode = /*#__PURE__*/function (_DrawCombineNode) {
 /* harmony import */ var _editor_dom_treeNode_MarkNode__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(57727);
 /* harmony import */ var _editor_dom_treeNode_TextInputFieldNode__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(90161);
 /* harmony import */ var _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(74089);
-/* harmony import */ var _drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(48970);
+/* harmony import */ var _drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(51760);
 /* harmony import */ var _editor_utils_DrawSimpleText__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(57590);
 
 
@@ -72679,8 +72288,8 @@ var HOEditorFactorys = __webpack_require__(74089);
 var DrawArea = __webpack_require__(83358);
 // EXTERNAL MODULE: ./src/editor/draw/DrawLine.ts + 1 modules
 var DrawLine = __webpack_require__(96635);
-// EXTERNAL MODULE: ./src/editor/draw/drawTree/DrawTree.ts + 3 modules
-var DrawTree = __webpack_require__(48970);
+// EXTERNAL MODULE: ./src/editor/draw/drawTree/DrawTree.ts + 4 modules
+var DrawTree = __webpack_require__(51760);
 // EXTERNAL MODULE: ./src/editor/draw/IDrawInfos.ts
 var IDrawInfos = __webpack_require__(78632);
 // EXTERNAL MODULE: ./src/editor/draw/PagePaintPosition.ts
@@ -73823,7 +73432,7 @@ var DrawPageCell = /*#__PURE__*/function (_DrawArea) {
 /* harmony import */ var _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(74089);
 /* harmony import */ var _drawArea_DrawHeader__WEBPACK_IMPORTED_MODULE_19__ = __webpack_require__(5328);
 /* harmony import */ var _drawArea_DrawFooter__WEBPACK_IMPORTED_MODULE_20__ = __webpack_require__(114);
-/* harmony import */ var _drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_21__ = __webpack_require__(48970);
+/* harmony import */ var _drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_21__ = __webpack_require__(51760);
 /* harmony import */ var _DrawPageTable__WEBPACK_IMPORTED_MODULE_22__ = __webpack_require__(15694);
 
 
@@ -74078,7 +73687,7 @@ var DrawPageMarkNode = /*#__PURE__*/function (_DrawCombineNode) {
 /* harmony import */ var _editor_dom_treeNode_TableFormula__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(90832);
 /* harmony import */ var _editor_dom_treeNode_TableNode__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(5010);
 /* harmony import */ var _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(74089);
-/* harmony import */ var _drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(48970);
+/* harmony import */ var _drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(51760);
 /* harmony import */ var _IDrawInfos__WEBPACK_IMPORTED_MODULE_20__ = __webpack_require__(78632);
 /* harmony import */ var _DrawPageCell__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(59105);
 /* harmony import */ var _DrawRect__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(34311);
@@ -77860,8 +77469,8 @@ var yuki_createjs = __webpack_require__(38205);
 var DrawCombineNode = __webpack_require__(66114);
 // EXTERNAL MODULE: ./src/editor/dom/treeNode/TextNode.ts
 var TextNode = __webpack_require__(27198);
-// EXTERNAL MODULE: ./src/editor/draw/drawTree/DrawTree.ts + 3 modules
-var DrawTree = __webpack_require__(48970);
+// EXTERNAL MODULE: ./src/editor/draw/drawTree/DrawTree.ts + 4 modules
+var DrawTree = __webpack_require__(51760);
 // EXTERNAL MODULE: ./src/editor/dom/domNode/TextStyle.ts
 var TextStyle = __webpack_require__(29899);
 // EXTERNAL MODULE: ./src/editor/dom/treeNode/MarkNode.ts
@@ -78792,7 +78401,7 @@ var DrawTextNode = /*#__PURE__*/function (_DrawCombineNode) {
 /* harmony import */ var core_js_modules_es_string_bold_js__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_string_bold_js__WEBPACK_IMPORTED_MODULE_2__);
 /* harmony import */ var _yuki_createjs__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(38205);
 /* harmony import */ var _yuki_createjs__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(_yuki_createjs__WEBPACK_IMPORTED_MODULE_3__);
-/* harmony import */ var _drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(48970);
+/* harmony import */ var _drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(51760);
 /* harmony import */ var _editor_dom_domNode_TextStyle__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(29899);
 /* harmony import */ var _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(74089);
 /* harmony import */ var _editor_utils_DrawSimpleText__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(57590);
@@ -79608,7 +79217,7 @@ var DrawPrintSelected = /*#__PURE__*/function (_DrawPrintBase) {
 
 /***/ }),
 
-/***/ 48970:
+/***/ 51760:
 /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -80231,8 +79840,477 @@ var Editor = /*#__PURE__*/function () {
 var DrawLine = __webpack_require__(96635);
 // EXTERNAL MODULE: ./src/editor/draw/drawNode/DrawCombineNode.ts
 var DrawCombineNode = __webpack_require__(66114);
-// EXTERNAL MODULE: ./src/editor/draw/drawArea/DrawPage.ts
-var DrawPage = __webpack_require__(72722);
+// EXTERNAL MODULE: ./src/editor/draw/drawArea/DrawHeader.ts
+var DrawHeader = __webpack_require__(5328);
+// EXTERNAL MODULE: ./src/editor/draw/drawArea/DrawFooter.ts
+var DrawFooter = __webpack_require__(114);
+// EXTERNAL MODULE: ./src/editor/SubDocManger.ts
+var SubDocManger = __webpack_require__(80556);
+// EXTERNAL MODULE: ./src/editor/dom/PageProperty.ts
+var PageProperty = __webpack_require__(65847);
+;// CONCATENATED MODULE: ./src/editor/draw/drawArea/DrawPage.ts
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+var DrawPage = /*#__PURE__*/function () {
+  function DrawPage(hoeditorfacotryID, index //,
+  //doc: DocTree,
+  //drawTree: DrawTree
+  ) {
+    (0,classCallCheck/* default */.Z)(this, DrawPage);
+    (0,defineProperty/* default */.Z)(this, "_active", void 0);
+    (0,defineProperty/* default */.Z)(this, "_pageIndex", void 0);
+    (0,defineProperty/* default */.Z)(this, "_name", void 0);
+    (0,defineProperty/* default */.Z)(this, "_domLevel", void 0);
+    (0,defineProperty/* default */.Z)(this, "_selectLevel", void 0);
+    (0,defineProperty/* default */.Z)(this, "_background", void 0);
+    (0,defineProperty/* default */.Z)(this, "_hoEditorFactoryID", void 0);
+    (0,defineProperty/* default */.Z)(this, "_drawDocContainer", void 0);
+    (0,defineProperty/* default */.Z)(this, "_headerLeftTag", void 0);
+    (0,defineProperty/* default */.Z)(this, "_headerRightTag", void 0);
+    (0,defineProperty/* default */.Z)(this, "_footerLeftTag", void 0);
+    (0,defineProperty/* default */.Z)(this, "_footerRightTag", void 0);
+    (0,defineProperty/* default */.Z)(this, "_drawHeader", void 0);
+    (0,defineProperty/* default */.Z)(this, "_drawFooter", void 0);
+    (0,defineProperty/* default */.Z)(this, "_storeDrawHeader", void 0);
+    (0,defineProperty/* default */.Z)(this, "_storeDrawFooter", void 0);
+    (0,defineProperty/* default */.Z)(this, "_needUpdateStage", void 0);
+    (0,defineProperty/* default */.Z)(this, "_selectContainer", void 0);
+    (0,defineProperty/* default */.Z)(this, "_mainDocBorder", void 0);
+    (0,defineProperty/* default */.Z)(this, "_drawMainDoc", void 0);
+    (0,defineProperty/* default */.Z)(this, "_activeDrawRect", void 0);
+    this._hoEditorFactoryID = hoeditorfacotryID;
+    this._selectContainer = new createjs.Container();
+    this._selectContainer.id = index;
+    // this._docTree = doc;
+    // this._drawTree = drawTree;
+    // this._docTree = hoeditorfacotry.docTree;
+    // this._drawTree = hoeditorfacotry.drawTree;
+    this._active = false;
+    this._pageIndex = index;
+    this._name = 'vuePage';
+    this._domLevel = null;
+    this._selectLevel = null;
+    this._needUpdateStage = true;
+    //左上角分隔标记
+    this._headerLeftTag = this.addAreaSplitTag(19.5, -0.5, 19.5, 19.5, 0, 19.5);
+    //右上角分隔标记
+    this._headerRightTag = this.addAreaSplitTag(0.5, -0.5, 0.5, 19.5, 19.5, 19.5);
+    //左下角分隔标记
+    this._footerLeftTag = this.addAreaSplitTag(19.5, 19.5, 19.5, 0.5, 0.5, 0.5);
+    //右下角分隔标记
+    this._footerRightTag = this.addAreaSplitTag(0.5, 20.5, 0.5, 0.5, 20.5, 0.5);
+    this._drawDocContainer = new createjs.Container();
+  }
+  (0,createClass/* default */.Z)(DrawPage, [{
+    key: "needUpdateStage",
+    get:
+    //当前页的激活状态
+    // private _docTree: DocTree;
+    // private _drawTree: DrawTree;
+    //页码
+
+    function get() {
+      return this._needUpdateStage;
+    },
+    set: function set(needUpdateStage) {
+      this._needUpdateStage = needUpdateStage;
+    }
+  }, {
+    key: "storeDrawHeader",
+    get: function get() {
+      return this._storeDrawHeader;
+    },
+    set: function set(storeDrawHeader) {
+      this._storeDrawHeader = storeDrawHeader;
+    }
+  }, {
+    key: "storeDrawFooter",
+    get: function get() {
+      return this._storeDrawFooter;
+    },
+    set: function set(storeDrawFooter) {
+      this._storeDrawFooter = storeDrawFooter;
+    }
+  }, {
+    key: "drawMainDoc",
+    get: function get() {
+      return this._drawMainDoc;
+    }
+  }, {
+    key: "drawHeader",
+    get: function get() {
+      return this._drawHeader;
+    },
+    set: function set(drawHeader) {
+      this._drawHeader = drawHeader;
+    }
+  }, {
+    key: "drawFooter",
+    get: function get() {
+      return this._drawFooter;
+    },
+    set: function set(drawFooter) {
+      this._drawFooter = drawFooter;
+    }
+  }, {
+    key: "headerLeftTag",
+    get: function get() {
+      return this._headerLeftTag;
+    }
+  }, {
+    key: "headerRightTag",
+    get: function get() {
+      return this._headerRightTag;
+    }
+    //当前激活的编辑器
+  }, {
+    key: "activeDrawRect",
+    get: function get() {
+      return this._activeDrawRect;
+    },
+    set: function set(val) {
+      if (this._activeDrawRect != val) {
+        this._activeDrawRect = val;
+      }
+    }
+  }, {
+    key: "footerLeftTag",
+    get: function get() {
+      return this._footerLeftTag;
+    }
+  }, {
+    key: "footerRightTag",
+    get: function get() {
+      return this._footerRightTag;
+    }
+  }, {
+    key: "mainDocBorder",
+    get: function get() {
+      return this._mainDocBorder;
+    }
+  }, {
+    key: "selectContainer",
+    get: function get() {
+      return this._selectContainer;
+    }
+  }, {
+    key: "afterCreate",
+    value: function afterCreate() {
+      var index = this._pageIndex;
+      var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID);
+      this._drawMainDoc = hoEditorFactory.drawPageTree.drawMainDocs[index];
+      var headerIndex = hoEditorFactory.subDocManger.getSubDocIndex(index, SubDocManger/* HeaderFooterType.hftHead */.pi.hftHead)[0];
+      this._storeDrawHeader = new DrawHeader/* DrawHeader */.g(this._hoEditorFactoryID, "".concat(DocTree/* gHeaderPath */.Yh, "/").concat(headerIndex), index);
+      var footerIndex = hoEditorFactory.subDocManger.getSubDocIndex(index, SubDocManger/* HeaderFooterType.hftFoot */.pi.hftFoot)[0];
+      this._storeDrawFooter = new DrawFooter/* DrawFooter */.d(this._hoEditorFactoryID, "".concat(DocTree/* gFooterPath */.LE, "/").concat(footerIndex), index);
+      this._drawHeader = this._storeDrawHeader;
+      this._drawFooter = this._storeDrawFooter;
+      // hoEditorFactory.subDocManger.copySubDocToPages(
+      //   hoEditorFactory.drawPageTree.drawHeaders[headerIndex],
+      //   index,
+      //   HeaderFooterType.hftHead
+      // );
+      // hoEditorFactory.subDocManger.repaintPageMarkNodes(
+      //   this._drawHeader,
+      //   HeaderFooterType.hftHead
+      // );
+      // hoEditorFactory.subDocManger.copySubDocToPages(
+      //   hoEditorFactory.drawPageTree.drawHeaders[footerIndex],
+      //   index,
+      //   HeaderFooterType.hftFoot
+      // );
+      // hoEditorFactory.subDocManger.repaintPageMarkNodes(
+      //   this._drawFooter,
+      //   HeaderFooterType.hftFoot
+      // );
+      this._activeDrawRect = this._drawMainDoc;
+    }
+    /**
+     * @author xyl
+     * @param domLevel  文档绘制层
+     * @param selectLevel 选区绘制层
+     * @description 初始化绘制页
+     */
+  }, {
+    key: "init",
+    value: function init(domLevel, selectLevel) {
+      this._domLevel = domLevel;
+      this._selectLevel = selectLevel;
+      // this.repaint();
+    }
+  }, {
+    key: "setEnableMouseOver",
+    value: function setEnableMouseOver(count) {
+      var selectLevel = this._selectLevel;
+      var domLevel = this._domLevel;
+      if (selectLevel.stage && domLevel.stage) {
+        selectLevel.stage.enableMouseOver(count);
+        selectLevel.stage.nextStage = domLevel.stage;
+        domLevel.stage.enableMouseOver(count);
+      }
+    }
+  }, {
+    key: "addMainDocBorder",
+    value: function addMainDocBorder(topY) {
+      var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID);
+      var leftX = hoEditorFactory.pageProperty.leftMarginPixes;
+      var rightX = hoEditorFactory.pageProperty.widthPixes - hoEditorFactory.pageProperty.rightMarginPixes;
+      var bottomY = topY + this._drawMainDoc.dHeight;
+      var aTag = new createjs.Container();
+      var ashape = new createjs.Shape();
+      var color = hoEditorFactory.pageProperty.borderColor;
+      var paintLineStyle = hoEditorFactory.pageProperty.paintRowLine;
+      ashape.graphics.beginStroke(color);
+      if (paintLineStyle == PageProperty/* PaintRowLineStyle.solid */.kd.solid) {
+        ashape.graphics.setStrokeStyle(1);
+      } else if (paintLineStyle == PageProperty/* PaintRowLineStyle.dot */.kd.dot) {
+        ashape.graphics.setStrokeDash([3, 3], 0);
+      } else if (paintLineStyle == PageProperty/* PaintRowLineStyle.dash */.kd.dash) {
+        ashape.graphics.setStrokeDash([9, 9], 0);
+      } else if (paintLineStyle == PageProperty/* PaintRowLineStyle.dashdot */.kd.dashdot) {
+        ashape.graphics.setStrokeDash([9, 3, 3, 9], 0);
+      } else if (paintLineStyle == PageProperty/* PaintRowLineStyle.dashdotdo */.kd.dashdotdo) {
+        ashape.graphics.setStrokeDash([9, 3, 3, 3, 3, 9], 0);
+      }
+      ashape.graphics.moveTo(leftX - 0.5, topY - 0.5);
+      ashape.graphics.lineTo(rightX + 0.5, topY - 0.5);
+      ashape.graphics.moveTo(rightX + 0.5, topY - 0.5);
+      ashape.graphics.lineTo(rightX + 0.5, bottomY + 0.5);
+      ashape.graphics.moveTo(rightX + 0.5, bottomY + 0.5);
+      ashape.graphics.lineTo(leftX - 0.5, bottomY + 0.5);
+      ashape.graphics.moveTo(leftX - 0.5, bottomY + 0.5);
+      ashape.graphics.lineTo(leftX - 0.5, topY - 0.5);
+      ashape.x = 0;
+      ashape.y = 0;
+      aTag.addChild(ashape);
+      return aTag;
+    }
+  }, {
+    key: "addAreaSplitTag",
+    value: function addAreaSplitTag(x1, y1, x2, y2, x3, y3) {
+      var aTag = new createjs.Container();
+      var ashape = new createjs.Shape();
+      ashape.graphics.beginStroke('#000').setStrokeStyle(1);
+      ashape.graphics.moveTo(x1, y1);
+      ashape.graphics.lineTo(x2, y2);
+      ashape.graphics.moveTo(x2, y2);
+      ashape.graphics.lineTo(x3, y3);
+      ashape.x = 0;
+      ashape.y = 0;
+      aTag.addChild(ashape);
+      return aTag;
+    }
+  }, {
+    key: "drawSelectLevel",
+    get: function get() {
+      return this._selectLevel;
+    }
+  }, {
+    key: "drawDomLevel",
+    get: function get() {
+      return this._domLevel;
+    }
+    // get docTree() {
+    //   return this._docTree;
+    // }
+    // get drawTree() {
+    //   return this._drawTree;
+    // }
+  }, {
+    key: "pageIndex",
+    get: function get() {
+      return this._pageIndex;
+    }
+  }, {
+    key: "name",
+    get: function get() {
+      return this._name;
+    }
+    /**
+     *
+     * @param mode 0:清空selectlevel  1:清空DomLevel
+     */
+  }, {
+    key: "clear",
+    value: function clear(mode) {
+      var lm = typeof mode != 'number' ? 2 : mode;
+      if (lm != 1) {
+        this._selectContainer.removeAllChildren();
+      }
+      if (this._domLevel && this._domLevel.stage && lm != 0) {
+        this._domLevel.stage.clear();
+      }
+    }
+  }, {
+    key: "destory",
+    value: function destory() {
+      this._domLevel = null;
+      this._selectLevel = null;
+    }
+    /**
+     * 更新页面绘制范围
+     */
+  }, {
+    key: "reFreshBounds",
+    value: function reFreshBounds() {
+      if (!this._domLevel) return;
+      var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID);
+      this.pageIndex;
+      var dhheight = Math.max(this._drawHeader.actualHeight + hoEditorFactory.pageProperty.headerYPixes, hoEditorFactory.pageProperty.topMarginPixes);
+      var dfheight = Math.max(this._drawFooter.actualHeight + hoEditorFactory.pageProperty.footerYPixes, hoEditorFactory.pageProperty.bottomMarginPixes); // Math.max(
+      //   hoEditorFactory.pageProperty.topMarginPixes,
+      //   wHeaderthis._domLevel.dra.actualHeight
+      // );
+      // const dfheight = Math.max(
+      //   hoEditorFactory.pageProperty.topMarginPixes,
+      //    this._drawFooter.actualHeight
+      // );
+      // console.log(dhheight);
+      // if (path.startsWith('header') || path.startsWith('footer')) {
+      //根据页眉，页脚高度重新设置正文位置和高度
+      this._domLevel.mainDocTop = dhheight;
+      this.drawMainDoc.maxHeight = hoEditorFactory.pageProperty.heightPixes - dhheight - dfheight;
+      this.drawMainDoc.dHeight = hoEditorFactory.pageProperty.heightPixes - dhheight - dfheight;
+      //TODO:正文重新绘制，还可能创建新的页面，等其他操作 this._domLevel.drawMainDoc.paintArea();
+      // }
+      // if (path.startsWith('footer')) {
+      this._drawHeader.y = hoEditorFactory.pageProperty.headerYPixes;
+      this._drawFooter.dTop = hoEditorFactory.pageProperty.heightPixes - dfheight;
+      this._drawFooter.y = this._drawFooter.dTop;
+      this._domLevel.footerTop = this._drawFooter.dTop;
+      this._headerLeftTag.y = dhheight - 20;
+      this._headerLeftTag.x = hoEditorFactory.pageProperty.leftMarginPixes - 20;
+      this._headerRightTag.x = hoEditorFactory.pageProperty.widthPixes - hoEditorFactory.pageProperty.rightMarginPixes;
+      this._headerRightTag.y = dhheight - 20;
+      this._footerLeftTag.y = this._drawFooter.y;
+      this._footerLeftTag.x = this._headerLeftTag.x;
+      this._footerRightTag.x = this._headerRightTag.x;
+      this._footerRightTag.y = this._drawFooter.y;
+      this._drawMainDoc.x = hoEditorFactory.pageProperty.leftMarginPixes;
+      this._mainDocBorder && (this._mainDocBorder.children = []);
+      if (hoEditorFactory.pageProperty.borderColor !== '#FFFFFF' && hoEditorFactory.pageProperty.isPaintBorder) {
+        var _this$_domLevel$stage;
+        this._mainDocBorder = this.addMainDocBorder(dhheight);
+        (_this$_domLevel$stage = this._domLevel.stage) === null || _this$_domLevel$stage === void 0 ? void 0 : _this$_domLevel$stage.addChild(this._mainDocBorder);
+      }
+      this._drawHeader.paintMask(dhheight);
+      this._drawFooter.paintMask(dfheight);
+      hoEditorFactory.pageProperty.canvasHeadFootPos.headerY = dhheight;
+      hoEditorFactory.pageProperty.canvasHeadFootPos.footerY = dfheight;
+      // }
+      // this.refresh();
+    }
+    /**
+     * 隐藏此页面上的表格边框
+     */
+    // public hideCellBorder() {
+    //   const maindoc = this.drawDomLevel?.drawMainDoc;
+    //   if (maindoc) {
+    //     maindoc.drawLines.forEach((value) => {
+    //       if (value instanceof DrawPageCell) {
+    //         //TODO：隐藏边框
+    //         console.log("隐藏边框");
+    //       }
+    //     });
+    //   }
+    // }
+  }, {
+    key: "paintBackGround",
+    value: function () {
+      var _paintBackGround = (0,asyncToGenerator/* default */.Z)( /*#__PURE__*/(0,regeneratorRuntime/* default */.Z)().mark(function _callee() {
+        var hoEditorFactory, backColor;
+        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.instance */.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();
+                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);
+                }
+              case 6:
+              case "end":
+                return _context.stop();
+            }
+          }
+        }, _callee, this);
+      }));
+      function paintBackGround() {
+        return _paintBackGround.apply(this, arguments);
+      }
+      return paintBackGround;
+    }()
+  }, {
+    key: "removeBackGroud",
+    value: function removeBackGroud() {
+      if (this._background && this._domLevel && this._domLevel.stage) {
+        this.drawDocContainer.removeChild(this._background);
+      }
+    }
+  }, {
+    key: "BackGround",
+    get: function get() {
+      return this._background;
+    }
+    /**
+     * @author xyl
+     * @param path 路径
+     * @returns 根据文档路径获取当前所在的绘制区域对象
+     *
+     */
+  }, {
+    key: "getDrawAreaByPath",
+    value: function getDrawAreaByPath(path) {
+      var arr = path.split('/');
+      if (arr[0] === DocTree/* gMainPath */.d9) {
+        return this._drawMainDoc;
+      } else if (arr[0] === DocTree/* gHeaderPath */.Yh) {
+        //FIXME:这样返回是过渡，因为hodoc.vue返回的pagepos不对
+        //   return hoEditorFactory.drawTree.getHeaderByPath(path);
+        return this._drawHeader;
+      } else if (arr[0] === DocTree/* gFooterPath */.LE) {
+        //FIXME:这样返回是过渡，因为hodoc.vue返回的pagepos不对
+        //   return hoEditorFactory.drawTree.getFooterByPath(path);
+        return this._drawFooter;
+      } else {
+        throw new Error("\u9519\u8BEF\u7684\u6587\u6863\u8DEF\u5F84:".concat(path));
+      }
+    }
+  }, {
+    key: "drawDocContainer",
+    get: function get() {
+      return this._drawDocContainer;
+    }
+  }]);
+  return DrawPage;
+}();
 // EXTERNAL MODULE: ./src/editor/dom/DomRange.ts
 var DomRange = __webpack_require__(94639);
 // EXTERNAL MODULE: ./src/editor/draw/IDrawInfos.ts
@@ -80405,10 +80483,6 @@ var DrawPageTable = __webpack_require__(15694);
 var DrawArea = __webpack_require__(83358);
 // EXTERNAL MODULE: ./src/editor/events/NodeClickEvent.ts
 var NodeClickEvent = __webpack_require__(84561);
-// EXTERNAL MODULE: ./src/editor/draw/drawArea/DrawHeader.ts
-var DrawHeader = __webpack_require__(5328);
-// EXTERNAL MODULE: ./src/editor/draw/drawArea/DrawFooter.ts
-var DrawFooter = __webpack_require__(114);
 // EXTERNAL MODULE: ./src/editor/events/PageAreaChangedEvent.ts
 var PageAreaChangedEvent = __webpack_require__(86626);
 // EXTERNAL MODULE: ./src/editor/draw/drawNode/DrawPageCell.ts + 1 modules
@@ -80419,8 +80493,6 @@ var PrintStatus = __webpack_require__(63170);
 var DrawPageMainDoc = __webpack_require__(77441);
 // EXTERNAL MODULE: ./src/editor/draw/drawNode/DrawTextNode.ts + 1 modules
 var DrawTextNode = __webpack_require__(24492);
-// EXTERNAL MODULE: ./src/editor/SubDocManger.ts
-var SubDocManger = __webpack_require__(80556);
 // EXTERNAL MODULE: ./src/editor/dom/treeNode/TableFormula.ts
 var TableFormula = __webpack_require__(90832);
 // EXTERNAL MODULE: ./src/editor/draw/DrawConfig.ts
@@ -83455,7 +83527,7 @@ var DrawTree = /*#__PURE__*/function () {
   }, {
     key: "addPage",
     value: function addPage() {
-      var dpage = new DrawPage/* DrawPage */.h(this._hoEditorFactoryID, this._drawPages.length //,
+      var dpage = new DrawPage(this._hoEditorFactoryID, this._drawPages.length //,
       //HOEditorFactorys.instance().getFactory(this._hoEditorFactoryID).docTree,
       //this
       );
@@ -84470,7 +84542,7 @@ var DrawTree = /*#__PURE__*/function () {
           //   value.parentNode.update();
           // }
           var isCellInFormula = value.isCellInFormula(cell, r, c);
-          if (isCellInFormula || value.formularType === TableFormula/* FormularType.ftBMI */.a.ftBMI || value.formularType === TableFormula/* FormularType.ftLaborProcess */.a.ftLaborProcess || value.formularType === TableFormula/* FormularType.ftExpectedBirthDate */.a.ftExpectedBirthDate || value.formularType === TableFormula/* FormularType.ftPregnantWeeks */.a.ftPregnantWeeks || value.formularType === TableFormula/* FormularType.ftScoreMapping */.a.ftScoreMapping || value.formularType === TableFormula/* FormularType.ftBodySurfaceArea */.a.ftBodySurfaceArea || value.formularType === TableFormula/* FormularType.ftCalcDays */.a.ftCalcDays) {
+          if (isCellInFormula || value.formularType === TableFormula/* FormularType.ftBMI */.a.ftBMI || value.formularType === TableFormula/* FormularType.ftLaborProcess */.a.ftLaborProcess || value.formularType === TableFormula/* FormularType.ftExpectedBirthDate */.a.ftExpectedBirthDate || value.formularType === TableFormula/* FormularType.ftPregnantWeeks */.a.ftPregnantWeeks || value.formularType === TableFormula/* FormularType.ftScoreMapping */.a.ftScoreMapping || value.formularType === TableFormula/* FormularType.ftBodySurfaceArea */.a.ftBodySurfaceArea || value.formularType === TableFormula/* FormularType.ftCalcDays */.a.ftCalcDays || value.formularType === TableFormula/* FormularType.ftCalcTime */.a.ftCalcTime) {
             //const str = value.formulaStr;
             value.updateResult();
             value.getParentCell().drawCell.needUpdate = true;
@@ -85469,7 +85541,7 @@ var LineStyleUndoUnit = /*#__PURE__*/function () {
 /* harmony import */ var _draw_SelectRange__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(53901);
 /* harmony import */ var _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(74089);
 /* harmony import */ var _dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(24701);
-/* harmony import */ var _draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(48970);
+/* harmony import */ var _draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(51760);
 
 
 
@@ -85782,7 +85854,7 @@ var NodeDeleteUndoUnit = /*#__PURE__*/function (_UndoInfo) {
 /* harmony import */ var _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_22__ = __webpack_require__(74089);
 /* harmony import */ var _dom_treeNode_MarkNode__WEBPACK_IMPORTED_MODULE_23__ = __webpack_require__(57727);
 /* harmony import */ var _dom_treeNode_CellNode__WEBPACK_IMPORTED_MODULE_24__ = __webpack_require__(68598);
-/* harmony import */ var _draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_25__ = __webpack_require__(48970);
+/* harmony import */ var _draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_25__ = __webpack_require__(51760);
 
 
 
@@ -86605,7 +86677,7 @@ var NodeStyleUndoUnit = /*#__PURE__*/function () {
 /* harmony import */ var _editor_dom_DocTree__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(32629);
 /* harmony import */ var _dom_treeNode_TextNode__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(27198);
 /* harmony import */ var _events_NodeChangeEvent__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(2613);
-/* harmony import */ var _draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(48970);
+/* harmony import */ var _draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(51760);
 /* harmony import */ var _dom_DomRange__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(94639);
 /* harmony import */ var _TextNodeSplitUndoUnit__WEBPACK_IMPORTED_MODULE_19__ = __webpack_require__(59057);
 /* harmony import */ var _events_SelectionChangeEvent__WEBPACK_IMPORTED_MODULE_20__ = __webpack_require__(931);
@@ -87166,7 +87238,7 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
                 n = 0;
               case 14:
                 if (!(n < nodes.length)) {
-                  _context2.next = 38;
+                  _context2.next = 37;
                   break;
                 }
                 node = nodes[n];
@@ -87178,15 +87250,12 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
                 this._isError = true;
                 return _context2.abrupt("return");
               case 20:
-                if (nodes.length === 1 && node instanceof _dom_treeNode_TextInputFieldNode__WEBPACK_IMPORTED_MODULE_22__/* .TextInputFieldNode */ .re && !node.isAllowDelete && nodes[0].childNodes[1] instanceof _dom_treeNode_MarkNode__WEBPACK_IMPORTED_MODULE_23__/* .MarkNode */ .j) {
-                  hoEditorFactory.docTree.curDomRange.setSamePath(this._endPath);
-                }
                 if (!(node instanceof _dom_treeNode_ControlNode__WEBPACK_IMPORTED_MODULE_30__/* .ControlNode */ .w || node instanceof _dom_treeNode_TextInputFieldNode__WEBPACK_IMPORTED_MODULE_22__/* .TextInputFieldNode */ .re)) {
-                  _context2.next = 31;
+                  _context2.next = 30;
                   break;
                 }
                 if (node.isAllowDelete) {
-                  _context2.next = 31;
+                  _context2.next = 30;
                   break;
                 }
                 tip = "";
@@ -87205,18 +87274,22 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
                 ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_39__/* ["default"].warn */ .Z.warn(tip + "元素已设置为不允许删除。请先右键元素属性设置成允许删除,再进行删除操作。");
                 this._isError = true;
                 return _context2.abrupt("return");
-              case 31:
+              case 30:
                 if (!(node instanceof _dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_35__/* .SignNode */ .N && node.isTemplate && node.number === 0)) {
-                  _context2.next = 35;
+                  _context2.next = 34;
                   break;
                 }
                 ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_39__/* ["default"].warn */ .Z.warn("该签名元素不允许删除！");
                 this._isError = true;
                 return _context2.abrupt("return");
-              case 35:
+              case 34:
                 n++;
                 _context2.next = 14;
                 break;
+              case 37:
+                if (nodes.length === 1 && nodes[0] instanceof _dom_treeNode_TextInputFieldNode__WEBPACK_IMPORTED_MODULE_22__/* .TextInputFieldNode */ .re && !nodes[0].isAllowDelete && nodes[0].childNodes[1] instanceof _dom_treeNode_MarkNode__WEBPACK_IMPORTED_MODULE_23__/* .MarkNode */ .j) {
+                  hoEditorFactory.docTree.curDomRange.setSamePath(this._endPath);
+                }
               case 38:
                 pnode = (_currRange$npEnd$node = currRange.npEnd.node) === null || _currRange$npEnd$node === void 0 ? void 0 : _currRange$npEnd$node.parentNode;
                 if (!(pnode && pnode instanceof _dom_treeNode_TextInputFieldNode__WEBPACK_IMPORTED_MODULE_22__/* .TextInputFieldNode */ .re && currRange.npEnd.path != hoEditorFactory.docTree.getNodeLastPath(pnode))) {
@@ -89621,8 +89694,8 @@ var es_object_to_string = __webpack_require__(41539);
 var es_regexp_to_string = __webpack_require__(39714);
 // EXTERNAL MODULE: ./src/HOEditorFactorys.ts
 var HOEditorFactorys = __webpack_require__(74089);
-// EXTERNAL MODULE: ./src/editor/draw/drawTree/DrawTree.ts + 3 modules
-var DrawTree = __webpack_require__(48970);
+// EXTERNAL MODULE: ./src/editor/draw/drawTree/DrawTree.ts + 4 modules
+var DrawTree = __webpack_require__(51760);
 ;// CONCATENATED MODULE: ./src/editor/undoRedo/ContainerUndoUnit.ts
 
 
@@ -196158,7 +196231,7 @@ var map = {
 	"./table/TableColProperty.vue": 2116,
 	"./table/TableForm.vue": 19064,
 	"./table/TableFormTree.vue": 39703,
-	"./table/TableFormula.vue": 79032,
+	"./table/TableFormula.vue": 66591,
 	"./table/TableProperty.vue": 47130,
 	"./table/TableRowProperty.vue": 5218,
 	"./textDialog/TextDialog.vue": 74353,
@@ -232567,19 +232640,19 @@ var es_string_match = __webpack_require__(4723);
 var es_number_constructor = __webpack_require__(9653);
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.json.stringify.js
 var es_json_stringify = __webpack_require__(38862);
-;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/HoDoc.vue?vue&type=template&id=1734b9ac&
-var HoDocvue_type_template_id_1734b9ac_render = function render() {
+;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/HoDoc.vue?vue&type=template&id=3b98bb65&
+var HoDocvue_type_template_id_3b98bb65_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
     class: _vm.docClassNames,
     style: {
-      minWidth: _vm.canvasParams.width + 'px'
+      minWidth: _vm.normalWidth + 'px'
     }
   }, [_vm.drawPageLength > 0 ? _c('div', {
     staticClass: "editor",
     style: {
-      minWidth: _vm.canvasParams.width + 'px'
+      minWidth: _vm.normalWidth + 'px'
     },
     on: {
       "click": function click($event) {
@@ -232713,7 +232786,7 @@ var HoDocvue_type_template_id_1734b9ac_render = function render() {
     }
   }, [_vm._v("v " + _vm._s(_vm.version))])])])], 1);
 };
-var HoDocvue_type_template_id_1734b9ac_staticRenderFns = [];
+var HoDocvue_type_template_id_3b98bb65_staticRenderFns = [];
 
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.filter.js
 var es_array_filter = __webpack_require__(57327);
@@ -232723,23 +232796,23 @@ var es_string_includes = __webpack_require__(32023);
 var es_array_sort = __webpack_require__(2707);
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.string.replace.js
 var es_string_replace = __webpack_require__(15306);
-;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/HoPage.vue?vue&type=template&id=59b9f9ce&scoped=true&
-var HoPagevue_type_template_id_59b9f9ce_scoped_true_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/HoPage.vue?vue&type=template&id=f467d786&scoped=true&
+var HoPagevue_type_template_id_f467d786_scoped_true_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
     ref: "hoPage",
     class: _vm.pageClassNames,
     style: {
-      height: _vm.scaleHeight + 'px',
-      width: _vm.scaleWidth + 'px'
+      height: _vm.normalHeight + 'px',
+      width: _vm.normalWidth + 'px'
     }
   }, [_c('canvas', {
     ref: "domcanvas",
     class: _vm.domCanvasName,
     style: {
-      height: _vm.scaleHeight + 'px',
-      width: _vm.scaleWidth + 'px'
+      height: _vm.normalHeight + 'px',
+      width: _vm.normalWidth + 'px'
     },
     attrs: {
       "width": _vm.scaleWidth,
@@ -232749,8 +232822,8 @@ var HoPagevue_type_template_id_59b9f9ce_scoped_true_render = function render() {
     ref: "selectcanvas",
     staticClass: "selectcanvas",
     style: {
-      height: _vm.scaleHeight + 'px',
-      width: _vm.scaleWidth + 'px'
+      height: _vm.normalHeight + 'px',
+      width: _vm.normalWidth + 'px'
     },
     attrs: {
       "width": _vm.scaleWidth,
@@ -232764,7 +232837,7 @@ var HoPagevue_type_template_id_59b9f9ce_scoped_true_render = function render() {
   }), [_vm._t("hoAddCellButton")], _vm.index === _vm.aiInfo.pageIndex && _vm.aiInfo.aiText ? _c('AiModel', {
     attrs: {
       "textStyles": _vm.textStyles,
-      "scaleWidth": _vm.scaleWidth,
+      "scaleWidth": _vm.canvasWidth,
       "hoEditorFactoryId": _vm.hoEditorId,
       "aiInfo": _vm.aiInfo
     }
@@ -232788,7 +232861,7 @@ var HoPagevue_type_template_id_59b9f9ce_scoped_true_render = function render() {
     }], null, true)
   }) : _vm._e()], 2);
 };
-var HoPagevue_type_template_id_59b9f9ce_scoped_true_staticRenderFns = [];
+var HoPagevue_type_template_id_f467d786_scoped_true_staticRenderFns = [];
 
 // EXTERNAL MODULE: ./node_modules/@babel/runtime/helpers/esm/regeneratorRuntime.js
 var regeneratorRuntime = __webpack_require__(80543);
@@ -232814,8 +232887,8 @@ var es_string_starts_with = __webpack_require__(23157);
 var es_array_splice = __webpack_require__(40561);
 // EXTERNAL MODULE: ./src/editor/dom/DocTree.ts
 var DocTree = __webpack_require__(32629);
-// EXTERNAL MODULE: ./src/editor/draw/drawTree/DrawTree.ts + 3 modules
-var DrawTree = __webpack_require__(48970);
+// EXTERNAL MODULE: ./src/editor/draw/drawTree/DrawTree.ts + 4 modules
+var DrawTree = __webpack_require__(51760);
 // EXTERNAL MODULE: ./src/editor/events/SelectionChangeEvent.ts
 var SelectionChangeEvent = __webpack_require__(931);
 // EXTERNAL MODULE: ./src/editor/dom/DomRange.ts
@@ -232922,8 +232995,8 @@ var DrawSelectLevel = /*#__PURE__*/function () {
         this._selectCanvas.width = hoEditorFactory.pageProperty.canvasParams.width;
         this._selectCanvas.height = hoEditorFactory.pageProperty.canvasParams.height; //   if (hoEditorFactory.drawTree.paintStatus === PaintState.psReview) {
         this._selectStage = new createjs.Stage(this._selectCanvas);
-        this._selectStage.scaleX = DrawConfig/* DrawConfig.instance */.f.instance().scaleXY;
-        this._selectStage.scaleY = DrawConfig/* DrawConfig.instance */.f.instance().scaleXY;
+        this._selectStage.scaleX = Math.max(DrawConfig/* DrawConfig.instance */.f.instance().scaleXY, DrawConfig/* DrawConfig.instance */.f.instance().transformScale);
+        this._selectStage.scaleY = Math.max(DrawConfig/* DrawConfig.instance */.f.instance().scaleXY, DrawConfig/* DrawConfig.instance */.f.instance().transformScale);
         var dPage = hoEditorFactory.drawTree.drawPages[this._pageIndex];
         if ((_dPage$drawDomLevel = dPage.drawDomLevel) !== null && _dPage$drawDomLevel !== void 0 && _dPage$drawDomLevel.stage) this._selectStage.nextStage = (_dPage$drawDomLevel2 = dPage.drawDomLevel) === null || _dPage$drawDomLevel2 === void 0 ? void 0 : _dPage$drawDomLevel2.stage;
         dPage.setEnableMouseOver(5);
@@ -233520,8 +233593,8 @@ var DrawDomLevel = /*#__PURE__*/function () {
         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.instance */.f.instance().scaleXY;
-        this._domStage.scaleY = DrawConfig/* DrawConfig.instance */.f.instance().scaleXY;
+        this._domStage.scaleX = Math.max(DrawConfig/* DrawConfig.instance */.f.instance().scaleXY, DrawConfig/* DrawConfig.instance */.f.instance().transformScale);
+        this._domStage.scaleY = Math.max(DrawConfig/* DrawConfig.instance */.f.instance().scaleXY, DrawConfig/* DrawConfig.instance */.f.instance().transformScale);
         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) {
@@ -233649,7 +233722,7 @@ var DrawDomLevel = /*#__PURE__*/function () {
     value: function getDrawPlaceByPos(x, y) {
       var hoeditorfactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID);
       var dPage = hoeditorfactory.drawTree.drawPages[this._pageIndex];
-      var adjy = y / DrawConfig/* DrawConfig.instance */.f.instance().scaleXY;
+      var adjy = y / Math.max(DrawConfig/* DrawConfig.instance */.f.instance().scaleXY, DrawConfig/* DrawConfig.instance */.f.instance().transformScale);
       if (adjy >= 0 && adjy <= this._mainDocTop) {
         return dPage.drawHeader;
       } else if (adjy > this._mainDocTop && adjy < this._footerTop) {
@@ -233903,7 +233976,6 @@ var AiModels_component = (0,componentNormalizer/* default */.Z)(
 
 
 
-
 /* harmony default export */ var HoPagevue_type_script_lang_js_ = ({
   name: 'HoPage',
   components: {
@@ -233970,6 +234042,20 @@ var AiModels_component = (0,componentNormalizer/* default */.Z)(
     scaleWidth: function scaleWidth() {
       return this.canvasWidth;
     },
+    normalWidth: function normalWidth() {
+      var width = this.canvasWidth / DrawConfig/* DrawConfig.instance */.f.instance().transformScale;
+      if (width % 2 === 1) {
+        return width + 1;
+      }
+      return width;
+    },
+    normalHeight: function normalHeight() {
+      var height = this.canvasHeight / DrawConfig/* DrawConfig.instance */.f.instance().transformScale;
+      if (height % 2 === 1) {
+        return height + 1;
+      }
+      return height;
+    },
     domCanvasName: function domCanvasName() {
       return this.currentActivePages === this.index ? 'domcanvas domcanvas-selected' : 'domcanvas';
     }
@@ -234026,10 +234112,10 @@ var AiModels_component = (0,componentNormalizer/* default */.Z)(
 });
 ;// CONCATENATED MODULE: ./src/components/HoPage.vue?vue&type=script&lang=js&
  /* harmony default export */ var components_HoPagevue_type_script_lang_js_ = (HoPagevue_type_script_lang_js_); 
-;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-12.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-12.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-12.use[2]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/HoPage.vue?vue&type=style&index=0&id=59b9f9ce&prod&scoped=true&lang=css&
+;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-12.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-12.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-12.use[2]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/HoPage.vue?vue&type=style&index=0&id=f467d786&prod&scoped=true&lang=css&
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./src/components/HoPage.vue?vue&type=style&index=0&id=59b9f9ce&prod&scoped=true&lang=css&
+;// CONCATENATED MODULE: ./src/components/HoPage.vue?vue&type=style&index=0&id=f467d786&prod&scoped=true&lang=css&
 
 ;// CONCATENATED MODULE: ./src/components/HoPage.vue
 
@@ -234042,11 +234128,11 @@ var AiModels_component = (0,componentNormalizer/* default */.Z)(
 
 var HoPage_component = (0,componentNormalizer/* default */.Z)(
   components_HoPagevue_type_script_lang_js_,
-  HoPagevue_type_template_id_59b9f9ce_scoped_true_render,
-  HoPagevue_type_template_id_59b9f9ce_scoped_true_staticRenderFns,
+  HoPagevue_type_template_id_f467d786_scoped_true_render,
+  HoPagevue_type_template_id_f467d786_scoped_true_staticRenderFns,
   false,
   null,
-  "59b9f9ce",
+  "f467d786",
   null
   
 )
@@ -234228,8 +234314,6 @@ var HoToPage_component = (0,componentNormalizer/* default */.Z)(
 ;// CONCATENATED MODULE: ./src/components/backToPage/index.ts
 
 /* harmony default export */ var backToPage = (HoToPage);
-// EXTERNAL MODULE: ./src/editor/draw/drawArea/DrawPage.ts
-var DrawPage = __webpack_require__(72722);
 // EXTERNAL MODULE: ./src/plugins/util.ts
 var plugins_util = __webpack_require__(62783);
 // EXTERNAL MODULE: ./src/components/controls/poperSelect/PoperSelect.vue + 9 modules
@@ -234246,298 +234330,6 @@ var TableCellPoper = __webpack_require__(21277);
 var DateTimeNode = __webpack_require__(92501);
 // EXTERNAL MODULE: ./src/editor/dom/treeNode/DownListNode.ts
 var DownListNode = __webpack_require__(45712);
-// EXTERNAL MODULE: ./node_modules/core-js/modules/es.promise.js
-var es_promise = __webpack_require__(88674);
-// EXTERNAL MODULE: ./node_modules/core-js/modules/es.string.trim.js
-var es_string_trim = __webpack_require__(73210);
-;// CONCATENATED MODULE: ./src/editor/externalCall/ElementController.ts
-
-
-
-
-
-
-
-
-
-/*
- * @Author: your name
- * @Date: 2021-07-31 09:27:53
- * @LastEditTime: 2023-01-06 09:59:51
- * @LastEditors: liyanan 2441631434@qq.com
- * @Description: In User Settings Edit
- * @FilePath: \hoeditor-web\src\editor\externalCall\ElementController.ts
- */
-
-
-
-
-var ElementController = /*#__PURE__*/function () {
-  function ElementController(hoEditorFactoryID) {
-    (0,esm_classCallCheck/* default */.Z)(this, ElementController);
-    (0,esm_defineProperty/* default */.Z)(this, "_hoEditorFactoryID", void 0);
-    this._hoEditorFactoryID = hoEditorFactoryID;
-  }
-  /**
-   * 根据路径找节点
-   * @param path 路径
-   */
-  (0,esm_createClass/* default */.Z)(ElementController, [{
-    key: "findNodebyPath",
-    value: function findNodebyPath(path) {
-      var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID);
-      return hoEditorFactory.vueController.findNodebyPath(path);
-    }
-    /**
-     * 根据节点id找节点
-     * @param scope 查找区域 "all":所有区域  "header":页眉  "main":正文  "footer":页脚
-     * @param id 节点id
-     */
-  }, {
-    key: "getNodeByID",
-    value: function getNodeByID(scope, id) {
-      var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID);
-      return hoEditorFactory.vueController.getNodeByID(scope, id);
-    }
-    /**
-     * 根据节点名称找节点
-     * @param scope 查找区域 "all":所有区域  "header":页眉  "main":正文  "footer":页脚
-     * @param bFindAll 是否查找所有符合的 true:返回所有符合的 false:返回第一个符合的
-     * @param name 节点名称
-     */
-  }, {
-    key: "getNodesByName",
-    value: function getNodesByName(scope, bFindAll, name) {
-      var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID);
-      return hoEditorFactory.vueController.getNodesByName(scope, bFindAll, name);
-    }
-    /**
-     * 获取文本域内文本内容
-     * @param node 文本域节点
-     * @returns  域内文本内容
-     */
-  }, {
-    key: "getTextInputFieldValue",
-    value: function getTextInputFieldValue(node) {
-      var text = node.getFieldText();
-      return text;
-    }
-    /**
-     * 获取单元格内文本内容
-     * @param node 单元格节点
-     * @returns  单元格内文本内容
-     */
-  }, {
-    key: "getCellText",
-    value: function getCellText(node) {
-      var text = node.getCellText();
-      return text;
-    }
-    /**
-     * 更新文本域内文本
-     * @param node 文本域节点
-     * @param text 更新文本
-     * @param customProperty 自定义属性
-     */
-  }, {
-    key: "updateTextInputFieldValue",
-    value: function updateTextInputFieldValue(node, text, customProperty, keyValue, value, listItems) {
-      var hPromise = Promise.resolve();
-      hPromise = hPromise.then(function (res) {
-        return new Promise( /*#__PURE__*/function () {
-          var _ref = (0,asyncToGenerator/* default */.Z)( /*#__PURE__*/(0,regeneratorRuntime/* default */.Z)().mark(function _callee(resolve) {
-            return (0,regeneratorRuntime/* default */.Z)().wrap(function _callee$(_context) {
-              while (1) {
-                switch (_context.prev = _context.next) {
-                  case 0:
-                    if (!(node instanceof TextInputFieldNode/* TextInputFieldNode */.re)) {
-                      _context.next = 5;
-                      break;
-                    }
-                    _context.next = 3;
-                    return node.setFieldText(text, customProperty, keyValue, value);
-                  case 3:
-                    _context.next = 6;
-                    break;
-                  case 5:
-                    console.warn("\u9700\u8981TextInputFieldNode\u7C7B\u578B\u7684node\u5143\u7D20: node==>".concat(node, " text==>").concat(text));
-                  case 6:
-                    resolve();
-                  case 7:
-                  case "end":
-                    return _context.stop();
-                }
-              }
-            }, _callee);
-          }));
-          return function (_x) {
-            return _ref.apply(this, arguments);
-          };
-        }());
-      });
-    }
-    /**
-     * 更新单元格内文本
-     * @param node 单元格节点
-     * @param text 更新为
-     */
-  }, {
-    key: "updateCellText",
-    value: function updateCellText(node, text) {
-      node.setCellText(text);
-    }
-    /**
-     * 更新日期时间元素文本
-     * @param node 日期时间节点
-     * @param text 更新为
-     */
-  }, {
-    key: "updateDateTimeText",
-    value: function updateDateTimeText(node, text) {
-      node.setDateTimeText(text);
-    }
-    /**
-    * 更新下拉列表元素文本
-    * @param node 下拉列表节点
-    * @param text 更新为
-    */
-  }, {
-    key: "updateDownListText",
-    value: function updateDownListText(node, text) {
-      node.setDownListText(text);
-    }
-    /**
-     * 删除元素
-     * @param node 节点
-     */
-  }, {
-    key: "deleteNode",
-    value: function deleteNode(node) {
-      var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID);
-      hoEditorFactory.vueController.deleteNode(node);
-    }
-    /**
-     * 验证病历文件中所有文本域的数据格式
-     * @param 错误列表(元素,错误信息)
-     */
-  }, {
-    key: "verifyTextFieldsDataFormat",
-    value: function verifyTextFieldsDataFormat() {
-      var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID);
-      return hoEditorFactory.vueController.verifyTextFieldsDataFormat();
-    }
-    /**
-     *  @description 获取所有的元素：包括日期、下拉选择组件、文本域
-     * @returns 返回获取到的所有元素
-     */
-  }, {
-    key: "getAllElementNodes",
-    value: function getAllElementNodes() {
-      var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID);
-      var headerDocTree = hoEditorFactory.subDocManger.headerDocTree;
-      var mainNodes = hoEditorFactory.docTree.mainNodes;
-      var footerDocTree = hoEditorFactory.subDocManger.footerDocTree;
-      var ret = new Array();
-      for (var i = 0; i < headerDocTree.length; i++) {
-        var headerNodes = headerDocTree[i].subDocNodes;
-        var hsPath = headerNodes[0].getNodePath();
-        var hePath = hoEditorFactory.docTree.getNodeLastPath(headerNodes[headerNodes.length - 1]);
-        ret = ret.concat(DomRange/* DomRange.getElementNode */.a.getElementNode(this._hoEditorFactoryID, hsPath, hePath, true));
-      }
-      var msPath = mainNodes[0].getNodePath();
-      var mePath = hoEditorFactory.docTree.getNodeLastPath(mainNodes[mainNodes.length - 1]);
-      ret = ret.concat(DomRange/* DomRange.getElementNode */.a.getElementNode(this._hoEditorFactoryID, msPath, mePath, true));
-      for (var _i = 0; _i < footerDocTree.length; _i++) {
-        var footerNodes = footerDocTree[_i].subDocNodes;
-        var fsPath = footerNodes[0].getNodePath();
-        var fePath = hoEditorFactory.docTree.getNodeLastPath(footerNodes[footerNodes.length - 1]);
-        ret = ret.concat(DomRange/* DomRange.getElementNode */.a.getElementNode(this._hoEditorFactoryID, fsPath, fePath, true));
-      }
-      return ret;
-    }
-    /**
-    * 插入签名
-    * @param type 1图片 2字符串
-    * @param name 签名名称
-    * @param signor 签名人
-    * @param signTime 签名时间
-    * @param imgSrc type=1：图片路径或者base64，type=2：字符串
-    * @param imgWidth 图片宽
-    * @param imgHeight 图片高
-    * @param customProperty 自定义参数
-    */
-  }, {
-    key: "insertSignNode",
-    value: function insertSignNode(type, name, signor, signTime, signTimeFormat, imgSrc, imgWidth, imgHeight, customProperty, fingerPrintSrc) {
-      var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID);
-      hoEditorFactory.vueController.insertSignNode(type, name, signor, signTime, signTimeFormat, imgSrc, imgWidth, imgHeight, customProperty, fingerPrintSrc);
-    }
-    /**
-    * 更新签名
-    * @param node 签名节点
-    * @param type 1图片 2字符串
-    * @param name 签名名称
-    * @param signor 签名人
-    * @param signTime 签名时间
-    * @param imgSrc type=1：图片路径或者base64，type=2：字符串
-    * @param imgWidth 图片宽
-    * @param imgHeight 图片高
-    * @param customProperty 自定义参数
-    */
-  }, {
-    key: "updateSignNode",
-    value: function updateSignNode(node, type, name, signor, signTime, imgSrc, imgWidth, imgHeight, customProperty, fingerPrintSrc) {
-      var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID);
-      hoEditorFactory.vueController.updateSignNode(node, type, name, signor, signTime, imgSrc, imgWidth, imgHeight, customProperty, fingerPrintSrc);
-    }
-    /**
-     * 强制删除
-     */
-  }, {
-    key: "forceDelete",
-    value: function forceDelete() {
-      var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID);
-      hoEditorFactory.vueController.forceDelete();
-    }
-    /**
-     * @param node 单复选节点
-     * @param additionalInfo 附加说明
-     */
-  }, {
-    key: "editRadioCheckBoxText",
-    value: function editRadioCheckBoxText(node, appendText) {
-      if (!node || !(node instanceof RadioAndCheckBoxNode/* RadioAndCheckBoxNode */.Yh) || !node.isEditText || appendText.trim().length === 0) return;
-      var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID);
-      hoEditorFactory.vueController.editRadioCheckBoxText(node, appendText);
-    }
-    /**
-    * 获取当前病历中的所有元素
-    * @returns 返回元素是{id,name,text,json}的数据
-    */
-  }, {
-    key: "getAllElements",
-    value: function getAllElements() {
-      var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID);
-      hoEditorFactory.vueController.getAllElements();
-    }
-    /**
-     * 根据元素id更新元素
-     */
-  }, {
-    key: "updateElementById",
-    value: function updateElementById(id, eleJson) {
-      var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID);
-      hoEditorFactory.vueController.updateElementById(id, eleJson);
-    }
-  }, {
-    key: "moveCaretToElement",
-    value: function moveCaretToElement(scope, id) {
-      var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID);
-      hoEditorFactory.vueController.moveCaretToElement(scope, id);
-    }
-  }]);
-  return ElementController;
-}();
 ;// CONCATENATED MODULE: ./node_modules/intersection-observer-polyfill/src/shims/es6-collections.js
 /**
  * Simple shims for WeakMap and Map classes.
@@ -235932,7 +235724,7 @@ var ParagraphNode = __webpack_require__(67945);
 // EXTERNAL MODULE: ./src/editor/dom/treeNode/MarkNode.ts
 var MarkNode = __webpack_require__(57727);
 ;// CONCATENATED MODULE: ./src/components/version.ts
-/* harmony default export */ var version = ('3.0.58');
+/* harmony default export */ var version = ('3.0.60');
 // EXTERNAL MODULE: ./src/components/controls/poperTipText/PoperTipText.vue + 5 modules
 var PoperTipText = __webpack_require__(15845);
 ;// CONCATENATED MODULE: ./src/components/controls/poperTipText/index.ts
@@ -235978,12 +235770,9 @@ var ImageNode = __webpack_require__(97186);
 
 
 
-
-
-
-
-var defaultWidth = Math.floor(793 * DrawConfig/* DrawConfig.instance */.f.instance().scaleXY) % 2 === 1 ? Math.floor(793 * DrawConfig/* DrawConfig.instance */.f.instance().scaleXY) + 1 : Math.floor(793 * DrawConfig/* DrawConfig.instance */.f.instance().scaleXY);
-var defaultHeight = Math.floor(1122 * DrawConfig/* DrawConfig.instance */.f.instance().scaleXY) % 2 === 1 ? Math.floor(1122 * DrawConfig/* DrawConfig.instance */.f.instance().scaleXY) + 1 : Math.floor(1122 * DrawConfig/* DrawConfig.instance */.f.instance().scaleXY);
+var scaleXY = Math.max(DrawConfig/* DrawConfig.instance */.f.instance().scaleXY, DrawConfig/* DrawConfig.instance */.f.instance().transformScale);
+var defaultWidth = Math.floor(793 * scaleXY) % 2 === 1 ? Math.floor(793 * scaleXY) + 1 : Math.floor(793 * scaleXY);
+var defaultHeight = Math.floor(1122 * scaleXY) % 2 === 1 ? Math.floor(1122 * scaleXY) + 1 : Math.floor(1122 * scaleXY);
 /* harmony default export */ var HoDocvue_type_script_lang_js_ = ({
   name: 'HoDoc',
   components: {
@@ -236085,6 +235874,13 @@ var defaultHeight = Math.floor(1122 * DrawConfig/* DrawConfig.instance */.f.inst
   computed: {
     docClassNames: function docClassNames() {
       return this.hoEditorFactoryIdList.length === 1 ? 'edit-area edit-area-padding' : 'edit-area';
+    },
+    normalWidth: function normalWidth() {
+      var width = this.canvasParams.width / DrawConfig/* DrawConfig.instance */.f.instance().transformScale;
+      if (width % 2 === 1) {
+        return width + 1;
+      }
+      return width;
     }
   },
   watch: {
@@ -236643,10 +236439,10 @@ var defaultHeight = Math.floor(1122 * DrawConfig/* DrawConfig.instance */.f.inst
 });
 ;// CONCATENATED MODULE: ./src/components/HoDoc.vue?vue&type=script&lang=js&
  /* harmony default export */ var components_HoDocvue_type_script_lang_js_ = (HoDocvue_type_script_lang_js_); 
-;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-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/HoDoc.vue?vue&type=style&index=0&id=1734b9ac&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/HoDoc.vue?vue&type=style&index=0&id=3b98bb65&prod&lang=scss&
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./src/components/HoDoc.vue?vue&type=style&index=0&id=1734b9ac&prod&lang=scss&
+;// CONCATENATED MODULE: ./src/components/HoDoc.vue?vue&type=style&index=0&id=3b98bb65&prod&lang=scss&
 
 ;// CONCATENATED MODULE: ./src/components/HoDoc.vue
 
@@ -236659,8 +236455,8 @@ var defaultHeight = Math.floor(1122 * DrawConfig/* DrawConfig.instance */.f.inst
 
 var HoDoc_component = (0,componentNormalizer/* default */.Z)(
   components_HoDocvue_type_script_lang_js_,
-  HoDocvue_type_template_id_1734b9ac_render,
-  HoDocvue_type_template_id_1734b9ac_staticRenderFns,
+  HoDocvue_type_template_id_3b98bb65_render,
+  HoDocvue_type_template_id_3b98bb65_staticRenderFns,
   false,
   null,
   null,
@@ -238538,6 +238334,8 @@ var GenerateCode = /*#__PURE__*/function () {
 var message_style = __webpack_require__(94310);
 // EXTERNAL MODULE: ./node_modules/ant-design-vue/es/message/index.js + 3 modules
 var message = __webpack_require__(40735);
+// EXTERNAL MODULE: ./node_modules/core-js/modules/es.string.trim.js
+var es_string_trim = __webpack_require__(73210);
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.string.replace-all.js
 var es_string_replace_all = __webpack_require__(68757);
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.string.ends-with.js
@@ -239425,6 +239223,8 @@ var es_regexp_constructor = __webpack_require__(24603);
 var es_regexp_dot_all = __webpack_require__(28450);
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.regexp.sticky.js
 var es_regexp_sticky = __webpack_require__(88386);
+// EXTERNAL MODULE: ./node_modules/core-js/modules/es.promise.js
+var es_promise = __webpack_require__(88674);
 // EXTERNAL MODULE: ./node_modules/x2js/x2js.js
 var x2js_x2js = __webpack_require__(27098);
 var x2js_default = /*#__PURE__*/__webpack_require__.n(x2js_x2js);
@@ -241688,7 +241488,7 @@ var StructureConvert = /*#__PURE__*/function () {
         var formularNodes = hoEditorFactory.drawTree.formularNodes;
         var tableArr = [];
         formularNodes.forEach(function (value, key) {
-          if (value.formularType === TableFormula/* FormularType.ftSum */.a.ftSum || value.formularType === TableFormula/* FormularType.ftFormular */.a.ftFormular || value.formularType === TableFormula/* FormularType.ftBMI */.a.ftBMI || value.formularType === TableFormula/* FormularType.ftLaborProcess */.a.ftLaborProcess || value.formularType === TableFormula/* FormularType.ftExpectedBirthDate */.a.ftExpectedBirthDate || value.formularType === TableFormula/* FormularType.ftPregnantWeeks */.a.ftPregnantWeeks || value.formularType === TableFormula/* FormularType.ftScoreMapping */.a.ftScoreMapping || value.formularType === TableFormula/* FormularType.ftBodySurfaceArea */.a.ftBodySurfaceArea || value.formularType === TableFormula/* FormularType.ftCalcDays */.a.ftCalcDays) {
+          if (value.formularType === TableFormula/* FormularType.ftSum */.a.ftSum || value.formularType === TableFormula/* FormularType.ftFormular */.a.ftFormular || value.formularType === TableFormula/* FormularType.ftBMI */.a.ftBMI || value.formularType === TableFormula/* FormularType.ftLaborProcess */.a.ftLaborProcess || value.formularType === TableFormula/* FormularType.ftExpectedBirthDate */.a.ftExpectedBirthDate || value.formularType === TableFormula/* FormularType.ftPregnantWeeks */.a.ftPregnantWeeks || value.formularType === TableFormula/* FormularType.ftScoreMapping */.a.ftScoreMapping || value.formularType === TableFormula/* FormularType.ftBodySurfaceArea */.a.ftBodySurfaceArea || value.formularType === TableFormula/* FormularType.ftCalcDays */.a.ftCalcDays || value.formularType === TableFormula/* FormularType.ftCalcTime */.a.ftCalcTime) {
             value.updateResult();
             value.getParentCell().drawCell.needUpdate = true;
             var table = value.getParentCell().table;
@@ -248269,8 +248069,21 @@ var VueController = /*#__PURE__*/function () {
   }, {
     key: "setCanvasScale",
     value: function setCanvasScale(scale) {
+      if (DrawConfig/* DrawConfig.instance */.f.instance().transformScale == 1) {
+        var scaleXY = scale || 1;
+        DrawConfig/* DrawConfig.instance */.f.instance().scaleXY = scaleXY;
+      } else {
+        DrawConfig/* DrawConfig.instance */.f.instance().scaleXY = 1;
+      }
+    }
+  }, {
+    key: "setCanvasTransformScale",
+    value: function setCanvasTransformScale(scale) {
       var scaleXY = scale || 1;
-      DrawConfig/* DrawConfig.instance */.f.instance().scaleXY = scaleXY;
+      if (scaleXY > 1) {
+        DrawConfig/* DrawConfig.instance */.f.instance().scaleXY = 1;
+      }
+      DrawConfig/* DrawConfig.instance */.f.instance().transformScale = scaleXY;
     }
     /**
      * 根据节点名称和文本查询并设置高亮区域
@@ -251174,6 +250987,294 @@ var EditController = /*#__PURE__*/function () {
   }]);
   return EditController;
 }();
+;// CONCATENATED MODULE: ./src/editor/externalCall/ElementController.ts
+
+
+
+
+
+
+
+
+
+/*
+ * @Author: your name
+ * @Date: 2021-07-31 09:27:53
+ * @LastEditTime: 2023-01-06 09:59:51
+ * @LastEditors: liyanan 2441631434@qq.com
+ * @Description: In User Settings Edit
+ * @FilePath: \hoeditor-web\src\editor\externalCall\ElementController.ts
+ */
+
+
+
+
+var ElementController = /*#__PURE__*/function () {
+  function ElementController(hoEditorFactoryID) {
+    (0,esm_classCallCheck/* default */.Z)(this, ElementController);
+    (0,esm_defineProperty/* default */.Z)(this, "_hoEditorFactoryID", void 0);
+    this._hoEditorFactoryID = hoEditorFactoryID;
+  }
+  /**
+   * 根据路径找节点
+   * @param path 路径
+   */
+  (0,esm_createClass/* default */.Z)(ElementController, [{
+    key: "findNodebyPath",
+    value: function findNodebyPath(path) {
+      var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID);
+      return hoEditorFactory.vueController.findNodebyPath(path);
+    }
+    /**
+     * 根据节点id找节点
+     * @param scope 查找区域 "all":所有区域  "header":页眉  "main":正文  "footer":页脚
+     * @param id 节点id
+     */
+  }, {
+    key: "getNodeByID",
+    value: function getNodeByID(scope, id) {
+      var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID);
+      return hoEditorFactory.vueController.getNodeByID(scope, id);
+    }
+    /**
+     * 根据节点名称找节点
+     * @param scope 查找区域 "all":所有区域  "header":页眉  "main":正文  "footer":页脚
+     * @param bFindAll 是否查找所有符合的 true:返回所有符合的 false:返回第一个符合的
+     * @param name 节点名称
+     */
+  }, {
+    key: "getNodesByName",
+    value: function getNodesByName(scope, bFindAll, name) {
+      var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID);
+      return hoEditorFactory.vueController.getNodesByName(scope, bFindAll, name);
+    }
+    /**
+     * 获取文本域内文本内容
+     * @param node 文本域节点
+     * @returns  域内文本内容
+     */
+  }, {
+    key: "getTextInputFieldValue",
+    value: function getTextInputFieldValue(node) {
+      var text = node.getFieldText();
+      return text;
+    }
+    /**
+     * 获取单元格内文本内容
+     * @param node 单元格节点
+     * @returns  单元格内文本内容
+     */
+  }, {
+    key: "getCellText",
+    value: function getCellText(node) {
+      var text = node.getCellText();
+      return text;
+    }
+    /**
+     * 更新文本域内文本
+     * @param node 文本域节点
+     * @param text 更新文本
+     * @param customProperty 自定义属性
+     */
+  }, {
+    key: "updateTextInputFieldValue",
+    value: function updateTextInputFieldValue(node, text, customProperty, keyValue, value, listItems) {
+      var hPromise = Promise.resolve();
+      hPromise = hPromise.then(function (res) {
+        return new Promise( /*#__PURE__*/function () {
+          var _ref = (0,asyncToGenerator/* default */.Z)( /*#__PURE__*/(0,regeneratorRuntime/* default */.Z)().mark(function _callee(resolve) {
+            return (0,regeneratorRuntime/* default */.Z)().wrap(function _callee$(_context) {
+              while (1) {
+                switch (_context.prev = _context.next) {
+                  case 0:
+                    if (!(node instanceof TextInputFieldNode/* TextInputFieldNode */.re)) {
+                      _context.next = 5;
+                      break;
+                    }
+                    _context.next = 3;
+                    return node.setFieldText(text, customProperty, keyValue, value);
+                  case 3:
+                    _context.next = 6;
+                    break;
+                  case 5:
+                    console.warn("\u9700\u8981TextInputFieldNode\u7C7B\u578B\u7684node\u5143\u7D20: node==>".concat(node, " text==>").concat(text));
+                  case 6:
+                    resolve();
+                  case 7:
+                  case "end":
+                    return _context.stop();
+                }
+              }
+            }, _callee);
+          }));
+          return function (_x) {
+            return _ref.apply(this, arguments);
+          };
+        }());
+      });
+    }
+    /**
+     * 更新单元格内文本
+     * @param node 单元格节点
+     * @param text 更新为
+     */
+  }, {
+    key: "updateCellText",
+    value: function updateCellText(node, text) {
+      node.setCellText(text);
+    }
+    /**
+     * 更新日期时间元素文本
+     * @param node 日期时间节点
+     * @param text 更新为
+     */
+  }, {
+    key: "updateDateTimeText",
+    value: function updateDateTimeText(node, text) {
+      node.setDateTimeText(text);
+    }
+    /**
+    * 更新下拉列表元素文本
+    * @param node 下拉列表节点
+    * @param text 更新为
+    */
+  }, {
+    key: "updateDownListText",
+    value: function updateDownListText(node, text) {
+      node.setDownListText(text);
+    }
+    /**
+     * 删除元素
+     * @param node 节点
+     */
+  }, {
+    key: "deleteNode",
+    value: function deleteNode(node) {
+      var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID);
+      hoEditorFactory.vueController.deleteNode(node);
+    }
+    /**
+     * 验证病历文件中所有文本域的数据格式
+     * @param 错误列表(元素,错误信息)
+     */
+  }, {
+    key: "verifyTextFieldsDataFormat",
+    value: function verifyTextFieldsDataFormat() {
+      var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID);
+      return hoEditorFactory.vueController.verifyTextFieldsDataFormat();
+    }
+    /**
+     *  @description 获取所有的元素：包括日期、下拉选择组件、文本域
+     * @returns 返回获取到的所有元素
+     */
+  }, {
+    key: "getAllElementNodes",
+    value: function getAllElementNodes() {
+      var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID);
+      var headerDocTree = hoEditorFactory.subDocManger.headerDocTree;
+      var mainNodes = hoEditorFactory.docTree.mainNodes;
+      var footerDocTree = hoEditorFactory.subDocManger.footerDocTree;
+      var ret = new Array();
+      for (var i = 0; i < headerDocTree.length; i++) {
+        var headerNodes = headerDocTree[i].subDocNodes;
+        var hsPath = headerNodes[0].getNodePath();
+        var hePath = hoEditorFactory.docTree.getNodeLastPath(headerNodes[headerNodes.length - 1]);
+        ret = ret.concat(DomRange/* DomRange.getElementNode */.a.getElementNode(this._hoEditorFactoryID, hsPath, hePath, true));
+      }
+      var msPath = mainNodes[0].getNodePath();
+      var mePath = hoEditorFactory.docTree.getNodeLastPath(mainNodes[mainNodes.length - 1]);
+      ret = ret.concat(DomRange/* DomRange.getElementNode */.a.getElementNode(this._hoEditorFactoryID, msPath, mePath, true));
+      for (var _i = 0; _i < footerDocTree.length; _i++) {
+        var footerNodes = footerDocTree[_i].subDocNodes;
+        var fsPath = footerNodes[0].getNodePath();
+        var fePath = hoEditorFactory.docTree.getNodeLastPath(footerNodes[footerNodes.length - 1]);
+        ret = ret.concat(DomRange/* DomRange.getElementNode */.a.getElementNode(this._hoEditorFactoryID, fsPath, fePath, true));
+      }
+      return ret;
+    }
+    /**
+    * 插入签名
+    * @param type 1图片 2字符串
+    * @param name 签名名称
+    * @param signor 签名人
+    * @param signTime 签名时间
+    * @param imgSrc type=1：图片路径或者base64，type=2：字符串
+    * @param imgWidth 图片宽
+    * @param imgHeight 图片高
+    * @param customProperty 自定义参数
+    */
+  }, {
+    key: "insertSignNode",
+    value: function insertSignNode(type, name, signor, signTime, signTimeFormat, imgSrc, imgWidth, imgHeight, customProperty, fingerPrintSrc) {
+      var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID);
+      hoEditorFactory.vueController.insertSignNode(type, name, signor, signTime, signTimeFormat, imgSrc, imgWidth, imgHeight, customProperty, fingerPrintSrc);
+    }
+    /**
+    * 更新签名
+    * @param node 签名节点
+    * @param type 1图片 2字符串
+    * @param name 签名名称
+    * @param signor 签名人
+    * @param signTime 签名时间
+    * @param imgSrc type=1：图片路径或者base64，type=2：字符串
+    * @param imgWidth 图片宽
+    * @param imgHeight 图片高
+    * @param customProperty 自定义参数
+    */
+  }, {
+    key: "updateSignNode",
+    value: function updateSignNode(node, type, name, signor, signTime, imgSrc, imgWidth, imgHeight, customProperty, fingerPrintSrc) {
+      var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID);
+      hoEditorFactory.vueController.updateSignNode(node, type, name, signor, signTime, imgSrc, imgWidth, imgHeight, customProperty, fingerPrintSrc);
+    }
+    /**
+     * 强制删除
+     */
+  }, {
+    key: "forceDelete",
+    value: function forceDelete() {
+      var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID);
+      hoEditorFactory.vueController.forceDelete();
+    }
+    /**
+     * @param node 单复选节点
+     * @param additionalInfo 附加说明
+     */
+  }, {
+    key: "editRadioCheckBoxText",
+    value: function editRadioCheckBoxText(node, appendText) {
+      if (!node || !(node instanceof RadioAndCheckBoxNode/* RadioAndCheckBoxNode */.Yh) || !node.isEditText || appendText.trim().length === 0) return;
+      var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID);
+      hoEditorFactory.vueController.editRadioCheckBoxText(node, appendText);
+    }
+    /**
+    * 获取当前病历中的所有元素
+    * @returns 返回元素是{id,name,text,json}的数据
+    */
+  }, {
+    key: "getAllElements",
+    value: function getAllElements() {
+      var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID);
+      hoEditorFactory.vueController.getAllElements();
+    }
+    /**
+     * 根据元素id更新元素
+     */
+  }, {
+    key: "updateElementById",
+    value: function updateElementById(id, eleJson) {
+      var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID);
+      hoEditorFactory.vueController.updateElementById(id, eleJson);
+    }
+  }, {
+    key: "moveCaretToElement",
+    value: function moveCaretToElement(scope, id) {
+      var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID);
+      hoEditorFactory.vueController.moveCaretToElement(scope, id);
+    }
+  }]);
+  return ElementController;
+}();
 ;// CONCATENATED MODULE: ./src/editor/externalCall/NodeController.ts
 
 
@@ -256206,12 +256307,12 @@ var formularType = {
   5: 'pregnantWeeks',
   6: 'ftScoreMapping',
   7: 'bodySurfaceArea',
-  8: 'ftCalcDays' //计算住院天数
+  8: 'ftCalcDays',
+  9: 'ftCalcTime' //计算时间差
 };
 
 var getFormula = function getFormula(tableFormular) {
   // 获取公式类型
-
   return formularType[tableFormular.formularType];
 };
 // EXTERNAL MODULE: ./src/components/common/commondata/index.ts
@@ -261398,8 +261499,8 @@ var ToolTablevue_type_template_id_c3a519ae_render = function render() {
 };
 var ToolTablevue_type_template_id_c3a519ae_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/HoTableFeatures.vue?vue&type=template&id=9b687288&
-var HoTableFeaturesvue_type_template_id_9b687288_render = function render() {
+;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/toolbar/insert/HoTableFeatures.vue?vue&type=template&id=2517920a&
+var HoTableFeaturesvue_type_template_id_2517920a_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -261446,7 +261547,9 @@ var HoTableFeaturesvue_type_template_id_9b687288_render = function render() {
     key: "bodySurfaceArea"
   }, [_vm._v("体表面积")]), _c('a-menu-item', {
     key: "ftCalcDays"
-  }, [_vm._v("计算住院天数")])], 1)], 1)], 2)], 1) : _vm._e(), _vm.table.insertRowAbove && _vm.tableProperty.canAddRow ? _c('div', {
+  }, [_vm._v("计算住院天数")]), _c('a-menu-item', {
+    key: "ftCalcTime"
+  }, [_vm._v("时间计算")])], 1)], 1)], 2)], 1) : _vm._e(), _vm.table.insertRowAbove && _vm.tableProperty.canAddRow ? _c('div', {
     directives: [{
       name: "debounce",
       rawName: "v-debounce:1000.click",
@@ -261604,7 +261707,7 @@ var HoTableFeaturesvue_type_template_id_9b687288_render = function render() {
     staticClass: "ho-emr-tool-item"
   }, [_c('span', [_vm._v("取消合并单元格")])]) : _vm._e()]);
 };
-var HoTableFeaturesvue_type_template_id_9b687288_staticRenderFns = [];
+var HoTableFeaturesvue_type_template_id_2517920a_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/toolbar/insert/HoTableFeatures.vue?vue&type=script&lang=js&
 
@@ -261765,7 +261868,8 @@ var HoTableFeaturesvue_type_template_id_9b687288_staticRenderFns = [];
         expectedDate: '预产期计算公式',
         ftScoreMapping: '分值映射计算公式',
         bodySurfaceArea: '体表面积公式',
-        ftCalcDays: '计算住院天数公式'
+        ftCalcDays: '计算住院天数公式',
+        ftCalcTime: "时间计算公式"
       };
       if (formula[formulaType] === 'code') {
         this.setCellCode();
@@ -261840,8 +261944,8 @@ var HoTableFeaturesvue_type_template_id_9b687288_staticRenderFns = [];
 ;
 var HoTableFeatures_component = (0,componentNormalizer/* default */.Z)(
   insert_HoTableFeaturesvue_type_script_lang_js_,
-  HoTableFeaturesvue_type_template_id_9b687288_render,
-  HoTableFeaturesvue_type_template_id_9b687288_staticRenderFns,
+  HoTableFeaturesvue_type_template_id_2517920a_render,
+  HoTableFeaturesvue_type_template_id_2517920a_staticRenderFns,
   false,
   null,
   null,
@@ -263311,7 +263415,8 @@ var popper = __webpack_require__(95551);
         pregnantWeeks: '孕周公式',
         ftScoreMapping: '分值映射公式',
         bodySurfaceArea: '体表面积公式',
-        ftCalcDays: '计算住院天数公式'
+        ftCalcDays: '计算住院天数公式',
+        ftCalcTime: "时间计算公式"
       },
       isPasted: false,
       isWebview: false,