npm - hoeditor-web - Versions diffs - 3.0.52 → 3.0.54 - Mend

hoeditor-web 3.0.52 → 3.0.54

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (3) hide show

package/lib/hoeditor.umd.js CHANGED Viewed

@@ -5764,7 +5764,7 @@ var component = (0,componentNormalizer/* default */.Z)(
 /***/ }),
-/***/ 7981:
+/***/ 66053:
 /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 "use strict";
@@ -5776,7 +5776,7 @@ __webpack_require__.d(__webpack_exports__, {
   "default": function() { return /* binding */ ExpressionForm; }
 });
-;// 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/expressionForm/ExpressionForm.vue?vue&type=template&id=06607b98&
+;// 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/expressionForm/ExpressionForm.vue?vue&type=template&id=3bb70df0&
 var render = function render() {
   var _vm = this,
     _c = _vm._self._c;
@@ -5832,7 +5832,13 @@ var render = function render() {
     staticClass: "expression-item"
   }, [_c('span', {
     staticClass: "expression-item-label"
-  }, [_vm._v("末次月经/绝经年龄")]), _vm.isUseDate ? _c('a-date-picker', {
+  }, [_vm._v("末次月经/绝经年龄")]), _c('a-date-picker', {
+    directives: [{
+      name: "show",
+      rawName: "v-show",
+      value: _vm.isUseDate,
+      expression: "isUseDate"
+    }],
     attrs: {
       "prefix-icon": "null",
       "type": "date",
@@ -5848,7 +5854,13 @@ var render = function render() {
       },
       expression: "menstrualHistory.menoPauseAge"
     }
-  }) : _vm._e(), !_vm.isUseDate ? _c('a-input', {
+  }), _c('a-input', {
+    directives: [{
+      name: "show",
+      rawName: "v-show",
+      value: !_vm.isUseDate,
+      expression: "!isUseDate"
+    }],
     attrs: {
       "type": "text"
     },
@@ -5864,7 +5876,7 @@ var render = function render() {
       "slot": "addonAfter"
     },
     slot: "addonAfter"
-  }, [_vm._v(_vm._s(_vm.menoPauseAgeText))]) : _vm._e()]) : _vm._e()], 1)]), _c('div', {
+  }, [_vm._v(_vm._s(_vm.menoPauseAgeText))]) : _vm._e()])], 1)]), _c('div', {
     staticClass: "expression-item"
   }, [_c('span', {
     staticClass: "expression-item-label"
@@ -6674,14 +6686,12 @@ var staticRenderFns = [function () {
   }, [_c('li', [_vm._v("第二乳磨牙")]), _c('li', [_vm._v("第一乳磨牙")]), _c('li', [_vm._v("乳尖牙")]), _c('li', [_vm._v("乳侧切牙")]), _c('li', [_vm._v("乳中切牙")]), _c('li', [_vm._v("乳中切牙")]), _c('li', [_vm._v("乳侧切牙")]), _c('li', [_vm._v("乳尖牙")]), _c('li', [_vm._v("第一乳磨牙")]), _c('li', [_vm._v("第二乳磨牙")])]);
 }];
-;// CONCATENATED MODULE: ./src/components/controls/expressionForm/ExpressionForm.vue?vue&type=template&id=06607b98&
+;// CONCATENATED MODULE: ./src/components/controls/expressionForm/ExpressionForm.vue?vue&type=template&id=3bb70df0&
 // EXTERNAL MODULE: ./node_modules/@babel/runtime/helpers/esm/objectSpread2.js
 var objectSpread2 = __webpack_require__(63442);
 // EXTERNAL MODULE: ./node_modules/@babel/runtime/helpers/esm/toConsumableArray.js + 3 modules
 var toConsumableArray = __webpack_require__(61748);
-// EXTERNAL MODULE: ./node_modules/core-js/modules/es.number.constructor.js
-var es_number_constructor = __webpack_require__(9653);
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.includes.js
 var es_array_includes = __webpack_require__(26699);
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.string.includes.js
@@ -6734,7 +6744,6 @@ var zh_cn = __webpack_require__(83839);
 /* harmony default export */ var ExpressionFormvue_type_script_lang_js_ = ({
   name: 'ExpressionForm',
   data: function data() {
@@ -6818,16 +6827,16 @@ var zh_cn = __webpack_require__(83839);
     }
   },
   watch: {
-    'menstrualHistory.menoPauseAge': {
-      deep: true,
-      handler: function handler() {
-        if (Number(this.menstrualHistory.menoPauseAge) && parseInt(this.menstrualHistory.menoPauseAge)) {
-          this.menoPauseAgeText = '岁';
-        } else {
-          this.menoPauseAgeText = '';
-        }
-      }
-    }
+    // 'menstrualHistory.menoPauseAge': {
+    //     deep: true,
+    //     handler() {
+    //         if ((Number(this.menstrualHistory.menoPauseAge) && parseInt(this.menstrualHistory.menoPauseAge)) || this.menstrualHistory.menoPauseAge == '') {
+    //             this.menoPauseAgeText = '岁';
+    //         } else {
+    //             this.menoPauseAgeText = '';
+    //         }
+    //     },
+    // },
   },
   computed: {
     controlType: function controlType() {
@@ -7116,10 +7125,10 @@ var zh_cn = __webpack_require__(83839);
 });
 ;// CONCATENATED MODULE: ./src/components/controls/expressionForm/ExpressionForm.vue?vue&type=script&lang=js&
  /* harmony default export */ var expressionForm_ExpressionFormvue_type_script_lang_js_ = (ExpressionFormvue_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/expressionForm/ExpressionForm.vue?vue&type=style&index=0&id=06607b98&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/expressionForm/ExpressionForm.vue?vue&type=style&index=0&id=3bb70df0&prod&lang=scss&
 // extracted by mini-css-extract-plugin
-;// CONCATENATED MODULE: ./src/components/controls/expressionForm/ExpressionForm.vue?vue&type=style&index=0&id=06607b98&prod&lang=scss&
+;// CONCATENATED MODULE: ./src/components/controls/expressionForm/ExpressionForm.vue?vue&type=style&index=0&id=3bb70df0&prod&lang=scss&
 // EXTERNAL MODULE: ./node_modules/@vue/vue-loader-v15/lib/runtime/componentNormalizer.js
 var componentNormalizer = __webpack_require__(70713);
@@ -8877,7 +8886,7 @@ var component = (0,componentNormalizer/* default */.Z)(
 /***/ }),
-/***/ 78773:
+/***/ 85778:
 /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 "use strict";
@@ -8897,7 +8906,7 @@ var es_string_includes = __webpack_require__(32023);
 var es_regexp_exec = __webpack_require__(74916);
 // 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/controls/poperSelect/PoperSelect.vue?vue&type=template&id=63ef43d4&
+;// 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/poperSelect/PoperSelect.vue?vue&type=template&id=5888a1e4&
@@ -9285,7 +9294,7 @@ var render = function render() {
 };
 var staticRenderFns = [];
-;// CONCATENATED MODULE: ./src/components/controls/poperSelect/PoperSelect.vue?vue&type=template&id=63ef43d4&
+;// CONCATENATED MODULE: ./src/components/controls/poperSelect/PoperSelect.vue?vue&type=template&id=5888a1e4&
 // EXTERNAL MODULE: ./node_modules/@babel/runtime/helpers/esm/toConsumableArray.js + 3 modules
 var toConsumableArray = __webpack_require__(61748);
@@ -11362,7 +11371,8 @@ var type = __webpack_require__(41542);
       // 保存打开表单时的节点路径
       endPath: '',
       calendarInstance: null,
-      calendarTimeInstance: null
+      calendarTimeInstance: null,
+      isSelected: false
     };
   },
   computed: {
@@ -11798,6 +11808,7 @@ var type = __webpack_require__(41542);
      */
     selectItemsChange: function selectItemsChange(value) {
       var _this8 = this;
+      if (this.isSelected) return; // 单选时已选过不在进入选择
       if (!this.isAllowMultiSelect) {
         var item = {};
         var selectItemIndex = 0;
@@ -11809,6 +11820,7 @@ var type = __webpack_require__(41542);
           }
         });
         item.selected = !item.selected;
+        this.isSelected = true;
         this.poperSelectList.splice(selectItemIndex, 1, item);
         this.currentList = (0,toConsumableArray/* default */.Z)(this.poperSelectList);
         this.sureSelect();
@@ -11843,10 +11855,12 @@ var type = __webpack_require__(41542);
     },
     selectItems: function selectItems(item, index) {
       var _this9 = this;
+      if (this.isSelected) return; // 单选时已选过不在进入选择
       if (!this.isAllowMultiSelect) {
         this.poperSelectList.forEach(function (v) {
           v.selected = false;
         });
+        this.isSelected = true;
         item.selected = !item.selected;
         this.poperSelectList.splice(index, 1, item);
         this.currentList = (0,toConsumableArray/* default */.Z)(this.poperSelectList);
@@ -11976,16 +11990,12 @@ var type = __webpack_require__(41542);
         this.textParam.keyValue = keyValue;
         this.textParam.value = value;
         if (this.textParam.downListProperty.allowMultiSelected && !this.textParam.insCheckSyncUpdateList) {
-          hoEditorFactory.vueController.updateTextInputField(this.textParam);
-        } else if (this.textParam.downListProperty.allowMultiSelected && this.textParam.insCheckSyncUpdateList) {
-          // hoEditorFactory.vueController.updateTextInputField(this.textParam);
-          // console.log(text, value, keyValue, this.selectedList);
           // hoEditorFactory.vueController.updateTextInputField(this.textParam);
+          hoEditorFactory.elementController.updateTextInputFieldValue(currentPoperNode, text, currentPoperNode.customProperty, keyValue, value);
+        } else if (this.textParam.downListProperty.allowMultiSelected && this.textParam.insCheckSyncUpdateList) {
           var checkText = '<span>' + textArr.join('') + '</span>';
           hoEditorFactory.vueController.insertHtmlText(checkText, checkText, keyValue, this.selectedList, true);
         } else {
-          // const customProperty = this.getCustomProperty ? this.getCustomProperty() : {};
           hoEditorFactory.elementController.updateTextInputFieldValue(currentPoperNode, text, currentPoperNode.customProperty, keyValue, value);
         }
       }
@@ -12022,6 +12032,7 @@ var type = __webpack_require__(41542);
       this.poppernIstance && this.poppernIstance.update();
     },
     handleClose: function handleClose() {
+      this.isSelected = false;
       this.removeListerner();
       this.$emit('poperClose');
       console.timeEnd('下拉选中时间');
@@ -12038,10 +12049,10 @@ var type = __webpack_require__(41542);
 });
 ;// CONCATENATED MODULE: ./src/components/controls/poperSelect/PoperSelect.vue?vue&type=script&lang=js&
  /* harmony default export */ var poperSelect_PoperSelectvue_type_script_lang_js_ = (PoperSelectvue_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/poperSelect/PoperSelect.vue?vue&type=style&index=0&id=63ef43d4&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/poperSelect/PoperSelect.vue?vue&type=style&index=0&id=5888a1e4&prod&lang=scss&
 // extracted by mini-css-extract-plugin
-;// CONCATENATED MODULE: ./src/components/controls/poperSelect/PoperSelect.vue?vue&type=style&index=0&id=63ef43d4&prod&lang=scss&
+;// CONCATENATED MODULE: ./src/components/controls/poperSelect/PoperSelect.vue?vue&type=style&index=0&id=5888a1e4&prod&lang=scss&
 // EXTERNAL MODULE: ./node_modules/@vue/vue-loader-v15/lib/runtime/componentNormalizer.js
 var componentNormalizer = __webpack_require__(70713);
@@ -20216,7 +20227,7 @@ var component = (0,componentNormalizer/* default */.Z)(
 /***/ }),
-/***/ 94535:
+/***/ 74353:
 /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 "use strict";
@@ -20230,7 +20241,7 @@ __webpack_require__.d(__webpack_exports__, {
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.function.name.js
 var es_function_name = __webpack_require__(68309);
-;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/textDialog/TextDialog.vue?vue&type=template&id=51bd6486&
+;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/textDialog/TextDialog.vue?vue&type=template&id=2e48f0d1&
 var render = function render() {
   var _vm = this,
@@ -20661,7 +20672,18 @@ var render = function render() {
       },
       expression: "textParam.insCheckSyncUpdateList"
     }
-  }, [_vm._v("插入检查检验同步更新列表项")])], 1)])]), _c('a-tab-pane', {
+  }, [_vm._v("插入检查检验同步更新列表项")]), _c('a-checkbox', {
+    attrs: {
+      "size": "small"
+    },
+    model: {
+      value: _vm.textParam.hideDuringPrint,
+      callback: function callback($$v) {
+        _vm.$set(_vm.textParam, "hideDuringPrint", $$v);
+      },
+      expression: "textParam.hideDuringPrint"
+    }
+  }, [_vm._v("打印时隐藏")])], 1)])]), _c('a-tab-pane', {
     key: "third",
     attrs: {
       "tab": "其他属性"
@@ -20696,7 +20718,7 @@ var render = function render() {
 };
 var staticRenderFns = [];
-;// CONCATENATED MODULE: ./src/components/controls/textDialog/TextDialog.vue?vue&type=template&id=51bd6486&
+;// CONCATENATED MODULE: ./src/components/controls/textDialog/TextDialog.vue?vue&type=template&id=2e48f0d1&
 // EXTERNAL MODULE: ./node_modules/@babel/runtime/helpers/esm/objectSpread2.js
 var objectSpread2 = __webpack_require__(63442);
@@ -20821,6 +20843,8 @@ var HOEditorFactorys = __webpack_require__(74089);
             _this.customPropertyValue = (0,objectSpread2/* default */.Z)({}, property);
           } else if (key === 'readType') {
             _this.textParam.readType = updateNode.readType == 1 ? true : false;
+          } else if (key === 'hideDuringPrint') {
+            _this.textParam.hideDuringPrint = updateNode.hideDuringPrint == 'undefined' || updateNode.hideDuringPrint == undefined ? false : updateNode.hideDuringPrint;
           } else {
             _this.textParam[key] = updateNode[key];
           }
@@ -20924,10 +20948,10 @@ var HOEditorFactorys = __webpack_require__(74089);
 });
 ;// CONCATENATED MODULE: ./src/components/controls/textDialog/TextDialog.vue?vue&type=script&lang=js&
  /* harmony default export */ var textDialog_TextDialogvue_type_script_lang_js_ = (TextDialogvue_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/textDialog/TextDialog.vue?vue&type=style&index=0&id=51bd6486&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/textDialog/TextDialog.vue?vue&type=style&index=0&id=2e48f0d1&prod&lang=scss&
 // extracted by mini-css-extract-plugin
-;// CONCATENATED MODULE: ./src/components/controls/textDialog/TextDialog.vue?vue&type=style&index=0&id=51bd6486&prod&lang=scss&
+;// CONCATENATED MODULE: ./src/components/controls/textDialog/TextDialog.vue?vue&type=style&index=0&id=2e48f0d1&prod&lang=scss&
 // EXTERNAL MODULE: ./node_modules/@vue/vue-loader-v15/lib/runtime/componentNormalizer.js
 var componentNormalizer = __webpack_require__(70713);
@@ -28962,7 +28986,8 @@ var textParams = {
   readType: false,
   keyValue: '',
   value: '',
-  insCheckSyncUpdateList: false
+  insCheckSyncUpdateList: false,
+  hideDuringPrint: false
   // isMultiLinesDisplay: false
 };
@@ -35276,6 +35301,8 @@ var DrawPageTable = __webpack_require__(15694);
 var ParagraphNode = __webpack_require__(67945);
 // EXTERNAL MODULE: ./src/editor/draw/drawArea/DrawPageMainDoc.ts
 var DrawPageMainDoc = __webpack_require__(77441);
+// EXTERNAL MODULE: ./src/editor/draw/drawNode/DrawTable.ts
+var DrawTable = __webpack_require__(74298);
 ;// CONCATENATED MODULE: ./src/editor/PrintStatus.ts
@@ -35317,6 +35344,7 @@ var DrawPageMainDoc = __webpack_require__(77441);
 /**
@@ -35922,7 +35950,7 @@ var Print = /*#__PURE__*/function () {
     key: "printToPDF",
     value: function () {
       var _printToPDF = (0,asyncToGenerator/* default */.Z)( /*#__PURE__*/(0,regeneratorRuntime/* default */.Z)().mark(function _callee2(hoEditorFactoryID, PDF, type, fileName, reslove, positionY, format) {
-        var hoEditorFactory, dPage, docHeight, dHeight, startPageNum, svgBox, orientation, width, height, last, pageNumber, startPageNumOver, _iterator, _step, index, cpage, mainHeight, lastDline, dShape, posIndex, posY, _dShape, svg2pdfOptions, _cpage$drawDomLevel, _cpage$drawDomLevel$s, ctx, pageSize, _cpage$drawDomLevel2, _cpage$drawDomLevel2$, _ctx, _ctx2, _svgBox2, svgData, _ctx3, _cpage$drawDomLevel$s2, _svgBox, printStyle, exportHtml, url, link, _last, otherPageNumber, i, name;
+        var hoEditorFactory, dPage, docHeight, dHeight, startPageNum, svgBox, orientation, width, height, last, pageNumber, startPageNumOver, _iterator, _step, index, cpage, children, mainHeight, lastDline, dShape, posIndex, posY, _dShape, svg2pdfOptions, _cpage$drawDomLevel, _cpage$drawDomLevel$s, ctx, pageSize, _cpage$drawDomLevel2, _cpage$drawDomLevel2$, _ctx, _ctx2, _svgBox2, svgData, _ctx3, _cpage$drawDomLevel$s2, _svgBox, printStyle, exportHtml, url, link, _last, otherPageNumber, i, name;
         return (0,regeneratorRuntime/* default */.Z)().wrap(function _callee2$(_context3) {
           while (1) {
             switch (_context3.prev = _context3.next) {
@@ -35974,7 +36002,7 @@ var Print = /*#__PURE__*/function () {
                 _iterator.s();
               case 19:
                 if ((_step = _iterator.n()).done) {
-                  _context3.next = 66;
+                  _context3.next = 67;
                   break;
                 }
                 index = _step.value;
@@ -35983,22 +36011,32 @@ var Print = /*#__PURE__*/function () {
                   break;
                 }
                 message/* default.info */.Z.info('请进行翻页');
-                return _context3.abrupt("continue", 64);
+                return _context3.abrupt("continue", 65);
               case 24:
                 last = index;
                 if (!(index < hoEditorFactory.startPageNum)) {
                   _context3.next = 27;
                   break;
                 }
-                return _context3.abrupt("break", 66);
+                return _context3.abrupt("break", 67);
               case 27:
-                cpage = hoEditorFactory.drawTree.drawPages[index];
-                if (!(index === hoEditorFactory.drawTree.drawPages.length - 1 && cpage.drawMainDoc.children.length === 2 && !(cpage.drawMainDoc.children[0] instanceof DrawPageTable/* DrawPageTable */.ox) && cpage.drawMainDoc.children[1] && cpage.drawMainDoc.children[1].drawItems.length === 0)) {
-                  _context3.next = 30;
+                cpage = hoEditorFactory.drawTree.drawPages[index]; // if (
+                //     index === hoEditorFactory.drawTree.drawPages.length - 1 &&
+                //     cpage.drawMainDoc.children.length === 2 &&
+                //     !(cpage.drawMainDoc.children[0] instanceof DrawPageTable) &&
+                //     cpage.drawMainDoc.children[1] &&
+                //     (cpage.drawMainDoc.children[1] as any).drawItems.length === 0
+                // ) {
+                //     console.log('??????');
+                //     break;
+                // }
+                children = cpage.drawMainDoc.children;
+                if (!(children.length == 2 && !(children[0] instanceof DrawPageTable/* DrawPageTable */.ox) && children[1] && children[1].drawItems.length == 0 || children.length == 1 && children[0] instanceof DrawLine/* DrawLine */.a && children[0].drawItems.length == 0)) {
+                  _context3.next = 31;
                   break;
                 }
-                return _context3.abrupt("break", 66);
-              case 30:
+                return _context3.abrupt("continue", 65);
+              case 31:
                 if (cpage.drawDomLevel && !cpage.drawDomLevel.stage) {
                   cpage.drawDomLevel.bindStage();
                   cpage.needUpdateStage = true;
@@ -36006,8 +36044,8 @@ var Print = /*#__PURE__*/function () {
                 // 合并续打： 上一页还有空余时续打起始页隐藏页脚
                 if (index === hoEditorFactory.startPageNum && positionY) {
                   mainHeight = cpage.drawMainDoc.y;
-                  if (cpage.drawMainDoc.children.length > 0) {
-                    lastDline = cpage.drawMainDoc.children[cpage.drawMainDoc.children.length - 1];
+                  if (children.length > 0) {
+                    lastDline = children[children.length - 1];
                     mainHeight += lastDline.y + lastDline.dHeight;
                   }
                   if (mainHeight - positionY <= 10) {
@@ -36048,7 +36086,7 @@ var Print = /*#__PURE__*/function () {
                   }
                 }
                 if (!(hoEditorFactory.isUseImagePrint && type !== 'html')) {
-                  _context3.next = 49;
+                  _context3.next = 50;
                   break;
                 }
                 PDF === null || PDF === void 0 ? void 0 : PDF.addPage();
@@ -36068,9 +36106,9 @@ var Print = /*#__PURE__*/function () {
                 ctx && ((_cpage$drawDomLevel = cpage.drawDomLevel) === null || _cpage$drawDomLevel === void 0 ? void 0 : (_cpage$drawDomLevel$s = _cpage$drawDomLevel.stage) === null || _cpage$drawDomLevel$s === void 0 ? void 0 : _cpage$drawDomLevel$s.draw(ctx));
                 ctx = null;
-                _context3.next = 63;
+                _context3.next = 64;
                 break;
-              case 49:
+              case 50:
                 _ctx = new canvas2svg({
                   width: width,
                   height: height,
@@ -36078,61 +36116,61 @@ var Print = /*#__PURE__*/function () {
                 });
                 _ctx && ((_cpage$drawDomLevel2 = cpage.drawDomLevel) === null || _cpage$drawDomLevel2 === void 0 ? void 0 : (_cpage$drawDomLevel2$ = _cpage$drawDomLevel2.stage) === null || _cpage$drawDomLevel2$ === void 0 ? void 0 : _cpage$drawDomLevel2$.draw(_ctx));
                 if (!(type === 'html')) {
-                  _context3.next = 56;
+                  _context3.next = 57;
                   break;
                 }
                 svgData = (_ctx2 = _ctx) === null || _ctx2 === void 0 ? void 0 : _ctx2.getSvg();
                 svgData && ((_svgBox2 = svgBox) === null || _svgBox2 === void 0 ? void 0 : _svgBox2.appendChild(svgData));
-                _context3.next = 62;
+                _context3.next = 63;
                 break;
-              case 56:
+              case 57:
                 PDF === null || PDF === void 0 ? void 0 : PDF.addPage();
                 pageNumber++;
                 _context3.t0 = PDF;
                 if (!_context3.t0) {
-                  _context3.next = 62;
+                  _context3.next = 63;
                   break;
                 }
-                _context3.next = 62;
+                _context3.next = 63;
                 return svg2pdf((_ctx3 = _ctx) === null || _ctx3 === void 0 ? void 0 : _ctx3.getSvg(), PDF, svg2pdfOptions);
-              case 62:
-                _ctx = null;
               case 63:
+                _ctx = null;
+              case 64:
                 if (index > 0 && cpage.drawDomLevel) {
                   (_cpage$drawDomLevel$s2 = cpage.drawDomLevel.stage) === null || _cpage$drawDomLevel$s2 === void 0 ? void 0 : _cpage$drawDomLevel$s2.removeAllChildren();
                   cpage.drawDomLevel.clearStage();
                 }
                 // index > 0 && cpage.drawDomLevel?.clearStage();
-              case 64:
+              case 65:
                 _context3.next = 19;
                 break;
-              case 66:
-                _context3.next = 71;
+              case 67:
+                _context3.next = 72;
                 break;
-              case 68:
-                _context3.prev = 68;
+              case 69:
+                _context3.prev = 69;
                 _context3.t1 = _context3["catch"](17);
                 _iterator.e(_context3.t1);
-              case 71:
-                _context3.prev = 71;
+              case 72:
+                _context3.prev = 72;
                 _iterator.f();
-                return _context3.finish(71);
-              case 74:
+                return _context3.finish(72);
+              case 75:
                 console.timeEnd('绘制svg和生成pdf');
                 if (hoEditorFactory.printStatus.printRange !== PrintRange.prSelected) hoEditorFactory.printStatus.recordLastPosByPageIndex(last);
                 hoEditorFactory.printStatus.DrawPrintRange().PrintOver();
                 if (!(type === 'html')) {
-                  _context3.next = 94;
+                  _context3.next = 95;
                   break;
                 }
                 if (!(svgBox && svgBox.childNodes.length === 0)) {
-                  _context3.next = 82;
+                  _context3.next = 83;
                   break;
                 }
                 message/* default.info */.Z.info('无新增内容');
                 reslove && reslove('printend');
                 return _context3.abrupt("return");
-              case 82:
+              case 83:
                 printStyle = (0,util/* createPrintHTMLStyle */.j_)(hoEditorFactory.pageProperty.pageSize, orientation);
                 exportHtml = "\n                <!DOCTYPE html>\n                <html lang=\"en\">\n                    <head>\n                    <meta charset=\"utf-8\">\n                    <style>".concat(printStyle.innerHTML, "</style>\n                    </head>\n                    <body>").concat((_svgBox = svgBox) === null || _svgBox === void 0 ? void 0 : _svgBox.innerHTML, "</body>\n                </html>\n            ");
                 url = window.URL.createObjectURL(new Blob([exportHtml], {
@@ -36149,20 +36187,20 @@ var Print = /*#__PURE__*/function () {
                 }, 100);
                 reslove && reslove('printend');
                 return _context3.abrupt("return");
-              case 94:
+              case 95:
                 if (!(positionY || hoEditorFactory.startPageNum !== 0 && positionY !== undefined)) {
-                  _context3.next = 100;
+                  _context3.next = 101;
                   break;
                 }
                 _last = hoEditorFactory.printStatus.printRecord.last();
                 if (!(_last && hoEditorFactory.startPageNum == _last[0] && positionY === _last[1])) {
-                  _context3.next = 100;
+                  _context3.next = 101;
                   break;
                 }
                 message/* default.info */.Z.info('无新增内容无法续打，如果要打印最后一份病历，请打开打印记录，删除最近一次打印记录');
                 reslove && reslove('printend');
                 return _context3.abrupt("return");
-              case 100:
+              case 101:
                 if (type === 'pdf') {
                   PDF === null || PDF === void 0 ? void 0 : PDF.deletePage(1);
                   PDF === null || PDF === void 0 ? void 0 : PDF.save(fileName + '.pdf');
@@ -36185,12 +36223,12 @@ var Print = /*#__PURE__*/function () {
                   PDF && this.openDataUriInWindow(PDF, name, hoEditorFactory.pageProperty.widthPixes, hoEditorFactory.printSilently);
                 }
                 reslove && reslove('printend');
-              case 102:
+              case 103:
               case "end":
                 return _context3.stop();
             }
           }
-        }, _callee2, this, [[17, 68, 71, 74]]);
+        }, _callee2, this, [[17, 69, 72, 75]]);
       }));
       function printToPDF(_x2, _x3, _x4, _x5, _x6, _x7, _x8) {
         return _printToPDF.apply(this, arguments);
@@ -36201,7 +36239,7 @@ var Print = /*#__PURE__*/function () {
     key: "createPDFBase64",
     value: function () {
       var _createPDFBase = (0,asyncToGenerator/* default */.Z)( /*#__PURE__*/(0,regeneratorRuntime/* default */.Z)().mark(function _callee3(hoEditorFactoryID, reslove, PDF) {
-        var hoEditorFactory, orientation, svgBox, last, pageNumber, _iterator2, _step2, _cpage$drawDomLevel5, index, cpage, _cpage$drawDomLevel3, _cpage$drawDomLevel3$, ctx, _cpage$drawDomLevel4, _cpage$drawDomLevel4$, _ctx5, _ctx4;
+        var hoEditorFactory, orientation, svgBox, last, pageNumber, _iterator2, _step2, _cpage$drawDomLevel5, index, cpage, children, _cpage$drawDomLevel3, _cpage$drawDomLevel3$, ctx, _cpage$drawDomLevel4, _cpage$drawDomLevel4$, _ctx5, _ctx4;
         return (0,regeneratorRuntime/* default */.Z)().wrap(function _callee3$(_context4) {
           while (1) {
             switch (_context4.prev = _context4.next) {
@@ -36222,7 +36260,7 @@ var Print = /*#__PURE__*/function () {
                 _iterator2.s();
               case 12:
                 if ((_step2 = _iterator2.n()).done) {
-                  _context4.next = 42;
+                  _context4.next = 43;
                   break;
                 }
                 index = _step2.value;
@@ -36231,16 +36269,25 @@ var Print = /*#__PURE__*/function () {
                   break;
                 }
                 message/* default.info */.Z.info('请进行翻页');
-                return _context4.abrupt("continue", 40);
+                return _context4.abrupt("continue", 41);
               case 17:
                 last = index;
-                cpage = hoEditorFactory.drawTree.drawPages[index];
-                if (!(index === hoEditorFactory.drawTree.drawPages.length - 1 && cpage.drawMainDoc.children.length === 2 && !(cpage.drawMainDoc.children[0] instanceof DrawPageTable/* DrawPageTable */.ox) && cpage.drawMainDoc.children[1] && cpage.drawMainDoc.children[1].drawItems.length === 0)) {
-                  _context4.next = 21;
+                cpage = hoEditorFactory.drawTree.drawPages[index]; // if (
+                //     index === hoEditorFactory.drawTree.drawPages.length - 1 &&
+                //     cpage.drawMainDoc.children.length === 2 &&
+                //     !(cpage.drawMainDoc.children[0] instanceof DrawPageTable) &&
+                //     cpage.drawMainDoc.children[1] &&
+                //     (cpage.drawMainDoc.children[1] as any).drawItems.length === 0
+                // ) {
+                //     break;
+                // }
+                children = cpage.drawMainDoc.children;
+                if (!(children.length == 2 && !(children[0] instanceof DrawPageTable/* DrawPageTable */.ox) && children[1] && children[1].drawItems.length == 0 || children.length == 1 && children[0] instanceof DrawLine/* DrawLine */.a && children[0].drawItems.length == 0)) {
+                  _context4.next = 22;
                   break;
                 }
-                return _context4.abrupt("break", 42);
-              case 21:
+                return _context4.abrupt("continue", 41);
+              case 22:
                 if (cpage.drawDomLevel && !cpage.drawDomLevel.stage) {
                   cpage.drawDomLevel.bindStage();
                   cpage.needUpdateStage = true;
@@ -36250,7 +36297,7 @@ var Print = /*#__PURE__*/function () {
                   cpage.needUpdateStage = false;
                 }
                 if (!hoEditorFactory.isUseImagePrint) {
-                  _context4.next = 32;
+                  _context4.next = 33;
                   break;
                 }
                 PDF === null || PDF === void 0 ? void 0 : PDF.addPage();
@@ -36259,9 +36306,9 @@ var Print = /*#__PURE__*/function () {
                 window.printBlack = hoEditorFactory.printBlack;
                 ctx && ((_cpage$drawDomLevel3 = cpage.drawDomLevel) === null || _cpage$drawDomLevel3 === void 0 ? void 0 : (_cpage$drawDomLevel3$ = _cpage$drawDomLevel3.stage) === null || _cpage$drawDomLevel3$ === void 0 ? void 0 : _cpage$drawDomLevel3$.draw(ctx));
                 ctx = null;
-                _context4.next = 39;
+                _context4.next = 40;
                 break;
-              case 32:
+              case 33:
                 _ctx4 = new canvas2svg({
                   width: hoEditorFactory.pageProperty.widthPixes,
                   height: orientation === 'l' ? hoEditorFactory.pageProperty.heightPixes - 1 : hoEditorFactory.pageProperty.heightPixes,
@@ -36270,38 +36317,38 @@ var Print = /*#__PURE__*/function () {
                 _ctx4 && ((_cpage$drawDomLevel4 = cpage.drawDomLevel) === null || _cpage$drawDomLevel4 === void 0 ? void 0 : (_cpage$drawDomLevel4$ = _cpage$drawDomLevel4.stage) === null || _cpage$drawDomLevel4$ === void 0 ? void 0 : _cpage$drawDomLevel4$.draw(_ctx4));
                 PDF.addPage();
                 pageNumber++;
-                _context4.next = 38;
+                _context4.next = 39;
                 return svg2pdf((_ctx5 = _ctx4) === null || _ctx5 === void 0 ? void 0 : _ctx5.getSvg(), PDF);
-              case 38:
-                _ctx4 = null;
               case 39:
-                index > 0 && ((_cpage$drawDomLevel5 = cpage.drawDomLevel) === null || _cpage$drawDomLevel5 === void 0 ? void 0 : _cpage$drawDomLevel5.clearStage());
+                _ctx4 = null;
               case 40:
+                index > 0 && ((_cpage$drawDomLevel5 = cpage.drawDomLevel) === null || _cpage$drawDomLevel5 === void 0 ? void 0 : _cpage$drawDomLevel5.clearStage());
+              case 41:
                 _context4.next = 12;
                 break;
-              case 42:
-                _context4.next = 47;
+              case 43:
+                _context4.next = 48;
                 break;
-              case 44:
-                _context4.prev = 44;
+              case 45:
+                _context4.prev = 45;
                 _context4.t0 = _context4["catch"](10);
                 _iterator2.e(_context4.t0);
-              case 47:
-                _context4.prev = 47;
+              case 48:
+                _context4.prev = 48;
                 _iterator2.f();
-                return _context4.finish(47);
-              case 50:
+                return _context4.finish(48);
+              case 51:
                 if (hoEditorFactory.printStatus.printRange !== PrintRange.prSelected) {
                   hoEditorFactory.printStatus.recordLastPosByPageIndex(last);
                 }
                 hoEditorFactory.printStatus.DrawPrintRange().PrintOver();
                 reslove && reslove(pageNumber);
-              case 53:
+              case 54:
               case "end":
                 return _context4.stop();
             }
           }
-        }, _callee3, null, [[10, 44, 47, 50]]);
+        }, _callee3, null, [[10, 45, 48, 51]]);
       }));
       function createPDFBase64(_x9, _x10, _x11) {
         return _createPDFBase.apply(this, arguments);
@@ -36312,7 +36359,7 @@ var Print = /*#__PURE__*/function () {
     key: "createHTML",
     value: function () {
       var _createHTML = (0,asyncToGenerator/* default */.Z)( /*#__PURE__*/(0,regeneratorRuntime/* default */.Z)().mark(function _callee4(hoEditorFactoryID, reslove, htmlText) {
-        var hoEditorFactory, svgBox, orientation, width, height, last, _iterator3, _step3, _cpage$drawDomLevel6, _cpage$drawDomLevel6$, _cpage$drawDomLevel7, index, cpage, ctx, svgData, printStyle;
+        var hoEditorFactory, svgBox, orientation, width, height, last, _iterator3, _step3, _cpage$drawDomLevel6, _cpage$drawDomLevel6$, _cpage$drawDomLevel7, index, cpage, children, ctx, svgData, printStyle;
         return (0,regeneratorRuntime/* default */.Z)().wrap(function _callee4$(_context5) {
           while (1) {
             switch (_context5.prev = _context5.next) {
@@ -36331,7 +36378,7 @@ var Print = /*#__PURE__*/function () {
                 _iterator3.s();
               case 12:
                 if ((_step3 = _iterator3.n()).done) {
-                  _context5.next = 30;
+                  _context5.next = 31;
                   break;
                 }
                 index = _step3.value;
@@ -36340,16 +36387,25 @@ var Print = /*#__PURE__*/function () {
                   break;
                 }
                 message/* default.info */.Z.info('请进行翻页');
-                return _context5.abrupt("continue", 28);
+                return _context5.abrupt("continue", 29);
               case 17:
                 last = index;
-                cpage = hoEditorFactory.drawTree.drawPages[index];
-                if (!(index === hoEditorFactory.drawTree.drawPages.length - 1 && cpage.drawMainDoc.children.length === 2 && !(cpage.drawMainDoc.children[0] instanceof DrawPageTable/* DrawPageTable */.ox) && cpage.drawMainDoc.children[1] && cpage.drawMainDoc.children[1].drawItems.length === 0)) {
-                  _context5.next = 21;
+                cpage = hoEditorFactory.drawTree.drawPages[index]; // if (
+                //     index === hoEditorFactory.drawTree.drawPages.length - 1 &&
+                //     cpage.drawMainDoc.children.length === 2 &&
+                //     !(cpage.drawMainDoc.children[0] instanceof DrawPageTable) &&
+                //     cpage.drawMainDoc.children[1] &&
+                //     (cpage.drawMainDoc.children[1] as any).drawItems.length === 0
+                // ) {
+                //     break;
+                // }
+                children = cpage.drawMainDoc.children;
+                if (!(children.length == 2 && !(children[0] instanceof DrawPageTable/* DrawPageTable */.ox) && children[1] && children[1].drawItems.length == 0 || children.length == 1 && children[0] instanceof DrawLine/* DrawLine */.a && children[0].drawItems.length == 0)) {
+                  _context5.next = 22;
                   break;
                 }
-                return _context5.abrupt("break", 30);
-              case 21:
+                return _context5.abrupt("continue", 29);
+              case 22:
                 if (cpage.drawDomLevel && !cpage.drawDomLevel.stage) {
                   cpage.drawDomLevel.bindStage();
                   cpage.needUpdateStage = true;
@@ -36367,21 +36423,21 @@ var Print = /*#__PURE__*/function () {
                 svgData = ctx === null || ctx === void 0 ? void 0 : ctx.getSvg();
                 svgBox === null || svgBox === void 0 ? void 0 : svgBox.appendChild(svgData);
                 index > 0 && ((_cpage$drawDomLevel7 = cpage.drawDomLevel) === null || _cpage$drawDomLevel7 === void 0 ? void 0 : _cpage$drawDomLevel7.clearStage());
-              case 28:
+              case 29:
                 _context5.next = 12;
                 break;
-              case 30:
-                _context5.next = 35;
+              case 31:
+                _context5.next = 36;
                 break;
-              case 32:
-                _context5.prev = 32;
+              case 33:
+                _context5.prev = 33;
                 _context5.t0 = _context5["catch"](10);
                 _iterator3.e(_context5.t0);
-              case 35:
-                _context5.prev = 35;
+              case 36:
+                _context5.prev = 36;
                 _iterator3.f();
-                return _context5.finish(35);
-              case 38:
+                return _context5.finish(36);
+              case 39:
                 if (hoEditorFactory.printStatus.printRange !== PrintRange.prSelected) {
                   hoEditorFactory.printStatus.recordLastPosByPageIndex(last);
                 }
@@ -36389,12 +36445,12 @@ var Print = /*#__PURE__*/function () {
                 printStyle = (0,util/* createPrintHTMLStyle */.j_)(hoEditorFactory.pageProperty.pageSize, orientation);
                 htmlText.text = "\n            <!DOCTYPE html>\n            <html lang=\"en\">\n                <head>\n                    <meta charset=\"utf-8\">\n                    <style>".concat(printStyle.innerHTML, "</style>\n                </head>\n                <body>").concat(svgBox === null || svgBox === void 0 ? void 0 : svgBox.innerHTML, "</body>\n            </html>\n        ");
                 reslove && reslove('printend');
-              case 43:
+              case 44:
               case "end":
                 return _context5.stop();
             }
           }
-        }, _callee4, null, [[10, 32, 35, 38]]);
+        }, _callee4, null, [[10, 33, 36, 39]]);
       }));
       function createHTML(_x12, _x13, _x14) {
         return _createHTML.apply(this, arguments);
@@ -36405,7 +36461,7 @@ var Print = /*#__PURE__*/function () {
     key: "printAllNew",
     value: function () {
       var _printAllNew = (0,asyncToGenerator/* default */.Z)( /*#__PURE__*/(0,regeneratorRuntime/* default */.Z)().mark(function _callee5(hoEditorFactoryID, reslove, PDF, position, isPrintFirstDoc) {
-        var hoEditorFactory, a4Size, svgBox, last, widthPixes, heightPixes, orientation, formats, format, svg2pdfOptions, firstPageIndex, _iterator4, _step4, _cpage$drawDomLevel10, index, cpage, _cpage$drawDomLevel8, _cpage$drawDomLevel8$, pageSize, ctx, _cpage$drawDomLevel9, _cpage$drawDomLevel9$, _ctx7, _ctx6, lastPos;
+        var hoEditorFactory, a4Size, svgBox, last, widthPixes, heightPixes, orientation, formats, format, svg2pdfOptions, firstPageIndex, _iterator4, _step4, _cpage$drawDomLevel10, index, cpage, children, _cpage$drawDomLevel8, _cpage$drawDomLevel8$, pageSize, ctx, _cpage$drawDomLevel9, _cpage$drawDomLevel9$, _ctx7, _ctx6, lastPos;
         return (0,regeneratorRuntime/* default */.Z)().wrap(function _callee5$(_context6) {
           while (1) {
             switch (_context6.prev = _context6.next) {
@@ -36438,10 +36494,14 @@ var Print = /*#__PURE__*/function () {
                   }
                 }
                 firstPageIndex = -1; // 用来处理 批量打印----首次病程单独打印----未选择首次病程----只选择病程记录----合并时带上首次病程确保页数准确----打印时丢掉首次病程确保不重复打印首次病程
-                if (isPrintFirstDoc) {
+                if (isPrintFirstDoc && firstPageIndex == -1) {
                   hoEditorFactory.docTree.mainNodes.forEach(function (node) {
-                    if (node instanceof ParagraphNode/* ParagraphNode */.C && node.printAsSinglePage && node.drawlines[0].parent instanceof DrawPageMainDoc/* DrawPageMainDoc */.$ && firstPageIndex == -1) {
-                      firstPageIndex = node.drawlines[0].parent.pageIndex;
+                    if (node instanceof ParagraphNode/* ParagraphNode */.C && node.printAsSinglePage) {
+                      if (node.drawlines[0].parent instanceof DrawPageMainDoc/* DrawPageMainDoc */.$) {
+                        firstPageIndex = node.drawlines[0].parent.pageIndex;
+                      } else if (node.drawlines[0] instanceof DrawTable/* DrawTable */.t && node.drawlines[0].drawPageTables[0].parent instanceof DrawPageMainDoc/* DrawPageMainDoc */.$) {
+                        firstPageIndex = node.drawlines[0].drawPageTables[0].parent.pageIndex;
+                      }
                     }
                   });
                 }
@@ -36450,7 +36510,7 @@ var Print = /*#__PURE__*/function () {
                 _iterator4.s();
               case 19:
                 if ((_step4 = _iterator4.n()).done) {
-                  _context6.next = 54;
+                  _context6.next = 55;
                   break;
                 }
                 index = _step4.value;
@@ -36459,13 +36519,13 @@ var Print = /*#__PURE__*/function () {
                   break;
                 }
                 message/* default.info */.Z.info('请进行翻页');
-                return _context6.abrupt("continue", 52);
+                return _context6.abrupt("continue", 53);
               case 24:
                 if (!(index < firstPageIndex)) {
                   _context6.next = 26;
                   break;
                 }
-                return _context6.abrupt("continue", 52);
+                return _context6.abrupt("continue", 53);
               case 26:
                 last = index;
                 cpage = hoEditorFactory.drawTree.drawPages[index];
@@ -36477,14 +36537,25 @@ var Print = /*#__PURE__*/function () {
                   cpage.drawDomLevel.stage.update();
                   cpage.needUpdateStage = false;
                 }
-                if (!(index === hoEditorFactory.drawTree.drawPages.length - 1 && cpage.drawMainDoc.children.length === 2 && !(cpage.drawMainDoc.children[0] instanceof DrawPageTable/* DrawPageTable */.ox) && cpage.drawMainDoc.children[1] && cpage.drawMainDoc.children[1].drawItems.length === 0)) {
-                  _context6.next = 32;
+                // if (
+                //     index === hoEditorFactory.drawTree.drawPages.length - 1 &&
+                //     cpage.drawMainDoc.children.length === 2 &&
+                //     !(cpage.drawMainDoc.children[0] instanceof DrawPageTable) &&
+                //     cpage.drawMainDoc.children[1] &&
+                //     (cpage.drawMainDoc.children[1] as any).drawItems.length === 0
+                // ) {
+                //     console.log('??????');
+                //     break;
+                // }
+                children = cpage.drawMainDoc.children;
+                if (!(children.length == 2 && !(children[0] instanceof DrawPageTable/* DrawPageTable */.ox) && children[1] && children[1].drawItems.length == 0 || children.length == 1 && children[0] instanceof DrawLine/* DrawLine */.a && children[0].drawItems.length == 0)) {
+                  _context6.next = 33;
                   break;
                 }
-                return _context6.abrupt("break", 54);
-              case 32:
+                return _context6.abrupt("continue", 53);
+              case 33:
                 if (!hoEditorFactory.isUseImagePrint) {
-                  _context6.next = 45;
+                  _context6.next = 46;
                   break;
                 }
                 pageSize = JSON.stringify([hoEditorFactory.pageProperty.widthMm, hoEditorFactory.pageProperty.heightMm]);
@@ -36516,9 +36587,9 @@ var Print = /*#__PURE__*/function () {
                 ctx.posY = svg2pdfOptions.y;
                 ctx && ((_cpage$drawDomLevel8 = cpage.drawDomLevel) === null || _cpage$drawDomLevel8 === void 0 ? void 0 : (_cpage$drawDomLevel8$ = _cpage$drawDomLevel8.stage) === null || _cpage$drawDomLevel8$ === void 0 ? void 0 : _cpage$drawDomLevel8$.draw(ctx));
                 ctx = null;
-                _context6.next = 51;
+                _context6.next = 52;
                 break;
-              case 45:
+              case 46:
                 _ctx6 = new canvas2svg({
                   width: widthPixes,
                   height: orientation === 'l' ? heightPixes - 1 : heightPixes,
@@ -36530,27 +36601,27 @@ var Print = /*#__PURE__*/function () {
                 } else {
                   PDF === null || PDF === void 0 ? void 0 : PDF.addPage(format, orientation);
                 }
-                _context6.next = 50;
+                _context6.next = 51;
                 return svg2pdf((_ctx7 = _ctx6) === null || _ctx7 === void 0 ? void 0 : _ctx7.getSvg(), PDF, svg2pdfOptions);
-              case 50:
-                _ctx6 = null;
               case 51:
-                index > 0 && ((_cpage$drawDomLevel10 = cpage.drawDomLevel) === null || _cpage$drawDomLevel10 === void 0 ? void 0 : _cpage$drawDomLevel10.clearStage());
+                _ctx6 = null;
               case 52:
+                index > 0 && ((_cpage$drawDomLevel10 = cpage.drawDomLevel) === null || _cpage$drawDomLevel10 === void 0 ? void 0 : _cpage$drawDomLevel10.clearStage());
+              case 53:
                 _context6.next = 19;
                 break;
-              case 54:
-                _context6.next = 59;
+              case 55:
+                _context6.next = 60;
                 break;
-              case 56:
-                _context6.prev = 56;
+              case 57:
+                _context6.prev = 57;
                 _context6.t0 = _context6["catch"](17);
                 _iterator4.e(_context6.t0);
-              case 59:
-                _context6.prev = 59;
+              case 60:
+                _context6.prev = 60;
                 _iterator4.f();
-                return _context6.finish(59);
-              case 62:
+                return _context6.finish(60);
+              case 63:
                 if (hoEditorFactory.printStatus.printRange !== PrintRange.prSelected) {
                   hoEditorFactory.printStatus.recordLastPosByPageIndex(last);
                 }
@@ -36564,12 +36635,12 @@ var Print = /*#__PURE__*/function () {
                 }
                 hoEditorFactory.printStatus.DrawPrintRange().PrintOver();
                 reslove();
-              case 66:
+              case 67:
               case "end":
                 return _context6.stop();
             }
           }
-        }, _callee5, null, [[17, 56, 59, 62]]);
+        }, _callee5, null, [[17, 57, 60, 63]]);
       }));
       function printAllNew(_x15, _x16, _x17, _x18, _x19) {
         return _printAllNew.apply(this, arguments);
@@ -37873,7 +37944,7 @@ var DocController = /*#__PURE__*/function () {
     }
   }, {
     key: "insertALine",
-    value: function insertALine(hoEditorFactory, path, lineText, roots, pNode, curTextStyle, node, childIndex, isEndLine, aresolve, oldCanModifyContent) {
+    value: function insertALine(hoEditorFactory, path, lineText, roots, pNode, curTextStyle, node, childIndex, isEndLine, aresolve, oldCanModifyContent, isUpdate) {
       var _this = this;
       // const startTagLen = "<元素>".length;
       // let istart = lineText.indexOf("<元素>");
@@ -37952,7 +38023,7 @@ var DocController = /*#__PURE__*/function () {
                     strPath = hoEditorFactory.docTree.getNodeLastPath(textNode);
                   } else {
                     var _textNode = new _treeNode_TextNode__WEBPACK_IMPORTED_MODULE_26__/* .TextNode */ .R(_this._hoEditorFactoryID, roots, pNode, _treeNode_BaseNode__WEBPACK_IMPORTED_MODULE_23__/* .NodeType.ntText */ .Jq.ntText, aText, hoEditorFactory.docTree.curStyleIndex);
-                    strPath = _this.insertNodeByPath(strPath, _textNode, oldCanModifyContent == undefined ? false : true, isHasRelateEle && index > 1 ? true : false);
+                    strPath = _this.insertNodeByPath(strPath, _textNode, isUpdate, isHasRelateEle && index > 1 ? true : false);
                   }
                 } else {
                   var styleIndex = hoEditorFactory.docTree.curStyleIndex;
@@ -37965,7 +38036,7 @@ var DocController = /*#__PURE__*/function () {
                     styleIndex = hoEditorFactory.docTree.styleCompare(newStyle);
                   }
                   var _textNode2 = new _treeNode_TextNode__WEBPACK_IMPORTED_MODULE_26__/* .TextNode */ .R(_this._hoEditorFactoryID, roots, pNode, _treeNode_BaseNode__WEBPACK_IMPORTED_MODULE_23__/* .NodeType.ntText */ .Jq.ntText, aText, styleIndex);
-                  strPath = _this.insertNodeByPath(strPath, _textNode2, oldCanModifyContent == undefined ? false : true, isHasRelateEle && index > 1 ? true : false);
+                  strPath = _this.insertNodeByPath(strPath, _textNode2, isUpdate, isHasRelateEle && index > 1 ? true : false);
                 }
                 // if (index === arrSubString.length - 1 && isEndLine && oldCanModifyContent !== undefined && pNode instanceof TextInputFieldNode) {
                 //   pNode.canModifyContent = oldCanModifyContent;
@@ -38089,7 +38160,14 @@ var DocController = /*#__PURE__*/function () {
                 if (pNode instanceof _treeNode_TextInputFieldNode__WEBPACK_IMPORTED_MODULE_45__/* .TextInputFieldNode */ .re) {
                   pNode.canModifyContent = canModifyContent;
                 }
-                strPath = _this2.insertALine(hoEditorFactory, strPath, text, nodePosition.roots, pNode, curTextStyle, node, nodePosition.childIndex, index === lines.length - 1, resolve, oldCanModifyContent);
+                var isUpdate = false;
+                if (oldCanModifyContent !== undefined) {
+                  isUpdate = true;
+                  if (pNode instanceof _treeNode_TextInputFieldNode__WEBPACK_IMPORTED_MODULE_45__/* .TextInputFieldNode */ .re && pNode.downListProperty.isMultiLinesDisplay && index > 0) {
+                    isUpdate = false;
+                  }
+                }
+                strPath = _this2.insertALine(hoEditorFactory, strPath, text, nodePosition.roots, pNode, curTextStyle, node, nodePosition.childIndex, index === lines.length - 1, resolve, oldCanModifyContent, isUpdate);
               }
             });
           });
@@ -44831,7 +44909,8 @@ 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 width = Math.floor(this._widthPixes * _draw_DrawConfig__WEBPACK_IMPORTED_MODULE_9__/* .DrawConfig.instance */ .f.instance().scaleXY) % 2 === 1 ? Math.floor(this._widthPixes * _draw_DrawConfig__WEBPACK_IMPORTED_MODULE_9__/* .DrawConfig.instance */ .f.instance().scaleXY) + 1 : Math.floor(this._widthPixes * _draw_DrawConfig__WEBPACK_IMPORTED_MODULE_9__/* .DrawConfig.instance */ .f.instance().scaleXY);
+        var scaleXY = _draw_DrawConfig__WEBPACK_IMPORTED_MODULE_9__/* .DrawConfig.instance */ .f.instance().scaleXY;
+        var width = Math.floor(this._widthPixes * scaleXY) % 2 === 1 ? Math.floor(this._widthPixes * scaleXY) + 1 : Math.floor(this._widthPixes * scaleXY);
         this._canvasParams.width = width;
       }
     }
@@ -44847,7 +44926,8 @@ var PageProperty = /*#__PURE__*/function () {
         this._widthPixes = hoeditorfacotry.unitConvert.mmConversionPx(this._widthMm + this._commentWidthMm, true);
         hoeditorfacotry.drawTree.updateDrawTreeFirstLine();
       }
-      var width = Math.floor(this._widthPixes * _draw_DrawConfig__WEBPACK_IMPORTED_MODULE_9__/* .DrawConfig.instance */ .f.instance().scaleXY) % 2 === 1 ? Math.floor(this._widthPixes * _draw_DrawConfig__WEBPACK_IMPORTED_MODULE_9__/* .DrawConfig.instance */ .f.instance().scaleXY) + 1 : Math.floor(this._widthPixes * _draw_DrawConfig__WEBPACK_IMPORTED_MODULE_9__/* .DrawConfig.instance */ .f.instance().scaleXY);
+      var scaleXY = _draw_DrawConfig__WEBPACK_IMPORTED_MODULE_9__/* .DrawConfig.instance */ .f.instance().scaleXY;
+      var width = Math.floor(this._widthPixes * scaleXY) % 2 === 1 ? Math.floor(this._widthPixes * scaleXY) + 1 : Math.floor(this._widthPixes * scaleXY);
       this._canvasParams.width = width;
     }
   }, {
@@ -44860,7 +44940,8 @@ 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 height = Math.floor(this._heightPixes * _draw_DrawConfig__WEBPACK_IMPORTED_MODULE_9__/* .DrawConfig.instance */ .f.instance().scaleXY) % 2 === 1 ? Math.floor(this._heightPixes * _draw_DrawConfig__WEBPACK_IMPORTED_MODULE_9__/* .DrawConfig.instance */ .f.instance().scaleXY) + 1 : Math.floor(this._heightPixes * _draw_DrawConfig__WEBPACK_IMPORTED_MODULE_9__/* .DrawConfig.instance */ .f.instance().scaleXY);
+      var scaleXY = _draw_DrawConfig__WEBPACK_IMPORTED_MODULE_9__/* .DrawConfig.instance */ .f.instance().scaleXY;
+      var height = Math.floor(this._heightPixes * scaleXY) % 2 === 1 ? Math.floor(this._heightPixes * scaleXY) + 1 : Math.floor(this._heightPixes * scaleXY);
       this._canvasParams.height = height;
     }
   }, {
@@ -44884,7 +44965,7 @@ var PageProperty = /*#__PURE__*/function () {
       if (value !== this._bottomMarginMm) {
         this._bottomMarginMm = value;
         this._bottomMarginPixes = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_8__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID).unitConvert.mmConversionPx(this._bottomMarginMm, false);
-        //   this._canvasHeadFootPos.footerY = this._heightPixes - this._bottomMarginPixes;
+        // this._canvasHeadFootPos.footerY = this._heightPixes - this._bottomMarginPixes;
       }
     }
   }, {
@@ -47156,7 +47237,7 @@ var CombineStyle = /*#__PURE__*/function () {
         //小五
         fontHeight = hoeditfactory.unitConvert.mmConversionPx(3.18, false);
       }
-      if (fontSize === 10.5 || fontSize === 10) {
+      if (fontSize === 10.5) {
         //五号
         fontHeight = hoeditfactory.unitConvert.mmConversionPx(3.70, false);
       }
@@ -52962,7 +53043,7 @@ var NodeNeedModifyEvent = __webpack_require__(76830);
  * @Author: liyanan 2441631434@qq.com
  * @Date: 2023-03-17 14:19:29
  * @LastEditors: liyanan 2441631434@qq.com
- * @LastEditTime: 2023-03-30 09:44:07
+ * @LastEditTime: 2023-04-19 15:29:42
  * @FilePath: \hoeditor-web\src\editor\draw\drawNode\DrawJumpButton.ts
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -53025,22 +53106,6 @@ var DrawJumpButton = /*#__PURE__*/function (_DrawCombineNode) {
           hoEditorFactory.docTree.nodeNeedModify(nodeNeedModifyEvent);
         }
       });
-      // button.addEventListener("mouseover", function () {
-      //     const hoEditorFactory = HOEditorFactorys.instance().getFactory(drawNode._hoEditorFactoryID);
-      //     const dArea = hoEditorFactory.drawPageTree.getMainRootArea(drawNode);
-      //     if (dArea) {
-      //         (button.children[1] as createjs.Text).font = "bold " + font;
-      //         hoEditorFactory.drawPageTree.updateDrawPage(dArea.index);
-      //     }
-      // });
-      // button.addEventListener("mouseout", function () {
-      //     const hoEditorFactory = HOEditorFactorys.instance().getFactory(drawNode._hoEditorFactoryID);
-      //     const dArea = hoEditorFactory.drawPageTree.getMainRootArea(drawNode);
-      //     if (dArea) {
-      //         (button.children[1] as createjs.Text).font = font;
-      //         hoEditorFactory.drawPageTree.updateDrawPage(dArea.index);
-      //     }
-      // });
       button.addEventListener("pressup", function () {
         var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(drawNode._hoEditorFactoryID);
         var dArea = hoEditorFactory.drawPageTree.getMainRootArea(drawNode);
@@ -55237,6 +55302,8 @@ var ParagraphNode = /*#__PURE__*/function (_BaseNode) {
       var index = this._drawLines.length;
       if (index > 0) {
         var prevLine = this._drawLines[index - 1];
+        prevLine.x = this.combineParagraph.leftMarginPixes + ileft;
+        prevLine.dWidth = paragraphWidth - this.combineParagraph.leftMarginPixes - this.combineParagraph.rightMarginPixes;
         if (prevLine instanceof _editor_draw_DrawLine__WEBPACK_IMPORTED_MODULE_15__/* .DrawLine */ .a) prevLine.updateLineStyle();
       }
       var aline = new _editor_draw_DrawLine__WEBPACK_IMPORTED_MODULE_15__/* .DrawLine */ .a(this._rootPath, this, index, paragraphWidth);
@@ -55546,9 +55613,9 @@ var ParagraphNode = /*#__PURE__*/function (_BaseNode) {
           styleIndex: this._paraNo,
           textStyleNo: this.styleIndex,
           printAsSinglePage: this.printAsSinglePage,
+          forceChangeHeader: this.forceChangeHeader,
           docId: this.docId,
-          customProperty: this.customProperty,
-          forceChangeHeader: this.forceChangeHeader
+          customProperty: this.customProperty
         };
         return paga;
       }
@@ -55558,9 +55625,9 @@ var ParagraphNode = /*#__PURE__*/function (_BaseNode) {
           styleIndex: this._paraNo,
           textStyleNo: this.styleIndex,
           printAsSinglePage: this.printAsSinglePage,
+          forceChangeHeader: this.forceChangeHeader,
           docId: this.docId,
-          customProperty: this.customProperty,
-          forceChangeHeader: this.forceChangeHeader
+          customProperty: this.customProperty
         }
       };
     }
@@ -55620,8 +55687,6 @@ var ParagraphNode = /*#__PURE__*/function (_BaseNode) {
       paragraphNode.printAsSinglePage = json.printAsSinglePage ? json.printAsSinglePage === "true" ? true : false : false;
       paragraphNode.forceChangeHeader = json.forceChangeHeader ? json.forceChangeHeader === "true" ? true : false : false;
       paragraphNode.styleIndex = json.textStyleNo ? Number(json.textStyleNo) : 0;
-      // paragraphNode._dHeight = Number(json.height);
-      // paragraphNode._dTop = Number(json.top);
       return paragraphNode;
     }
   }]);
@@ -63094,7 +63159,7 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
 /*
  * @Author: your name
  * @Date: 2020-11-03 15:17:54
- * @LastEditTime: 2023-04-18 14:15:13
+ * @LastEditTime: 2023-04-28 09:27:36
  * @LastEditors: liyanan 2441631434@qq.com
  * @Description: In User Settings Edit
  * @FilePath: \hoeditor-web\src\editor\dom\treeNode\TextInputFieldNode.ts
@@ -63544,6 +63609,8 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_58__/* ["default"] */ .Z)((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_5__/* ["default"] */ .Z)(_this), "_keyValue", '');
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_58__/* ["default"] */ .Z)((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_5__/* ["default"] */ .Z)(_this), "_value", '');
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_58__/* ["default"] */ .Z)((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_5__/* ["default"] */ .Z)(_this), "_insCheckSyncUpdateList", false);
+    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_58__/* ["default"] */ .Z)((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_5__/* ["default"] */ .Z)(_this), "_hideDuringPrint", false);
+    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_58__/* ["default"] */ .Z)((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_5__/* ["default"] */ .Z)(_this), "_isElementLink", false);
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_58__/* ["default"] */ .Z)((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_5__/* ["default"] */ .Z)(_this), "_childNodes2", void 0);
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_58__/* ["default"] */ .Z)((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_5__/* ["default"] */ .Z)(_this), "StartMarkNode", void 0);
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_58__/* ["default"] */ .Z)((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_5__/* ["default"] */ .Z)(_this), "EndMarkNode", void 0);
@@ -63718,6 +63785,8 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
     //选中项的key值
     //选中项的value值
     //插入检查检验同步更新列表项
+    //打印时隐藏
+    //是否进行元素联动
     /**
      * Getter alignWithBlocked
      * @return {boolean}
@@ -64065,6 +64134,26 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
         this._insCheckSyncUpdateList = val;
       }
     }
+  }, {
+    key: "hideDuringPrint",
+    get: function get() {
+      return this._hideDuringPrint;
+    },
+    set: function set(val) {
+      if (this._hideDuringPrint !== val) {
+        this._hideDuringPrint = val;
+      }
+    }
+  }, {
+    key: "isElementLink",
+    get: function get() {
+      return this._isElementLink;
+    },
+    set: function set(val) {
+      if (this._isElementLink !== val) {
+        this._isElementLink = val;
+      }
+    }
   }, {
     key: "generateInnerCode",
     value: function generateInnerCode() {
@@ -64614,6 +64703,20 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
         //this.EndMarkNode.node2DrawNode();
         aline = this.EndMarkNode.placeDNode2DrawLine(droots, paraNode, aline, start, start + this.EndMarkNode.getLength() - 1, endPath);
       }
+      if (this.hideDuringPrint && !this.isEmpty() && (hoEditorFactory.drawTree.paintStatus == _editor_draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_28__/* .PaintState.psPreview */ .Dh.psPreview || hoEditorFactory.drawTree.paintStatus == _editor_draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_28__/* .PaintState.psPrint */ .Dh.psPrint)) {
+        var hidden = function hidden(childNodes) {
+          for (var h = 1; h < childNodes.length - 1; h++) {
+            var child = childNodes[h];
+            if (child instanceof TextInputFieldNode) {
+              hidden(child.childNodes);
+            }
+            for (var k = 0; k < child.drawNodes.length; k++) {
+              child.drawNodes[k].alpha = 0;
+            }
+          }
+        };
+        hidden(this.childNodes);
+      }
       return aline.paragraphNode.getLastDrawline();
     }
   }, {
@@ -64949,6 +65052,8 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
         alignWithBlocked: this.alignWithBlocked,
         readType: this.readType,
         insCheckSyncUpdateList: this.insCheckSyncUpdateList,
+        hideDuringPrint: this.hideDuringPrint,
+        isElementLink: this.isElementLink,
         childNodes: childNodes
       };
       return {
@@ -65038,6 +65143,8 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
       json.isSynchro = !json.isSynchro ? false : json.isSynchro;
       json.readType = json.readType ? Number(json.readType) : -1;
       json.insCheckSyncUpdateList = !json.insCheckSyncUpdateList ? false : json.insCheckSyncUpdateList;
+      json.hideDuringPrint = !json.hideDuringPrint ? false : json.hideDuringPrint;
+      json.isElementLink = !json.isElementLink ? false : json.isElementLink;
       var temp = new TextInputFieldNode(hoEditorFactoryID, rootNodes, pNode ? pNode : null, _BaseNode__WEBPACK_IMPORTED_MODULE_40__/* .NodeType.ntField */ .Jq.ntField, json);
       // this.insertChild
       if (json.childNodes) {
@@ -66717,8 +66824,8 @@ var DrawLine = /*#__PURE__*/function (_DrawContainer) {
       // this.paragraphNode.getParagraphLeftWidth()[1] - this.paragraphNode.combineParagraph.leftMarginPixes
       // - this.paragraphNode.combineParagraph.rightMarginPixes;
       // if (this.paragraphNode.parentNode instanceof TextInputFieldNode)
-      //   this.x = this.paragraphNode.getParagraphLeftWidth()[0] + this.paragraphNode.combineParagraph.leftMarginPixes
-      // else this.x = this.paragraphNode.combineParagraph.leftMarginPixes
+      this.x = this.paragraphNode.getParagraphLeftWidth()[0] + this.paragraphNode.combineParagraph.leftMarginPixes;
+      //else this.x = this.paragraphNode.combineParagraph.leftMarginPixes
       //文字摆放开始位置
       //this.paragraphNode.combineParagraph.leftMarginPixes;
       //字间距，分散对齐:计算宽度时候使用默认字间距
@@ -68447,8 +68554,8 @@ var DrawArea = /*#__PURE__*/function (_DrawRect) {
                   dline.drawPageTables[j].parent.removeChild(dline.drawPageTables[j]);
                 }
               }
+              dline.drawPageTables.splice(index, dline.drawPageTables.length);
             }
-            dline.drawPageTables.splice(index, dline.drawPageTables.length);
           }
           this._endDline = nextDline - 1;
           this.clearOverDitem(dlines, nextDline);
@@ -71531,7 +71638,7 @@ var DrawDateTime = /*#__PURE__*/function (_DrawCombineNode) {
 /*
  * @Author: your name
  * @Date: 2020-11-30 10:59:00
- * @LastEditTime: 2022-07-19 16:10:16
+ * @LastEditTime: 2023-04-20 16:59:41
  * @LastEditors: liyanan 2441631434@qq.com
  * @Description: In User Settings Edit
  * @FilePath: \hoeditor-web\src\editor\draw\drawNode\DrawDownListNode.ts
@@ -71604,6 +71711,14 @@ var DrawDownListNode = /*#__PURE__*/function (_DrawCombineNode) {
         if (child.name !== "backColor" && child.name !== "event") {
           this.children.splice(j, 1);
         }
+        if (child.name == "backColor" && child instanceof createjs.Shape) {
+          var color = child.graphics.instructions[2].style;
+          this.children.splice(j, 1);
+          var backColor = new createjs.Shape();
+          backColor.graphics.clear().beginFill(color).drawRect(0, -this.dHeight + 2, this.dWidth, this.dHeight);
+          backColor.name = "backColor";
+          this.addChildAt(backColor, 0);
+        }
       }
       var leftWidth = 0;
       for (var i = 0; i < this._text.length; i++) {
@@ -73244,7 +73359,8 @@ var DrawPageCell = /*#__PURE__*/function (_DrawArea) {
   }, {
     key: "endPaintBackGround",
     value: function endPaintBackGround(newHeight) {
-      // this._backImg.cache(-1, -1, this._dWidth + 1, newHeight + 1);
+      //this._backImg.cache(-1, -1, this._dWidth + 1, newHeight + 1);
+      this._backImg.graphics.endStroke();
     }
   }, {
     key: "paintMarker",
@@ -79807,17 +79923,21 @@ var EditorController = /*#__PURE__*/function () {
       if (!metaKey && !altKey) {
         if (keyCode === 37) {
           hoeditorfactory.docController.directionKey('left'); //左移
+          hoeditorfactory.drawTree.caret.aiInfo.aiText = '';
         } else if (keyCode === 39) {
           hoeditorfactory.docController.directionKey('right'); //右移
+          hoeditorfactory.drawTree.caret.aiInfo.aiText = '';
         } else if (keyCode === 38) {
           if (!ctrlKey) {
             hoeditorfactory.docController.directionKey('up'); //上移
+            hoeditorfactory.drawTree.caret.aiInfo.aiText = '';
           } else {
             return true;
           }
         } else if (keyCode === 40) {
           if (!ctrlKey) {
             hoeditorfactory.docController.directionKey('down'); //下移
+            hoeditorfactory.drawTree.caret.aiInfo.aiText = '';
           } else {
             return true;
           }
@@ -84235,41 +84355,50 @@ var DrawTree = /*#__PURE__*/function () {
   }, {
     key: "updateDrawFormular",
     value: function updateDrawFormular(cell) {
-      var _this5 = this;
       var hoeditfactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID);
       var _cell$table$getCellIn = cell.table.getCellInfos(cell),
         _cell$table$getCellIn2 = (0,slicedToArray/* default */.Z)(_cell$table$getCellIn, 2),
         r = _cell$table$getCellIn2[0],
         c = _cell$table$getCellIn2[1];
+      var isNeedUpdate = false;
       this.formularNodes.forEach(function (value, key) {
-        if (value.parentNode && value.parentNode instanceof TextInputFieldNode/* TextInputFieldNode */.re) {
-          if (value.parentNode.childNodes.length === 0) {
-            value.parentNode.node2DrawNode();
-          }
-          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) {
-          //const str = value.formulaStr;
-          value.updateResult();
-          value.getParentCell().drawCell.needUpdate = true;
-          if (isCellInFormula) {
-            _this5.updateDrawFormular(value.getParentCell());
-          }
-          var prevNode = value.previousLeaf();
-          if (!prevNode) {
-            throw new Error('错误的绘制位置');
-          }
-          var startPath = hoeditfactory.docTree.getNodeLastPath(prevNode);
-          var changeEvent = new NodeChangeEvent/* NodeChangeEvent */.G(_this5._hoEditorFactoryID, DocTree/* DocAction.daModifyStyle */.gk.daModifyStyle, startPath, startPath);
-          changeEvent.oldEndPath = startPath;
-          changeEvent.oldDrawLines = new SelectRange/* SelectRange */.E(_this5._hoEditorFactoryID).getRangeDrawLines(startPath, startPath, false);
-          hoeditfactory.docTree.change(changeEvent);
-          if (value.parentNode && value.parentNode instanceof TextInputFieldNode/* TextInputFieldNode */.re) {
-            value.parentNode.update();
+        var pnode = value.getParentCell();
+        if (cell.table == pnode.table) {
+          // if (value.parentNode && value.parentNode instanceof TextInputFieldNode) {
+          //   if (value.parentNode.childNodes.length === 0) {
+          //     value.parentNode.node2DrawNode();
+          //   }
+          //   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) {
+            //const str = value.formulaStr;
+            value.updateResult();
+            value.getParentCell().drawCell.needUpdate = true;
+            isNeedUpdate = true;
+            // if (isCellInFormula) {
+            //   this.updateDrawFormular(value.getParentCell());
+            // }
+            // const prevNode = value.previousLeaf();
+            // if (!prevNode) {
+            //   throw new Error('错误的绘制位置');
+            // }
+            // const startPath = hoeditfactory.docTree.getNodeLastPath(prevNode);
+            // const changeEvent = new NodeChangeEvent(this._hoEditorFactoryID,
+            //   DocAction.daModifyStyle, startPath, startPath)
+            // changeEvent.oldEndPath = startPath;
+            // changeEvent.oldDrawLines = new SelectRange(this._hoEditorFactoryID).getRangeDrawLines(startPath, startPath, false)
+            // hoeditfactory.docTree.change(changeEvent);
+            // if (value.parentNode && value.parentNode instanceof TextInputFieldNode) {
+            //   value.parentNode.update();
+            // }
           }
         }
       });
+      if (isNeedUpdate) {
+        cell.table.update();
+      }
     }
   }, {
     key: "setCaretVisible",
@@ -90378,8 +90507,8 @@ function expressionCalculator(expr) {
 /*
  * @Author: your name
  * @Date: 2020-11-30 08:42:46
- * @LastEditTime: 2021-09-28 10:21:05
- * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2023-04-19 11:36:26
+ * @LastEditors: liyanan 2441631434@qq.com
  * @Description: In User Settings Edit
  * @FilePath: \hoeditor-web\src\editor\utils\UnitConvert.ts
  */
@@ -90496,6 +90625,47 @@ var UnitConvert = /*#__PURE__*/function () {
       str = str.replace(new RegExp(s1, 'gm'), s2);
       return str;
     }
+  }, {
+    key: "getCorrectFontSize",
+    value: function getCorrectFontSize(size) {
+      var correctSize = 12;
+      if (size < 6) {
+        if (size == 5) {
+          correctSize = 5;
+        } else {
+          correctSize = 5.5;
+        }
+      } else if (size >= 6 && size <= 7) {
+        correctSize = 6.5;
+      } else if (size > 7 && size <= 8) {
+        correctSize = 7.5;
+      } else if (size > 8 && size < 10) {
+        correctSize = 9;
+      } else if (size >= 10 && size <= 11) {
+        correctSize = 10.5;
+      } else if (size > 11 && size <= 13) {
+        correctSize = 12;
+      } else if (size > 13 && size <= 14.5) {
+        correctSize = 14;
+      } else if (size > 14.5 && size <= 15.5) {
+        correctSize = 15;
+      } else if (size > 15.5 && size <= 17) {
+        correctSize = 16;
+      } else if (size > 17 && size <= 20) {
+        correctSize = 18;
+      } else if (size > 20 && size <= 23) {
+        correctSize = 22;
+      } else if (size > 23 && size <= 25) {
+        correctSize = 24;
+      } else if (size > 25 && size <= 31) {
+        correctSize = 26;
+      } else if (size > 31 && size <= 39) {
+        correctSize = 36;
+      } else if (size > 39) {
+        correctSize = 42;
+      }
+      return correctSize;
+    }
   }], [{
     key: "instance",
     get:
@@ -195866,7 +196036,7 @@ var map = {
 	"./dataSource/DataSource.vue": 9238,
 	"./dateDialog/DateDialog.vue": 12144,
 	"./delimiter/Delimiter.vue": 31861,
-	"./expressionForm/ExpressionForm.vue": 7981,
+	"./expressionForm/ExpressionForm.vue": 66053,
 	"./findReplace/FindReplace.vue": 25918,
 	"./gestation/Gestation.vue": 6251,
 	"./hoprint/HoPrint.vue": 62321,
@@ -195875,7 +196045,7 @@ var map = {
 	"./pageInfoes/PageInfoes.vue": 17481,
 	"./paragraph/ParagraphDialog.vue": 54949,
 	"./poperSelect/PoperMark.vue": 71472,
-	"./poperSelect/PoperSelect.vue": 78773,
+	"./poperSelect/PoperSelect.vue": 85778,
 	"./poperTipText/PoperTipText.vue": 15845,
 	"./popers/Poper.vue": 57937,
 	"./popers/Title.vue": 89987,
@@ -195892,7 +196062,7 @@ var map = {
 	"./table/TableFormula.vue": 79032,
 	"./table/TableProperty.vue": 47130,
 	"./table/TableRowProperty.vue": 5218,
-	"./textDialog/TextDialog.vue": 94535,
+	"./textDialog/TextDialog.vue": 74353,
 	"./textDialog/TextToLabelDialog.vue": 35791,
 	"./upload/CanvasImageDialog.vue": 94116,
 	"./upload/HoFabric.vue": 43008,
@@ -232878,6 +233048,8 @@ var DrawSelectLevel = /*#__PURE__*/function () {
                   } else {
                     if (lastPath == startPos.path) {
                       hoeditorfactory.vueController.getCaretPreviousText(nextNode.parentNode.text);
+                    } else {
+                      hoeditorfactory.drawTree.caret.aiInfo.aiText = '';
                     }
                   }
                 }
@@ -233795,7 +233967,7 @@ 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
-var PoperSelect = __webpack_require__(78773);
+var PoperSelect = __webpack_require__(85778);
 // EXTERNAL MODULE: ./src/components/controls/poperSelect/PoperMark.vue + 5 modules
 var PoperMark = __webpack_require__(71472);
 ;// CONCATENATED MODULE: ./src/components/controls/poperSelect/index.ts
@@ -235494,7 +235666,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.52');
+/* harmony default export */ var version = ('3.0.54');
 // EXTERNAL MODULE: ./src/components/controls/poperTipText/PoperTipText.vue + 5 modules
 var PoperTipText = __webpack_require__(15845);
 ;// CONCATENATED MODULE: ./src/components/controls/poperTipText/index.ts
@@ -236581,7 +236753,15 @@ var DrawPageTree = /*#__PURE__*/function () {
             this._startNeedUpdatePage = Math.min(drawArea.pageIndex, this._startNeedUpdatePage === -1 ? 99999 : this._startNeedUpdatePage);
             this._endNeedUpdatePage = Math.max(drawArea.pageIndex, this._endNeedUpdatePage);
             if (dline.paragraphNode.docId != '') {
-              hoEditorFactory.subDocManger.updateSubDocPageIndexByPath(drawArea.pageIndex, dline.paragraphNode.docId);
+              if (drawArea.children.length > 0) {
+                if (drawArea.children.length == 1 && drawArea.children[0] instanceof DrawLine/* DrawLine */.a && drawArea.children[0].drawItems.length == 0) {
+                  hoEditorFactory.subDocManger.updateSubDocPageIndexByPath(drawArea.pageIndex, dline.paragraphNode.docId);
+                } else {
+                  hoEditorFactory.subDocManger.updateSubDocPageIndexByPath(drawArea.pageIndex + 1, dline.paragraphNode.docId);
+                }
+              } else {
+                hoEditorFactory.subDocManger.updateSubDocPageIndexByPath(drawArea.pageIndex, dline.paragraphNode.docId);
+              }
             }
             if (drawArea.allowAcrossPage) restHeight = drawArea.maxHeight - dTop;
           }
@@ -238344,9 +238524,7 @@ var HTMLconverter2 = /*#__PURE__*/function () {
             //size = Math.round(hoeditorfactory.unitConvert.pxConversionMm(size, true) );
             size = size / 96 * 72;
           }
-          if (size == 11 || size == 11.5) {
-            size = 12;
-          }
+          size = hoeditorfactory.unitConvert.getCorrectFontSize(size);
           tmp.size = size;
         }
       }
@@ -240782,7 +240960,8 @@ var StructureConvert = /*#__PURE__*/function () {
           var fontStyle = styles[i];
           var textStyle = new TextStyle/* TextStyle */.pn(this._hoEditorFactoryID);
           if (typeof fontStyle["size"] !== "undefined" && fontStyle["size"] !== defaultFont.size.toString()) {
-            textStyle.size = Number(fontStyle["size"]);
+            //textStyle.size = Number(fontStyle["size"]);
+            textStyle.size = hoEditorFactory.unitConvert.getCorrectFontSize(Number(fontStyle["size"]));
           }
           if (typeof fontStyle["font"] !== "undefined" && fontStyle["font"] !== defaultFont.font) {
             textStyle.font = fontStyle["font"];
@@ -241243,50 +241422,15 @@ var StructureConvert = /*#__PURE__*/function () {
           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.updateResult();
             value.getParentCell().drawCell.needUpdate = true;
-            // const prevNode = value.previousLeaf();
-            // if (!prevNode) {
-            //   throw new Error('错误的绘制位置');
-            // }
             var table = value.getParentCell().table;
             if (!tableArr.includes(table)) {
               tableArr.push(table);
             }
-            // const startPath = hoEditorFactory.docTree.getNodeLastPath(prevNode);
-            // const changeEvent = new NodeChangeEvent(this._hoEditorFactoryID,
-            //   DocAction.daModifyStyle, startPath, startPath)
-            // changeEvent.oldEndPath = startPath;
-            // changeEvent.oldDrawLines = new SelectRange(this._hoEditorFactoryID).getRangeDrawLines(startPath, startPath, false)
-            // hangeEvent.repaintImmediate=false;
-            //hoEditorFactory.docTree.change(changeEvent);
           }
         });
         for (var t = tableArr.length - 1; t >= 0; t--) {
-          //   const table=tableArr[t];
           tableArr[t].update();
-          //   const dpos = hoEditorFactory.drawTree.getDlineDrawRootLists(
-          //     table.drawTable
-          //   );
-          //   const mainArea = hoEditorFactory.drawPageTree.getMainRootArea(
-          //     table.drawTable.drawPageTables[0]
-          //   );
-          //   if (mainArea) {
-          //     let drawTop = table.drawTable.drawPageTables[0].y;
-          //     if (mainArea.contains(table.drawTable.drawPageTables[0]) && table.drawTable.drawPageTables[0] instanceof DrawPageTable
-          //       && (table.drawTable.drawPageTables[0] as DrawPageTable).table.drawTable.drawPageTables.indexOf(table.drawTable.drawPageTables[0] as DrawPageTable) > 0
-          //     ) {
-          //       drawTop = 0
-          //     }
-          //     hoEditorFactory.drawPageTree.update(
-          //       mainArea,
-          //       dpos[0].drawRoots,
-          //       drawTop,
-          //       dpos[0].index,
-          //       dpos[0].index
-          //     );
-          //   }
         }
         var errorsMap = hoEditorFactory.drawTree.errorsMap;
         if (errorsMap.size > 0) {
           var area = hoEditorFactory.drawPageTree.drawMainDocs[0];
@@ -244684,6 +244828,7 @@ var VueController = /*#__PURE__*/function () {
       if (hoEditorFactory.docTree.changing(changingEvent)) {
         hoEditorFactory.docController.deleteComment(type);
       }
+      comment/* $Comment.close */.D.close();
     }
     // /**
     //  * 设置当前用户
@@ -246293,7 +246438,7 @@ var VueController = /*#__PURE__*/function () {
                   if (list[i][0]) {
                     updateNodesStyle(xmlobj.header[0].subDocNodes, fontStyleMap, paraStyleMap);
                     //生成随机数ID用于合并病历新起一页时，找到对应的页眉页脚
-                    var strID = hoEditorFactory.gernerateCode.generateID('cb');
+                    var strID = hoEditorFactory.gernerateCode.generateID('DocId');
                     xmlobj.header[0].beginPath = strID;
                     xmlobj.header[0].pageIndex = -1;
                     mergeObject.header.push(xmlobj.header[0]);
@@ -246319,7 +246464,7 @@ var VueController = /*#__PURE__*/function () {
                     if (list[i][2]) {
                       updateNodesStyle(xmlobj.header[0].subDocNodes, fontStyleMap, paraStyleMap);
                       //生成随机数ID用于合并病历新起一页时，找到对应的页眉页脚
-                      var _strID = hoEditorFactory.gernerateCode.generateID('cb');
+                      var _strID = hoEditorFactory.gernerateCode.generateID('DocId');
                       xmlobj.header[0].beginPath = _strID;
                       xmlobj.header[0].pageIndex = -1;
                       mergeObject.header.push(xmlobj.header[0]);
@@ -248129,9 +248274,9 @@ var VueController = /*#__PURE__*/function () {
     key: "initAiFunc",
     value: function initAiFunc(getAiText) {
       var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID);
-      if (hoEditorFactory.drawTree.paintStatus === DrawTree/* PaintState.psEdit */.Dh.psEdit) {
-        hoEditorFactory.aiTextFunc = getAiText;
-      }
+      // if (hoEditorFactory.drawTree.paintStatus === PaintState.psEdit) {
+      hoEditorFactory.aiTextFunc = getAiText;
+      // }
     }
     /**
      * 查询光标所在位置之前的文本内容
@@ -249610,6 +249755,20 @@ var VueController = /*#__PURE__*/function () {
       var newDomRangeCur = new DomRange/* DomRange */.a(this._hoEditorFactoryID, nodePathCur, nodePathCur);
       hoEditorFactory.docController.insertRadioAndCheckBox("update", newDomRangeCur, nodeObjectStr, node.styleIndex);
     }
+    //是否是空页
+  }, {
+    key: "isEmptyPage",
+    value: function isEmptyPage(index) {
+      var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID);
+      var drawMainDoc = hoEditorFactory.drawPageTree.drawMainDocs[index];
+      if (drawMainDoc) {
+        var children = drawMainDoc.children;
+        if (children.length == 1 && children[0] instanceof DrawLine/* DrawLine */.a && children[0].drawItems.length == 0) {
+          return true;
+        }
+      }
+      return false;
+    }
   }]);
   return VueController;
 }();
@@ -250652,14 +250811,18 @@ var EditController = /*#__PURE__*/function () {
         }
         //粘贴完重新绘制一下计算公式
         var formularNodes = hoeditorfactory.drawTree.formularNodes;
+        var isNeedUpdate = false;
         formularNodes.forEach(function (value) {
           var acell = value.getParentCell();
           if (acell.table == parentNode.table) {
             value.updateResult();
             acell.drawCell.needUpdate = true;
+            isNeedUpdate = true;
           }
         });
-        parentNode.table.update();
+        if (isNeedUpdate) {
+          parentNode.table.update();
+        }
         return;
       } else {
         if (parentNode instanceof CellNode/* CellNode */.D && nodes.length > 0) {
@@ -253073,6 +253236,7 @@ var PrintController = /*#__PURE__*/function () {
                 }
                 setTimeout(function () {
                   hoEditorFactory.vueController.moveCaretToPath(path);
+                  _this2.clearJsPDF();
                 }, 0);
                 return _context2.abrupt("return", base64.replace(/^data:application\/pdf;filename=generated.pdf;base64,/, ''));
               case 21:
@@ -253105,8 +253269,18 @@ var PrintController = /*#__PURE__*/function () {
       if (this._waitPrint) {
         this.printPromisePDF();
       }
-      if (this._waitSavepdf) {
-        this.saveAsPDF();
+      // if (this._waitSavepdf) {
+      //     this.saveAsPDF();
+      // }
+    }
+  }, {
+    key: "clearJsPDF",
+    value: function clearJsPDF() {
+      if (this.PDF.internal.getFont("SimSun")) {
+        delete this.PDF.internal.getFont("SimSun").metadata;
+        delete this.PDF.internal.getFont("SimSun").data;
+        delete this.PDF.internal.vFS["SimSun-normal.ttf"];
+        this.PDF = null;
       }
     }
     /**
@@ -253118,53 +253292,62 @@ var PrintController = /*#__PURE__*/function () {
     value: function saveAsPDF(pdfName, type, isSpecial) {
       var _this3 = this;
       var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID);
-      if (!this._isSetFont) {
-        this._waitSavepdf = true;
-        return;
-      }
-      var fileType = type ? type : 'pdf';
-      var fileName = pdfName ? pdfName : hoEditorFactory.vueController.getDocTitle() ? hoEditorFactory.vueController.getDocTitle() : '电子病历文档';
-      // 保存打印前文档状态 和 内容
-      var beforePrintStatus = hoEditorFactory.drawTree.paintStatus;
-      var xml = hoEditorFactory.vueController.getDocXml(true);
-      var hPromise = Promise.resolve();
-      hPromise = hPromise.then(function () {
-        return new Promise(function (resolve) {
-          hoEditorFactory.printStatus.printMode = 0;
-          hoEditorFactory.drawTree.paintStatus = DrawTree/* PaintState.psPreview */.Dh.psPreview;
-          hoEditorFactory.drawTree.rebuildAllDrawLine(false, resolve);
+      var print = function print() {
+        var fileType = type ? type : 'pdf';
+        var fileName = pdfName ? pdfName : hoEditorFactory.vueController.getDocTitle() ? hoEditorFactory.vueController.getDocTitle() : '电子病历文档';
+        // 保存打印前文档状态 和 内容
+        var beforePrintStatus = hoEditorFactory.drawTree.paintStatus;
+        var xml = hoEditorFactory.vueController.getDocXml(true);
+        var hPromise = Promise.resolve();
+        hPromise = hPromise.then(function () {
+          return new Promise(function (resolve) {
+            hoEditorFactory.printStatus.printMode = 0;
+            hoEditorFactory.drawTree.paintStatus = DrawTree/* PaintState.psPreview */.Dh.psPreview;
+            hoEditorFactory.drawTree.rebuildAllDrawLine(false, resolve);
+          });
         });
-      });
-      hPromise = hPromise.then(function () {
-        return new Promise(function (resolve) {
-          var orientation = hoEditorFactory.pageProperty.widthMm > hoEditorFactory.pageProperty.heightMm ? 'l' : 'p';
-          var format = [hoEditorFactory.pageProperty.widthPixes, hoEditorFactory.pageProperty.heightPixes];
-          if (hoEditorFactory.isFixedPrintToA4 == '1' && isSpecial) {
-            format = _this3._a4Size[orientation];
-          }
-          var pageSize = JSON.stringify([hoEditorFactory.pageProperty.widthMm, hoEditorFactory.pageProperty.heightMm]);
-          if (hoEditorFactory.isFixedPrintToA4 == '2' && ['[148,210]', '[210,148]'].includes(pageSize)) {
-            format = [793, 1122];
-            orientation = 'p';
-          }
-          var options = {
-            orientation: orientation,
-            unit: 'px',
-            format: format,
-            hotfixes: ['px_scaling'],
-            compress: true
-          };
-          _this3.PDF = null;
-          _this3.PDF = new jspdf/* default */.ZP(options);
-          // PDF.setFont("SimSun");
-          PrintStatus/* Print.printToPDF */.Kh.printToPDF(_this3._hoEditorFactoryID, _this3.PDF, fileType, fileName, resolve, undefined, format);
+        hPromise = hPromise.then(function () {
+          return new Promise(function (resolve) {
+            var orientation = hoEditorFactory.pageProperty.widthMm > hoEditorFactory.pageProperty.heightMm ? 'l' : 'p';
+            var format = [hoEditorFactory.pageProperty.widthPixes, hoEditorFactory.pageProperty.heightPixes];
+            if (hoEditorFactory.isFixedPrintToA4 == '1' && isSpecial) {
+              format = _this3._a4Size[orientation];
+            }
+            var pageSize = JSON.stringify([hoEditorFactory.pageProperty.widthMm, hoEditorFactory.pageProperty.heightMm]);
+            if (hoEditorFactory.isFixedPrintToA4 == '2' && ['[148,210]', '[210,148]'].includes(pageSize)) {
+              format = [793, 1122];
+              orientation = 'p';
+            }
+            var options = {
+              orientation: orientation,
+              unit: 'px',
+              format: format,
+              hotfixes: ['px_scaling'],
+              compress: true
+            };
+            _this3.PDF = null;
+            _this3.PDF = new jspdf/* default */.ZP(options);
+            // PDF.setFont("SimSun");
+            PrintStatus/* Print.printToPDF */.Kh.printToPDF(_this3._hoEditorFactoryID, _this3.PDF, fileType, fileName, resolve, undefined, format);
+          });
         });
-      });
-      hPromise.then(function (resolve) {
-        // 恢复文档状态 和 内容;
-        hoEditorFactory.drawTree.paintStatus = beforePrintStatus;
-        hoEditorFactory.vueController.openXml(xml);
-      });
+        hPromise.then(function (resolve) {
+          // 恢复文档状态 和 内容;
+          hoEditorFactory.drawTree.paintStatus = beforePrintStatus;
+          hoEditorFactory.vueController.openXml(xml);
+          _this3.clearJsPDF();
+        });
+      };
+      if (!this._isSetFont) {
+        hoEditorFactory.vueController.hoLocalStorage().loadFontString().then(function (font) {
+          if (font) {
+            _this3.setjsPDFFonts(font);
+            print();
+          }
+        });
+      } else {
+        print();
+      }
     }
     /**
      * 打印
@@ -253300,6 +253483,7 @@ var PrintController = /*#__PURE__*/function () {
             });
             hoEditorFactory.vueController.rebuildAll(true);
           }
+          _this4.clearJsPDF();
         }
       });
     }
@@ -253469,6 +253653,7 @@ var PrintController = /*#__PURE__*/function () {
                       // 	hoEditorFactory.drawTree.rebuildAllDrawLine(false);
                       // }, 0);
                       console.timeEnd('连续打印总用时');
+                      _this5.clearJsPDF();
                       resolves(pos);
                     });
                   } else {
@@ -253481,10 +253666,8 @@ var PrintController = /*#__PURE__*/function () {
                     // hoEditorFactory.vueController.newFile("caseHistory");
                     // 恢复文档内容
                     hoEditorFactory.vueController.openXml(xml);
-                    // setTimeout(() => {
-                    // 	hoEditorFactory.drawTree.rebuildAllDrawLine(false);
-                    // }, 0);
                     console.timeEnd('连续打印总用时');
+                    _this5.clearJsPDF();
                     return null;
                   }
                 });
@@ -253624,6 +253807,7 @@ var PrintController = /*#__PURE__*/function () {
                               (_this6$PDF = _this6.PDF) === null || _this6$PDF === void 0 ? void 0 : _this6$PDF.deletePage(1);
                               name = hoEditorFactory.vueController.getDocTitle() ? hoEditorFactory.vueController.getDocTitle() : '电子病历文档';
                               PrintStatus/* Print.openDataUriInWindow */.Kh.openDataUriInWindow(_this6.PDF, name, hoEditorFactory.pageProperty.widthPixes, hoEditorFactory.printSilently);
+                              _this6.clearJsPDF();
                             }
                           case 2:
                           case "end":
@@ -253664,54 +253848,6 @@ var PrintController = /*#__PURE__*/function () {
         list.push([false, v]);
       });
       hoEditorFactory.vueController.openDocsForPrint(list);
-      // if (!hoEditorFactory.isHideComments) {
-      // 	hoEditorFactory.vueController.hideComments(true);
-      // }
-      // hoEditorFactory.printStatus.printMode = 0;
-      // hoEditorFactory.drawTree.paintStatus = PaintState.psReadOnly;
-      // console.time("连续查看病历合并总用时");
-      // if (!hoEditorFactory.continuousView.status) {
-      // 	hoEditorFactory.continuousView.status = true;
-      // 	this._viewXmlList = [...xmlList];
-      // 	this._xmlIndex = -1;
-      // } else {
-      // 	this._viewXmlList = [...this._viewXmlList, ...xmlList];
-      // }
-      // const createSvg = () => {
-      // 	this._xmlIndex++;
-      // 	if (this._xmlIndex <= this._viewXmlList.length - 1) {
-      // 		const current = typeof this._viewXmlList[this._xmlIndex] != "string";
-      // 		const xml = current ? this._viewXmlList[this._xmlIndex].xml : this._viewXmlList[this._xmlIndex];
-      // 		const isMerge = current ? this._viewXmlList[this._xmlIndex].isMerge : false;
-      // 		if (this._xmlIndex === 0) {
-      // 			Promise.all([hoEditorFactory.vueController.openXml(xml, undefined, true)]).then(() => {
-      // 				if (hoEditorFactory.loadImageCount == 0) {
-      // 					hoEditorFactory.loadImageCallback = null;
-      // 					createSvg();
-      // 				} else {
-      // 					hoEditorFactory.loadImageCallback = createSvg;
-      // 				}
-      // 			});
-      // 		} else {
-      // 			Promise.all([hoEditorFactory.vueController.mergeDocs(xml, isMerge, undefined, true)]).then(() => {
-      // 				if (hoEditorFactory.loadImageCount == 0) {
-      // 					hoEditorFactory.loadImageCallback = null;
-      // 					createSvg();
-      // 				} else {
-      // 					hoEditorFactory.loadImageCallback = createSvg;
-      // 				}
-      // 			});
-      // 		}
-      // 		if (this._xmlIndex === this._viewXmlList.length - 1) {
-      // 			console.timeEnd("连续查看病历合并总用时");
-      // 		}
-      // 		if (mergeEnd) {
-      // 			this._xmlIndex = 0;
-      // 			this._viewXmlList = [];
-      // 		}
-      // 	}
-      // };
-      // createSvg();
     }
   }]);
   return PrintController;
@@ -254286,6 +254422,7 @@ var HoLocalStorage = /*#__PURE__*/function () {
   // 网络中断后缓存文件
   // 网络连接状态
   // 网络连接中断后定时30s缓存一次
+  // 增加页面刷新时缓存未保存的病历数据
   function HoLocalStorage(hoEditorFactoryID) {
     var _window, _window$chrome, _window$chrome$webvie;
     (0,esm_classCallCheck/* default */.Z)(this, HoLocalStorage);
@@ -254307,6 +254444,7 @@ var HoLocalStorage = /*#__PURE__*/function () {
     (0,esm_defineProperty/* default */.Z)(this, "_offline_cache_list", void 0);
     (0,esm_defineProperty/* default */.Z)(this, "_networkConnectionStatus", true);
     (0,esm_defineProperty/* default */.Z)(this, "_offLineIntervalCacheTimer", void 0);
+    (0,esm_defineProperty/* default */.Z)(this, "pageLoadCacheList", void 0);
     var _this = this;
     this._hoEditorFactoryID = hoEditorFactoryID;
     // 设置今天的 storeName
@@ -254364,7 +254502,11 @@ var HoLocalStorage = /*#__PURE__*/function () {
         name: '_ho_web',
         storeName: '_offline_cache_list'
       });
-      this.networkEventListener();
+      this.pageLoadCacheList = localforage_default().createInstance({
+        name: '_ho_web',
+        storeName: 'PageLoadCacheList'
+      });
+      // this.networkEventListener();
     }
     //获取localXmlList
   }, {
@@ -262860,7 +263002,7 @@ var popper = __webpack_require__(95551);
       formularType: {
         sum: '表格行列求和公式',
         formula: '四则运算公式',
-        bmi: 'bmi计算公式',
+        bmi: 'BMI计算公式',
         labor: '产程公式',
         expectedDate: '预产期公式',
         pregnantWeeks: '孕周公式',
@@ -262871,7 +263013,8 @@ var popper = __webpack_require__(95551);
       isPasted: false,
       isWebview: false,
       htmlText: '',
-      txtText: ''
+      txtText: '',
+      radioBoxSelected: false
     };
   },
   created: function created() {
@@ -262895,7 +263038,7 @@ var popper = __webpack_require__(95551);
     });
   },
   mounted: function mounted() {
-    var _this$hoEditorProvide, _this$hoEditorProvide2;
+    var _this$hoEditorProvide, _this$hoEditorProvide2, _this$hoEditorProvide3;
     this.isIncludes = (_this$hoEditorProvide = this.hoEditorProvider.rightNode) === null || _this$hoEditorProvide === void 0 ? void 0 : _this$hoEditorProvide.labelNode().isIncludes;
     // this.patientID = this.vueController?.getDocProperty().patientID;
     this.isDeisgn = this.hoEditorProvider.rightNode.paintStatus;
@@ -262915,6 +263058,10 @@ var popper = __webpack_require__(95551);
         }]
       });
     }
+    if (((_this$hoEditorProvide3 = this.hoEditorProvider.rightNode) === null || _this$hoEditorProvide3 === void 0 ? void 0 : _this$hoEditorProvide3.type) === 'RadioBox') {
+      var _this$hoEditorProvide4;
+      this.radioBoxSelected = (_this$hoEditorProvide4 = this.hoEditorProvider.rightNode) === null || _this$hoEditorProvide4 === void 0 ? void 0 : _this$hoEditorProvide4.node().isSelected;
+    }
     this.emrDebug = window && window.emrDebug0331 ? true : false;
   },
   methods: {
@@ -262985,6 +263132,12 @@ var popper = __webpack_require__(95551);
       this.handleClose();
     },
+    cancelRadioSelect: function cancelRadioSelect() {
+      this.handleClose();
+      if (this.hoEditorProvider.rightNode) {
+        this.vueController.cancelSelect(this.hoEditorProvider.rightNode.node());
+      }
+    },
     addDiagonal: function addDiagonal(type) {
       var node = this.hoEditorProvider.rightNode.node();
       if (node instanceof CellNode/* CellNode */.D) {
@@ -263157,16 +263310,14 @@ var popper = __webpack_require__(95551);
     }
   },
   render: function render() {
-    var _this$hoEditorProvide3,
+    var _this$hoEditorProvide5,
       _this$$slots$hoRightS,
-      _this$hoEditorProvide4,
-      _this$hoEditorProvide5,
       _this$hoEditorProvide6,
       _this$hoEditorProvide7,
       _this$hoEditorProvide8,
-      _this5 = this,
       _this$hoEditorProvide9,
       _this$hoEditorProvide10,
+      _this5 = this,
       _this$hoEditorProvide11,
       _this$hoEditorProvide12,
       _this$hoEditorProvide13,
@@ -263187,7 +263338,9 @@ var popper = __webpack_require__(95551);
       _this$hoEditorProvide28,
       _this$hoEditorProvide29,
       _this$hoEditorProvide30,
-      _this$hoEditorProvide31;
+      _this$hoEditorProvide31,
+      _this$hoEditorProvide32,
+      _this$hoEditorProvide33;
     var h = arguments[0];
     return h("div", {
       "directives": [{
@@ -263196,7 +263349,7 @@ var popper = __webpack_require__(95551);
       }],
       "ref": "mouseRightMenuPopup",
       "class": "mouse-right-menu-popup animation-in"
-    }, [(this.isPasted || this.isWebview || this.htmlText || this.txtText) && ((_this$hoEditorProvide3 = this.hoEditorProvider.rightNode) === null || _this$hoEditorProvide3 === void 0 ? void 0 : _this$hoEditorProvide3.paintStatus) !== 4 && h("ul", {
+    }, [(this.isPasted || this.isWebview || this.htmlText || this.txtText) && ((_this$hoEditorProvide5 = this.hoEditorProvider.rightNode) === null || _this$hoEditorProvide5 === void 0 ? void 0 : _this$hoEditorProvide5.paintStatus) !== 4 && h("ul", {
       "class": "mouse-right-menu"
     }, [h("li", {
       "class": "mouse-menu-item",
@@ -263220,7 +263373,7 @@ var popper = __webpack_require__(95551);
       "class": "mouse-menu-item mouse-right-menu-line"
     })]), (_this$$slots$hoRightS = this.$slots.hoRightSlot) === null || _this$$slots$hoRightS === void 0 ? void 0 : _this$$slots$hoRightS.map(function (v) {
       return v;
-    }), ((_this$hoEditorProvide4 = this.hoEditorProvider.rightNode) === null || _this$hoEditorProvide4 === void 0 ? void 0 : _this$hoEditorProvide4.paintStatus) !== 4 && h("p", [this.isIncludes === 'toLabel' && h("ul", {
+    }), ((_this$hoEditorProvide6 = this.hoEditorProvider.rightNode) === null || _this$hoEditorProvide6 === void 0 ? void 0 : _this$hoEditorProvide6.paintStatus) !== 4 && h("p", [this.isIncludes === 'toLabel' && h("ul", {
       "class": "mouse-right-menu"
     }, [h("li", {
       "class": "mouse-menu-item mouse-right-menu-line"
@@ -263238,12 +263391,12 @@ var popper = __webpack_require__(95551);
       "on": {
         "click": this.labelToText.bind(this)
       }
-    }, ["\u6807\u7B7E\u8F6C\u6587\u672C"]), ((_this$hoEditorProvide5 = this.hoEditorProvider.rightNode) === null || _this$hoEditorProvide5 === void 0 ? void 0 : _this$hoEditorProvide5.paintStatus) == 0 && h("li", {
+    }, ["\u6807\u7B7E\u8F6C\u6587\u672C"]), ((_this$hoEditorProvide7 = this.hoEditorProvider.rightNode) === null || _this$hoEditorProvide7 === void 0 ? void 0 : _this$hoEditorProvide7.paintStatus) == 0 && h("li", {
       "class": "mouse-menu-item",
       "on": {
         "click": this.editLabel.bind(this)
       }
-    }, ["\u7F16\u8F91\u6807\u7B7E\u5173\u8054\u5143\u7D20"])]), ((_this$hoEditorProvide6 = this.hoEditorProvider.rightNode) === null || _this$hoEditorProvide6 === void 0 ? void 0 : _this$hoEditorProvide6.type) === 'express' && ((_this$hoEditorProvide7 = this.hoEditorProvider.rightNode) === null || _this$hoEditorProvide7 === void 0 ? void 0 : _this$hoEditorProvide7.paintStatus) === 0 && ((_this$hoEditorProvide8 = this.hoEditorProvider.rightNode) === null || _this$hoEditorProvide8 === void 0 ? void 0 : _this$hoEditorProvide8.paintStatus) === 0 && h("ul", {
+    }, ["\u7F16\u8F91\u6807\u7B7E\u5173\u8054\u5143\u7D20"])]), ((_this$hoEditorProvide8 = this.hoEditorProvider.rightNode) === null || _this$hoEditorProvide8 === void 0 ? void 0 : _this$hoEditorProvide8.type) === 'express' && ((_this$hoEditorProvide9 = this.hoEditorProvider.rightNode) === null || _this$hoEditorProvide9 === void 0 ? void 0 : _this$hoEditorProvide9.paintStatus) === 0 && ((_this$hoEditorProvide10 = this.hoEditorProvider.rightNode) === null || _this$hoEditorProvide10 === void 0 ? void 0 : _this$hoEditorProvide10.paintStatus) === 0 && h("ul", {
       "class": "mouse-right-menu"
     }, [h("li", {
       "class": "mouse-menu-item mouse-right-menu-line"
@@ -263254,7 +263407,7 @@ var popper = __webpack_require__(95551);
           return _this5.toUpdateNodes('express', event);
         }
       }
-    }, ["\u533B\u5B66\u8868\u8FBE\u5F0F\u5C5E\u6027"])]), (((_this$hoEditorProvide9 = this.hoEditorProvider.rightNode) === null || _this$hoEditorProvide9 === void 0 ? void 0 : _this$hoEditorProvide9.type) === 'RadioBox' || ((_this$hoEditorProvide10 = this.hoEditorProvider.rightNode) === null || _this$hoEditorProvide10 === void 0 ? void 0 : _this$hoEditorProvide10.type) === 'CheckBox') && ((_this$hoEditorProvide11 = this.hoEditorProvider.rightNode) === null || _this$hoEditorProvide11 === void 0 ? void 0 : _this$hoEditorProvide11.paintStatus) === 0 && h("ul", {
+    }, ["\u533B\u5B66\u8868\u8FBE\u5F0F\u5C5E\u6027"])]), (((_this$hoEditorProvide11 = this.hoEditorProvider.rightNode) === null || _this$hoEditorProvide11 === void 0 ? void 0 : _this$hoEditorProvide11.type) === 'RadioBox' || ((_this$hoEditorProvide12 = this.hoEditorProvider.rightNode) === null || _this$hoEditorProvide12 === void 0 ? void 0 : _this$hoEditorProvide12.type) === 'CheckBox') && ((_this$hoEditorProvide13 = this.hoEditorProvider.rightNode) === null || _this$hoEditorProvide13 === void 0 ? void 0 : _this$hoEditorProvide13.paintStatus) === 0 && h("ul", {
       "class": "mouse-right-menu"
     }, [h("li", {
       "class": "mouse-menu-item mouse-right-menu-line"
@@ -263266,7 +263419,18 @@ var popper = __webpack_require__(95551);
           return _this5.toUpdateNodes((_this5$hoEditorProvid = _this5.hoEditorProvider.rightNode) === null || _this5$hoEditorProvid === void 0 ? void 0 : _this5$hoEditorProvid.type, event);
         }
       }
-    }, [((_this$hoEditorProvide12 = this.hoEditorProvider.rightNode) === null || _this$hoEditorProvide12 === void 0 ? void 0 : _this$hoEditorProvide12.type) === 'RadioBox' ? '单选框属性' : '复选框属性'])]), ((_this$hoEditorProvide13 = this.hoEditorProvider.rightNode) === null || _this$hoEditorProvide13 === void 0 ? void 0 : _this$hoEditorProvide13.type) === 'date' && ((_this$hoEditorProvide14 = this.hoEditorProvider.rightNode) === null || _this$hoEditorProvide14 === void 0 ? void 0 : _this$hoEditorProvide14.paintStatus) === 0 && h("ul", {
+    }, [((_this$hoEditorProvide14 = this.hoEditorProvider.rightNode) === null || _this$hoEditorProvide14 === void 0 ? void 0 : _this$hoEditorProvide14.type) === 'RadioBox' ? '单选框属性' : '复选框属性'])]), this.radioBoxSelected && h("ul", {
+      "class": "mouse-right-menu"
+    }, [h("li", {
+      "class": "mouse-menu-item mouse-right-menu-line"
+    }), h("li", {
+      "class": "mouse-menu-item",
+      "on": {
+        "click": function click() {
+          return _this5.cancelRadioSelect();
+        }
+      }
+    }, ["\u53D6\u6D88\u9009\u4E2D"])]), ((_this$hoEditorProvide15 = this.hoEditorProvider.rightNode) === null || _this$hoEditorProvide15 === void 0 ? void 0 : _this$hoEditorProvide15.type) === 'date' && ((_this$hoEditorProvide16 = this.hoEditorProvider.rightNode) === null || _this$hoEditorProvide16 === void 0 ? void 0 : _this$hoEditorProvide16.paintStatus) === 0 && h("ul", {
       "class": "mouse-right-menu"
     }, [h("li", {
       "class": "mouse-menu-item mouse-right-menu-line"
@@ -263277,7 +263441,7 @@ var popper = __webpack_require__(95551);
           return _this5.toUpdateNodes('date', event);
         }
       }
-    }, ["\u65E5\u671F\u5C5E\u6027"])]), ((_this$hoEditorProvide15 = this.hoEditorProvider.rightNode) === null || _this$hoEditorProvide15 === void 0 ? void 0 : _this$hoEditorProvide15.type) === 'select' && ((_this$hoEditorProvide16 = this.hoEditorProvider.rightNode) === null || _this$hoEditorProvide16 === void 0 ? void 0 : _this$hoEditorProvide16.paintStatus) === 0 && h("ul", {
+    }, ["\u65E5\u671F\u5C5E\u6027"])]), ((_this$hoEditorProvide17 = this.hoEditorProvider.rightNode) === null || _this$hoEditorProvide17 === void 0 ? void 0 : _this$hoEditorProvide17.type) === 'select' && ((_this$hoEditorProvide18 = this.hoEditorProvider.rightNode) === null || _this$hoEditorProvide18 === void 0 ? void 0 : _this$hoEditorProvide18.paintStatus) === 0 && h("ul", {
       "class": "mouse-right-menu"
     }, [h("li", {
       "class": "mouse-menu-item mouse-right-menu-line"
@@ -263288,7 +263452,7 @@ var popper = __webpack_require__(95551);
           return _this5.toUpdateNodes('select', event);
         }
       }
-    }, ["\u4E0B\u62C9\u6846\u5C5E\u6027"])]), ((_this$hoEditorProvide17 = this.hoEditorProvider.rightNode) === null || _this$hoEditorProvide17 === void 0 ? void 0 : _this$hoEditorProvide17.type) === 'barcode' && ((_this$hoEditorProvide18 = this.hoEditorProvider.rightNode) === null || _this$hoEditorProvide18 === void 0 ? void 0 : _this$hoEditorProvide18.paintStatus) === 0 && h("ul", {
+    }, ["\u4E0B\u62C9\u6846\u5C5E\u6027"])]), ((_this$hoEditorProvide19 = this.hoEditorProvider.rightNode) === null || _this$hoEditorProvide19 === void 0 ? void 0 : _this$hoEditorProvide19.type) === 'barcode' && ((_this$hoEditorProvide20 = this.hoEditorProvider.rightNode) === null || _this$hoEditorProvide20 === void 0 ? void 0 : _this$hoEditorProvide20.paintStatus) === 0 && h("ul", {
       "class": "mouse-right-menu"
     }, [h("li", {
       "class": "mouse-menu-item mouse-right-menu-line"
@@ -263299,7 +263463,7 @@ var popper = __webpack_require__(95551);
           return _this5.toUpdateNodes('barcode', event);
         }
       }
-    }, ["\u6761\u5F62\u7801\u5C5E\u6027"])]), ((_this$hoEditorProvide19 = this.hoEditorProvider.rightNode) === null || _this$hoEditorProvide19 === void 0 ? void 0 : _this$hoEditorProvide19.type) === 'qrcode' && ((_this$hoEditorProvide20 = this.hoEditorProvider.rightNode) === null || _this$hoEditorProvide20 === void 0 ? void 0 : _this$hoEditorProvide20.paintStatus) === 0 && h("ul", {
+    }, ["\u6761\u5F62\u7801\u5C5E\u6027"])]), ((_this$hoEditorProvide21 = this.hoEditorProvider.rightNode) === null || _this$hoEditorProvide21 === void 0 ? void 0 : _this$hoEditorProvide21.type) === 'qrcode' && ((_this$hoEditorProvide22 = this.hoEditorProvider.rightNode) === null || _this$hoEditorProvide22 === void 0 ? void 0 : _this$hoEditorProvide22.paintStatus) === 0 && h("ul", {
       "class": "mouse-right-menu"
     }, [h("li", {
       "class": "mouse-menu-item mouse-right-menu-line"
@@ -263310,7 +263474,7 @@ var popper = __webpack_require__(95551);
           return _this5.toUpdateNodes('qrcode', event);
         }
       }
-    }, ["\u4E8C\u7EF4\u7801\u5C5E\u6027"])]), ((_this$hoEditorProvide21 = this.hoEditorProvider.rightNode) === null || _this$hoEditorProvide21 === void 0 ? void 0 : _this$hoEditorProvide21.type) === 'edit-image' && ((_this$hoEditorProvide22 = this.hoEditorProvider.rightNode) === null || _this$hoEditorProvide22 === void 0 ? void 0 : _this$hoEditorProvide22.paintStatus) === 0 && h("ul", {
+    }, ["\u4E8C\u7EF4\u7801\u5C5E\u6027"])]), ((_this$hoEditorProvide23 = this.hoEditorProvider.rightNode) === null || _this$hoEditorProvide23 === void 0 ? void 0 : _this$hoEditorProvide23.type) === 'edit-image' && ((_this$hoEditorProvide24 = this.hoEditorProvider.rightNode) === null || _this$hoEditorProvide24 === void 0 ? void 0 : _this$hoEditorProvide24.paintStatus) === 0 && h("ul", {
       "class": "mouse-right-menu"
     }, [h("li", {
       "class": "mouse-menu-item mouse-right-menu-line"
@@ -263321,7 +263485,7 @@ var popper = __webpack_require__(95551);
           return _this5.toUpdateNodes('edit-image', event);
         }
       }
-    }, ["\u7F16\u8F91\u56FE\u7247"])]), ((_this$hoEditorProvide23 = this.hoEditorProvider.rightNode) === null || _this$hoEditorProvide23 === void 0 ? void 0 : _this$hoEditorProvide23.type) === 'text' && ((_this$hoEditorProvide24 = this.hoEditorProvider.rightNode) === null || _this$hoEditorProvide24 === void 0 ? void 0 : _this$hoEditorProvide24.paintStatus) === 0 && h("ul", {
+    }, ["\u7F16\u8F91\u56FE\u7247"])]), ((_this$hoEditorProvide25 = this.hoEditorProvider.rightNode) === null || _this$hoEditorProvide25 === void 0 ? void 0 : _this$hoEditorProvide25.type) === 'text' && ((_this$hoEditorProvide26 = this.hoEditorProvider.rightNode) === null || _this$hoEditorProvide26 === void 0 ? void 0 : _this$hoEditorProvide26.paintStatus) === 0 && h("ul", {
       "class": "mouse-right-menu"
     }, [h("li", {
       "class": "mouse-menu-item mouse-right-menu-line"
@@ -263332,7 +263496,7 @@ var popper = __webpack_require__(95551);
           return _this5.toUpdateNodes('text', event);
         }
       }
-    }, ["\u6587\u672C\u57DF\u5C5E\u6027"])]), (((_this$hoEditorProvide25 = this.hoEditorProvider.rightNode) === null || _this$hoEditorProvide25 === void 0 ? void 0 : _this$hoEditorProvide25.rightTypeIsTable) && this.defaultTable && (((_this$hoEditorProvide26 = this.hoEditorProvider.rightNode) === null || _this$hoEditorProvide26 === void 0 ? void 0 : _this$hoEditorProvide26.paintStatus) === 0 || ((_this$hoEditorProvide27 = this.hoEditorProvider.rightNode) === null || _this$hoEditorProvide27 === void 0 ? void 0 : _this$hoEditorProvide27.isCanUseTableProperty)) || this.emrDebug) && h("ul", {
+    }, ["\u6587\u672C\u57DF\u5C5E\u6027"])]), (((_this$hoEditorProvide27 = this.hoEditorProvider.rightNode) === null || _this$hoEditorProvide27 === void 0 ? void 0 : _this$hoEditorProvide27.rightTypeIsTable) && this.defaultTable && (((_this$hoEditorProvide28 = this.hoEditorProvider.rightNode) === null || _this$hoEditorProvide28 === void 0 ? void 0 : _this$hoEditorProvide28.paintStatus) === 0 || ((_this$hoEditorProvide29 = this.hoEditorProvider.rightNode) === null || _this$hoEditorProvide29 === void 0 ? void 0 : _this$hoEditorProvide29.isCanUseTableProperty)) || this.emrDebug) && h("ul", {
       "class": "mouse-right-menu"
     }, [h("li", {
       "class": "mouse-menu-item mouse-right-menu-line"
@@ -263371,7 +263535,7 @@ var popper = __webpack_require__(95551);
           return _this5.toUpdateNodes('table-formula', event);
         }
       }
-    }, [this.formularType[this.hoEditorProvider.rightNode.tableFormulaType]])]), ((_this$hoEditorProvide28 = this.hoEditorProvider.rightNode) === null || _this$hoEditorProvide28 === void 0 ? void 0 : _this$hoEditorProvide28.rightTypeIsTable) && this.defaultTable && h("ul", {
+    }, [this.formularType[this.hoEditorProvider.rightNode.tableFormulaType]])]), ((_this$hoEditorProvide30 = this.hoEditorProvider.rightNode) === null || _this$hoEditorProvide30 === void 0 ? void 0 : _this$hoEditorProvide30.rightTypeIsTable) && this.defaultTable && h("ul", {
       "class": "mouse-right-menu"
     }, [h("li", {
       "class": "mouse-menu-item mouse-right-menu-line"
@@ -263427,7 +263591,7 @@ var popper = __webpack_require__(95551);
         "type": "delete"
       },
       "style": "font-size: 20px;"
-    }), h("span", ["\u5220\u9664\u5BF9\u89D2\u7EBF"])])]), ((_this$hoEditorProvide29 = this.hoEditorProvider.rightNode) === null || _this$hoEditorProvide29 === void 0 ? void 0 : _this$hoEditorProvide29.rightTypeIsTable) && this.defaultTable && h("ul", {
+    }), h("span", ["\u5220\u9664\u5BF9\u89D2\u7EBF"])])]), ((_this$hoEditorProvide31 = this.hoEditorProvider.rightNode) === null || _this$hoEditorProvide31 === void 0 ? void 0 : _this$hoEditorProvide31.rightTypeIsTable) && this.defaultTable && h("ul", {
       "class": "mouse-right-menu"
     }, [h("li", {
       "class": "mouse-menu-item mouse-right-menu-line"
@@ -263441,7 +263605,7 @@ var popper = __webpack_require__(95551);
         table: this.defaultTable,
         tableProperty: this.hoEditorProvider.rightNode.tableProperty
       })
-    })]), ((_this$hoEditorProvide30 = this.hoEditorProvider.rightNode) === null || _this$hoEditorProvide30 === void 0 ? void 0 : _this$hoEditorProvide30.canShowComment) && h("ul", {
+    })]), ((_this$hoEditorProvide32 = this.hoEditorProvider.rightNode) === null || _this$hoEditorProvide32 === void 0 ? void 0 : _this$hoEditorProvide32.canShowComment) && h("ul", {
       "class": "mouse-right-menu"
     }, [h("li", {
       "class": "mouse-menu-item",
@@ -263450,7 +263614,7 @@ var popper = __webpack_require__(95551);
           return _this5.hideComments();
         }
       }
-    }, [(_this$hoEditorProvide31 = this.hoEditorProvider.rightNode) !== null && _this$hoEditorProvide31 !== void 0 && _this$hoEditorProvide31.isHideComments ? '显示' : '隐藏', "\u6279\u6CE8"])])]), h("ul", {
+    }, [(_this$hoEditorProvide33 = this.hoEditorProvider.rightNode) !== null && _this$hoEditorProvide33 !== void 0 && _this$hoEditorProvide33.isHideComments ? '显示' : '隐藏', "\u6279\u6CE8"])])]), h("ul", {
       "class": "mouse-right-menu"
     }, [h("li", {
       "class": "mouse-menu-item"