hoeditor-web 2.0.96 → 2.0.99

package/lib/hoeditor.umd.js

@@ -10528,7 +10528,7 @@ var component = (0,componentNormalizer/* default */.Z)(
 
 /***/ }),
 
-/***/ 54089:
+/***/ 87043:
 /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -10540,11 +10540,13 @@ __webpack_require__.d(__webpack_exports__, {
   "default": function() { return /* binding */ Sign; }
 });
 
-;// CONCATENATED MODULE: ./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/sign/Sign.vue?vue&type=template&id=47d45612&
+;// CONCATENATED MODULE: ./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/sign/Sign.vue?vue&type=template&id=5a3cdcd6&
 var render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{class:_vm.animationClassNames},[_c('header',{staticClass:"modal-title"},[_c('span',[_vm._v("签名")]),_c('i',{staticClass:"el-icon-close modal-title-close",on:{"click":_vm.handleClose}})]),_c('section',{staticClass:"modal-content",staticStyle:{"padding":"20px"}},[_c('ul',{staticClass:"control-list"},[_c('li',{staticClass:"control-item"},[_c('span',{staticClass:"label"},[_vm._v("签名名称")]),_c('el-input',{staticStyle:{"width":"120px","display":"flex"},attrs:{"size":"mini"},model:{value:(_vm.name),callback:function ($$v) {_vm.name=$$v},expression:"name"}})],1),_c('li',{staticClass:"control-item",staticStyle:{"align-items":"baseline"}},[_c('span',{staticClass:"label"},[_vm._v("签名类型")]),_c('div',{staticStyle:{"flex":"1"}},[_c('el-radio',{attrs:{"label":1},model:{value:(_vm.signType),callback:function ($$v) {_vm.signType=$$v},expression:"signType"}},[_vm._v("患者签名")]),_c('el-radio',{attrs:{"label":0},model:{value:(_vm.signType),callback:function ($$v) {_vm.signType=$$v},expression:"signType"}},[_vm._v("医生签名")]),_c('el-radio',{attrs:{"label":3},model:{value:(_vm.signType),callback:function ($$v) {_vm.signType=$$v},expression:"signType"}},[_vm._v("自定义医生签名")]),_c('el-radio',{attrs:{"label":2},model:{value:(_vm.signType),callback:function ($$v) {_vm.signType=$$v},expression:"signType"}},[_vm._v("自定义CA签名")])],1)]),(_vm.signType == 2)?_c('li',{staticClass:"control-item"},[_c('span',{staticClass:"label"},[_vm._v("连接符")]),_c('el-input',{staticStyle:{"width":"120px","display":"flex"},attrs:{"size":"mini"},model:{value:(_vm.connectChar),callback:function ($$v) {_vm.connectChar=$$v},expression:"connectChar"}})],1):_vm._e(),(_vm.signType >= 3)?[_c('li',{staticClass:"control-item"},[_c('span',{staticClass:"label"},[_vm._v("签名格式")]),_c('el-select',{attrs:{"size":"mini","placeholder":"请选择"},model:{value:(_vm.signFormat),callback:function ($$v) {_vm.signFormat=$$v},expression:"signFormat"}},[_c('el-option',{attrs:{"label":"<医师姓名>","value":"<医师姓名>"}}),_c('el-option',{attrs:{"label":"<医师姓名>（<医师职称>）","value":"<医师姓名>（<医师职称>）"}}),_c('el-option',{attrs:{"label":"<医师姓名>：<医师职称>","value":"<医师姓名>：<医师职称>"}}),_c('el-option',{attrs:{"label":"<医师姓名>：<医师职称>\\n<签名时间>","value":"<医师姓名>：<医师职称>\\n<签名时间>"}}),_vm._l((_vm.customSignFormatList),function(format){return _c('el-option',{key:format.label,attrs:{"label":format.label,"value":format.value}})})],2)],1),_c('li',{staticClass:"control-item"},[_c('span',{staticClass:"label"},[_vm._v("签名时间格式")]),_c('el-select',{attrs:{"size":"mini","placeholder":"请选择"},model:{value:(_vm.signTimeFormat),callback:function ($$v) {_vm.signTimeFormat=$$v},expression:"signTimeFormat"}},[_c('el-option',{attrs:{"label":"yyyy-MM-DD HH:mm:ss","value":"yyyy-MM-DD HH:mm:ss"}}),_c('el-option',{attrs:{"label":"yyyy-MM-DD HH:mm","value":"yyyy-MM-DD HH:mm"}}),_c('el-option',{attrs:{"label":"yyyy/MM/DD HH:mm:ss","value":"yyyy/MM/DD HH:mm:ss"}}),_c('el-option',{attrs:{"label":"yyyy/MM/DD HH:mm","value":"yyyy/MM/DD HH:mm"}}),_c('el-option',{attrs:{"label":"yyyy年MM月DD日 HH时mm分ss秒","value":"yyyy年MM月DD日 HH时mm分ss秒"}}),_c('el-option',{attrs:{"label":"yyyy年MM月DD日 HH时mm分","value":"yyyy年MM月DD日 HH时mm分"}})],1)],1),_c('li',{staticClass:"control-item"},[_c('span',{staticClass:"label"},[_vm._v("签名连接方式")]),_c('el-select',{attrs:{"size":"mini","placeholder":"请选择"},model:{value:(_vm.connectMode),callback:function ($$v) {_vm.connectMode=$$v},expression:"connectMode"}},[_c('el-option',{attrs:{"label":"/","value":"/"}}),_c('el-option',{attrs:{"label":"换行","value":"换行"}}),_c('el-option',{attrs:{"label":"、","value":"、"}}),_c('el-option',{attrs:{"label":"，","value":"，"}})],1)],1),_c('li',{staticClass:"control-item"},[_c('span',{staticClass:"label"}),_c('el-checkbox',{model:{value:(_vm.isFront),callback:function ($$v) {_vm.isFront=$$v},expression:"isFront"}},[_vm._v("连接符前置")]),_c('el-tooltip',{attrs:{"placement":"right","effect":"dark"}},[_c('div',{attrs:{"slot":"content"},slot:"content"},[_vm._v("不勾选参数:     医师签名 / "),_c('br'),_vm._v("   勾选参数:     / 医师签名")]),_c('i',{staticClass:"el-icon-info",staticStyle:{"font-size":"18px","margin-left":"10px"}})])],1),_c('li',{staticClass:"control-item"},[_c('span',{staticClass:"label"}),_c('el-checkbox',{model:{value:(_vm.allowEditSignTime),callback:function ($$v) {_vm.allowEditSignTime=$$v},expression:"allowEditSignTime"}},[_vm._v("允许修改签名时间")])],1)]:_vm._e()],2),(_vm.signType >= 3)?_c('div',{staticClass:"section-right"},[_c('div',{staticClass:"custom-format-tool-box"},[_c('ul',{staticClass:"custom-format-tool"},[_c('li',[_c('el-button',{attrs:{"size":"small","plain":""},on:{"click":function($event){_vm.customFormatContent += '<医师姓名>'}}},[_vm._v("医师姓名")]),_c('i',{staticClass:"el-icon-circle-plus"})],1),_c('li',[_c('el-button',{attrs:{"size":"small","plain":""},on:{"click":function($event){_vm.customFormatContent += '<医师工号>'}}},[_vm._v("医师工号")]),_c('i',{staticClass:"el-icon-circle-plus"})],1),_c('li',[_c('el-button',{attrs:{"size":"small","plain":""},on:{"click":function($event){_vm.customFormatContent += '<医师职称>'}}},[_vm._v("医师职称")]),_c('i',{staticClass:"el-icon-circle-plus"})],1),_c('li',[_c('el-button',{attrs:{"size":"small","plain":""},on:{"click":function($event){_vm.customFormatContent += '<签名时间>'}}},[_vm._v("签名时间")]),_c('i',{staticClass:"el-icon-circle-plus"})],1)]),_c('el-input',{attrs:{"type":"textarea","placeholder":"请输入内容"},model:{value:(_vm.customFormatContent),callback:function ($$v) {_vm.customFormatContent=$$v},expression:"customFormatContent"}})],1),_c('p',[_vm._v("提示：")]),_c('p',[_vm._v("1. 尖括号内的内容用来替换, 不能修改")]),_c('p',[_vm._v("2. 尖括号外的内容处理格式，可以编辑")]),_c('p',[_vm._v("2. 回车键可以自动换行，或者手动插入换行符\\n")]),_c('div',{staticClass:"custom-format-tool-btn"},[_c('el-button',{attrs:{"size":"small","type":"primary"},on:{"click":_vm.createSignFormat}},[_vm._v("添加自定义签名格式")])],1)]):_vm._e()]),_c('footer',{staticClass:"ho-modal-footer"},[_c('el-button',{attrs:{"size":"small","type":"primary"},on:{"click":_vm.insertSign}},[_vm._v("确定")]),_c('el-button',{staticStyle:{"margin-left":"30px"},attrs:{"size":"small"},on:{"click":_vm.handleClose}},[_vm._v("取消")])],1)])}
 var staticRenderFns = []
 
 
+// EXTERNAL MODULE: ./node_modules/core-js/modules/es.function.name.js
+var es_function_name = __webpack_require__(68309);
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.regexp.exec.js
 var es_regexp_exec = __webpack_require__(74916);
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.string.replace.js
@@ -10565,10 +10567,10 @@ var es_array_concat = __webpack_require__(92222);
 var web_dom_collections_for_each = __webpack_require__(54747);
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.slice.js
 var es_array_slice = __webpack_require__(47042);
-// EXTERNAL MODULE: ./node_modules/core-js/modules/es.function.name.js
-var es_function_name = __webpack_require__(68309);
-// EXTERNAL MODULE: ./src/components/controls/colorPicker/HoColorPicker.vue + 5 modules
-var HoColorPicker = __webpack_require__(59552);
+// EXTERNAL MODULE: ./src/HOEditorFactorys.ts
+var HOEditorFactorys = __webpack_require__(28831);
+// EXTERNAL MODULE: ./src/editor/dom/treeNode/SignNode.ts
+var SignNode = __webpack_require__(78975);
 ;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-83[0].rules[0].use[0]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/sign/Sign.vue?vue&type=script&lang=js&
 
 
@@ -10687,14 +10689,18 @@ var HoColorPicker = __webpack_require__(59552);
 //
 //
 
+
 /* harmony default export */ var Signvue_type_script_lang_js_ = ({
   name: 'Sign',
-  components: {
-    HoColorPicker: HoColorPicker["default"]
-  },
   props: {
     vueController: {
       default: function _default() {}
+    },
+    controlStatus: {
+      default: 'add'
+    },
+    hoEditorFactoryId: {
+      default: ''
     }
   },
   data: function data() {
@@ -10713,7 +10719,41 @@ var HoColorPicker = __webpack_require__(59552);
       animationClassNames: 'control-modal-contents sign-modal animation-in'
     };
   },
+  mounted: function mounted() {
+    if (this.controlStatus === 'update') {
+      var node = this.getCurrentSelectNode();
+
+      if (node) {
+        this.name = node.name;
+        this.signType = node.signType == 0 && node.connectMode ? 3 : node.signType;
+        this.signFormat = node.signFormat;
+        this.connectMode = node.connectMode;
+        this.connectChar = node.connectChar;
+        this.isFront = node.isFront;
+        this.signTimeFormat = node.signTimeFormat;
+        this.customFormatContent = node.customFormatContent;
+        this.customSignFormatList = node.customSignFormatList;
+      }
+    }
+  },
   methods: {
+    getCurrentSelectNode: function getCurrentSelectNode() {
+      var _hoEditorFactory$vueC;
+
+      var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this.hoEditorFactoryId);
+      var domRange = {
+        startPath: hoEditorFactory.docTree.curDomRange.normalize().startPath,
+        endPath: hoEditorFactory.docTree.curDomRange.normalize().endPath
+      };
+      var node = (_hoEditorFactory$vueC = hoEditorFactory.vueController.findNodebyPath(domRange.endPath)) === null || _hoEditorFactory$vueC === void 0 ? void 0 : _hoEditorFactory$vueC.node;
+      if (!node) return undefined;
+
+      if (node instanceof SignNode/* SignNode */.N) {
+        return node;
+      }
+
+      return null;
+    },
     // 创建自定义签名格式
     createSignFormat: function createSignFormat() {
       var customFormat = JSON.stringify(this.customFormatContent).replace(/^\s+|\s+$/g, '');
@@ -10806,7 +10846,7 @@ var component = (0,componentNormalizer/* default */.Z)(
 
 /***/ }),
 
-/***/ 28654:
+/***/ 9715:
 /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -10818,7 +10858,7 @@ __webpack_require__.d(__webpack_exports__, {
   "default": function() { return /* binding */ TableCellPoper; }
 });
 
-;// CONCATENATED MODULE: ./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/table/TableCellPoper.vue?vue&type=template&id=0b7fa5e8&scoped=true&
+;// CONCATENATED MODULE: ./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/table/TableCellPoper.vue?vue&type=template&id=958de66c&scoped=true&
 var render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"cell-poper-selected-modal animation-in",style:(_vm.posStyle)},[_c('div',{staticStyle:{"height":"0","overflow":"hidden"}},[_c('svg',{attrs:{"viewBox":"0 0 1303 1024","version":"1.1","xmlns":"http://www.w3.org/2000/svg","width":"16","height":"16"}},[_c('defs',[_c('g',{attrs:{"id":"selected"}},[_c('path',{attrs:{"d":"M498.688 1024c-26.996364 0-52.782545-11.636364-71.214545-32.395636L29.323636 536.017455a124.276364 124.276364 0 0 1 0-160.302546 89.181091 89.181091 0 0 1 132.747637-11.915636l11.264 11.915636L497.105455 749.288727 1133.102545 34.443636a88.994909 88.994909 0 0 1 129.489455-11.915636l11.357091 11.915636c39.098182 45.521455 39.098182 114.874182 0 160.395637l-705.629091 796.765091c-17.966545 20.48-43.194182 32.209455-69.632 32.395636","fill":"#2175FF"}})])])])]),(_vm.isCanSearch)?_c('el-input',{attrs:{"placeholder":"可搜索","size":"mini"},on:{"input":_vm.searchList},model:{value:(_vm.input),callback:function ($$v) {_vm.input=$$v},expression:"input"}}):_vm._e(),(_vm.editorProperty === 1)?_c('div',{staticClass:"select-poper"},[_c('ul',{staticClass:"list"},[_vm._l((_vm.currentList),function(item,index){return _c('li',{key:item.id,class:item.default ? 'selected' : '',on:{"click":function($event){return _vm.selectItems(item, index)}}},[_c('span',[_vm._v(_vm._s(item.text.split("<元素>")[0]))]),_c('svg',{attrs:{"viewBox":"0 0 1303 1024","version":"1.1","xmlns":"http://www.w3.org/2000/svg","width":"16","height":"16"}},[_c('use',{attrs:{"xlink:href":"#selected"}})])])}),(_vm.currentList.length === 0)?_c('li',{staticStyle:{"text-align":"center"}},[_vm._v("无选项")]):_vm._e()],2),(_vm.isAllowMultiSelect)?_c('footer',{staticStyle:{"bottom":"-43px","padding":"10px","text-align":"center"}},[_c('el-button',{staticStyle:{"padding":"5px 13px"},attrs:{"size":"mini"},on:{"click":_vm.sureSelect}},[_vm._v("确定")]),_c('el-button',{staticStyle:{"padding":"5px 13px"},attrs:{"size":"mini"},on:{"click":function($event){_vm.selected = []}}},[_vm._v("清空")]),_c('el-button',{staticStyle:{"padding":"5px 13px"},attrs:{"size":"mini"},on:{"click":_vm.handleClose}},[_vm._v("取消")])],1):_c('footer',{staticStyle:{"bottom":"-43px","padding":"10px","justify-content":"center"}},[_c('el-button',{staticStyle:{"padding":"5px 13px"},attrs:{"size":"mini"},on:{"click":_vm.handleClose}},[_vm._v("关闭")])],1)]):_vm._e(),(_vm.editorProperty === 2)?_c('div',{staticClass:"date-poper"},[(_vm.inputStyle.includes('dd'))?_c('DatePanel',{attrs:{"value":_vm.date},on:{"getValue":_vm.getTime}}):_vm._e(),(_vm.inputStyle.includes('MM') && !_vm.inputStyle.includes('dd'))?_c('DatePanel',{attrs:{"dateType":"month","value":_vm.date},on:{"getValue":_vm.getTime}}):_vm._e(),(_vm.inputStyle.includes('yyyy') && !_vm.inputStyle.includes('MM'))?_c('DatePanel',{attrs:{"dateType":"year","value":_vm.date},on:{"getValue":_vm.getTime}}):_vm._e(),(_vm.inputStyle.includes('HH'))?_c('div',{staticClass:"timepicker",staticStyle:{"padding":"8px 0"}},[_c('el-time-picker',{staticStyle:{"width":"200px"},attrs:{"type":"time","format":_vm.timeStyle,"value-format":_vm.timeStyle,"size":"mini"},model:{value:(_vm.time),callback:function ($$v) {_vm.time=$$v},expression:"time"}})],1):_vm._e(),_c('footer',[_c('el-button',{staticStyle:{"padding":"5px 13px"},attrs:{"size":"mini"},on:{"click":_vm.sureDate}},[_vm._v("确定")]),_c('el-button',{staticStyle:{"padding":"5px 13px"},attrs:{"size":"mini"},on:{"click":_vm.currentDateTime}},[_vm._v(_vm._s(_vm.inputStyle.indexOf('HH') !== -1 ? '此刻' : '今天'))]),_c('el-button',{staticStyle:{"padding":"5px 13px"},attrs:{"size":"mini"},on:{"click":function($event){return _vm.handleClose('cancel')}}},[_vm._v("取消")])],1)],1):_vm._e()],1)}
 var staticRenderFns = []
 
@@ -11285,10 +11325,10 @@ var HOEditorFactorys = __webpack_require__(28831);
 });
 ;// CONCATENATED MODULE: ./src/components/controls/table/TableCellPoper.vue?vue&type=script&lang=js&
  /* harmony default export */ var table_TableCellPopervue_type_script_lang_js_ = (TableCellPopervue_type_script_lang_js_); 
-;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-65[0].rules[0].use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-65[0].rules[0].use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-65[0].rules[0].use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-65[0].rules[0].use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/table/TableCellPoper.vue?vue&type=style&index=0&id=0b7fa5e8&lang=scss&scoped=true&
+;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-65[0].rules[0].use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-65[0].rules[0].use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-65[0].rules[0].use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-65[0].rules[0].use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/table/TableCellPoper.vue?vue&type=style&index=0&id=958de66c&lang=scss&scoped=true&
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./src/components/controls/table/TableCellPoper.vue?vue&type=style&index=0&id=0b7fa5e8&lang=scss&scoped=true&
+;// CONCATENATED MODULE: ./src/components/controls/table/TableCellPoper.vue?vue&type=style&index=0&id=958de66c&lang=scss&scoped=true&
 
 // EXTERNAL MODULE: ./node_modules/@vue/vue-loader-v15/lib/runtime/componentNormalizer.js
 var componentNormalizer = __webpack_require__(1001);
@@ -11307,7 +11347,7 @@ var component = (0,componentNormalizer/* default */.Z)(
   staticRenderFns,
   false,
   null,
-  "0b7fa5e8",
+  "958de66c",
   null
   
 )
@@ -11968,7 +12008,7 @@ var component = (0,componentNormalizer/* default */.Z)(
 
 /***/ }),
 
-/***/ 59243:
+/***/ 26853:
 /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -11980,7 +12020,7 @@ __webpack_require__.d(__webpack_exports__, {
   "default": function() { return /* binding */ TableColProperty; }
 });
 
-;// CONCATENATED MODULE: ./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/table/TableColProperty.vue?vue&type=template&id=600b7f95&
+;// CONCATENATED MODULE: ./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/table/TableColProperty.vue?vue&type=template&id=384a329a&
 var render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"control-modal-contents table-row-modal animation-in"},[_c('header',{staticClass:"modal-title"},[_c('span',[_vm._v("表格列属性")]),_c('i',{staticClass:"el-icon-close modal-title-close",on:{"click":_vm.handleClose}})]),_c('section',{staticClass:"modal-content"},[_c('ul',{staticClass:"control-list"},[_c('li',{staticClass:"control-item"},[_c('span',{staticClass:"label"},[_vm._v("编号")]),_c('span',{staticClass:"readonly-value"},[_vm._v(_vm._s(_vm.id))])]),_c('li',{staticClass:"control-item"},[_c('div',{staticClass:"control-item"},[_c('span',{staticClass:"label"},[_vm._v("自定义属性")]),_c('el-button',{attrs:{"size":"mini"},on:{"click":_vm.openCustomsModal}},[_vm._v("自定义属性")])],1)]),_c('li',{staticClass:"control-item"},[_c('div',{staticStyle:{"padding-right":"20px"}},[_c('el-checkbox',{on:{"change":_vm.watchParamsChange},model:{value:(_vm.isSpecifyWidth),callback:function ($$v) {_vm.isSpecifyWidth=$$v},expression:"isSpecifyWidth"}},[_vm._v("指定宽度（厘米）")])],1),_c('el-input-number',{attrs:{"size":"mini","disabled":!_vm.isSpecifyWidth,"step":1,"min":0,"precision":2,"controls":false},model:{value:(_vm.width),callback:function ($$v) {_vm.width=$$v},expression:"width"}}),_c('span',{staticStyle:{"padding-left":"10px"}},[_vm._v("当前显示宽度 "+_vm._s(_vm.colWidth)+" 厘米")])],1),_c('li',{staticClass:"control-item"},[_c('span',{staticClass:"label"},[_vm._v("垂直对齐方式")]),_c('el-select',{staticStyle:{"text-align":"left","font-size":"20px"},attrs:{"placeholder":"垂直对齐方式","size":"mini"},model:{value:(_vm.align),callback:function ($$v) {_vm.align=$$v},expression:"align"}},[_c('el-option',{attrs:{"label":"靠上","value":0}}),_c('el-option',{attrs:{"label":"居中","value":1}}),_c('el-option',{attrs:{"label":"靠下","value":2}})],1)],1),_c('li',{staticClass:"control-item"},[_c('span',{staticClass:"label"},[_vm._v("编辑器属性")]),_c('el-select',{staticStyle:{"text-align":"left","font-size":"20px"},attrs:{"placeholder":"编辑器属性","size":"mini"},on:{"change":_vm.editorPropertyChange},model:{value:(_vm.editorProperty),callback:function ($$v) {_vm.editorProperty=$$v},expression:"editorProperty"}},[_c('el-option',{attrs:{"label":"无","value":0}}),_c('el-option',{attrs:{"label":"下拉列表","value":1}}),_c('el-option',{attrs:{"label":"日期","value":2}}),_c('el-option',{attrs:{"label":"数值","value":3}}),_c('el-option',{attrs:{"label":"签名","value":4}})],1)],1),_c('li',{directives:[{name:"show",rawName:"v-show",value:(_vm.editorProperty === 4),expression:"editorProperty === 4"}],staticClass:"control-item"},[_c('div',{staticClass:"control-item"},[_c('span',{staticClass:"label"},[_vm._v("签名名称")]),_c('el-input',{attrs:{"size":"mini"},model:{value:(_vm.name),callback:function ($$v) {_vm.name=$$v},expression:"name"}})],1)]),_c('li',{directives:[{name:"show",rawName:"v-show",value:(_vm.editorProperty === 1),expression:"editorProperty === 1"}],staticClass:"control-item"},[_c('div',{staticClass:"control-item"},[_c('span',{staticClass:"label"},[_vm._v("分隔符")]),_c('el-select',{staticStyle:{"text-align":"left","font-size":"20px"},attrs:{"placeholder":"分隔符","size":"mini"},model:{value:(_vm.splitCharacter),callback:function ($$v) {_vm.splitCharacter=$$v},expression:"splitCharacter"}},[_c('el-option',{attrs:{"label":",","value":","}}),_c('el-option',{attrs:{"label":"、","value":"、"}}),_c('el-option',{attrs:{"label":"/","value":"/"}}),_c('el-option',{attrs:{"label":"-","value":"-"}})],1)],1)]),_c('li',{directives:[{name:"show",rawName:"v-show",value:(_vm.editorProperty === 1),expression:"editorProperty === 1"}],staticClass:"control-item"},[_c('div',{staticClass:"control-item"},[_c('el-checkbox',{model:{value:(_vm.allowMultiSelected),callback:function ($$v) {_vm.allowMultiSelected=$$v},expression:"allowMultiSelected"}},[_vm._v("允许多选")])],1),_c('div',{staticClass:"control-item"},[_c('el-checkbox',{model:{value:(_vm.isAllowDel),callback:function ($$v) {_vm.isAllowDel=$$v},expression:"isAllowDel"}},[_vm._v("允许被删除")])],1),_c('div',{staticClass:"control-item"},[_c('el-checkbox',{model:{value:(_vm.canModifyContent),callback:function ($$v) {_vm.canModifyContent=$$v},expression:"canModifyContent"}},[_vm._v("用户可以直接编辑修改内容")])],1)]),_c('li',{directives:[{name:"show",rawName:"v-show",value:(_vm.editorProperty === 1),expression:"editorProperty === 1"}],staticClass:"control-item"},[_c('span',{staticClass:"label"},[_vm._v("来源")]),_c('el-input',{attrs:{"size":"mini"},model:{value:(_vm.source),callback:function ($$v) {_vm.source=$$v},expression:"source"}})],1),_c('li',{directives:[{name:"show",rawName:"v-show",value:(_vm.editorProperty === 1),expression:"editorProperty === 1"}],staticClass:"control-item"},[_c('el-table',{staticStyle:{"width":"100%"},attrs:{"data":_vm.listItems,"max-height":"210px"}},[_c('el-table-column',{staticStyle:{"text-align":"center"},attrs:{"label":"","width":"32"},scopedSlots:_vm._u([{key:"default",fn:function(scope){return [_c('i',{directives:[{name:"show",rawName:"v-show",value:(scope.$index === _vm.focusIndexs),expression:"scope.$index === focusIndexs"}],staticClass:"el-icon-edit",staticStyle:{"transform":"translateX(6px)"}})]}}])}),_c('el-table-column',{attrs:{"label":"文本","width":"130"},scopedSlots:_vm._u([{key:"default",fn:function(scope){return [_c('el-input',{class:_vm.errorIndex.includes(scope.row.id) ? 'error' : '',attrs:{"size":"small"},on:{"focus":function($event){return _vm.focusIndex(scope.$index)},"input":function($event){return _vm.inputIndex(scope.$index)},"blur":function($event){return _vm.blurIndex(scope.$index)}},model:{value:(scope.row.text),callback:function ($$v) {_vm.$set(scope.row, "text", $$v)},expression:"scope.row.text"}})]}}])}),_c('el-table-column',{attrs:{"label":"值","width":"130"},scopedSlots:_vm._u([{key:"default",fn:function(scope){return [_c('el-input',{attrs:{"size":"small"},on:{"focus":function($event){return _vm.focusIndex(scope.$index)},"input":function($event){return _vm.inputIndex(scope.$index)},"blur":function($event){return _vm.blurIndex(scope.$index)}},model:{value:(scope.row.value),callback:function ($$v) {_vm.$set(scope.row, "value", $$v)},expression:"scope.row.value"}})]}}])}),_c('el-table-column',{scopedSlots:_vm._u([{key:"default",fn:function(scope){return (scope.$index !== _vm.listItems.length - 1 && _vm.focusIndexs === scope.$index)?[_c('el-button',{attrs:{"size":"mini"},on:{"click":function($event){$event.stopPropagation();return _vm.deleteCurrentRow(scope.row.id)}}},[_vm._v("删除")])]:undefined}}],null,true)})],1)],1),_c('li',{directives:[{name:"show",rawName:"v-show",value:(_vm.editorProperty === 2),expression:"editorProperty === 2"}],staticClass:"control-item"},[_c('div',{staticClass:"control-item"},[_c('span',{staticClass:"label"},[_vm._v("日期格式")]),_c('el-select',{attrs:{"placeholder":"输入样式","size":"mini"},model:{value:(_vm.inputStyle),callback:function ($$v) {_vm.inputStyle=$$v},expression:"inputStyle"}},_vm._l((_vm.dateFormatList),function(item){return _c('el-option',{key:item,attrs:{"label":item,"value":item}})}),1)],1)]),_c('li',{directives:[{name:"show",rawName:"v-show",value:(_vm.editorProperty === 3),expression:"editorProperty === 3"}],staticClass:"control-item"},[_c('div',{staticClass:"control-item"},[_c('span',{staticClass:"label"},[_vm._v("最小值")]),_c('el-input-number',{attrs:{"size":"mini","max":Number(_vm.maxNumVal),"min":0,"step":10,"controls":false},model:{value:(_vm.minNumVal),callback:function ($$v) {_vm.minNumVal=$$v},expression:"minNumVal"}})],1),_c('div',{staticClass:"control-item"},[_c('span',{staticClass:"label"},[_vm._v("最大值")]),_c('el-input-number',{attrs:{"size":"mini","min":Number(_vm.minNumVal),"step":10,"controls":false},model:{value:(_vm.maxNumVal),callback:function ($$v) {_vm.maxNumVal=$$v},expression:"maxNumVal"}})],1)])])]),_c('footer',{staticClass:"ho-modal-footer"},[_c('el-button',{attrs:{"size":"small","type":"primary"},on:{"click":_vm.sure}},[_vm._v("确定")]),_c('el-button',{staticStyle:{"margin-left":"30px"},attrs:{"size":"small"},on:{"click":_vm.handleClose}},[_vm._v("取消")])],1)])}
 var staticRenderFns = []
 
@@ -12248,13 +12288,14 @@ var getCellNode = __webpack_require__(28547);
   },
   created: function created() {
     var cellNode = this.getCellNodes();
+    var colInfoes = null;
 
     if (cellNode !== null) {
-      var _this$colInfoes;
+      var _colInfoes;
 
       var currentCols = cellNode.row.indexOf(cellNode);
-      this.colInfoes = cellNode.table.colInfos[currentCols];
-      var customProperties = (_this$colInfoes = this.colInfoes) === null || _this$colInfoes === void 0 ? void 0 : _this$colInfoes.colProperty.customProperties;
+      colInfoes = cellNode.table.colInfos[currentCols];
+      var customProperties = (_colInfoes = colInfoes) === null || _colInfoes === void 0 ? void 0 : _colInfoes.colProperty.customProperties;
 
       if (Array.isArray(customProperties) && customProperties.length > 0) {
         this.setCustomsValue([].concat((0,toConsumableArray/* default */.Z)(customProperties), [{
@@ -12270,11 +12311,11 @@ var getCellNode = __webpack_require__(28547);
       }
     }
 
-    if (this.colInfoes !== null) {
+    if (colInfoes !== null) {
       var _colProperty$dateTime, _colProperty$dateTime2;
 
       var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this.hoEditorFactoryId);
-      var colProperty = this.colInfoes.colProperty;
+      var colProperty = colInfoes.colProperty;
       this.id = colProperty.id ? colProperty.id : this.vueController.generateID('TB');
       this.editorProperty = colProperty.editorProperty ? colProperty.editorProperty : 0;
       this.align = colProperty.align ? colProperty.align : 0;
@@ -12294,7 +12335,7 @@ var getCellNode = __webpack_require__(28547);
       this.maxNumVal = colProperty.numberProperty ? colProperty.numberProperty.maxNumVal : 0;
       this.minNumVal = colProperty.numberProperty ? colProperty.numberProperty.minNumVal : 100;
       this.width = colProperty.width ? colProperty.width : 0;
-      this.colWidth = (hoEditorFactory.unitConvert.pxConversionMm(this.colInfoes.colWidth, false) / 10).toFixed(2);
+      this.colWidth = (hoEditorFactory.unitConvert.pxConversionMm(colInfoes.colWidth, false) / 10).toFixed(2);
       this.isSpecifyWidth = colProperty.isSpecifyWidth ? true : false;
     }
   },
@@ -12428,14 +12469,16 @@ var getCellNode = __webpack_require__(28547);
           param[key] = _this[key];
         }
       });
-      this.vueController.colProperty(JSON.stringify(param), this.colInfoes);
+      var cellNode = this.getCellNodes();
+      var currentCols = cellNode.row.indexOf(cellNode);
+      var colInfoes = cellNode.table.colInfos[currentCols];
+      this.vueController.colProperty(JSON.stringify(param), colInfoes);
       this.$nextTick(function () {
         return _this.handleClose();
       });
     },
     handleClose: function handleClose() {
       this.$emit('closed');
-      this.colInfoes = null;
     }
   }
 });
@@ -13046,7 +13089,7 @@ var component = (0,componentNormalizer/* default */.Z)(
 
 /***/ }),
 
-/***/ 52032:
+/***/ 1429:
 /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -13058,7 +13101,7 @@ __webpack_require__.d(__webpack_exports__, {
   "default": function() { return /* binding */ TableRowProperty; }
 });
 
-;// CONCATENATED MODULE: ./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/table/TableRowProperty.vue?vue&type=template&id=3bd61b91&scoped=true&
+;// CONCATENATED MODULE: ./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/table/TableRowProperty.vue?vue&type=template&id=f923cecc&scoped=true&
 var render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"control-modal-contents table-row-modal animation-in"},[_c('header',{staticClass:"modal-title"},[_c('span',[_vm._v("表格行属性")]),_c('i',{staticClass:"el-icon-close modal-title-close",on:{"click":_vm.handleClose}})]),_c('section',{staticClass:"modal-content"},[_c('ul',{staticClass:"control-list"},[_c('li',{staticClass:"control-item"},[_c('span',{staticClass:"label"},[_vm._v("自定义属性")]),_c('el-button',{attrs:{"size":"mini"},on:{"click":_vm.openCustomsModal}},[_vm._v("自定义属性")])],1),_c('li',{staticClass:"control-item"},[_c('span',{staticClass:"label"},[_vm._v("数据源")]),_c('el-button',{attrs:{"size":"mini"},on:{"click":_vm.openDataSourceModal}},[_vm._v("设置数据源")])],1),_c('li',{staticClass:"control-item"},[_c('div',{staticStyle:{"padding-right":"20px"}},[_c('el-checkbox',{on:{"change":_vm.watchParamsChange},model:{value:(_vm.isSpecifyHeight),callback:function ($$v) {_vm.isSpecifyHeight=$$v},expression:"isSpecifyHeight"}},[_vm._v("指定高度（厘米）")])],1),_c('el-input-number',{attrs:{"size":"mini","disabled":!_vm.isSpecifyHeight,"precision":2,"step":1,"min":0,"controls":false,"controls-position":"right"},model:{value:(_vm.rowHeight),callback:function ($$v) {_vm.rowHeight=$$v},expression:"rowHeight"}}),_c('span',{staticStyle:{"padding-left":"10px"}},[_vm._v("当前显示高度 "+_vm._s(_vm.rowHeightMm)+" 厘米")])],1),_c('li',{staticClass:"control-item",staticStyle:{"padding":"0 0 0 10px"}},[_c('el-checkbox',{attrs:{"disabled":!_vm.isSpecifyHeight},model:{value:(_vm.isLockRowHeight),callback:function ($$v) {_vm.isLockRowHeight=$$v},expression:"isLockRowHeight"}},[_vm._v("锁定行高")])],1),_c('li',{staticClass:"control-item"},[_c('div',{staticStyle:{"width":"100%"}},[_c('el-checkbox',{model:{value:(_vm.repeatAsTitleAtPageTop),callback:function ($$v) {_vm.repeatAsTitleAtPageTop=$$v},expression:"repeatAsTitleAtPageTop"}},[_vm._v("在隔页顶端以标题行形式重复出现")])],1),_c('div',{staticStyle:{"width":"100%"}},[_c('el-checkbox',{model:{value:(_vm.sameLineCanAcrossPages),callback:function ($$v) {_vm.sameLineCanAcrossPages=$$v},expression:"sameLineCanAcrossPages"}},[_vm._v("同行内容能跨页")])],1),_c('div',{staticStyle:{"width":"100%"}},[_c('el-checkbox',{model:{value:(_vm.forcedPageBreak),callback:function ($$v) {_vm.forcedPageBreak=$$v},expression:"forcedPageBreak"}},[_vm._v("强制分页")])],1),_c('div',{staticStyle:{"width":"100%"}},[_c('el-checkbox',{model:{value:(_vm.printCellBorders),callback:function ($$v) {_vm.printCellBorders=$$v},expression:"printCellBorders"}},[_vm._v("打印单元格边框线")])],1),_c('div',{staticStyle:{"width":"100%"}},[_c('el-checkbox',{model:{value:(_vm.printCellBg),callback:function ($$v) {_vm.printCellBg=$$v},expression:"printCellBg"}},[_vm._v("打印单元格背景")])],1)])])]),_c('footer',{staticClass:"ho-modal-footer"},[_c('el-button',{attrs:{"size":"small","type":"primary"},on:{"click":_vm.sure}},[_vm._v("确定")]),_c('el-button',{staticStyle:{"margin-left":"30px"},attrs:{"size":"small"},on:{"click":_vm.handleClose}},[_vm._v("取消")])],1)])}
 var staticRenderFns = []
 
@@ -13235,17 +13278,18 @@ var TableNode = __webpack_require__(59530);
   methods: {
     init: function init() {
       var cellNode = this.getCellNodes();
+      var rowInfos = null;
 
       if (cellNode !== null) {
         var currentRows = cellNode.table.rows.indexOf(cellNode.row);
-        this.rowInfos = cellNode.table.rowInfos[currentRows];
+        rowInfos = cellNode.table.rowInfos[currentRows];
       }
 
-      if (this.rowInfos !== null) {
-        this.rowProperty = this.rowInfos.rowProperty;
+      if (rowInfos !== null) {
+        this.rowProperty = rowInfos.rowProperty;
       }
 
-      if (this.rowProperty !== null && this.rowInfos !== null) {
+      if (this.rowProperty !== null && rowInfos !== null) {
         var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this.hoEditorFactoryId);
         this.id = this.rowProperty.id ? this.rowProperty.id : this.vueController.generateID('TB');
         this.isSpecifyHeight = this.rowProperty.isSpecifyHeight;
@@ -13257,7 +13301,7 @@ var TableNode = __webpack_require__(59530);
         this.printCellBorders = this.rowProperty.printCellBorders;
         this.printCellBg = this.rowProperty.printCellBg;
         this.tabKeyInsNewLine = this.rowProperty.tabKeyInsNewLine;
-        this.rowHeightMm = (hoEditorFactory.unitConvert.pxConversionMm(this.rowInfos.rowHeight, false) / 10).toFixed(2);
+        this.rowHeightMm = (hoEditorFactory.unitConvert.pxConversionMm(rowInfos.rowHeight, false) / 10).toFixed(2);
       }
     },
     getCellNodes: function getCellNodes() {
@@ -13338,7 +13382,15 @@ var TableNode = __webpack_require__(59530);
           param[key] = _this[key];
         }
       });
-      this.vueController.rowProperty(JSON.stringify(param), this.rowInfos);
+      var cellNode = this.getCellNodes();
+      var rowInfos = null;
+
+      if (cellNode !== null) {
+        var currentRows = cellNode.table.rows.indexOf(cellNode.row);
+        rowInfos = cellNode.table.rowInfos[currentRows];
+      }
+
+      this.vueController.rowProperty(JSON.stringify(param), rowInfos);
       this.$nextTick(function () {
         return _this.handleClose();
       });
@@ -13352,10 +13404,10 @@ var TableNode = __webpack_require__(59530);
 });
 ;// CONCATENATED MODULE: ./src/components/controls/table/TableRowProperty.vue?vue&type=script&lang=js&
  /* harmony default export */ var table_TableRowPropertyvue_type_script_lang_js_ = (TableRowPropertyvue_type_script_lang_js_); 
-;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-65[0].rules[0].use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-65[0].rules[0].use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-65[0].rules[0].use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-65[0].rules[0].use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/table/TableRowProperty.vue?vue&type=style&index=0&id=3bd61b91&lang=scss&scoped=true&
+;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-65[0].rules[0].use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-65[0].rules[0].use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-65[0].rules[0].use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-65[0].rules[0].use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/table/TableRowProperty.vue?vue&type=style&index=0&id=f923cecc&lang=scss&scoped=true&
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./src/components/controls/table/TableRowProperty.vue?vue&type=style&index=0&id=3bd61b91&lang=scss&scoped=true&
+;// CONCATENATED MODULE: ./src/components/controls/table/TableRowProperty.vue?vue&type=style&index=0&id=f923cecc&lang=scss&scoped=true&
 
 // EXTERNAL MODULE: ./node_modules/@vue/vue-loader-v15/lib/runtime/componentNormalizer.js
 var componentNormalizer = __webpack_require__(1001);
@@ -13374,7 +13426,7 @@ var component = (0,componentNormalizer/* default */.Z)(
   staticRenderFns,
   false,
   null,
-  "3bd61b91",
+  "f923cecc",
   null
   
 )
@@ -26551,14 +26603,14 @@ var SubDocManger = /*#__PURE__*/function () {
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   "P": function() { return /* binding */ DocController; }
 /* harmony export */ });
-/* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_regeneratorRuntime_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(87461);
-/* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_asyncToGenerator_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(60199);
-/* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createForOfIteratorHelper_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(42071);
-/* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(91347);
+/* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createForOfIteratorHelper_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(42071);
+/* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(91347);
+/* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_regeneratorRuntime_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(87461);
+/* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_asyncToGenerator_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(60199);
 /* harmony import */ var element_ui_lib_message_box__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(86769);
 /* harmony import */ var element_ui_lib_message_box__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(element_ui_lib_message_box__WEBPACK_IMPORTED_MODULE_4__);
 /* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_classCallCheck_js__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(42015);
-/* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_86__ = __webpack_require__(16296);
+/* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_87__ = __webpack_require__(16296);
 /* harmony import */ var core_js_modules_es_object_to_string_js__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(41539);
 /* harmony import */ var core_js_modules_es_object_to_string_js__WEBPACK_IMPORTED_MODULE_6___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_object_to_string_js__WEBPACK_IMPORTED_MODULE_6__);
 /* harmony import */ var core_js_modules_es_promise_js__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(88674);
@@ -26650,12 +26702,14 @@ var SubDocManger = /*#__PURE__*/function () {
 /* harmony import */ var _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_77__ = __webpack_require__(28831);
 /* harmony import */ var _undoRedo_ParseUndoUnit__WEBPACK_IMPORTED_MODULE_78__ = __webpack_require__(94294);
 /* harmony import */ var _undoRedo_TableUndos_TableInsertParagraphUndoUnit__WEBPACK_IMPORTED_MODULE_79__ = __webpack_require__(74487);
-/* harmony import */ var _treeNode_SeparateCharNode__WEBPACK_IMPORTED_MODULE_80__ = __webpack_require__(87303);
-/* harmony import */ var _treeNode_LabelNode__WEBPACK_IMPORTED_MODULE_81__ = __webpack_require__(37713);
-/* harmony import */ var _NodePosition__WEBPACK_IMPORTED_MODULE_82__ = __webpack_require__(14245);
-/* harmony import */ var _treeNode_SignNode__WEBPACK_IMPORTED_MODULE_83__ = __webpack_require__(78975);
-/* harmony import */ var _events_NodeNeedModifyEvent__WEBPACK_IMPORTED_MODULE_84__ = __webpack_require__(88531);
-/* harmony import */ var _treeNode_GestationNode__WEBPACK_IMPORTED_MODULE_85__ = __webpack_require__(55817);
+/* harmony import */ var _draw_DrawLine__WEBPACK_IMPORTED_MODULE_80__ = __webpack_require__(95329);
+/* harmony import */ var _treeNode_SeparateCharNode__WEBPACK_IMPORTED_MODULE_81__ = __webpack_require__(87303);
+/* harmony import */ var _treeNode_LabelNode__WEBPACK_IMPORTED_MODULE_82__ = __webpack_require__(37713);
+/* harmony import */ var _NodePosition__WEBPACK_IMPORTED_MODULE_83__ = __webpack_require__(14245);
+/* harmony import */ var _treeNode_SignNode__WEBPACK_IMPORTED_MODULE_84__ = __webpack_require__(78975);
+/* harmony import */ var _events_NodeNeedModifyEvent__WEBPACK_IMPORTED_MODULE_85__ = __webpack_require__(88531);
+/* harmony import */ var _treeNode_GestationNode__WEBPACK_IMPORTED_MODULE_86__ = __webpack_require__(55817);
+
 
 
 
@@ -26762,7 +26816,7 @@ var DocController = /*#__PURE__*/function () {
   // }
 
 
-  (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_86__/* ["default"] */ .Z)(DocController, [{
+  (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_87__/* ["default"] */ .Z)(DocController, [{
     key: "onInsertNodeByID",
     get: function get() {
       return this._onInsertNodeByID;
@@ -27273,7 +27327,7 @@ var DocController = /*#__PURE__*/function () {
 
       if (!domRange.isEmpty) {
         domRange = domRange.normalize();
-      } else if (hoEditorFactory.drawTree.paintStatus === _draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_28__/* .PaintState.psReview */ .Dh.psReview && !(domRange.npStart.node instanceof _treeNode_SignNode__WEBPACK_IMPORTED_MODULE_83__/* .SignNode */ .N)) {
+      } else if (hoEditorFactory.drawTree.paintStatus === _draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_28__/* .PaintState.psReview */ .Dh.psReview && !(domRange.npStart.node instanceof _treeNode_SignNode__WEBPACK_IMPORTED_MODULE_84__/* .SignNode */ .N)) {
         element_ui_lib_message_box__WEBPACK_IMPORTED_MODULE_4___default().alert("审阅模式下，只能选中文档内容进行删除");
 
         return;
@@ -27300,183 +27354,336 @@ var DocController = /*#__PURE__*/function () {
 
   }, {
     key: "deleteTextBeforePath",
-    value: function deleteTextBeforePath(startPath) {
-      var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_77__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
-      var domRange = hoEditorFactory.docTree.curDomRange.normalize();
+    value: function () {
+      var _deleteTextBeforePath = (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_asyncToGenerator_js__WEBPACK_IMPORTED_MODULE_3__/* ["default"] */ .Z)( /*#__PURE__*/(0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_regeneratorRuntime_js__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z)().mark(function _callee(startPath) {
+        var hoEditorFactory, domRange, nodePosition, childIndex, node, ret, topath, arr, tmp, aRange, endPath, _topath, _aRange, prevNode, cellNode, tableNode, tIndex, cIndex, preParaNode, newpath, signUserId, preNode, nextNode, path, signNode, spath, epath, newSignNode, pNode;
 
-      if (!domRange.isEmpty) {
-        this.deleteRange(domRange, true); // hoEditorFactory.undoService.begin();
-        // hoEditorFactory.undoService.add(
-        //   new NodesDeleteUndoUnit(
-        //     this._hoEditorFactoryID,
-        //     domRange.startPath,
-        //     domRange.endPath,
-        //     true
-        //   )
-        // );
-        // hoEditorFactory.undoService.commit();
-      } else {
-        var nodePosition = hoEditorFactory.docTree.findNodePositionByPath(startPath);
-        var childIndex = nodePosition.childIndex;
-        var node = nodePosition.node;
+        return (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_regeneratorRuntime_js__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z)().wrap(function _callee$(_context) {
+          while (1) {
+            switch (_context.prev = _context.next) {
+              case 0:
+                hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_77__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
+                domRange = hoEditorFactory.docTree.curDomRange.normalize();
 
-        if (node) {
-          if (domRange.isEmpty) {
-            //未选中任何区域
-            if (node instanceof _treeNode_TextNode__WEBPACK_IMPORTED_MODULE_27__/* .TextNode */ .R) {
-              //if (hoEditorFactory.docTree.docProperty.type === EmrType.etForm) {
-              if (node.parentNode instanceof _treeNode_CellNode__WEBPACK_IMPORTED_MODULE_57__/* .CellNode */ .D) {
-                var ret = node.parentNode.delCellNodeText();
-                if (!ret) return;
-              } //}
+                if (domRange.isEmpty) {
+                  _context.next = 6;
+                  break;
+                }
+
+                this.deleteRange(domRange, true); // hoEditorFactory.undoService.begin();
+                // hoEditorFactory.undoService.add(
+                //   new NodesDeleteUndoUnit(
+                //     this._hoEditorFactoryID,
+                //     domRange.startPath,
+                //     domRange.endPath,
+                //     true
+                //   )
+                // );
+                // hoEditorFactory.undoService.commit();
+
+                _context.next = 124;
+                break;
+
+              case 6:
+                nodePosition = hoEditorFactory.docTree.findNodePositionByPath(startPath);
+                childIndex = nodePosition.childIndex;
+                node = nodePosition.node;
+
+                if (!node) {
+                  _context.next = 124;
+                  break;
+                }
+
+                if (!domRange.isEmpty) {
+                  _context.next = 124;
+                  break;
+                }
+
+                if (!(node instanceof _treeNode_TextNode__WEBPACK_IMPORTED_MODULE_27__/* .TextNode */ .R)) {
+                  _context.next = 36;
+                  break;
+                }
+
+                if (!(node.parentNode instanceof _treeNode_CellNode__WEBPACK_IMPORTED_MODULE_57__/* .CellNode */ .D)) {
+                  _context.next = 16;
+                  break;
+                }
+
+                ret = node.parentNode.delCellNodeText();
+
+                if (ret) {
+                  _context.next = 16;
+                  break;
+                }
 
+                return _context.abrupt("return");
 
-              var topath = "";
+              case 16:
+                //}
+                topath = "";
 
-              if (childIndex > 0) {
-                var arr = startPath.split("/");
+                if (!(childIndex > 0)) {
+                  _context.next = 23;
+                  break;
+                }
+
+                arr = startPath.split("/");
                 arr[arr.length - 1] = parseInt(arr[arr.length - 1]) - 1 + "";
                 topath = arr.join("/");
-              } else {
-                var tmp = node.previousLeaf();
+                _context.next = 30;
+                break;
 
-                if (tmp) {
-                  topath = hoEditorFactory.docTree.getNodeLastPath(tmp);
-                } else {
-                  console.error("这里应该不会出现这种情况 2020.10.28");
-                  return;
+              case 23:
+                tmp = node.previousLeaf();
+
+                if (!tmp) {
+                  _context.next = 28;
+                  break;
                 }
-              }
 
-              hoEditorFactory.docTree.curDomRange = new _DomRange__WEBPACK_IMPORTED_MODULE_31__/* .DomRange */ .a(this._hoEditorFactoryID, topath, startPath); // hoEditorFactory.undoService.begin();
-              // hoEditorFactory.undoService.add(
-              //   new NodesDeleteUndoUnit(
-              //     this._hoEditorFactoryID,
-              //     topath,
-              //     startPath,
-              //     false
-              //   )
-              // );
-              // hoEditorFactory.undoService.commit();
-
-              var aRange = new _DomRange__WEBPACK_IMPORTED_MODULE_31__/* .DomRange */ .a(this._hoEditorFactoryID, startPath, topath).normalize();
-              this.deleteRange(aRange, true);
-              hoEditorFactory.docTree.curDomRange = new _DomRange__WEBPACK_IMPORTED_MODULE_31__/* .DomRange */ .a(this._hoEditorFactoryID, topath, topath);
-            } else if (node instanceof _treeNode_MarkNode__WEBPACK_IMPORTED_MODULE_47__/* .MarkNode */ .j) {
-              var endPath = hoEditorFactory.docTree.getNodeLastPath(node);
-
-              if (node.parentNode && node.parentNode instanceof _treeNode_TextInputFieldNode__WEBPACK_IMPORTED_MODULE_46__/* .TextInputFieldNode */ .re) {
-                if (node.parentNode.childNodes[1] instanceof _treeNode_MarkNode__WEBPACK_IMPORTED_MODULE_47__/* .MarkNode */ .j) {
-                  startPath = hoEditorFactory.docTree.getNodeLastPath(node.parentNode.previousLeaf());
-                  endPath = hoEditorFactory.docTree.getNodeLastPath(node.parentNode);
-                } else {
-                  if (node === node.parentNode.last()) {
-                    var _topath = hoEditorFactory.docTree.getNodeLastPath(node.previousLeaf());
+                topath = hoEditorFactory.docTree.getNodeLastPath(tmp);
+                _context.next = 30;
+                break;
 
-                    hoEditorFactory.drawTree.moveCaretToPath(_topath);
-                    hoEditorFactory.docTree.curDomRange.setSamePath(_topath);
-                    return;
-                  }
+              case 28:
+                console.error("这里应该不会出现这种情况 2020.10.28");
+                return _context.abrupt("return");
 
-                  if (node === node.parentNode.first()) {
-                    return;
-                  }
+              case 30:
+                hoEditorFactory.docTree.curDomRange = new _DomRange__WEBPACK_IMPORTED_MODULE_31__/* .DomRange */ .a(this._hoEditorFactoryID, topath, startPath); // hoEditorFactory.undoService.begin();
+                // hoEditorFactory.undoService.add(
+                //   new NodesDeleteUndoUnit(
+                //     this._hoEditorFactoryID,
+                //     topath,
+                //     startPath,
+                //     false
+                //   )
+                // );
+                // hoEditorFactory.undoService.commit();
+
+                aRange = new _DomRange__WEBPACK_IMPORTED_MODULE_31__/* .DomRange */ .a(this._hoEditorFactoryID, startPath, topath).normalize();
+                this.deleteRange(aRange, true);
+                hoEditorFactory.docTree.curDomRange = new _DomRange__WEBPACK_IMPORTED_MODULE_31__/* .DomRange */ .a(this._hoEditorFactoryID, topath, topath);
+                _context.next = 124;
+                break;
+
+              case 36:
+                if (!(node instanceof _treeNode_MarkNode__WEBPACK_IMPORTED_MODULE_47__/* .MarkNode */ .j)) {
+                  _context.next = 55;
+                  break;
                 }
-              }
 
-              var _aRange = new _DomRange__WEBPACK_IMPORTED_MODULE_31__/* .DomRange */ .a(this._hoEditorFactoryID, startPath, endPath //hoEditorFactory.docTree.getNodeLastPath(node)
-              ).normalize();
-
-              this.deleteRange(_aRange, true); // hoEditorFactory.undoService.begin();
-              // hoEditorFactory.undoService.add(
-              //   new NodesDeleteUndoUnit(
-              //     this._hoEditorFactoryID,
-              //     hoEditorFactory.docTree.getNodeLastPath(node),
-              //     startPath,
-              //     false
-              //   )
-              // );
-              // hoEditorFactory.undoService.commit();
-            } else {
-              if (node instanceof _treeNode_ParagraphNode__WEBPACK_IMPORTED_MODULE_30__/* .ParagraphNode */ .C) {
-                var prevNode = node.prevSibling();
+                endPath = hoEditorFactory.docTree.getNodeLastPath(node);
 
-                if (prevNode instanceof _treeNode_TableNode__WEBPACK_IMPORTED_MODULE_51__/* .TableNode */ .Fh) {
-                  return;
+                if (!(node.parentNode && node.parentNode instanceof _treeNode_TextInputFieldNode__WEBPACK_IMPORTED_MODULE_46__/* .TextInputFieldNode */ .re)) {
+                  _context.next = 51;
+                  break;
                 }
 
-                if (prevNode == null) {
-                  return;
+                if (!(node.parentNode.childNodes[1] instanceof _treeNode_MarkNode__WEBPACK_IMPORTED_MODULE_47__/* .MarkNode */ .j)) {
+                  _context.next = 44;
+                  break;
+                }
+
+                startPath = hoEditorFactory.docTree.getNodeLastPath(node.parentNode.previousLeaf());
+                endPath = hoEditorFactory.docTree.getNodeLastPath(node.parentNode);
+                _context.next = 51;
+                break;
+
+              case 44:
+                if (!(node === node.parentNode.last())) {
+                  _context.next = 49;
+                  break;
+                }
+
+                _topath = hoEditorFactory.docTree.getNodeLastPath(node.previousLeaf());
+                hoEditorFactory.drawTree.moveCaretToPath(_topath);
+                hoEditorFactory.docTree.curDomRange.setSamePath(_topath);
+                return _context.abrupt("return");
+
+              case 49:
+                if (!(node === node.parentNode.first())) {
+                  _context.next = 51;
+                  break;
+                }
+
+                return _context.abrupt("return");
+
+              case 51:
+                _aRange = new _DomRange__WEBPACK_IMPORTED_MODULE_31__/* .DomRange */ .a(this._hoEditorFactoryID, startPath, endPath //hoEditorFactory.docTree.getNodeLastPath(node)
+                ).normalize();
+                this.deleteRange(_aRange, true); // hoEditorFactory.undoService.begin();
+                // hoEditorFactory.undoService.add(
+                //   new NodesDeleteUndoUnit(
+                //     this._hoEditorFactoryID,
+                //     hoEditorFactory.docTree.getNodeLastPath(node),
+                //     startPath,
+                //     false
+                //   )
+                // );
+                // hoEditorFactory.undoService.commit();
+
+                _context.next = 124;
+                break;
+
+              case 55:
+                if (!(node instanceof _treeNode_ParagraphNode__WEBPACK_IMPORTED_MODULE_30__/* .ParagraphNode */ .C)) {
+                  _context.next = 82;
+                  break;
+                }
+
+                prevNode = node.prevSibling();
+
+                if (!(prevNode instanceof _treeNode_TableNode__WEBPACK_IMPORTED_MODULE_51__/* .TableNode */ .Fh)) {
+                  _context.next = 59;
+                  break;
+                }
+
+                return _context.abrupt("return");
+
+              case 59:
+                if (!(prevNode == null)) {
+                  _context.next = 82;
+                  break;
+                }
+
+                if (!(node.parentNode instanceof _treeNode_CellNode__WEBPACK_IMPORTED_MODULE_57__/* .CellNode */ .D)) {
+                  _context.next = 81;
+                  break;
+                }
+
+                cellNode = node.parentNode;
+                tableNode = cellNode.parentNode;
+                tIndex = tableNode.childNodes.indexOf(cellNode);
+                cIndex = cellNode.childNodes.indexOf(node);
+                preParaNode = hoEditorFactory.docTree.getSameRectPrevParanode(tableNode.paragraphNode);
+
+                if (!(preParaNode && tIndex == 0 && cIndex == 0 && preParaNode.drawlines.length == 1 && preParaNode.drawlines[0] instanceof _draw_DrawLine__WEBPACK_IMPORTED_MODULE_80__/* .DrawLine */ .a && preParaNode.drawlines[0].isEmpty())) {
+                  _context.next = 78;
+                  break;
+                }
+
+                hoEditorFactory.undoService.begin();
+                hoEditorFactory.undoService.add(new _undoRedo_NodeDeleteUndoUnit__WEBPACK_IMPORTED_MODULE_37__/* .NodeDeleteUndoUnit */ .w(this._hoEditorFactoryID, tableNode.paragraphNode, tableNode.paragraphNode.getNodePath()));
+                tableNode.paragraphNode = preParaNode;
+                _context.next = 72;
+                return hoEditorFactory.undoService.commit();
+
+              case 72:
+                newpath = cellNode.childNodes[0].getNodePath();
+                hoEditorFactory.docTree.curDomRange.setSamePath(newpath);
+                hoEditorFactory.drawTree.moveCaretToPath(newpath);
+                return _context.abrupt("return");
+
+              case 78:
+                return _context.abrupt("return");
+
+              case 79:
+                _context.next = 82;
+                break;
+
+              case 81:
+                return _context.abrupt("return");
+
+              case 82:
+                if (!(hoEditorFactory.drawTree.paintStatus === _draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_28__/* .PaintState.psReview */ .Dh.psReview && !(node instanceof _treeNode_SignNode__WEBPACK_IMPORTED_MODULE_84__/* .SignNode */ .N))) {
+                  _context.next = 87;
+                  break;
                 }
-              }
 
-              if (hoEditorFactory.drawTree.paintStatus === _draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_28__/* .PaintState.psReview */ .Dh.psReview && !(node instanceof _treeNode_SignNode__WEBPACK_IMPORTED_MODULE_83__/* .SignNode */ .N)) {
                 element_ui_lib_message_box__WEBPACK_IMPORTED_MODULE_4___default().alert("审阅模式下，只能对文本内容进行删除");
 
-                return;
-              } else {
-                if (hoEditorFactory.drawTree.paintStatus === _draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_28__/* .PaintState.psReview */ .Dh.psReview && node instanceof _treeNode_SignNode__WEBPACK_IMPORTED_MODULE_83__/* .SignNode */ .N) {
-                  var signUserId = node.customProperty.bce01;
+                return _context.abrupt("return");
 
-                  if (hoEditorFactory.userInfo.id != signUserId) {
-                    element_ui_lib_message_box__WEBPACK_IMPORTED_MODULE_4___default().alert("不是本人签名，不允许删除！");
+              case 87:
+                if (!(hoEditorFactory.drawTree.paintStatus === _draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_28__/* .PaintState.psReview */ .Dh.psReview && node instanceof _treeNode_SignNode__WEBPACK_IMPORTED_MODULE_84__/* .SignNode */ .N)) {
+                  _context.next = 92;
+                  break;
+                }
 
-                    return;
-                  }
+                signUserId = node.customProperty.bce01;
+
+                if (!(hoEditorFactory.userInfo.id != signUserId)) {
+                  _context.next = 92;
+                  break;
                 }
 
-                if (hoEditorFactory.drawTree.paintStatus !== _draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_28__/* .PaintState.psDesign */ .Dh.psDesign && node instanceof _treeNode_SignNode__WEBPACK_IMPORTED_MODULE_83__/* .SignNode */ .N) {
-                  element_ui_lib_message_box__WEBPACK_IMPORTED_MODULE_4___default().alert("不允许使用删除键删除签名，请右键删除元素", "系统提示");
+                element_ui_lib_message_box__WEBPACK_IMPORTED_MODULE_4___default().alert("不是本人签名，不允许删除！");
 
-                  return;
+                return _context.abrupt("return");
+
+              case 92:
+                if (!(hoEditorFactory.drawTree.paintStatus !== _draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_28__/* .PaintState.psDesign */ .Dh.psDesign && node instanceof _treeNode_SignNode__WEBPACK_IMPORTED_MODULE_84__/* .SignNode */ .N)) {
+                  _context.next = 95;
+                  break;
                 }
 
-                if (hoEditorFactory.drawTree.paintStatus !== _draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_28__/* .PaintState.psDesign */ .Dh.psDesign && node instanceof _treeNode_SignNode__WEBPACK_IMPORTED_MODULE_83__/* .SignNode */ .N && node.isTemplate && node.number === 0) {
-                  element_ui_lib_message_box__WEBPACK_IMPORTED_MODULE_4___default().alert("该签名元素不允许删除！", "系统提示");
+                element_ui_lib_message_box__WEBPACK_IMPORTED_MODULE_4___default().alert("不允许使用删除键删除签名，请右键删除元素", "系统提示");
 
-                  return;
+                return _context.abrupt("return");
+
+              case 95:
+                if (!(hoEditorFactory.drawTree.paintStatus !== _draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_28__/* .PaintState.psDesign */ .Dh.psDesign && node instanceof _treeNode_SignNode__WEBPACK_IMPORTED_MODULE_84__/* .SignNode */ .N && node.isTemplate && node.number === 0)) {
+                  _context.next = 98;
+                  break;
                 }
 
-                if (node instanceof _treeNode_SignNode__WEBPACK_IMPORTED_MODULE_83__/* .SignNode */ .N) {
-                  var preNode = node.previousLeaf();
-                  var nextNode = node.nextLeaf();
-
-                  if ((node.imgSrc !== "" || node.fingerPrintSrc !== "") && node.isTemplate && !(preNode instanceof _treeNode_SignNode__WEBPACK_IMPORTED_MODULE_83__/* .SignNode */ .N) && !(nextNode instanceof _treeNode_SignNode__WEBPACK_IMPORTED_MODULE_83__/* .SignNode */ .N)) {
-                    var path = hoEditorFactory.docTree.getNodeLastPath(preNode);
-                    var signNode = new _treeNode_SignNode__WEBPACK_IMPORTED_MODULE_83__/* .SignNode */ .N(this._hoEditorFactoryID, node.rootNodes, node.parentNode, _treeNode_BaseNode__WEBPACK_IMPORTED_MODULE_24__/* .NodeType.ntSign */ .Jq.ntSign, 0, 0, node.name === "" ? "医师签名" : node.name, node.signType, node.signFormat, "", "", node.signTimeFormat, "", 0, 0, {}, true, node.styleIndex, node.connectMode, node.isFront, node.allowEditSignTime);
-                    hoEditorFactory.undoService.begin();
-                    hoEditorFactory.undoService.add(new _undoRedo_NodeDeleteUndoUnit__WEBPACK_IMPORTED_MODULE_37__/* .NodeDeleteUndoUnit */ .w(this._hoEditorFactoryID, node, startPath));
-                    hoEditorFactory.undoService.add(new _undoRedo_NodeInsertUndoUnit__WEBPACK_IMPORTED_MODULE_25__/* .NodeInsertUndoUnit */ .R(this._hoEditorFactoryID, path, signNode));
-                    hoEditorFactory.undoService.commit();
-                    return;
-                  }
+                element_ui_lib_message_box__WEBPACK_IMPORTED_MODULE_4___default().alert("该签名元素不允许删除！", "系统提示");
 
-                  if (preNode instanceof _treeNode_SignNode__WEBPACK_IMPORTED_MODULE_83__/* .SignNode */ .N) {
-                    var spath = "";
+                return _context.abrupt("return");
 
-                    if (node.number === 2 || node.number === 1 && node.isTemplate) {
-                      spath = hoEditorFactory.docTree.getNodeLastPath(preNode.previousLeaf());
-                    } else {
-                      spath = hoEditorFactory.docTree.getNodeLastPath(preNode);
-                    } //const spath = hoEditorFactory.docTree.getNodeLastPath(preNode);
+              case 98:
+                if (!(node instanceof _treeNode_SignNode__WEBPACK_IMPORTED_MODULE_84__/* .SignNode */ .N)) {
+                  _context.next = 119;
+                  break;
+                }
 
+                preNode = node.previousLeaf();
+                nextNode = node.nextLeaf();
 
-                    var epath = hoEditorFactory.docTree.getNodeLastPath(node);
-                    var newSignNode = new _treeNode_SignNode__WEBPACK_IMPORTED_MODULE_83__/* .SignNode */ .N(this._hoEditorFactoryID, preNode.rootNodes, preNode.parentNode, _treeNode_BaseNode__WEBPACK_IMPORTED_MODULE_24__/* .NodeType.ntSign */ .Jq.ntSign, 1, preNode.type, preNode.name === "" ? "签名" : preNode.name, preNode.signType, preNode.signFormat, preNode.signor, preNode.signTime, preNode.signTimeFormat, preNode.imgSrc, preNode.imgWidth, preNode.imgHeight, preNode.customProperty, preNode.isTemplate ? preNode.isTemplate : node.isTemplate, //node.isTemplate,
-                    node.styleIndex, preNode.connectMode, preNode.isFront, preNode.allowEditSignTime);
-                    hoEditorFactory.undoService.begin();
-                    hoEditorFactory.undoService.add(new _undoRedo_NodesDeleteUndoUnit__WEBPACK_IMPORTED_MODULE_36__/* .NodesDeleteUndoUnit */ .F(this._hoEditorFactoryID, spath, epath));
+                if (!((node.imgSrc !== "" || node.fingerPrintSrc !== "") && node.isTemplate && !(preNode instanceof _treeNode_SignNode__WEBPACK_IMPORTED_MODULE_84__/* .SignNode */ .N) && !(nextNode instanceof _treeNode_SignNode__WEBPACK_IMPORTED_MODULE_84__/* .SignNode */ .N))) {
+                  _context.next = 109;
+                  break;
+                }
 
-                    if (node.number === 2 || node.number === 1 && node.isTemplate) {
-                      hoEditorFactory.undoService.add(new _undoRedo_NodeInsertUndoUnit__WEBPACK_IMPORTED_MODULE_25__/* .NodeInsertUndoUnit */ .R(this._hoEditorFactoryID, spath, newSignNode));
-                    }
+                path = hoEditorFactory.docTree.getNodeLastPath(preNode);
+                signNode = new _treeNode_SignNode__WEBPACK_IMPORTED_MODULE_84__/* .SignNode */ .N(this._hoEditorFactoryID, node.rootNodes, node.parentNode, _treeNode_BaseNode__WEBPACK_IMPORTED_MODULE_24__/* .NodeType.ntSign */ .Jq.ntSign, 0, 0, node.name === "" ? "医师签名" : node.name, node.signType, node.signFormat, "", "", node.signTimeFormat, "", 0, 0, {}, true, node.styleIndex, node.connectMode, node.isFront, node.allowEditSignTime);
+                hoEditorFactory.undoService.begin();
+                hoEditorFactory.undoService.add(new _undoRedo_NodeDeleteUndoUnit__WEBPACK_IMPORTED_MODULE_37__/* .NodeDeleteUndoUnit */ .w(this._hoEditorFactoryID, node, startPath));
+                hoEditorFactory.undoService.add(new _undoRedo_NodeInsertUndoUnit__WEBPACK_IMPORTED_MODULE_25__/* .NodeInsertUndoUnit */ .R(this._hoEditorFactoryID, path, signNode));
+                hoEditorFactory.undoService.commit();
+                return _context.abrupt("return");
 
-                    hoEditorFactory.undoService.commit();
-                    return;
-                  }
+              case 109:
+                if (!(preNode instanceof _treeNode_SignNode__WEBPACK_IMPORTED_MODULE_84__/* .SignNode */ .N)) {
+                  _context.next = 119;
+                  break;
                 }
 
-                var pNode = node.parentNode;
+                spath = "";
+
+                if (node.number === 2 || node.number === 1 && node.isTemplate) {
+                  spath = hoEditorFactory.docTree.getNodeLastPath(preNode.previousLeaf());
+                } else {
+                  spath = hoEditorFactory.docTree.getNodeLastPath(preNode);
+                } //const spath = hoEditorFactory.docTree.getNodeLastPath(preNode);
+
+
+                epath = hoEditorFactory.docTree.getNodeLastPath(node);
+                newSignNode = new _treeNode_SignNode__WEBPACK_IMPORTED_MODULE_84__/* .SignNode */ .N(this._hoEditorFactoryID, preNode.rootNodes, preNode.parentNode, _treeNode_BaseNode__WEBPACK_IMPORTED_MODULE_24__/* .NodeType.ntSign */ .Jq.ntSign, 1, preNode.type, preNode.name === "" ? "签名" : preNode.name, preNode.signType, preNode.signFormat, preNode.signor, preNode.signTime, preNode.signTimeFormat, preNode.imgSrc, preNode.imgWidth, preNode.imgHeight, preNode.customProperty, preNode.isTemplate ? preNode.isTemplate : node.isTemplate, //node.isTemplate,
+                node.styleIndex, preNode.connectMode, preNode.isFront, preNode.allowEditSignTime);
+                hoEditorFactory.undoService.begin();
+                hoEditorFactory.undoService.add(new _undoRedo_NodesDeleteUndoUnit__WEBPACK_IMPORTED_MODULE_36__/* .NodesDeleteUndoUnit */ .F(this._hoEditorFactoryID, spath, epath));
+
+                if (node.number === 2 || node.number === 1 && node.isTemplate) {
+                  hoEditorFactory.undoService.add(new _undoRedo_NodeInsertUndoUnit__WEBPACK_IMPORTED_MODULE_25__/* .NodeInsertUndoUnit */ .R(this._hoEditorFactoryID, spath, newSignNode));
+                }
+
+                hoEditorFactory.undoService.commit();
+                return _context.abrupt("return");
+
+              case 119:
+                pNode = node.parentNode;
                 hoEditorFactory.undoService.begin();
                 hoEditorFactory.undoService.add(new _undoRedo_NodeDeleteUndoUnit__WEBPACK_IMPORTED_MODULE_37__/* .NodeDeleteUndoUnit */ .w(this._hoEditorFactoryID, node, startPath));
                 hoEditorFactory.undoService.commit();
@@ -27484,12 +27691,21 @@ var DocController = /*#__PURE__*/function () {
                 if (pNode && pNode instanceof _treeNode_TextInputFieldNode__WEBPACK_IMPORTED_MODULE_46__/* .TextInputFieldNode */ .re && pNode.childNodes.length === 2) {
                   this.resetEmptyInputFieldNode(hoEditorFactory, pNode);
                 }
-              }
+
+              case 124:
+              case "end":
+                return _context.stop();
             }
           }
-        }
+        }, _callee, this);
+      }));
+
+      function deleteTextBeforePath(_x) {
+        return _deleteTextBeforePath.apply(this, arguments);
       }
-    }
+
+      return deleteTextBeforePath;
+    }()
   }, {
     key: "resetEmptyInputFieldNode",
     value: function resetEmptyInputFieldNode(hoEditorFactory, node) {
@@ -27601,7 +27817,7 @@ var DocController = /*#__PURE__*/function () {
             var drawArea = hoEditorFactory.drawPageTree.getMainRootArea(drawNode);
 
             if (drawArea) {
-              var nodeNeedModifyEvent = new _events_NodeNeedModifyEvent__WEBPACK_IMPORTED_MODULE_84__/* .NodeNeedModifyEvent */ .x(arange.npEnd.node, "dblclick", drawArea.index);
+              var nodeNeedModifyEvent = new _events_NodeNeedModifyEvent__WEBPACK_IMPORTED_MODULE_85__/* .NodeNeedModifyEvent */ .x(arange.npEnd.node, "dblclick", drawArea.index);
               hoEditorFactory.docTree.nodeNeedModify(nodeNeedModifyEvent);
               return;
             } else {
@@ -28426,7 +28642,7 @@ var DocController = /*#__PURE__*/function () {
         if (cell && cell instanceof _treeNode_CellNode__WEBPACK_IMPORTED_MODULE_57__/* .CellNode */ .D) {
           if (cell.table.tableProperty.canAddRow) {
             var _cell$table$getCellIn = cell.table.getCellInfos(cell),
-                _cell$table$getCellIn2 = (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_3__/* ["default"] */ .Z)(_cell$table$getCellIn, 2),
+                _cell$table$getCellIn2 = (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)(_cell$table$getCellIn, 2),
                 r = _cell$table$getCellIn2[0],
                 c = _cell$table$getCellIn2[1];
 
@@ -28474,7 +28690,7 @@ var DocController = /*#__PURE__*/function () {
         if (cell && cell instanceof _treeNode_CellNode__WEBPACK_IMPORTED_MODULE_57__/* .CellNode */ .D) {
           if (cell.table.tableProperty.canAddRow) {
             var _cell$table$getCellIn3 = cell.table.getCellInfos(cell),
-                _cell$table$getCellIn4 = (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_3__/* ["default"] */ .Z)(_cell$table$getCellIn3, 2),
+                _cell$table$getCellIn4 = (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)(_cell$table$getCellIn3, 2),
                 r = _cell$table$getCellIn4[0],
                 c = _cell$table$getCellIn4[1];
 
@@ -28521,7 +28737,7 @@ var DocController = /*#__PURE__*/function () {
 
         if (cell && cell instanceof _treeNode_CellNode__WEBPACK_IMPORTED_MODULE_57__/* .CellNode */ .D) {
           var _cell$table$getCellIn5 = cell.table.getCellInfos(cell),
-              _cell$table$getCellIn6 = (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_3__/* ["default"] */ .Z)(_cell$table$getCellIn5, 2),
+              _cell$table$getCellIn6 = (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)(_cell$table$getCellIn5, 2),
               r = _cell$table$getCellIn6[0],
               c = _cell$table$getCellIn6[1];
 
@@ -28569,7 +28785,7 @@ var DocController = /*#__PURE__*/function () {
 
         if (cell && cell instanceof _treeNode_CellNode__WEBPACK_IMPORTED_MODULE_57__/* .CellNode */ .D) {
           var _cell$table$getCellIn7 = cell.table.getCellInfos(cell),
-              _cell$table$getCellIn8 = (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_3__/* ["default"] */ .Z)(_cell$table$getCellIn7, 2),
+              _cell$table$getCellIn8 = (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)(_cell$table$getCellIn7, 2),
               r = _cell$table$getCellIn8[0],
               c = _cell$table$getCellIn8[1];
 
@@ -28608,7 +28824,7 @@ var DocController = /*#__PURE__*/function () {
     key: "tableDeleteRows",
     value: function tableDeleteRows(aRange) {
       var _TableNode$getSelectT = _treeNode_TableNode__WEBPACK_IMPORTED_MODULE_51__/* .TableNode.getSelectTableRowColInfos */ .Fh.getSelectTableRowColInfos(this._hoEditorFactoryID, aRange),
-          _TableNode$getSelectT2 = (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_3__/* ["default"] */ .Z)(_TableNode$getSelectT, 5),
+          _TableNode$getSelectT2 = (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)(_TableNode$getSelectT, 5),
           table = _TableNode$getSelectT2[0],
           r1 = _TableNode$getSelectT2[1],
           c1 = _TableNode$getSelectT2[2],
@@ -28663,7 +28879,7 @@ var DocController = /*#__PURE__*/function () {
     key: "tableDeleteCols",
     value: function tableDeleteCols(aRange) {
       var _TableNode$getSelectT3 = _treeNode_TableNode__WEBPACK_IMPORTED_MODULE_51__/* .TableNode.getSelectTableRowColInfos */ .Fh.getSelectTableRowColInfos(this._hoEditorFactoryID, aRange),
-          _TableNode$getSelectT4 = (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_3__/* ["default"] */ .Z)(_TableNode$getSelectT3, 5),
+          _TableNode$getSelectT4 = (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)(_TableNode$getSelectT3, 5),
           table = _TableNode$getSelectT4[0],
           r1 = _TableNode$getSelectT4[1],
           c1 = _TableNode$getSelectT4[2],
@@ -28732,22 +28948,22 @@ var DocController = /*#__PURE__*/function () {
         }
 
         var _cell1$table$getCellI = cell1.table.getCellInfos(cell1),
-            _cell1$table$getCellI2 = (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_3__/* ["default"] */ .Z)(_cell1$table$getCellI, 2),
+            _cell1$table$getCellI2 = (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)(_cell1$table$getCellI, 2),
             r1 = _cell1$table$getCellI2[0],
             c1 = _cell1$table$getCellI2[1];
 
         var _cell1$table$getCellI3 = cell1.table.getCellInfos(cell2),
-            _cell1$table$getCellI4 = (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_3__/* ["default"] */ .Z)(_cell1$table$getCellI3, 2),
+            _cell1$table$getCellI4 = (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)(_cell1$table$getCellI3, 2),
             r2 = _cell1$table$getCellI4[0],
             c2 = _cell1$table$getCellI4[1];
 
         var _cell1$table$calcRowS = cell1.table.calcRowSpanColsSpan(r1, c1, r2, c2),
-            _cell1$table$calcRowS2 = (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_3__/* ["default"] */ .Z)(_cell1$table$calcRowS, 2),
+            _cell1$table$calcRowS2 = (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)(_cell1$table$calcRowS, 2),
             rowSpan = _cell1$table$calcRowS2[0],
             colSpan = _cell1$table$calcRowS2[1];
 
         var _cell1$table$canMerge = cell1.table.canMergeCell(r1, c1, rowSpan, colSpan),
-            _cell1$table$canMerge2 = (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_3__/* ["default"] */ .Z)(_cell1$table$canMerge, 3),
+            _cell1$table$canMerge2 = (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)(_cell1$table$canMerge, 3),
             ret = _cell1$table$canMerge2[0],
             aRowSpan = _cell1$table$canMerge2[1],
             aColSpan = _cell1$table$canMerge2[2];
@@ -28793,24 +29009,24 @@ var DocController = /*#__PURE__*/function () {
         var endPath = cell1.table.getNodePath();
 
         var _hoEditorFactory$draw = hoEditorFactory.drawTree.getDrawRootsByPath(endPath),
-            _hoEditorFactory$draw2 = (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_3__/* ["default"] */ .Z)(_hoEditorFactory$draw, 2),
+            _hoEditorFactory$draw2 = (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)(_hoEditorFactory$draw, 2),
             dcell = _hoEditorFactory$draw2[0],
             dRoots = _hoEditorFactory$draw2[1];
 
         var startDline = dRoots.indexOf(cell1.table.drawTable);
 
         var _cell1$table$getCellI5 = cell1.table.getCellInfos(cell1),
-            _cell1$table$getCellI6 = (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_3__/* ["default"] */ .Z)(_cell1$table$getCellI5, 2),
+            _cell1$table$getCellI6 = (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)(_cell1$table$getCellI5, 2),
             r1 = _cell1$table$getCellI6[0],
             c1 = _cell1$table$getCellI6[1];
 
         var _cell1$table$getCellI7 = cell1.table.getCellInfos(cell2),
-            _cell1$table$getCellI8 = (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_3__/* ["default"] */ .Z)(_cell1$table$getCellI7, 2),
+            _cell1$table$getCellI8 = (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)(_cell1$table$getCellI7, 2),
             r2 = _cell1$table$getCellI8[0],
             c2 = _cell1$table$getCellI8[1];
 
         var _cell1$table$calcRowS3 = cell1.table.calcRowSpanColsSpan(r1, c1, r2, c2),
-            _cell1$table$calcRowS4 = (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_3__/* ["default"] */ .Z)(_cell1$table$calcRowS3, 2),
+            _cell1$table$calcRowS4 = (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)(_cell1$table$calcRowS3, 2),
             rowSpan = _cell1$table$calcRowS4[0],
             colSpan = _cell1$table$calcRowS4[1]; // cell1.table.mergeCells(r1, c1, rowSpan, colSpan);
 
@@ -28988,7 +29204,7 @@ var DocController = /*#__PURE__*/function () {
       var cellProperty = new _TableProperty__WEBPACK_IMPORTED_MODULE_58__/* .CellProperty */ .$W(objectValues);
       cellNode.cellProperty = cellProperty;
       cellNode.drawCell.drawPageCells.forEach(function (pcell) {
-        pcell.valignTop = pcell.calcValignTop();
+        pcell.valignTop = pcell.calcValignTop()[0];
       });
     }
     /**
@@ -29209,7 +29425,7 @@ var DocController = /*#__PURE__*/function () {
             var nodesMap = object.obj1;
             var indexsMap = object.obj2;
 
-            var _iterator = (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createForOfIteratorHelper_js__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z)(indexsMap.values()),
+            var _iterator = (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createForOfIteratorHelper_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z)(indexsMap.values()),
                 _step;
 
             try {
@@ -29599,14 +29815,14 @@ var DocController = /*#__PURE__*/function () {
   }, {
     key: "initBlankDoc",
     value: function () {
-      var _initBlankDoc = (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_asyncToGenerator_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)( /*#__PURE__*/(0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_regeneratorRuntime_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z)().mark(function _callee() {
+      var _initBlankDoc = (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_asyncToGenerator_js__WEBPACK_IMPORTED_MODULE_3__/* ["default"] */ .Z)( /*#__PURE__*/(0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_regeneratorRuntime_js__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z)().mark(function _callee2() {
         var hoEditorFactory, firstNode, strFirstPath, aPage;
-        return (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_regeneratorRuntime_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z)().wrap(function _callee$(_context) {
+        return (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_regeneratorRuntime_js__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z)().wrap(function _callee2$(_context2) {
           while (1) {
-            switch (_context.prev = _context.next) {
+            switch (_context2.prev = _context2.next) {
               case 0:
                 hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_77__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
-                _context.next = 3;
+                _context2.next = 3;
                 return hoEditorFactory.drawPageTree.stopPageEvent();
 
               case 3:
@@ -29616,15 +29832,15 @@ var DocController = /*#__PURE__*/function () {
                 hoEditorFactory.docTree.clearDocTree();
                 hoEditorFactory.drawPageTree.clear();
                 hoEditorFactory.drawPageTree.initDoc();
-                _context.next = 11;
+                _context2.next = 11;
                 return hoEditorFactory.drawTree.buildDrawTree(hoEditorFactory.subDocManger.headerDocTree[0].subDocNodes, hoEditorFactory.drawTree.headerDNodes[0]);
 
               case 11:
-                _context.next = 13;
+                _context2.next = 13;
                 return hoEditorFactory.drawTree.buildDrawTree(hoEditorFactory.subDocManger.footerDocTree[0].subDocNodes, hoEditorFactory.drawTree.footerDNodes[0]);
 
               case 13:
-                _context.next = 15;
+                _context2.next = 15;
                 return hoEditorFactory.drawTree.buildDrawTree(hoEditorFactory.docTree.mainNodes, hoEditorFactory.drawTree.mainDNodes);
 
               case 15:
@@ -29649,10 +29865,10 @@ var DocController = /*#__PURE__*/function () {
 
               case 25:
               case "end":
-                return _context.stop();
+                return _context2.stop();
             }
           }
-        }, _callee, this);
+        }, _callee2, this);
       }));
 
       function initBlankDoc() {
@@ -29985,7 +30201,7 @@ var DocController = /*#__PURE__*/function () {
 
         hoeditorfactory.undoService.begin();
         var newParaPath = paraNode.getNodePath();
-        var separateCharNode = new _treeNode_SeparateCharNode__WEBPACK_IMPORTED_MODULE_80__/* .SeparateCharNode */ .O(this._hoEditorFactoryID, np.roots, parentNode, _treeNode_BaseNode__WEBPACK_IMPORTED_MODULE_24__/* .NodeType.ntSeparateChar */ .Jq.ntSeparateChar, width, color);
+        var separateCharNode = new _treeNode_SeparateCharNode__WEBPACK_IMPORTED_MODULE_81__/* .SeparateCharNode */ .O(this._hoEditorFactoryID, np.roots, parentNode, _treeNode_BaseNode__WEBPACK_IMPORTED_MODULE_24__/* .NodeType.ntSeparateChar */ .Jq.ntSeparateChar, width, color);
         hoeditorfactory.undoService.add(new _undoRedo_NodeInsertUndoUnit__WEBPACK_IMPORTED_MODULE_25__/* .NodeInsertUndoUnit */ .R(this._hoEditorFactoryID, newParaPath, separateCharNode));
         hoeditorfactory.undoService.commit();
       }
@@ -30009,7 +30225,7 @@ var DocController = /*#__PURE__*/function () {
         if (np) {
           var node = np.node;
 
-          if (node instanceof _treeNode_GestationNode__WEBPACK_IMPORTED_MODULE_85__/* .GestationNode */ .G) {
+          if (node instanceof _treeNode_GestationNode__WEBPACK_IMPORTED_MODULE_86__/* .GestationNode */ .G) {
             hoEditorFactory.undoService.begin();
             hoEditorFactory.undoService.add(new _undoRedo_NodeDeleteUndoUnit__WEBPACK_IMPORTED_MODULE_37__/* .NodeDeleteUndoUnit */ .w(this._hoEditorFactoryID, node, startPath, "update"));
             startPath = hoEditorFactory.docTree.getNodeLastPath(node.previousLeaf());
@@ -30018,7 +30234,7 @@ var DocController = /*#__PURE__*/function () {
       }
 
       var parentNode = hoEditorFactory.docTree.getParentNode(startPath);
-      var gestationNode = new _treeNode_GestationNode__WEBPACK_IMPORTED_MODULE_85__/* .GestationNode */ .G(this._hoEditorFactoryID, domRange.npStart.roots, parentNode, _treeNode_BaseNode__WEBPACK_IMPORTED_MODULE_24__/* .NodeType.ntGestation */ .Jq.ntGestation, lastMenstruationDate, usedDate, hoEditorFactory.docTree.curStyleIndex); //插入节点
+      var gestationNode = new _treeNode_GestationNode__WEBPACK_IMPORTED_MODULE_86__/* .GestationNode */ .G(this._hoEditorFactoryID, domRange.npStart.roots, parentNode, _treeNode_BaseNode__WEBPACK_IMPORTED_MODULE_24__/* .NodeType.ntGestation */ .Jq.ntGestation, lastMenstruationDate, usedDate, hoEditorFactory.docTree.curStyleIndex); //插入节点
 
       if (operType === "add") {
         hoEditorFactory.undoService.begin();
@@ -30030,12 +30246,12 @@ var DocController = /*#__PURE__*/function () {
   }, {
     key: "textToLabel",
     value: function () {
-      var _textToLabel = (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_asyncToGenerator_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)( /*#__PURE__*/(0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_regeneratorRuntime_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z)().mark(function _callee2(range) {
+      var _textToLabel = (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_asyncToGenerator_js__WEBPACK_IMPORTED_MODULE_3__/* ["default"] */ .Z)( /*#__PURE__*/(0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_regeneratorRuntime_js__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z)().mark(function _callee3(range) {
         var hoeditorfactory, astart, aend, sChildIndex, eChildIndex, anode, startPath, endPath, drawNode, i, text, pathArr, _pathArr, labelNode, delRange, anodeEndPath, result;
 
-        return (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_regeneratorRuntime_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z)().wrap(function _callee2$(_context2) {
+        return (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_regeneratorRuntime_js__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z)().wrap(function _callee3$(_context3) {
           while (1) {
-            switch (_context2.prev = _context2.next) {
+            switch (_context3.prev = _context3.next) {
               case 0:
                 hoeditorfactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_77__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
                 astart = range.npStart.node;
@@ -30048,12 +30264,12 @@ var DocController = /*#__PURE__*/function () {
 
               case 8:
                 if (!anode) {
-                  _context2.next = 34;
+                  _context3.next = 34;
                   break;
                 }
 
                 if (!(anode instanceof _treeNode_TextNode__WEBPACK_IMPORTED_MODULE_27__/* .TextNode */ .R)) {
-                  _context2.next = 32;
+                  _context3.next = 32;
                   break;
                 }
 
@@ -30062,21 +30278,21 @@ var DocController = /*#__PURE__*/function () {
 
               case 12:
                 if (!(i < anode.drawNodes.length)) {
-                  _context2.next = 19;
+                  _context3.next = 19;
                   break;
                 }
 
                 if (!(sChildIndex < anode.drawNodes[i].endIndex)) {
-                  _context2.next = 16;
+                  _context3.next = 16;
                   break;
                 }
 
                 drawNode = anode.drawNodes[i];
-                return _context2.abrupt("break", 19);
+                return _context3.abrupt("break", 19);
 
               case 16:
                 i++;
-                _context2.next = 12;
+                _context3.next = 12;
                 break;
 
               case 19:
@@ -30117,9 +30333,9 @@ var DocController = /*#__PURE__*/function () {
                   }
                 }
 
-                labelNode = new _treeNode_LabelNode__WEBPACK_IMPORTED_MODULE_81__/* .LabelNode */ .P(this._hoEditorFactoryID, range.npStart.roots, anode.parentNode, _treeNode_BaseNode__WEBPACK_IMPORTED_MODULE_24__/* .NodeType.ntLabel */ .Jq.ntLabel, text, anode.styleIndex);
+                labelNode = new _treeNode_LabelNode__WEBPACK_IMPORTED_MODULE_82__/* .LabelNode */ .P(this._hoEditorFactoryID, range.npStart.roots, anode.parentNode, _treeNode_BaseNode__WEBPACK_IMPORTED_MODULE_24__/* .NodeType.ntLabel */ .Jq.ntLabel, text, anode.styleIndex);
                 delRange = new _DomRange__WEBPACK_IMPORTED_MODULE_31__/* .DomRange */ .a(this._hoEditorFactoryID, startPath, endPath);
-                _context2.next = 28;
+                _context3.next = 28;
                 return this.deleteRange(delRange, true);
 
               case 28:
@@ -30133,7 +30349,7 @@ var DocController = /*#__PURE__*/function () {
 
                 if (anode) {
                   anodeEndPath = hoeditorfactory.docTree.getNodeLastPath(anode);
-                  result = _NodePosition__WEBPACK_IMPORTED_MODULE_82__/* .NodePosition.treePathCompare */ .F.treePathCompare(anodeEndPath, range.startPath);
+                  result = _NodePosition__WEBPACK_IMPORTED_MODULE_83__/* .NodePosition.treePathCompare */ .F.treePathCompare(anodeEndPath, range.startPath);
 
                   if (result <= 0) {
                     anode = null;
@@ -30142,19 +30358,19 @@ var DocController = /*#__PURE__*/function () {
 
               case 34:
                 if (anode && astart.previousLeaf() && anode !== astart.previousLeaf()) {
-                  _context2.next = 8;
+                  _context3.next = 8;
                   break;
                 }
 
               case 35:
               case "end":
-                return _context2.stop();
+                return _context3.stop();
             }
           }
-        }, _callee2, this);
+        }, _callee3, this);
       }));
 
-      function textToLabel(_x) {
+      function textToLabel(_x2) {
         return _textToLabel.apply(this, arguments);
       }
 
@@ -30198,7 +30414,7 @@ var DocController = /*#__PURE__*/function () {
       var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_77__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
       var startPath = domRange.startPath;
       var parentNode = hoEditorFactory.docTree.getParentNode(startPath);
-      var signNode = new _treeNode_SignNode__WEBPACK_IMPORTED_MODULE_83__/* .SignNode */ .N(this._hoEditorFactoryID, domRange.npStart.roots, parentNode, _treeNode_BaseNode__WEBPACK_IMPORTED_MODULE_24__/* .NodeType.ntSign */ .Jq.ntSign, 0, 0, name, signType, signFormat, "", "", signTimeFormat, "", 0, 0, {}, true, hoEditorFactory.docTree.curStyleIndex, connectMode, isFront, allowEditSignTime, undefined, undefined, attribute, connectChar); //插入该表达式节点
+      var signNode = new _treeNode_SignNode__WEBPACK_IMPORTED_MODULE_84__/* .SignNode */ .N(this._hoEditorFactoryID, domRange.npStart.roots, parentNode, _treeNode_BaseNode__WEBPACK_IMPORTED_MODULE_24__/* .NodeType.ntSign */ .Jq.ntSign, 0, 0, name, signType, signFormat, "", "", signTimeFormat, "", 0, 0, {}, true, hoEditorFactory.docTree.curStyleIndex, connectMode, isFront, allowEditSignTime, undefined, undefined, attribute, connectChar); //插入该表达式节点
 
       hoEditorFactory.undoService.begin();
       hoEditorFactory.undoService.add(new _undoRedo_NodeInsertUndoUnit__WEBPACK_IMPORTED_MODULE_25__/* .NodeInsertUndoUnit */ .R(this._hoEditorFactoryID, startPath, signNode));
@@ -30228,7 +30444,7 @@ var DocController = /*#__PURE__*/function () {
       //   }
       // }
 
-      var signNode = new _treeNode_SignNode__WEBPACK_IMPORTED_MODULE_83__/* .SignNode */ .N(this._hoEditorFactoryID, domRange.npStart.roots, parentNode, _treeNode_BaseNode__WEBPACK_IMPORTED_MODULE_24__/* .NodeType.ntSign */ .Jq.ntSign, 1, type, name, 0, "医师签名", signor, signTime, signTimeFormat, imgSrc, imgWidth, imgHeight, customProperty, false, hoEditorFactory.docTree.curStyleIndex, undefined, undefined, undefined, fingerPrintSrc, fingerPosition); //插入该表达式节点
+      var signNode = new _treeNode_SignNode__WEBPACK_IMPORTED_MODULE_84__/* .SignNode */ .N(this._hoEditorFactoryID, domRange.npStart.roots, parentNode, _treeNode_BaseNode__WEBPACK_IMPORTED_MODULE_24__/* .NodeType.ntSign */ .Jq.ntSign, 1, type, name, 0, "医师签名", signor, signTime, signTimeFormat, imgSrc, imgWidth, imgHeight, customProperty, false, hoEditorFactory.docTree.curStyleIndex, undefined, undefined, undefined, fingerPrintSrc, fingerPosition); //插入该表达式节点
 
       hoEditorFactory.undoService.begin();
       hoEditorFactory.undoService.add(new _undoRedo_NodeInsertUndoUnit__WEBPACK_IMPORTED_MODULE_25__/* .NodeInsertUndoUnit */ .R(this._hoEditorFactoryID, startPath, signNode));
@@ -30292,7 +30508,7 @@ var DocController = /*#__PURE__*/function () {
           }
         }
 
-        var newSignNode = new _treeNode_SignNode__WEBPACK_IMPORTED_MODULE_83__/* .SignNode */ .N(this._hoEditorFactoryID, node.rootNodes, node.parentNode, _treeNode_BaseNode__WEBPACK_IMPORTED_MODULE_24__/* .NodeType.ntSign */ .Jq.ntSign, 2, type, name, node.signType, node.signFormat, signor, signTime, node.signTimeFormat, imgSrc, imgWidth, imgHeight, customProperty, false, node.styleIndex, node.connectMode, type == 1 && node.signType == 1 ? true : node.isFront, node.allowEditSignTime, fingerPrintSrc, fingerPosition); //插入该表达式节点
+        var newSignNode = new _treeNode_SignNode__WEBPACK_IMPORTED_MODULE_84__/* .SignNode */ .N(this._hoEditorFactoryID, node.rootNodes, node.parentNode, _treeNode_BaseNode__WEBPACK_IMPORTED_MODULE_24__/* .NodeType.ntSign */ .Jq.ntSign, 2, type, name, node.signType, node.signFormat, signor, signTime, node.signTimeFormat, imgSrc, imgWidth, imgHeight, customProperty, false, node.styleIndex, node.connectMode, type == 1 && node.signType == 1 ? true : node.isFront, node.allowEditSignTime, fingerPrintSrc, fingerPosition); //插入该表达式节点
 
         hoEditorFactory.undoService.begin();
         hoEditorFactory.undoService.add(new _undoRedo_NodeInsertUndoUnit__WEBPACK_IMPORTED_MODULE_25__/* .NodeInsertUndoUnit */ .R(this._hoEditorFactoryID, sPath, newSignNode));
@@ -30422,7 +30638,7 @@ var DocController = /*#__PURE__*/function () {
       var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_77__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
 
       var _cell$table$canMergeC = cell.table.canMergeCell(r, c, rowSpan, colSpan),
-          _cell$table$canMergeC2 = (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_3__/* ["default"] */ .Z)(_cell$table$canMergeC, 3),
+          _cell$table$canMergeC2 = (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)(_cell$table$canMergeC, 3),
           ret = _cell$table$canMergeC2[0],
           aRowSpan = _cell$table$canMergeC2[1],
           aColSpan = _cell$table$canMergeC2[2];
@@ -49482,15 +49698,17 @@ var RowInfos = /*#__PURE__*/function () {
 
         var r = this._table.rowInfos.indexOf(this);
 
-        for (var i = 0; i < this._table.colCount; i++) {
-          var _this$_table$getMainC = this._table.getMainCell(r, i),
-              _this$_table$getMainC2 = (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_5__/* ["default"] */ .Z)(_this$_table$getMainC, 3),
-              mainCell = _this$_table$getMainC2[0],
-              mr = _this$_table$getMainC2[1],
-              mc = _this$_table$getMainC2[2];
+        if (r >= 0) {
+          for (var i = 0; i < this._table.colCount; i++) {
+            var _this$_table$getMainC = this._table.getMainCell(r, i),
+                _this$_table$getMainC2 = (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_5__/* ["default"] */ .Z)(_this$_table$getMainC, 3),
+                mainCell = _this$_table$getMainC2[0],
+                mr = _this$_table$getMainC2[1],
+                mc = _this$_table$getMainC2[2];
 
-          if (mainCell.cellProperty.align !== _TableProperty__WEBPACK_IMPORTED_MODULE_30__/* .VAlign.vatop */ .TR.vatop) {
-            mainCell.drawCell.needUpdate = true;
+            if (mainCell.cellProperty.align !== _TableProperty__WEBPACK_IMPORTED_MODULE_30__/* .VAlign.vatop */ .TR.vatop) {
+              mainCell.drawCell.needUpdate = true;
+            }
           }
         }
       }
@@ -55602,6 +55820,8 @@ var UnitConvert = __webpack_require__(55479);
 var BaseNode = __webpack_require__(92178);
 // EXTERNAL MODULE: ./src/editor/draw/drawNode/DrawDownListNode.ts
 var DrawDownListNode = __webpack_require__(19459);
+// EXTERNAL MODULE: ./src/editor/dom/treeNode/TextInputFieldNode.ts
+var TextInputFieldNode = __webpack_require__(69802);
 ;// CONCATENATED MODULE: ./src/editor/draw/DrawLine.ts
 
 
@@ -55623,6 +55843,7 @@ var DrawDownListNode = __webpack_require__(19459);
 
 
 
+
 
 
 var DrawLine = /*#__PURE__*/function (_DrawContainer) {
@@ -56237,6 +56458,10 @@ var DrawLine = /*#__PURE__*/function (_DrawContainer) {
             break;
           }
       }
+
+      if (Paragraph/* Align.alright */.xM.alright && this.paragraphNode.parentNode instanceof TextInputFieldNode/* TextInputFieldNode */.re && this.paragraphNode.parentNode.alignWithBlocked) {
+        usedWidth = 0;
+      }
       /**
        * 返回字间距
        * @param index 字序号
@@ -63066,9 +63291,12 @@ var DrawPageCell = /*#__PURE__*/function (_DrawArea) {
     }
   }, {
     key: "afterHeightChanged",
-    value: function afterHeightChanged(oldHeight, newHeight) {
-      if (this._cell.cellProperty.align != TableProperty/* VAlign.vatop */.TR.vatop) {
-        var newValignTop = this.calcValignTop();
+    value: function afterHeightChanged() {
+      if (this._cell.cellProperty.align == TableProperty/* VAlign.vacenter */.TR.vacenter) {
+        var _this$calcValignTop = this.calcValignTop(),
+            _this$calcValignTop2 = (0,slicedToArray/* default */.Z)(_this$calcValignTop, 2),
+            newValignTop = _this$calcValignTop2[0],
+            topArr = _this$calcValignTop2[1];
 
         if (newValignTop != this._valignTop) {
           var adjustValignTop = newValignTop - this._valignTop;
@@ -63080,6 +63308,56 @@ var DrawPageCell = /*#__PURE__*/function (_DrawArea) {
             }
           }
         }
+      } else if (this._cell.cellProperty.align == TableProperty/* VAlign.vabottom */.TR.vabottom) {
+        var _this$calcValignTop3 = this.calcValignTop(),
+            _this$calcValignTop4 = (0,slicedToArray/* default */.Z)(_this$calcValignTop3, 2),
+            _newValignTop = _this$calcValignTop4[0],
+            rowHeightArr = _this$calcValignTop4[1];
+
+        if (rowHeightArr) {
+          // const getPlace=(dTop:number,dPageCellIndex: number,dHeight:number):[number,number]=>{
+          //   let index=0;
+          //   let newTop=dTop;
+          //   let rowHeight=0;
+          //   for (let i=0;i<topArr.length;i++ ){
+          //     if (dTop+dHeight<topArr[i]){
+          //       index=i;
+          //       break;
+          //     }
+          //     else {
+          //       newTop-=topArr[i]
+          //     }
+          //   }
+          //   return [index,newTop]
+          // }
+          if (_newValignTop != this._valignTop) {
+            this._valignTop = _newValignTop;
+            var childCount = this._cell.drawCell.drawLines.length;
+            var pageCellIndex = this._cell.drawCell.drawPageCells.length - 1;
+            var dPageCell = this._cell.drawCell.drawPageCells[pageCellIndex];
+            var cellrestHeight = rowHeightArr[pageCellIndex];
+
+            for (var _i = childCount - 1; _i >= 0; _i--) {
+              var dObj = this._cell.drawCell.drawLines[_i];
+
+              if (dObj instanceof DrawLine/* DrawLine */.a || dObj instanceof DrawPageTable/* DrawPageTable */.ox) {
+                while (pageCellIndex > 0 && cellrestHeight < dObj.dHeight) {
+                  pageCellIndex -= 1;
+                  dPageCell = this._cell.drawCell.drawPageCells[pageCellIndex];
+                  cellrestHeight = rowHeightArr[pageCellIndex];
+                }
+
+                if (!dPageCell.contains(dObj) && dObj.parent && dObj.parent.contains(dObj)) {
+                  dObj.parent.removeChild(dObj);
+                }
+
+                dObj.y = cellrestHeight - dObj.dHeight - dObj.paragraphNode.combineParagraph.lineSpace;
+                cellrestHeight = dObj.y;
+                dPageCell.addChild(dObj); // const [pageCellIndex,newTop]=getPlace(dTop,index,dObj.dHeight);
+              }
+            }
+          }
+        }
       }
     }
   }, {
@@ -63101,9 +63379,12 @@ var DrawPageCell = /*#__PURE__*/function (_DrawArea) {
     value: function calcValignTop() {
       var index = this.cell.drawCell.drawPageCells.indexOf(this);
       var innerTop = 0;
+      var toparr = new Array();
+      var aHeight = 0;
+      var hoeditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._cell.hoEditorFactoryID);
 
       if (index == 0) {
-        innerTop = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._cell.hoEditorFactoryID).unitConvert.mmConversionPx(this._cell.cellProperty.cellInnerMargin[0] * 10, true);
+        innerTop = hoeditorFactory.unitConvert.mmConversionPx(this._cell.cellProperty.cellInnerMargin[0] * 10, true);
       }
 
       var valignTop = innerTop;
@@ -63111,34 +63392,63 @@ var DrawPageCell = /*#__PURE__*/function (_DrawArea) {
       if (this._cell.cellProperty.align === TableProperty/* VAlign.vatop */.TR.vatop) {
         valignTop = innerTop;
       } else if (this._cell.cellProperty.align === TableProperty/* VAlign.vacenter */.TR.vacenter) {
-        var aHeight = this.calcCellHeight();
+        var _this$calcCellHeight = this.calcCellHeight();
+
+        var _this$calcCellHeight2 = (0,slicedToArray/* default */.Z)(_this$calcCellHeight, 2);
+
+        aHeight = _this$calcCellHeight2[0];
+        toparr = _this$calcCellHeight2[1];
         if (aHeight > this._cell.drawCell.docHeight) valignTop = (aHeight - this._cell.drawCell.docHeight) / 2;
       } else if (this._cell.cellProperty.align === TableProperty/* VAlign.vabottom */.TR.vabottom) {
-        var _aHeight = this.calcCellHeight();
+        var _this$calcCellHeight3 = this.calcCellHeight();
+
+        var _this$calcCellHeight4 = (0,slicedToArray/* default */.Z)(_this$calcCellHeight3, 2);
+
+        aHeight = _this$calcCellHeight4[0];
+        toparr = _this$calcCellHeight4[1];
+        var innerBottom = hoeditorFactory.unitConvert.mmConversionPx(this._cell.cellProperty.cellInnerMargin[1] * 10, true);
+        var restRowHeight = 0;
 
-        var innerBottom = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._cell.hoEditorFactoryID).unitConvert.mmConversionPx(this._cell.cellProperty.cellInnerMargin[1] * 10, true);
-        if (_aHeight > this._cell.drawCell.docHeight) valignTop = _aHeight - this._cell.drawCell.docHeight - innerBottom;
+        for (var r = index; r < toparr.length; r++) {
+          restRowHeight += toparr[r];
+        }
+
+        if (aHeight > this._cell.drawCell.docHeight && this._cell.drawCell.docHeight < restRowHeight) {
+          valignTop = restRowHeight - this._cell.drawCell.docHeight - innerBottom;
+        }
       }
 
-      return valignTop;
+      return [valignTop, toparr];
     }
   }, {
     key: "update",
     value: function update(prevDrawArea, dlines, startIndex, dTop, restHeight) {
-      var valignTop = dTop; // if (startIndex === 0) {
+      var valignTop = dTop;
+
+      if (this._cell.cellProperty.align == TableProperty/* VAlign.vabottom */.TR.vabottom) {
+        valignTop = this.calcValignTop()[0];
+        this._valignTop = valignTop;
+      } // if (startIndex === 0) {
       //    valignTop=this.calcValignTop();
       //    this._valignTop=valignTop;
       // }
 
+
       this._startDline = startIndex;
 
       var ret = (0,get/* default */.Z)((0,getPrototypeOf/* default */.Z)(DrawPageCell.prototype), "update", this).call(this, prevDrawArea, dlines, startIndex, valignTop, restHeight);
 
-      this._docHeight -= valignTop;
+      this._docHeight = Math.max(0, this._docHeight - valignTop);
       this.updateDHeight();
       return ret; // this.updateTouchArea(this._dHeight);
       // this.paintCellBackground(this._dHeight);
     }
+    /**
+     *
+     * @returns
+     * 返回单元格在所有分页上的总高度，以及每页高度数组
+     */
+
   }, {
     key: "calcCellHeight",
     value: function calcCellHeight() {
@@ -63148,16 +63458,55 @@ var DrawPageCell = /*#__PURE__*/function (_DrawArea) {
           c = _this$_cell$table$get6[1];
 
       var ret = 0;
+      var hoeditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._cell.hoEditorFactoryID);
+      var dTopArr = new Array();
+
+      if (this._cell.cellProperty.align == TableProperty/* VAlign.vabottom */.TR.vabottom) {
+        ret = 0;
+
+        for (var r = row, count = this._cell.rowSpan + row - 1; r <= count; r++) {
+          var rowInfos = this._cell.table.rowInfos[r];
+
+          if (rowInfos) {
+            ret += rowInfos.rowHeight;
+          }
+        }
+
+        var icount = this._cell.table.drawTable.drawPageTables.length;
+        var index = 0;
+        var pageHeight = 0;
+
+        for (var i = 0; i < icount; i++) {
+          dTopArr[index] = 0;
+
+          for (var _r = row, _count = this._cell.rowSpan + row - 1; _r <= _count; _r++) {
+            var dTable = this._cell.table.drawTable.drawPageTables[i];
+
+            if (dTable.parent && dTable.parent.contains(dTable)) {
+              var _rowInfos = dTable.partRowHeights.get(_r);
 
-      for (var r = row, count = this._cell.rowSpan + row - 1; r <= count; r++) {
-        var rowInfos = this._drawPageTable.partRowHeights.get(r);
+              if (_rowInfos) {
+                if (pageHeight < ret) {
+                  pageHeight += _rowInfos.rowHeight;
+                  dTopArr[index] += _rowInfos.rowHeight;
+                }
+              }
+            }
+
+            index += 1;
+          }
+        }
+      } else if (this._cell.cellProperty.align == TableProperty/* VAlign.vacenter */.TR.vacenter) {
+        for (var _r2 = row, _count2 = this._cell.rowSpan + row - 1; _r2 <= _count2; _r2++) {
+          var _rowInfos2 = this._drawPageTable.partRowHeights.get(_r2);
 
-        if (rowInfos) {
-          ret += rowInfos.rowHeight;
+          if (_rowInfos2) {
+            ret += _rowInfos2.rowHeight;
+          }
         }
       }
 
-      return ret;
+      return [ret, dTopArr];
     }
   }]);
 
@@ -63808,7 +64157,7 @@ var DrawPageTable = /*#__PURE__*/function (_DrawRect) {
       if (partCell) {
         var oldHeight = partCell.dHeight;
         partCell.dHeight = newHeight;
-        partCell.afterHeightChanged(oldHeight, newHeight);
+        partCell.afterHeightChanged();
 
         if (partCell.cell.rowSpan > 1) {
           var index = partCell.cell.drawCell.drawPageCells.indexOf(partCell) - 1;
@@ -66678,6 +67027,7 @@ var DrawTable = /*#__PURE__*/function (_DrawRect) {
     key: "updateRowHeight",
     value: function updateRowHeight(r) {
       var dHeight = _editor_dom_treeNode_TableNode__WEBPACK_IMPORTED_MODULE_13__/* .gDefaultRowHeight */ .dT;
+      var bottonAlignCell = new Array();
       var rowPorpertyHeight = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_14__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID).unitConvert.mmConversionPx(this._table.rowInfos[r].rowProperty.rowHeight * 10, false);
 
       if (this._table.rowInfos[r].rowProperty.isSpecifyHeight) {
@@ -66692,6 +67042,10 @@ var DrawTable = /*#__PURE__*/function (_DrawRect) {
         for (var c = 0; c < this._table.colCount; c++) {
           var aCell = this._table.rows[r][c];
 
+          if (aCell && aCell.cellProperty.align == _editor_dom_TableProperty__WEBPACK_IMPORTED_MODULE_11__/* .VAlign.vabottom */ .TR.vabottom) {
+            bottonAlignCell.push(aCell);
+          }
+
           if (aCell && aCell.rowSpan === 1 && aCell.drawCell.dHeight > dHeight) {
             dHeight = aCell.drawCell.dHeight; // let nextValue = aCell.drawCell.drawPageCells.values().next();
             // while (!nextValue.done) {
@@ -66729,6 +67083,10 @@ var DrawTable = /*#__PURE__*/function (_DrawRect) {
             if (dHeight > rowPorpertyHeight) this._table.rowInfos[r].rowHeight = rowPorpertyHeight;else this._table.rowInfos[r].rowHeight = dHeight;
           } else this._table.rowInfos[r].rowHeight = dHeight;
         }
+
+        for (var _c = 0; _c < bottonAlignCell.length; _c++) {
+          bottonAlignCell[_c].drawCell.needUpdate = true;
+        }
       } // for (let c = 0; c < this._table.colCount; c++) {
       //   const aCell = this._table.rows[r][c];
       //   if (aCell) {
@@ -66860,7 +67218,24 @@ var DrawTable = /*#__PURE__*/function (_DrawRect) {
 
           this.finishUpdate();
         }
-      }
+      } // for (let i=0;i<this._drawPageTables.length-1;i++){
+      //   let c=0;
+      //   while (c<this._table.colCount){
+      //     const [cell,mr,mc]= this._table.getMainCell(dPageTable.endRow,c);
+      //     let inc=1;
+      //     if (cell){
+      //       if (cell.cellProperty.align==VAlign.vabottom){
+      //       const pageCell=  cell.drawCell.getDrawPageCell(dPageTable);
+      //       if (pageCell){
+      //         pageCell.afterHeightChanged()
+      //       }
+      //       inc=cell.rowSpan;
+      //     }
+      //     c+=inc;
+      //   }
+      //   }
+      // }
+
 
       rowTop = dTop + dPageTable.dHeight;
 
@@ -70154,6 +70529,8 @@ var TableFormula = __webpack_require__(72330);
 var DrawConfig = __webpack_require__(15654);
 // EXTERNAL MODULE: ./src/editor/draw/drawNode/DrawSignNode.ts
 var DrawSignNode = __webpack_require__(23127);
+// EXTERNAL MODULE: ./src/editor/dom/TableProperty.ts
+var TableProperty = __webpack_require__(74004);
 ;// CONCATENATED MODULE: ./src/editor/draw/drawTree/DrawTree.ts
 
 
@@ -70216,6 +70593,7 @@ var DrawSignNode = __webpack_require__(23127);
 
 
 
+
 
 
  //当前的显示状态，psDesign为设计状态，psEdit为正常编辑状态 psPreview为打印预览态态  psPrint 正在打印状态, psReview审阅状态
@@ -72609,20 +72987,38 @@ var DrawTree = /*#__PURE__*/function () {
 
           var _index2 = dPlace.cell.drawCell.drawPageCells.indexOf(dPlace);
 
-          while (_index2 > 0) {
-            aPrevPlace = dPlace.cell.drawCell.drawPageCells[_index2 - 1];
+          if (dPlace.cell.cellProperty.align != TableProperty/* VAlign.vabottom */.TR.vabottom) {
+            while (_index2 > 0) {
+              aPrevPlace = dPlace.cell.drawCell.drawPageCells[_index2 - 1];
 
-            if (!aPrevPlace.isEmpty()) {
-              var rootArea = hoeditfactory.drawPageTree.getMainRootArea(aPrevPlace);
+              if (!aPrevPlace.isEmpty()) {
+                var rootArea = hoeditfactory.drawPageTree.getMainRootArea(aPrevPlace);
 
-              if (rootArea) {
-                aPage = this._drawPages[rootArea.index];
+                if (rootArea) {
+                  aPage = this._drawPages[rootArea.index];
+                }
+
+                return this.getStagePosition(aPage, aPrevPlace, x, 99999999);
               }
 
-              return this.getStagePosition(aPage, aPrevPlace, x, 99999999);
+              _index2 -= 1;
             }
+          } else {
+            while (_index2 < dPlace.cell.drawCell.drawPageCells.length - 1) {
+              aPrevPlace = dPlace.cell.drawCell.drawPageCells[_index2 + 1];
 
-            _index2 -= 1;
+              if (!aPrevPlace.isEmpty()) {
+                var _rootArea = hoeditfactory.drawPageTree.getMainRootArea(aPrevPlace);
+
+                if (_rootArea) {
+                  aPage = this._drawPages[_rootArea.index];
+                }
+
+                return this.getStagePosition(aPage, aPrevPlace, x, 99999999);
+              }
+
+              _index2 += 1;
+            }
           }
         } // if (dPlace instanceof DrawCell) {
         //   dItems = (dPlace as DrawCell).drawLxines;
@@ -212793,13 +213189,13 @@ var map = {
 	"./qrCode/QrCode.vue": 7049,
 	"./radioCheckBox/RadioCheckbox.vue": 29385,
 	"./selectDialog/SelectDialog.vue": 32949,
-	"./sign/Sign.vue": 54089,
-	"./table/TableCellPoper.vue": 28654,
+	"./sign/Sign.vue": 87043,
+	"./table/TableCellPoper.vue": 9715,
 	"./table/TableCellProperty.vue": 84650,
-	"./table/TableColProperty.vue": 59243,
+	"./table/TableColProperty.vue": 26853,
 	"./table/TableFormula.vue": 85592,
 	"./table/TableProperty.vue": 1527,
-	"./table/TableRowProperty.vue": 52032,
+	"./table/TableRowProperty.vue": 1429,
 	"./textDialog/TextDialog.vue": 87847,
 	"./upload/CanvasImageDialog.vue": 54485,
 	"./upload/UploadImageDialog.vue": 17621
@@ -214341,9 +214737,9 @@ var es_string_match = __webpack_require__(4723);
 var es_number_constructor = __webpack_require__(9653);
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.json.stringify.js
 var es_json_stringify = __webpack_require__(38862);
-;// CONCATENATED MODULE: ./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/HoDoc.vue?vue&type=template&id=5f466836&
-var HoDocvue_type_template_id_5f466836_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{class:_vm.docClassNames},[_c('div',{ref:"editorArea",staticClass:"editors"},[(_vm.drawPageLength > 0)?_c('div',{staticClass:"editor",on:{"click":function($event){return _vm.setActiveDocIndex(_vm.hoEditorId)}}},[_vm._l((_vm.drawPageCount.count),function(pgIndex){return [_c('HoPage',{key:pgIndex - 1,attrs:{"data-id":pgIndex - 1,"index":pgIndex - 1,"docIndex":_vm.docIndex,"canvasWidth":_vm.canvasParams.width,"canvasHeight":_vm.canvasParams.height,"currentActivePages":_vm.activePageIndex.index,"hoEditorId":_vm.hoEditorId,"hoEditorFactoryIdList":_vm.hoEditorFactoryIdList,"mouseMoveNodes":_vm.mouseMoveNodes,"viewableAreaObserver":_vm.viewableAreaObserver,"inViewPages":_vm.inViewPages,"canvasHeadFootPos":_vm.canvasHeadFootPos,"poperTipPos":_vm.poperTipPos,"textStyle":_vm.textStyle,"aiInfo":_vm.aiInfo},on:{"pageReady":_vm.pageReady,"canvasRightClick":_vm.mouseRightClickEvent},scopedSlots:_vm._u([{key:"hoPageHead",fn:function(){return [_vm._t("hoDocHead")]},proxy:true},{key:"hoPageFoot",fn:function(){return [_vm._t("hoDocFoot")]},proxy:true}],null,true)})]})],2):_vm._e()]),(_vm.poperType === 'datePoper' || _vm.poperType === 'selectPoper')?_c('PoperSelectModal',{attrs:{"poperType":_vm.poperType,"poperSelectList":_vm.poperSelectList,"poperPos":_vm.poperPos,"hoEditorId":_vm.hoEditorId},on:{"poperClose":_vm.poperClose}}):_vm._e(),_c('PoperMark',{directives:[{name:"show",rawName:"v-show",value:(_vm.poperType === 'datePoper' || _vm.poperType === 'selectPoper' || _vm.poperType === 'table-cell-poper'),expression:"poperType === 'datePoper' || poperType === 'selectPoper' || poperType === 'table-cell-poper'"}]}),(_vm.poperType === 'table-cell-poper')?_c('TableCellPoper',{attrs:{"poperNode":_vm.nodeValue,"poperPos":_vm.poperPos},on:{"poperClose":_vm.poperClose}}):_vm._e(),_c('HoToPage',{attrs:{"hoEditorId":_vm.hoEditorId,"inViewPages":_vm.inViewPages}}),_c('PoperTipText',{attrs:{"isPoperText":_vm.isPoperText,"poperText":_vm.poperText,"poperPos":_vm.poperTextPos},on:{"poperTextClose":_vm.poperTextClose}}),_c('ul',{directives:[{name:"click-outside",rawName:"v-click-outside",value:(function () { return (_vm.isCreateRightMenuModal = false); }),expression:"() => (isCreateRightMenuModal = false)"},{name:"show",rawName:"v-show",value:(_vm.isCreateRightMenuModal),expression:"isCreateRightMenuModal"}],ref:"rightMenuModal",staticClass:"create-right-menu"},[(_vm.showCommentsBtn)?_c('li',{staticClass:"mouse-menu-item",on:{"click":_vm.hideComments}},[_vm._v(_vm._s(_vm.isHideComments ? '显示' : '隐藏')+"批注")]):_vm._e(),(_vm.showDeleteSignMenu)?_c('li',{staticClass:"mouse-menu-item",on:{"click":_vm.deleteSignNode}},[_vm._v("删除签名")]):_vm._e(),_c('li',{staticClass:"mouse-menu-item"},[_vm._v(" 编辑器内核版本:   "),_c('span',{staticStyle:{"font-size":"14px","color":"#0a77e3"}},[_vm._v("v "+_vm._s(_vm.version))])])])],1)}
-var HoDocvue_type_template_id_5f466836_staticRenderFns = []
+;// CONCATENATED MODULE: ./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/HoDoc.vue?vue&type=template&id=6a4e96d0&
+var HoDocvue_type_template_id_6a4e96d0_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{class:_vm.docClassNames},[_c('div',{ref:"editorArea",staticClass:"editors"},[(_vm.drawPageLength > 0)?_c('div',{staticClass:"editor",on:{"click":function($event){return _vm.setActiveDocIndex(_vm.hoEditorId)}}},[_vm._l((_vm.drawPageCount.count),function(pgIndex){return [_c('HoPage',{key:pgIndex - 1,attrs:{"data-id":pgIndex - 1,"index":pgIndex - 1,"docIndex":_vm.docIndex,"canvasWidth":_vm.canvasParams.width,"canvasHeight":_vm.canvasParams.height,"currentActivePages":_vm.activePageIndex.index,"hoEditorId":_vm.hoEditorId,"hoEditorFactoryIdList":_vm.hoEditorFactoryIdList,"mouseMoveNodes":_vm.mouseMoveNodes,"viewableAreaObserver":_vm.viewableAreaObserver,"inViewPages":_vm.inViewPages,"canvasHeadFootPos":_vm.canvasHeadFootPos,"poperTipPos":_vm.poperTipPos,"textStyle":_vm.textStyle,"aiInfo":_vm.aiInfo},on:{"pageReady":_vm.pageReady,"canvasRightClick":_vm.mouseRightClickEvent},scopedSlots:_vm._u([{key:"hoPageHead",fn:function(){return [_vm._t("hoDocHead")]},proxy:true},{key:"hoPageFoot",fn:function(){return [_vm._t("hoDocFoot")]},proxy:true}],null,true)})]})],2):_vm._e()]),(_vm.poperType === 'datePoper' || _vm.poperType === 'selectPoper')?_c('PoperSelectModal',{attrs:{"poperType":_vm.poperType,"poperSelectList":_vm.poperSelectList,"poperPos":_vm.poperPos,"hoEditorId":_vm.hoEditorId},on:{"poperClose":_vm.poperClose}}):_vm._e(),_c('PoperMark',{directives:[{name:"show",rawName:"v-show",value:(_vm.poperType === 'datePoper' || _vm.poperType === 'selectPoper' || _vm.poperType === 'table-cell-poper'),expression:"poperType === 'datePoper' || poperType === 'selectPoper' || poperType === 'table-cell-poper'"}]}),(_vm.poperType === 'table-cell-poper')?_c('TableCellPoper',{attrs:{"poperNode":_vm.nodeValue,"poperPos":_vm.poperPos},on:{"poperClose":_vm.poperClose}}):_vm._e(),_c('HoToPage',{attrs:{"hoEditorId":_vm.hoEditorId,"inViewPages":_vm.inViewPages}}),_c('PoperTipText',{attrs:{"isPoperText":_vm.isPoperText,"poperText":_vm.poperText,"poperPos":_vm.poperTextPos},on:{"poperTextClose":_vm.poperTextClose}}),_c('ul',{directives:[{name:"click-outside",rawName:"v-click-outside",value:(function () { return (_vm.isCreateRightMenuModal = false); }),expression:"() => (isCreateRightMenuModal = false)"},{name:"show",rawName:"v-show",value:(_vm.isCreateRightMenuModal),expression:"isCreateRightMenuModal"}],ref:"rightMenuModal",staticClass:"create-right-menu"},[(_vm.showCommentsBtn)?_c('li',{staticClass:"mouse-menu-item",on:{"click":_vm.hideComments}},[_vm._v(_vm._s(_vm.isHideComments ? '显示' : '隐藏')+"批注")]):_vm._e(),(_vm.showDeleteSignMenu)?_c('li',{staticClass:"mouse-menu-item",on:{"click":_vm.deleteSignNode}},[_vm._v("删除签名")]):_vm._e(),_c('li',{staticClass:"mouse-menu-item"},[_vm._v(" 编辑器内核版本:   "),_c('span',{staticStyle:{"font-size":"14px","color":"#0a77e3"}},[_vm._v("v "+_vm._s(_vm.version))])])])],1)}
+var HoDocvue_type_template_id_6a4e96d0_staticRenderFns = []
 
 
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.filter.js
@@ -216280,7 +216676,7 @@ var PoperMark = __webpack_require__(39959);
 
 
 // EXTERNAL MODULE: ./src/components/controls/table/TableCellPoper.vue + 5 modules
-var TableCellPoper = __webpack_require__(28654);
+var TableCellPoper = __webpack_require__(9715);
 // EXTERNAL MODULE: ./src/editor/dom/treeNode/DateTimeNode.ts
 var DateTimeNode = __webpack_require__(40253);
 // EXTERNAL MODULE: ./src/editor/dom/treeNode/DownListNode.ts
@@ -217984,7 +218380,7 @@ var SignNode = __webpack_require__(78975);
 // EXTERNAL MODULE: ./src/editor/dom/treeNode/ParagraphNode.ts
 var ParagraphNode = __webpack_require__(13880);
 ;// CONCATENATED MODULE: ./src/components/version.ts
-/* harmony default export */ var version = ('2.0.96');
+/* harmony default export */ var version = ('2.0.99');
 // EXTERNAL MODULE: ./src/components/controls/poperTipText/PoperTipText.vue + 5 modules
 var PoperTipText = __webpack_require__(97824);
 ;// CONCATENATED MODULE: ./src/components/controls/poperTipText/index.ts
@@ -218259,7 +218655,7 @@ var ImageNode = __webpack_require__(23778);
       hoEditorFactory.nodeMouseMove.isUseTipText = this.isUseTipText;
     }
   },
-  inject: ['setRightClickNodeValue', 'setDblclickNodeValue', 'setUpdateNodeValue', 'getRightClickNodeValue'],
+  inject: ['setRightClickNodeValue', 'setDblclickNodeValue', 'setUpdateNodeValue', 'getRightClickNodeValue', 'setControlProperty'],
   created: function created() {
     var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this.hoEditorId);
     hoEditorFactory.hoEditorFactoryIndex = this.docIndex;
@@ -218469,6 +218865,10 @@ var ImageNode = __webpack_require__(23778);
       };
 
       if (node instanceof SignNode/* SignNode */.N) {
+        // if(hoEditorFactory.drawTree.paintStatus === 0 && !node.imgSrc && !node.fingerPrintSrc) {
+        //     this.setControlProperty('sign', 'update', '');
+        //     return;
+        // }
         // 通过自定义属性内部字段判断是否属于患者签名 指纹签名只有患者签名才会有 同时患者签名不存在自定义属性可以用是否存在某个属性确定是否是患者签名（需要确定的是imgsrc要存在 imgsrc不存在是指空签名元素）
         if (node.fingerPrintSrc || node.imgSrc && !node.fingerPrintSrc && node.customProperty && !node.customProperty.created_date) return false;
         this.$emit('dblNodeClick', {
@@ -218763,8 +219163,8 @@ var ImageNode = __webpack_require__(23778);
 
 var HoDoc_component = (0,componentNormalizer/* default */.Z)(
   components_HoDocvue_type_script_lang_js_,
-  HoDocvue_type_template_id_5f466836_render,
-  HoDocvue_type_template_id_5f466836_staticRenderFns,
+  HoDocvue_type_template_id_6a4e96d0_render,
+  HoDocvue_type_template_id_6a4e96d0_staticRenderFns,
   false,
   null,
   null,
@@ -218817,6 +219217,7 @@ var TableNode = __webpack_require__(59530);
 
 
 
+
 
 
 var NeedDrawPageInfo = /*#__PURE__*/function () {
@@ -219021,17 +219422,6 @@ var DrawPageTree = /*#__PURE__*/function () {
       return [ret, isNew];
     } //拆分成页
 
-  }, {
-    key: "clearAfterDTop",
-    value: function clearAfterDTop(dDrawArea, dTop) {
-      var numChildren = dDrawArea.children.length - 1;
-
-      for (var i = numChildren; i >= 0; i--) {
-        if (dDrawArea.children[i].y > dTop) {
-          dDrawArea.removeChildAt(i);
-        }
-      }
-    }
   }, {
     key: "paint",
     value: function paint(aDrawArea, dRoots, startLine, endLine) {
@@ -219104,7 +219494,7 @@ var DrawPageTree = /*#__PURE__*/function () {
       }
 
       if (hoEditorFactory.isUseDrawingOptimization) {
-        this.clearAfterDTop(mainArea, dTop);
+        this.clearAreas([mainArea]);
       }
 
       var nextLine = startLine;
@@ -219611,7 +220001,7 @@ var DrawPageTree = /*#__PURE__*/function () {
       }
 
       var startPaintWithUpdate = this._startNeedUpdatePage === -1 && this._endNeedUpdatePage === -1;
-      var imaxViewPage = Math.max.apply(Math, (0,toConsumableArray/* default */.Z)(hoEditorFactory.drawTree.inViewPages));
+      var imaxViewPage = Math.max.apply(Math, (0,toConsumableArray/* default */.Z)(hoEditorFactory.drawTree.inViewPages).concat([this._drawMainDocs.length - 1]));
 
       try {
         if (this._oldPageCount === 0) {
@@ -220446,8 +220836,6 @@ var message_box_default = /*#__PURE__*/__webpack_require__.n(message_box);
 var es_string_ends_with = __webpack_require__(27852);
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.object.assign.js
 var es_object_assign = __webpack_require__(19601);
-// EXTERNAL MODULE: ./node_modules/core-js/modules/es.number.to-fixed.js
-var es_number_to_fixed = __webpack_require__(56977);
 // EXTERNAL MODULE: ./node_modules/jquery/dist/jquery.js
 var jquery = __webpack_require__(19755);
 var jquery_default = /*#__PURE__*/__webpack_require__.n(jquery);
@@ -220494,7 +220882,6 @@ var Paragraph = __webpack_require__(28275);
 
 
 
-
 
 
 var HTMLconverter2 = /*#__PURE__*/function () {
@@ -220900,6 +221287,7 @@ var HTMLconverter2 = /*#__PURE__*/function () {
   }, {
     key: "SetTableProperty",
     value: function SetTableProperty(jnode, tableNode) {
+      var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID);
       var tconstents = jquery_default()(jnode).children();
       var rowInfos = new Array();
       var colInfos = new Array();
@@ -220911,22 +221299,25 @@ var HTMLconverter2 = /*#__PURE__*/function () {
 
         for (var j = 0; j < trs.length; j++) {
           var rowProperty = new TableProperty/* RowProperty */.Nr("");
+          rowProperty.isSpecifyHeight = true;
           var rowInfo = new TableNode/* RowInfos */.ii(tableNode, rowProperty);
-          var height = jquery_default()(trs[i]).css("height");
+          var height = jquery_default()(trs[j]).css("height");
 
           if (height && height != "0px") {
             var heightNum = 0;
 
             if (height.indexOf("pt") > 0) {
               heightNum = parseFloat(height.substring(0, height.indexOf("pt")));
+              heightNum = hoEditorFactory.unitConvert.fontPt2Pix(heightNum);
             }
 
             if (height.indexOf("px") > 0) {
               heightNum = parseFloat(height.substring(0, height.indexOf("px")));
-            }
+            } //heightNum = parseFloat(((heightNum * 96) / 72).toFixed(2));
+
 
-            heightNum = parseFloat((heightNum * 96 / 72).toFixed(2));
             rowInfo.rowHeight = heightNum;
+            rowInfo.rowProperty.rowHeight = hoEditorFactory.unitConvert.pxConversionMm(heightNum, false) * 0.1;
           }
 
           rowInfos.push(rowInfo);
@@ -220947,17 +221338,18 @@ var HTMLconverter2 = /*#__PURE__*/function () {
           var widthNum = 0;
 
           if (width.indexOf("pt") > 0) {
-            widthNum = parseFloat(width.substring(0, width.indexOf("pt")));
+            widthNum = parseFloat(width.substring(0, width.indexOf("pt"))); //widthNum = parseFloat(((widthNum * 96) / 72).toFixed(2));
+
+            widthNum = hoEditorFactory.unitConvert.fontPt2Pix(widthNum);
           }
 
           if (width.indexOf("px") > 0) {
             widthNum = parseFloat(width.substring(0, width.indexOf("px")));
-          }
-
-          widthNum = parseFloat((widthNum * 96 / 72).toFixed(2)); // if (widthNum == 0) {
+          } // if (widthNum == 0) {
           //   widthNum = 20;
           // }
 
+
           var colProperty = new TableProperty/* ColProperty */.Ti("");
           var colInfo = new TableNode/* ColInfos */.ZE(tableNode, widthNum, colProperty);
           colInfos.push(colInfo);
@@ -221069,9 +221461,9 @@ var HTMLconverter2 = /*#__PURE__*/function () {
               this.copyCellNode(cell, lntable, _i4, _j2);
             } else lntable.rows[_i4][_j2] = undefined;
           }
-        }
+        } //lntable.node2DrawNode();
+
 
-        lntable.node2DrawNode();
         return [lntable];
       }
     }
@@ -221248,6 +221640,8 @@ var HTMLconverter2 = /*#__PURE__*/function () {
 }();
 // EXTERNAL MODULE: ./node_modules/@babel/runtime/helpers/esm/typeof.js
 var esm_typeof = __webpack_require__(36768);
+// EXTERNAL MODULE: ./node_modules/core-js/modules/es.number.to-fixed.js
+var es_number_to_fixed = __webpack_require__(56977);
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.find.js
 var es_array_find = __webpack_require__(69826);
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.string.replace-all.js
@@ -227279,8 +227673,23 @@ var VueController = /*#__PURE__*/function () {
   }, {
     key: "getDocXml",
     value: function getDocXml(beauty, isValidStyle, clearSign) {
-      var ret = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID).structureConvert.doc2Xml('xml', beauty, isValidStyle, clearSign);
-      return ret;
+      var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID);
+
+      if (beauty && isValidStyle) {
+        hoEditorFactory.contentIsModify.isModify = false;
+        var stack = hoEditorFactory.undoService.stack;
+
+        if (stack.length > 0) {
+          var lastUnRedo = stack[stack.length - 1];
+          var undoUnits = lastUnRedo.undoUnits;
+          var undoUnit = undoUnits[undoUnits.length - 1];
+          hoEditorFactory.lastSaveTime = undoUnit.opTime;
+        } else {
+          hoEditorFactory.lastSaveTime = new Date(Date.now());
+        }
+      }
+
+      return hoEditorFactory.structureConvert.doc2Xml('xml', beauty, isValidStyle, clearSign);
     }
     /**
      * 返回编辑后的表单json数据
@@ -230109,6 +230518,29 @@ var VueController = /*#__PURE__*/function () {
 
       return isModify;
     }
+    /**
+     * 文档修改信息
+     */
+
+  }, {
+    key: "getDocModifyInfo",
+    value: function getDocModifyInfo() {
+      var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID);
+      var modifyInfo = {
+        lastSaveTime: new Date(hoEditorFactory.lastSaveTime).getTime(),
+        lastModifyTime: -1
+      };
+      var stack = hoEditorFactory.undoService.stack;
+
+      if (stack.length > 0) {
+        var lastUnRedo = stack[stack.length - 1];
+        var undoUnits = lastUnRedo.undoUnits;
+        var undoUnit = undoUnits[undoUnits.length - 1];
+        modifyInfo.lastModifyTime = new Date(undoUnit.opTime).getTime();
+      }
+
+      return modifyInfo;
+    }
     /**
      * 获取当前病历中的所有元素
      * @returns 返回元素是{id,name,text,json}的数据
@@ -236956,12 +237388,13 @@ var FontStyleMixin = /*#__PURE__*/function (_Vue) {
 
         var drawPageTables = tableNodeInfo.tableNode.drawTable.drawPageTables;
         var drawPageCells = tableNodeInfo.cellNode.drawCell.drawPageCells;
-        tableBounds.cellX = drawPageCells[0].x + 20;
-        tableBounds.cellY = drawPageCells[0].y + 20;
-        tableBounds.cellWidth = drawPageCells[0].dWidth;
-        tableBounds.cellHeight = drawPageCells[0].dHeight;
+        var currentPageIndex = dPage.drawMainDoc.pageIndex;
+        tableBounds.cellX = drawPageCells[currentPageIndex].x + 20;
+        tableBounds.cellY = drawPageCells[currentPageIndex].y + 20;
+        tableBounds.cellWidth = drawPageCells[currentPageIndex].dWidth;
+        tableBounds.cellHeight = drawPageCells[currentPageIndex].dHeight;
         drawPageTables.forEach(function (v, key) {
-          if (v.parent.pageIndex === dPage.drawMainDoc.pageIndex) {
+          if (v.parent.pageIndex === currentPageIndex) {
             tableBounds.height = v.dHeight;
             tableBounds.y = dPage.drawMainDoc.y + v.y;