hoeditor-web 2.0.107 → 2.0.109

package/lib/hoeditor.common.js

@@ -6301,7 +6301,7 @@ var component = (0,componentNormalizer/* default */.Z)(
 
 /***/ }),
 
-/***/ 42498:
+/***/ 64696:
 /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -6313,7 +6313,7 @@ __webpack_require__.d(__webpack_exports__, {
   "default": function() { return /* binding */ PoperSelect; }
 });
 
-;// 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/poperSelect/PoperSelect.vue?vue&type=template&id=06bcec15&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/poperSelect/PoperSelect.vue?vue&type=template&id=6e3640a6&scoped=true&
 var render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{ref:"poperSelectedModal",staticClass:"poper-selected-modal animation-in"},[_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 && !_vm.mutexSelect)?_c('div',{staticStyle:{"padding":"5px"}},[_c('el-input',{attrs:{"placeholder":_vm.currentListNameText + '搜索',"size":"mini"},on:{"input":_vm.searchList},model:{value:(_vm.input),callback:function ($$v) {_vm.input=$$v},expression:"input"}})],1):_vm._e(),(_vm.poperType === 'selectPoper' && _vm.currentList.length >= 0)?_c('div',{staticClass:"select-poper"},[_c('div',{staticClass:"list-box"},[(_vm.currentList.length == 0)?_c('ul',{staticClass:"list"},[_c('li',{staticStyle:{"text-align":"center"}},[_vm._v("无选项")])]):_vm._e(),(_vm.isAllowMultiSelect && !_vm.mutexSelect && _vm.currentList.length > 0)?_c('el-checkbox-group',{on:{"change":_vm.selectItemsChange},model:{value:(_vm.selectedIds),callback:function ($$v) {_vm.selectedIds=$$v},expression:"selectedIds"}},[_c('RecycleScroller',{staticClass:"scroller",attrs:{"items":_vm.currentList,"item-size":32,"key-field":"id"},scopedSlots:_vm._u([{key:"default",fn:function(ref){
 var item = ref.item;
 return [(item.title)?_c('p',{staticClass:"poper-select-title"},[_vm._v(_vm._s(item.text))]):_vm._e(),(!item.title)?_c('el-checkbox',{key:item.id + Math.random(),attrs:{"label":item.id}},[_vm._v(" "+_vm._s(item.text && item.text.indexOf("<元素>") !== -1 ? item.text.split("<元素>")[0] : item.text.split("<搜索>")[0])+" ")]):_vm._e()]}}],null,false,4143456003)})],1):_vm._e(),(_vm.isAllowMultiSelect && _vm.mutexSelect && _vm.currentList.length > 0)?[_c('el-checkbox-group',{on:{"change":_vm.mutexSelectItemsChange},model:{value:(_vm.mutexSelectedIds),callback:function ($$v) {_vm.mutexSelectedIds=$$v},expression:"mutexSelectedIds"}},[_vm._l((_vm.currentList),function(item,index){return [(index >= 1 && item.type != _vm.currentList[index - 1].type)?_c('p',{key:index + Math.random(),staticClass:"el-checkbox-mutex-line"}):_vm._e(),_c('el-checkbox',{key:item.id + Math.random(),attrs:{"label":item.id,"disabled":_vm.mutexType !== '' && _vm.mutexType != item.type}},[_vm._v(" "+_vm._s(item.text && item.text.indexOf("<元素>") !== -1 ? item.text.split("<元素>")[0] : item.text.split("<搜索>")[0])+" ")])]})],2)]:_vm._e(),(!_vm.isAllowMultiSelect && _vm.currentList.length > 0)?_c('el-radio-group',{model:{value:(_vm.selectedId),callback:function ($$v) {_vm.selectedId=$$v},expression:"selectedId"}},_vm._l((_vm.currentList),function(item){return _c('el-radio',{key:item.id + Math.random(),attrs:{"label":item.id},nativeOn:{"~click":function($event){return _vm.selectItemsChange(item)}}},[_vm._v(" "+_vm._s(item.text && item.text.indexOf("<元素>") !== -1 ? item.text.split("<元素>")[0] : item.text.split("<搜索>")[0])+" ")])}),1):_vm._e(),(_vm.selectedList.length > 0 && _vm.isAllowMultiSelect && !_vm.mutexSelect && _vm.isCanSearch)?_c('transition-group',{staticClass:"list",attrs:{"name":"drag","tag":"ul"}},[_c('li',{key:"已选择",staticStyle:{"position":"absolute","top":"0px","z-index":"111","background":"#fff"}},[_vm._v("已选择"+_vm._s(_vm.currentListNameText))]),_vm._l((_vm.selectedList),function(item,index){return [_c('li',{key:item.id + Math.random(),staticClass:"drag-item selected",attrs:{"draggable":""},on:{"dragenter":function($event){return _vm.dragenter($event, index)},"dragover":function($event){return _vm.dragover($event, index)},"dragstart":function($event){return _vm.dragstart(index)}}},[_c('span',[_vm._v(_vm._s(item.text && item.text.indexOf("<元素>") !== -1 ? item.text.split("<元素>")[0] : item.text.split("<搜索>")[0]))]),_c('i',{staticClass:"el-icon-delete",on:{"click":function($event){return _vm.deleteItems(item, index)}}})])]})],2):_vm._e()],2)]):_vm._e(),(_vm.poperType === 'selectPoper' && !_vm.isAllowMultiSelect)?_c('footer',[_c('el-button',{staticStyle:{"padding":"5px 13px"},attrs:{"size":"mini"},on:{"click":_vm.handleClose}},[_vm._v("关闭")])],1):_vm._e(),(_vm.poperType === 'selectPoper' && _vm.isAllowMultiSelect)?_c('footer',[(!_vm.mutexSelect)?_c('el-button',{staticStyle:{"padding":"5px 13px"},attrs:{"size":"mini"},on:{"click":_vm.allSelect}},[_vm._v("全选")]):_vm._e(),_c('el-button',{staticStyle:{"padding":"5px 13px"},attrs:{"size":"mini"},on:{"click":_vm.cancelSelect}},[_vm._v("清空")]),_c('el-button',{staticStyle:{"padding":"5px 13px"},attrs:{"size":"mini"},on:{"click":_vm.handleClose}},[_vm._v("取消")]),_c('el-button',{staticStyle:{"padding":"5px 13px"},attrs:{"size":"mini","type":"primary"},on:{"click":_vm.sureSelect}},[_vm._v("确定")])],1):_vm._e(),(_vm.poperType === 'datePoper')?_c('div',{staticClass:"date-poper"},[(_vm.dateTimeStyle.includes('dd'))?_c('DatePanel',{attrs:{"value":_vm.date},on:{"getValue":_vm.getTime}}):_vm._e(),(_vm.dateTimeStyle.includes('MM') && !_vm.dateTimeStyle.includes('dd'))?_c('DatePanel',{attrs:{"dateType":"month","value":_vm.date},on:{"getValue":_vm.getTime}}):_vm._e(),(_vm.dateTimeStyle.includes('yyyy') && !_vm.dateTimeStyle.includes('MM'))?_c('DatePanel',{attrs:{"dateType":"year","value":_vm.date},on:{"getValue":_vm.getTime}}):_vm._e(),(_vm.dateTimeStyle.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.handleClose}},[_vm._v("取消")]),_c('el-button',{staticStyle:{"padding":"5px 13px"},attrs:{"size":"mini"},on:{"click":_vm.currentDateTime}},[_vm._v("此刻")]),_c('el-button',{staticStyle:{"padding":"5px 13px"},attrs:{"size":"mini","type":"primary"},on:{"click":_vm.sureDate}},[_vm._v("确定")])],1)],1):_vm._e()])}
@@ -9014,6 +9014,7 @@ var popper = __webpack_require__(14519);
       console.time("下拉选中时间");
       var text = '';
       var keyValue = '';
+      var value = '';
       var currentPoperNode = this.getCurrentPoperNode();
       var selected = this.isAllowMultiSelect && this.isCanSearch ? this.selectedList : this.poperSelectList.filter(function (v) {
         return v.selected;
@@ -9036,6 +9037,7 @@ var popper = __webpack_require__(14519);
             }
 
             keyValue += v.id + ',';
+            String(v.value) && (value += v.value + ',');
           } else {
             if (currentPoperNode.customProperty && currentPoperNode.customProperty.hasThirdData && v.value) {
               text += v.value;
@@ -9044,6 +9046,7 @@ var popper = __webpack_require__(14519);
             }
 
             keyValue += v.id;
+            String(v.value) && (value += v.value);
           }
         });
       }
@@ -9066,13 +9069,15 @@ var popper = __webpack_require__(14519);
           dataMetaIdentifier: node.dataMetaIdentifier,
           identifierFormat: node.identifierFormat,
           readType: node.readType,
-          mutexSelect: node.mutexSelect
+          mutexSelect: node.mutexSelect,
+          value: value
         };
-        hoEditorFactory.vueController.updateDownList(JSON.stringify(params), this.poperSelectList);
+        hoEditorFactory.vueController.updateDownList(params, this.poperSelectList);
       } else if (currentPoperNode instanceof TextInputFieldNode/* TextInputFieldNode */.re) {
         text = text.replace(/,/g, currentPoperNode.downListProperty.splitCharacter);
         currentPoperNode.text = text;
         currentPoperNode.keyValue = keyValue;
+        currentPoperNode.value = value;
         Object.keys(this.textParam).map(function (v) {
           _this8.textParam[v] = currentPoperNode[v];
         });
@@ -9130,10 +9135,10 @@ var popper = __webpack_require__(14519);
 });
 ;// CONCATENATED MODULE: ./src/components/controls/poperSelect/PoperSelect.vue?vue&type=script&lang=js&
  /* harmony default export */ var poperSelect_PoperSelectvue_type_script_lang_js_ = (PoperSelectvue_type_script_lang_js_); 
-;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-22[0].rules[0].use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22[0].rules[0].use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22[0].rules[0].use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22[0].rules[0].use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/poperSelect/PoperSelect.vue?vue&type=style&index=0&id=06bcec15&lang=scss&scoped=true&
+;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-22[0].rules[0].use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22[0].rules[0].use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22[0].rules[0].use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22[0].rules[0].use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/poperSelect/PoperSelect.vue?vue&type=style&index=0&id=6e3640a6&lang=scss&scoped=true&
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./src/components/controls/poperSelect/PoperSelect.vue?vue&type=style&index=0&id=06bcec15&lang=scss&scoped=true&
+;// CONCATENATED MODULE: ./src/components/controls/poperSelect/PoperSelect.vue?vue&type=style&index=0&id=6e3640a6&lang=scss&scoped=true&
 
 // EXTERNAL MODULE: ./node_modules/@vue/vue-loader-v15/lib/runtime/componentNormalizer.js
 var componentNormalizer = __webpack_require__(1001);
@@ -9152,7 +9157,7 @@ var component = (0,componentNormalizer/* default */.Z)(
   staticRenderFns,
   false,
   null,
-  "06bcec15",
+  "6e3640a6",
   null
   
 )
@@ -10349,7 +10354,7 @@ var component = (0,componentNormalizer/* default */.Z)(
 
 /***/ }),
 
-/***/ 54891:
+/***/ 89365:
 /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -10361,7 +10366,7 @@ __webpack_require__.d(__webpack_exports__, {
   "default": function() { return /* binding */ SelectDialog; }
 });
 
-;// 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/selectDialog/SelectDialog.vue?vue&type=template&id=cdeb6102&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/selectDialog/SelectDialog.vue?vue&type=template&id=7e0bbb0b&scoped=true&
 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"},[_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('span',{staticClass:"label"},[_vm._v("内部标识符")]),_c('el-input',{attrs:{"size":"mini","placeholder":"内部标识符"},model:{value:(_vm.innerIdentifier),callback:function ($$v) {_vm.innerIdentifier=$$v},expression:"innerIdentifier"}})],1),_c('li',{staticClass:"control-item"},[_c('span',{staticClass:"label"},[_vm._v("数据元标识符")]),_c('el-input',{attrs:{"size":"mini","placeholder":"数据元标识符"},model:{value:(_vm.dataMetaIdentifier),callback:function ($$v) {_vm.dataMetaIdentifier=$$v},expression:"dataMetaIdentifier"}})],1),_c('li',{staticClass:"control-item"},[_c('span',{staticClass:"label"},[_vm._v("表示格式")]),_c('el-input',{attrs:{"size":"mini","placeholder":"表示格式"},model:{value:(_vm.identifierFormat),callback:function ($$v) {_vm.identifierFormat=$$v},expression:"identifierFormat"}})],1),_c('li',{staticClass:"control-item"},[_c('span',{staticClass:"label"},[_vm._v("名称")]),_c('el-input',{attrs:{"size":"mini","placeholder":"名称"},model:{value:(_vm.name),callback:function ($$v) {_vm.name=$$v},expression:"name"}})],1),_c('li',{staticClass:"control-item"},[_c('span',{staticClass:"label"},[_vm._v("提示文本")]),_c('el-input',{attrs:{"size":"mini","placeholder":"提示文本"},model:{value:(_vm.tipText),callback:function ($$v) {_vm.tipText=$$v},expression:"tipText"}})],1),_c('li',{staticClass:"control-item"},[_c('div',{staticStyle:{"width":"20%"}},[_c('el-checkbox',{model:{value:(_vm.isReadOnly),callback:function ($$v) {_vm.isReadOnly=$$v},expression:"isReadOnly"}},[_vm._v("内容只读")])],1),_c('div',{staticStyle:{"width":"20%"}},[_c('el-checkbox',{model:{value:(_vm.isAllowDelete),callback:function ($$v) {_vm.isAllowDelete=$$v},expression:"isAllowDelete"}},[_vm._v("允许删除")])],1),_c('div',{staticStyle:{"width":"20%"}},[_c('el-checkbox',{on:{"change":_vm.allowMultiSelectChange},model:{value:(_vm.allowMultiSelect),callback:function ($$v) {_vm.allowMultiSelect=$$v},expression:"allowMultiSelect"}},[_vm._v("允许多选")])],1),_c('div',{staticStyle:{"width":"20%"}},[_c('el-checkbox',{model:{value:(_vm.readType),callback:function ($$v) {_vm.readType=$$v},expression:"readType"}},[_vm._v("自动回填")])],1),_c('div',{staticStyle:{"width":"20%"}},[_c('el-checkbox',{attrs:{"disabled":!_vm.allowMultiSelect},model:{value:(_vm.mutexSelect),callback:function ($$v) {_vm.mutexSelect=$$v},expression:"mutexSelect"}},[_vm._v("选项互斥")])],1)]),_c('li',{staticClass:"control-item"},[_c('el-table',{staticStyle:{"width":"100%"},attrs:{"data":_vm.downListContent,"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":"mini"},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":"mini"},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',{attrs:{"label":"类型","width":"70"},scopedSlots:_vm._u([{key:"default",fn:function(scope){return [_c('el-input',{attrs:{"size":"mini"},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.type),callback:function ($$v) {_vm.$set(scope.row, "type", $$v)},expression:"scope.row.type"}})]}}])}),_c('el-table-column',{scopedSlots:_vm._u([{key:"default",fn:function(scope){return [(scope.row.default)?_c('span',{staticClass:"tags"},[_vm._v("默认")]):_vm._e(),(scope.row.default)?_c('el-button',{attrs:{"size":"mini"},on:{"click":function($event){$event.stopPropagation();return _vm.cancelDefault(scope.row.id)}}},[_vm._v("取消")]):_vm._e(),(!scope.row.default && scope.row.text)?_c('el-button',{attrs:{"size":"mini"},on:{"click":function($event){$event.stopPropagation();return _vm.setDefault(scope.row.id)}}},[_vm._v("设为默认")]):_vm._e(),(scope.$index !== _vm.downListContent.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("删除")]):_vm._e()]}}])})],1)],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 = []
 
@@ -10392,8 +10397,6 @@ var web_dom_collections_for_each = __webpack_require__(54747);
 var es_array_splice = __webpack_require__(40561);
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.join.js
 var es_array_join = __webpack_require__(69600);
-// EXTERNAL MODULE: ./node_modules/core-js/modules/es.json.stringify.js
-var es_json_stringify = __webpack_require__(38862);
 // EXTERNAL MODULE: ./src/editor/dom/treeNode/DownListNode.ts
 var DownListNode = __webpack_require__(98390);
 // EXTERNAL MODULE: ./src/HOEditorFactorys.ts
@@ -10412,7 +10415,6 @@ var HOEditorFactorys = __webpack_require__(41005);
 
 
 
-
 //
 //
 //
@@ -10743,11 +10745,13 @@ var HOEditorFactorys = __webpack_require__(41005);
         }
       });
       var textArr = [];
-      var value = '';
+      var keyValue = [];
+      var value = [];
       this.downListContent.forEach(function (v, index) {
         if (v.default) {
           textArr.push(v.text);
-          value += v.id + ',';
+          keyValue.push(v.id);
+          String(v.value) && value.push(v.value);
         }
       });
       this.text = textArr.join(',');
@@ -10764,7 +10768,8 @@ var HOEditorFactorys = __webpack_require__(41005);
         id: this.id,
         name: this.name,
         text: this.text,
-        keyValue: value,
+        keyValue: keyValue.join(","),
+        value: value.join(","),
         title: '下拉选择框',
         tipText: this.tipText,
         isAllowDelete: this.isAllowDelete,
@@ -10780,9 +10785,9 @@ var HOEditorFactorys = __webpack_require__(41005);
       params.readType ? params.readType = 1 : params.readType = 0;
 
       if (this.controlStatus === 'add') {
-        this.vueController.insertDownList('add', JSON.stringify(params), list);
+        this.vueController.insertDownList('add', params, list);
       } else if (this.controlStatus === 'update') {
-        this.vueController.updateDownList(JSON.stringify(params), list);
+        this.vueController.updateDownList(params, list);
       }
 
       this.$nextTick(function () {
@@ -10800,10 +10805,10 @@ var HOEditorFactorys = __webpack_require__(41005);
 });
 ;// CONCATENATED MODULE: ./src/components/controls/selectDialog/SelectDialog.vue?vue&type=script&lang=js&
  /* harmony default export */ var selectDialog_SelectDialogvue_type_script_lang_js_ = (SelectDialogvue_type_script_lang_js_); 
-;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-22[0].rules[0].use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22[0].rules[0].use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22[0].rules[0].use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22[0].rules[0].use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/selectDialog/SelectDialog.vue?vue&type=style&index=0&id=cdeb6102&lang=scss&scoped=true&
+;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-22[0].rules[0].use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22[0].rules[0].use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22[0].rules[0].use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22[0].rules[0].use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/selectDialog/SelectDialog.vue?vue&type=style&index=0&id=7e0bbb0b&lang=scss&scoped=true&
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./src/components/controls/selectDialog/SelectDialog.vue?vue&type=style&index=0&id=cdeb6102&lang=scss&scoped=true&
+;// CONCATENATED MODULE: ./src/components/controls/selectDialog/SelectDialog.vue?vue&type=style&index=0&id=7e0bbb0b&lang=scss&scoped=true&
 
 // EXTERNAL MODULE: ./node_modules/@vue/vue-loader-v15/lib/runtime/componentNormalizer.js
 var componentNormalizer = __webpack_require__(1001);
@@ -10822,7 +10827,7 @@ var component = (0,componentNormalizer/* default */.Z)(
   staticRenderFns,
   false,
   null,
-  "cdeb6102",
+  "7e0bbb0b",
   null
   
 )
@@ -10831,7 +10836,7 @@ var component = (0,componentNormalizer/* default */.Z)(
 
 /***/ }),
 
-/***/ 37542:
+/***/ 28663:
 /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -10843,7 +10848,7 @@ __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=49377b0d&
+;// 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=f7d15210&
 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 = []
 
@@ -11010,6 +11015,7 @@ var SignNode = __webpack_require__(34450);
       default: ''
     }
   },
+  inject: ['getCustomProperty'],
   data: function data() {
     return {
       height: 20,
@@ -29298,6 +29304,13 @@ var DocController = /*#__PURE__*/function () {
       var startPath = domRange.normalize().endPath;
       var pNode = hoEditorFactory.docTree.getParentNode(startPath);
       hoEditorFactory.undoService.begin();
+
+      if (domRange.npEnd.node instanceof _treeNode_TableFormula__WEBPACK_IMPORTED_MODULE_71__/* .TableFormula */ .N) {
+        var prePath = hoEditorFactory.docTree.getNodeLastPath(domRange.npEnd.node.previousLeaf());
+        hoEditorFactory.undoService.add(new _undoRedo_NodeDeleteUndoUnit__WEBPACK_IMPORTED_MODULE_37__/* .NodeDeleteUndoUnit */ .w(this._hoEditorFactoryID, domRange.npEnd.node, startPath, "update"));
+        startPath = prePath;
+      }
+
       var tableFormula = new _treeNode_TableFormula__WEBPACK_IMPORTED_MODULE_71__/* .TableFormula */ .N(this._hoEditorFactoryID, domRange.npStart.roots, pNode, _treeNode_BaseNode__WEBPACK_IMPORTED_MODULE_24__/* .NodeType.ntTableFormula */ .Jq.ntTableFormula, formulaStr, hoEditorFactory.docTree.curStyleIndex, isHideZero, formulaType);
       hoEditorFactory.undoService.add(new _undoRedo_NodeInsertUndoUnit__WEBPACK_IMPORTED_MODULE_25__/* .NodeInsertUndoUnit */ .R(this._hoEditorFactoryID, startPath, tableFormula));
       hoEditorFactory.undoService.commit();
@@ -31553,6 +31566,10 @@ var DocTree = /*#__PURE__*/function () {
   }, {
     key: "styleCompare",
     value: function styleCompare(newStyle) {
+      if (newStyle instanceof _domNode_TextStyle__WEBPACK_IMPORTED_MODULE_26__/* .TextStyle */ .pn && newStyle.font == "") {
+        newStyle.font = "宋体";
+      }
+
       var newStyleIndex = -1;
 
       if (newStyle instanceof _domNode_TextStyle__WEBPACK_IMPORTED_MODULE_26__/* .TextStyle */ .pn) {
@@ -34054,7 +34071,7 @@ var PageProperty = /*#__PURE__*/function () {
         this._fontSize = value;
         this.setDefaultStyle("text");
         var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_8__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
-        var defaultLineHeight = Math.round(hoEditorFactory.docTree.defaultCombineStyle.getFontHeightByFontSize(this.fontSize));
+        var defaultLineHeight = Math.round(hoEditorFactory.getFontHeightByFontSize(this.fontSize));
         hoEditorFactory.defaultLineHeight = defaultLineHeight;
       }
     }
@@ -35874,23 +35891,38 @@ var Paragraph = /*#__PURE__*/function () {
 /* harmony export */ });
 /* unused harmony export StyleType */
 /* harmony import */ var D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_classCallCheck_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(35671);
-/* harmony import */ var D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(22342);
-/* harmony import */ var core_js_modules_es_regexp_exec_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(74916);
-/* harmony import */ var core_js_modules_es_regexp_exec_js__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_regexp_exec_js__WEBPACK_IMPORTED_MODULE_1__);
-/* harmony import */ var core_js_modules_es_string_replace_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(15306);
-/* harmony import */ var core_js_modules_es_string_replace_js__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_string_replace_js__WEBPACK_IMPORTED_MODULE_2__);
-/* harmony import */ var core_js_modules_es_string_replace_all_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(68757);
-/* harmony import */ var core_js_modules_es_string_replace_all_js__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_string_replace_all_js__WEBPACK_IMPORTED_MODULE_3__);
-/* harmony import */ var core_js_modules_es_string_bold_js__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(50915);
-/* harmony import */ var core_js_modules_es_string_bold_js__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_string_bold_js__WEBPACK_IMPORTED_MODULE_4__);
-/* harmony import */ var core_js_modules_es_string_italics_js__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(58734);
-/* harmony import */ var core_js_modules_es_string_italics_js__WEBPACK_IMPORTED_MODULE_5___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_string_italics_js__WEBPACK_IMPORTED_MODULE_5__);
-/* harmony import */ var core_js_modules_es_object_assign_js__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(19601);
-/* harmony import */ var core_js_modules_es_object_assign_js__WEBPACK_IMPORTED_MODULE_6___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_object_assign_js__WEBPACK_IMPORTED_MODULE_6__);
-/* harmony import */ var core_js_modules_es_number_constructor_js__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(9653);
-/* harmony import */ var core_js_modules_es_number_constructor_js__WEBPACK_IMPORTED_MODULE_7___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_number_constructor_js__WEBPACK_IMPORTED_MODULE_7__);
-/* harmony import */ var _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(41005);
-/* harmony import */ var _UserHistory__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(70245);
+/* harmony import */ var D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(22342);
+/* harmony import */ var core_js_modules_es_array_iterator_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(66992);
+/* harmony import */ var core_js_modules_es_array_iterator_js__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_iterator_js__WEBPACK_IMPORTED_MODULE_1__);
+/* harmony import */ var core_js_modules_es_map_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(51532);
+/* harmony import */ var core_js_modules_es_map_js__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_map_js__WEBPACK_IMPORTED_MODULE_2__);
+/* harmony import */ var core_js_modules_es_object_to_string_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(41539);
+/* harmony import */ var core_js_modules_es_object_to_string_js__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_object_to_string_js__WEBPACK_IMPORTED_MODULE_3__);
+/* harmony import */ var core_js_modules_es_string_iterator_js__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(78783);
+/* harmony import */ var core_js_modules_es_string_iterator_js__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_string_iterator_js__WEBPACK_IMPORTED_MODULE_4__);
+/* harmony import */ var core_js_modules_web_dom_collections_iterator_js__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(33948);
+/* harmony import */ var core_js_modules_web_dom_collections_iterator_js__WEBPACK_IMPORTED_MODULE_5___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_web_dom_collections_iterator_js__WEBPACK_IMPORTED_MODULE_5__);
+/* harmony import */ var core_js_modules_es_regexp_exec_js__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(74916);
+/* harmony import */ var core_js_modules_es_regexp_exec_js__WEBPACK_IMPORTED_MODULE_6___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_regexp_exec_js__WEBPACK_IMPORTED_MODULE_6__);
+/* harmony import */ var core_js_modules_es_string_replace_js__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(15306);
+/* harmony import */ var core_js_modules_es_string_replace_js__WEBPACK_IMPORTED_MODULE_7___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_string_replace_js__WEBPACK_IMPORTED_MODULE_7__);
+/* harmony import */ var core_js_modules_es_string_replace_all_js__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(68757);
+/* harmony import */ var core_js_modules_es_string_replace_all_js__WEBPACK_IMPORTED_MODULE_8___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_string_replace_all_js__WEBPACK_IMPORTED_MODULE_8__);
+/* harmony import */ var core_js_modules_es_string_bold_js__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(50915);
+/* harmony import */ var core_js_modules_es_string_bold_js__WEBPACK_IMPORTED_MODULE_9___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_string_bold_js__WEBPACK_IMPORTED_MODULE_9__);
+/* harmony import */ var core_js_modules_es_string_italics_js__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(58734);
+/* harmony import */ var core_js_modules_es_string_italics_js__WEBPACK_IMPORTED_MODULE_10___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_string_italics_js__WEBPACK_IMPORTED_MODULE_10__);
+/* harmony import */ var core_js_modules_es_object_assign_js__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(19601);
+/* harmony import */ var core_js_modules_es_object_assign_js__WEBPACK_IMPORTED_MODULE_11___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_object_assign_js__WEBPACK_IMPORTED_MODULE_11__);
+/* harmony import */ var core_js_modules_es_number_constructor_js__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(9653);
+/* harmony import */ var core_js_modules_es_number_constructor_js__WEBPACK_IMPORTED_MODULE_12___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_number_constructor_js__WEBPACK_IMPORTED_MODULE_12__);
+/* harmony import */ var _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(41005);
+/* harmony import */ var _UserHistory__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(70245);
+
+
+
+
+
 
 
 
@@ -35923,9 +35955,11 @@ var CombineStyle = /*#__PURE__*/function () {
 
     this._hoEditorFactoryID = hoEditorFactoryID;
     CombineStyle.makeDefaultStyle(hoEditorFactoryID, this);
+    this._englishWidth = new Map();
+    this._chineseWidth = 0;
   }
 
-  (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_10__/* ["default"] */ .Z)(CombineStyle, [{
+  (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_15__/* ["default"] */ .Z)(CombineStyle, [{
     key: "size",
     get: function get() {
       return this._size;
@@ -36045,6 +36079,32 @@ var CombineStyle = /*#__PURE__*/function () {
         this._commentID = value;
       }
     }
+  }, {
+    key: "chineseWidth",
+    get: function get() {
+      return this._chineseWidth;
+    },
+    set: function set(val) {
+      if (val != this._chineseWidth) {
+        this._chineseWidth = val;
+      }
+    }
+  }, {
+    key: "getEnglishWidth",
+    value: function getEnglishWidth(val) {
+      var ret = this._englishWidth.get(val);
+
+      if (ret) {
+        return ret;
+      }
+
+      return 0;
+    }
+  }, {
+    key: "setEnglishWidth",
+    value: function setEnglishWidth(key, val) {
+      this._englishWidth.set(key, val);
+    }
   }, {
     key: "getStyleKey",
     value:
@@ -36052,7 +36112,7 @@ var CombineStyle = /*#__PURE__*/function () {
      * 组装DrawSimpleText()中的style参数
      */
     function getStyleKey() {
-      var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_8__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
+      var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_13__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
       var size = hoEditorFactory.unitConvert.fontPt2Pix(this._size); // let size=this._size;
 
       if (size) {
@@ -36095,7 +36155,7 @@ var CombineStyle = /*#__PURE__*/function () {
     key: "getFontHeightByFontSize",
     value: function getFontHeightByFontSize(fontSize) {
       var fontHeight = 0;
-      var hoeditfactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_8__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
+      var hoeditfactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_13__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
 
       if (fontSize === 5) {
         //如果字号是6像素  八号字体
@@ -36104,77 +36164,77 @@ var CombineStyle = /*#__PURE__*/function () {
 
       if (fontSize === 5.5) {
         //七号
-        fontHeight = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_8__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID).unitConvert.mmConversionPx(1.94, false);
+        fontHeight = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_13__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID).unitConvert.mmConversionPx(1.94, false);
       }
 
       if (fontSize === 6.5) {
         //小六
-        fontHeight = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_8__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID).unitConvert.mmConversionPx(2.29, false);
+        fontHeight = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_13__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID).unitConvert.mmConversionPx(2.29, false);
       }
 
       if (fontSize === 7.5) {
         //六号
-        fontHeight = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_8__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID).unitConvert.mmConversionPx(2.65, false);
+        fontHeight = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_13__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID).unitConvert.mmConversionPx(2.65, false);
       }
 
       if (fontSize === 9) {
         //小五
-        fontHeight = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_8__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID).unitConvert.mmConversionPx(3.18, false);
+        fontHeight = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_13__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID).unitConvert.mmConversionPx(3.18, false);
       }
 
       if (fontSize === 10.5 || fontSize === 10) {
         //五号
-        fontHeight = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_8__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID).unitConvert.mmConversionPx(3.70, false);
+        fontHeight = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_13__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID).unitConvert.mmConversionPx(3.70, false);
       }
 
       if (fontSize === 12) {
         //小四
-        fontHeight = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_8__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID).unitConvert.mmConversionPx(4.23, false);
+        fontHeight = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_13__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID).unitConvert.mmConversionPx(4.23, false);
       }
 
       if (fontSize === 14) {
         //四号
-        fontHeight = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_8__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID).unitConvert.mmConversionPx(4.94, false);
+        fontHeight = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_13__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID).unitConvert.mmConversionPx(4.94, false);
       }
 
       if (fontSize === 15) {
         //小三
-        fontHeight = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_8__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID).unitConvert.mmConversionPx(5.29, false);
+        fontHeight = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_13__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID).unitConvert.mmConversionPx(5.29, false);
       }
 
       if (fontSize === 16) {
         //三号
-        fontHeight = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_8__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID).unitConvert.mmConversionPx(5.64, false);
+        fontHeight = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_13__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID).unitConvert.mmConversionPx(5.64, false);
       }
 
       if (fontSize === 18) {
         //小二
-        fontHeight = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_8__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID).unitConvert.mmConversionPx(6.35, false);
+        fontHeight = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_13__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID).unitConvert.mmConversionPx(6.35, false);
       }
 
       if (fontSize === 22) {
         //二号
-        fontHeight = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_8__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID).unitConvert.mmConversionPx(7.76, false);
+        fontHeight = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_13__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID).unitConvert.mmConversionPx(7.76, false);
       }
 
       if (fontSize === 24) {
         //小一
-        fontHeight = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_8__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID).unitConvert.mmConversionPx(8.47, false);
+        fontHeight = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_13__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID).unitConvert.mmConversionPx(8.47, false);
       }
 
       if (fontSize === 26) {
         //一号
-        fontHeight = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_8__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID).unitConvert.mmConversionPx(9.17, false);
+        fontHeight = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_13__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID).unitConvert.mmConversionPx(9.17, false);
       }
 
       if (fontSize === 36) {
         //小初
-        fontHeight = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_8__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID).unitConvert.mmConversionPx(12.7, false);
+        fontHeight = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_13__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID).unitConvert.mmConversionPx(12.7, false);
       }
 
       if (fontSize === 42) {
         //初号
-        fontHeight = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_8__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID).unitConvert.mmConversionPx(14.82, false);
+        fontHeight = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_13__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID).unitConvert.mmConversionPx(14.82, false);
       }
 
       return fontHeight;
@@ -36188,7 +36248,7 @@ var CombineStyle = /*#__PURE__*/function () {
   }, {
     key: "makeDefaultStyle",
     value: function makeDefaultStyle(hoEditorFactoryID, ret) {
-      var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_8__/* .HOEditorFactorys.instance */ .b.instance().getFactory(hoEditorFactoryID);
+      var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_13__/* .HOEditorFactorys.instance */ .b.instance().getFactory(hoEditorFactoryID);
       ret._belongTo = StyleType.stAll;
       ret._font = hoEditorFactory.pageProperty.fontFormat;
       ret._size = hoEditorFactory.pageProperty.fontSize;
@@ -36232,7 +36292,7 @@ var TextStyle = /*#__PURE__*/function () {
   } // astyle: TextStyle
 
 
-  (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_10__/* ["default"] */ .Z)(TextStyle, [{
+  (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_15__/* ["default"] */ .Z)(TextStyle, [{
     key: "clone",
     value: function clone() {
       var obj3 = new TextStyle(this._hoEditorFactoryID); // = JSON.parse(JSON.stringify(astyle)) as TextStyle;
@@ -36254,7 +36314,7 @@ var TextStyle = /*#__PURE__*/function () {
   }, {
     key: "combineStyle",
     get: function get() {
-      return TextStyle.combineStyle(this._hoEditorFactoryID, this, _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_8__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID).docTree.defaultCombineStyle);
+      return TextStyle.combineStyle(this._hoEditorFactoryID, this, _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_13__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID).docTree.defaultCombineStyle);
     }
   }, {
     key: "copyProperty",
@@ -36398,7 +36458,7 @@ var TextStyle = /*#__PURE__*/function () {
      */
     function changeStyle(operateType, ext) {
       var newTextStyle = new TextStyle(this._hoEditorFactoryID);
-      var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_8__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
+      var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_13__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
       newTextStyle.copyProperty(this, newTextStyle); //先将新样式初始化为原来的样式
 
       if (operateType === "fontSizeEnlarge") {
@@ -36550,7 +36610,7 @@ var TextStyle = /*#__PURE__*/function () {
         }
       }
 
-      var newStyleIndex = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_8__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID).docTree.styleCompare(newTextStyle);
+      var newStyleIndex = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_13__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID).docTree.styleCompare(newTextStyle);
       return newStyleIndex;
     }
     /**
@@ -36588,7 +36648,7 @@ var TextStyle = /*#__PURE__*/function () {
 
       if (operateType === "reviewDelete") {
         newTextStyle.strikeout = true;
-        var newHistory = new _UserHistory__WEBPACK_IMPORTED_MODULE_9__/* .UserHistory */ .R(this._hoEditorFactoryID, _UserHistory__WEBPACK_IMPORTED_MODULE_9__/* .HistoryEditType.hetDelete */ .N.hetDelete);
+        var newHistory = new _UserHistory__WEBPACK_IMPORTED_MODULE_14__/* .UserHistory */ .R(this._hoEditorFactoryID, _UserHistory__WEBPACK_IMPORTED_MODULE_14__/* .HistoryEditType.hetDelete */ .N.hetDelete);
         var historyIndex = newHistory.userCompare();
         newTextStyle.deleterIndex = historyIndex;
       }
@@ -36597,7 +36657,7 @@ var TextStyle = /*#__PURE__*/function () {
 
       if (operateType === "formatPainter") {
         newStyleIndex = Number(changeValue);
-      } else newStyleIndex = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_8__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID).docTree.styleCompare(newTextStyle);
+      } else newStyleIndex = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_13__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID).docTree.styleCompare(newTextStyle);
 
       return newStyleIndex;
     }
@@ -36610,7 +36670,7 @@ var TextStyle = /*#__PURE__*/function () {
   }, {
     key: "getBiggerfontSize",
     value: function getBiggerfontSize(size) {
-      var biggerSize = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_8__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID).docTree.defaultCombineStyle.size;
+      var biggerSize = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_13__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID).docTree.defaultCombineStyle.size;
 
       if (size === 5) {
         biggerSize = 5.5;
@@ -36683,7 +36743,7 @@ var TextStyle = /*#__PURE__*/function () {
   }, {
     key: "getSmallerfontSize",
     value: function getSmallerfontSize(size) {
-      var smallerSize = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_8__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID).docTree.defaultCombineStyle.size;
+      var smallerSize = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_13__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID).docTree.defaultCombineStyle.size;
 
       if (size === 42) {
         smallerSize = 36;
@@ -39933,7 +39993,7 @@ var ControlNode = /*#__PURE__*/function (_BaseNode) {
 /* harmony export */ });
 /* harmony import */ var D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_typeof_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(58913);
 /* harmony import */ var D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_classCallCheck_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(35671);
-/* harmony import */ var D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_23__ = __webpack_require__(22342);
+/* harmony import */ var D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_24__ = __webpack_require__(22342);
 /* harmony import */ var D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_inherits_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(99640);
 /* harmony import */ var D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createSuper_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(28214);
 /* harmony import */ var core_js_modules_es_function_name_js__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(68309);
@@ -39965,6 +40025,8 @@ var ControlNode = /*#__PURE__*/function (_BaseNode) {
 /* harmony import */ var _BaseNode__WEBPACK_IMPORTED_MODULE_20__ = __webpack_require__(50369);
 /* harmony import */ var _ControlNode__WEBPACK_IMPORTED_MODULE_21__ = __webpack_require__(8395);
 /* harmony import */ var _plugins_util__WEBPACK_IMPORTED_MODULE_22__ = __webpack_require__(33913);
+/* harmony import */ var _TextInputFieldNode__WEBPACK_IMPORTED_MODULE_23__ = __webpack_require__(34565);
+
 
 
 
@@ -40066,7 +40128,7 @@ var DateTimeNode = /*#__PURE__*/function (_ControlNode) {
     return _this;
   }
 
-  (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_23__/* ["default"] */ .Z)(DateTimeNode, [{
+  (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_24__/* ["default"] */ .Z)(DateTimeNode, [{
     key: "setValuesObject",
     value: function setValuesObject(valuesObject) {
       var valuesObj = eval("(" + valuesObject + ")");
@@ -40163,7 +40225,7 @@ var DateTimeNode = /*#__PURE__*/function (_ControlNode) {
         cbStyle.color = "#838586";
       }
 
-      var dHeight = cbStyle.getFontHeightByFontSize(cbStyle.size);
+      var dHeight = hoEditorFactory.getFontHeightByFontSize(cbStyle.size);
       var dNode = new _editor_draw_drawNode_DrawDateTime__WEBPACK_IMPORTED_MODULE_14__/* .DrawDateTime */ .L(this._hoEditorFactoryID, this._rootPath, this, dHeight, cbStyle);
 
       this._drawNodes.push(dNode);
@@ -40241,13 +40303,42 @@ var DateTimeNode = /*#__PURE__*/function (_ControlNode) {
   }, {
     key: "node2Json",
     value: function node2Json(range, isCopy, type, isClearValue) {
-      var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_18__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
+      if (isCopy) {
+        return {
+          nodeType: _BaseNode__WEBPACK_IMPORTED_MODULE_20__/* .NodeType */ .Jq[_BaseNode__WEBPACK_IMPORTED_MODULE_20__/* .NodeType.ntControl */ .Jq.ntControl],
+          type: "ctDateTime",
+          id: this.id,
+          dataId: this.dataId,
+          innerIdentifier: this.innerIdentifier,
+          dataMetaIdentifier: this.dataMetaIdentifier,
+          identifierFormat: this.identifierFormat,
+          isSynchro: this.isSynchro,
+          controlStyle: this.controlStyle.replace("hh", "HH"),
+          name: this.name,
+          text: isClearValue || this.text === this.name ? "" : this.text,
+          labelText: this.labelText,
+          title: this.title,
+          styleIndex: this.styleIndex,
+          tipText: this.tipText,
+          isAllowDelete: this.isAllowDelete,
+          isReadOnly: this.isReadOnly,
+          readType: this.readType,
+          customProperty: this.customProperty,
+          remark: this.remark
+        };
+      }
+
+      var parentid = "";
+
+      if (this.parentNode && this.parentNode instanceof _TextInputFieldNode__WEBPACK_IMPORTED_MODULE_23__/* .TextInputFieldNode */ .re) {
+        parentid = this.parentNode.id;
+      }
+
       var retObj = {
         nodeType: _BaseNode__WEBPACK_IMPORTED_MODULE_20__/* .NodeType */ .Jq[_BaseNode__WEBPACK_IMPORTED_MODULE_20__/* .NodeType.ntControl */ .Jq.ntControl],
         type: "ctDateTime",
-        //id: type === "copy" ? hoEditorFactory.gernerateCode.generateID("DT") : this.id,
         id: this.id,
-        //dataId: type === "copy" ? hoEditorFactory.gernerateCode.generateID("DateTime") : this.dataId,
+        parentId: parentid,
         dataId: this.dataId,
         innerIdentifier: this.innerIdentifier,
         dataMetaIdentifier: this.dataMetaIdentifier,
@@ -40266,11 +40357,6 @@ var DateTimeNode = /*#__PURE__*/function (_ControlNode) {
         customProperty: this.customProperty,
         remark: this.remark
       };
-
-      if (isCopy) {
-        return retObj;
-      }
-
       var paga = {
         "DateTimeNode": retObj
       };
@@ -40330,7 +40416,7 @@ var DateTimeNode = /*#__PURE__*/function (_ControlNode) {
 /* harmony import */ var D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_inherits_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(99640);
 /* harmony import */ var D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createSuper_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(28214);
 /* harmony import */ var D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_classCallCheck_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(35671);
-/* harmony import */ var D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_22__ = __webpack_require__(22342);
+/* harmony import */ var D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_25__ = __webpack_require__(22342);
 /* harmony import */ var core_js_modules_es_function_name_js__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(68309);
 /* harmony import */ var core_js_modules_es_function_name_js__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_function_name_js__WEBPACK_IMPORTED_MODULE_4__);
 /* harmony import */ var core_js_modules_es_object_to_string_js__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(41539);
@@ -40349,16 +40435,24 @@ var DateTimeNode = /*#__PURE__*/function (_ControlNode) {
 /* harmony import */ var core_js_modules_es_regexp_exec_js__WEBPACK_IMPORTED_MODULE_11___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_regexp_exec_js__WEBPACK_IMPORTED_MODULE_11__);
 /* harmony import */ var core_js_modules_es_string_split_js__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(23123);
 /* harmony import */ var core_js_modules_es_string_split_js__WEBPACK_IMPORTED_MODULE_12___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_string_split_js__WEBPACK_IMPORTED_MODULE_12__);
-/* harmony import */ var core_js_modules_es_json_stringify_js__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(38862);
-/* harmony import */ var core_js_modules_es_json_stringify_js__WEBPACK_IMPORTED_MODULE_13___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_json_stringify_js__WEBPACK_IMPORTED_MODULE_13__);
-/* harmony import */ var _editor_draw_drawNode_DrawDownListNode__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(63756);
-/* harmony import */ var _editor_draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(24093);
-/* harmony import */ var _editor_draw_SelectRange__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(1470);
-/* harmony import */ var _editor_events_NodeChangeEvent__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(34534);
-/* harmony import */ var _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(41005);
-/* harmony import */ var _DocTree__WEBPACK_IMPORTED_MODULE_19__ = __webpack_require__(23375);
-/* harmony import */ var _BaseNode__WEBPACK_IMPORTED_MODULE_20__ = __webpack_require__(50369);
-/* harmony import */ var _ControlNode__WEBPACK_IMPORTED_MODULE_21__ = __webpack_require__(8395);
+/* harmony import */ var core_js_modules_es_array_includes_js__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(26699);
+/* harmony import */ var core_js_modules_es_array_includes_js__WEBPACK_IMPORTED_MODULE_13___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_includes_js__WEBPACK_IMPORTED_MODULE_13__);
+/* harmony import */ var core_js_modules_es_string_includes_js__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(32023);
+/* harmony import */ var core_js_modules_es_string_includes_js__WEBPACK_IMPORTED_MODULE_14___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_string_includes_js__WEBPACK_IMPORTED_MODULE_14__);
+/* harmony import */ var core_js_modules_es_array_join_js__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(69600);
+/* harmony import */ var core_js_modules_es_array_join_js__WEBPACK_IMPORTED_MODULE_15___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_join_js__WEBPACK_IMPORTED_MODULE_15__);
+/* harmony import */ var _editor_draw_drawNode_DrawDownListNode__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(63756);
+/* harmony import */ var _editor_draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(24093);
+/* harmony import */ var _editor_draw_SelectRange__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(1470);
+/* harmony import */ var _editor_events_NodeChangeEvent__WEBPACK_IMPORTED_MODULE_19__ = __webpack_require__(34534);
+/* harmony import */ var _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_20__ = __webpack_require__(41005);
+/* harmony import */ var _DocTree__WEBPACK_IMPORTED_MODULE_21__ = __webpack_require__(23375);
+/* harmony import */ var _BaseNode__WEBPACK_IMPORTED_MODULE_22__ = __webpack_require__(50369);
+/* harmony import */ var _ControlNode__WEBPACK_IMPORTED_MODULE_23__ = __webpack_require__(8395);
+/* harmony import */ var _TextInputFieldNode__WEBPACK_IMPORTED_MODULE_24__ = __webpack_require__(34565);
+
+
+
 
 
 
@@ -40410,7 +40504,7 @@ var BandDataSource = /*#__PURE__*/function () {
     this.execState = ""; //执行状态
   }
 
-  (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_22__/* ["default"] */ .Z)(BandDataSource, [{
+  (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_25__/* ["default"] */ .Z)(BandDataSource, [{
     key: "DataSourceEnabled",
     get: function get() {
       return this.dataSourceEnabled;
@@ -40499,7 +40593,7 @@ var DownListNodeInstance = /*#__PURE__*/function () {
     this.allowMultiSelect = false;
   }
 
-  (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_22__/* ["default"] */ .Z)(DownListNodeInstance, [{
+  (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_25__/* ["default"] */ .Z)(DownListNodeInstance, [{
     key: "Id",
     get: function get() {
       return this.id;
@@ -40626,6 +40720,8 @@ var DownListNode = /*#__PURE__*/function (_ControlNode) {
 
     _this._bandDataSource = new BandDataSource();
     _this._charSpace = 0;
+    _this._value = ""; //选中项的value值
+
     _this._styleIndex = styleIndex;
     _this.remark = "";
     _this._labelText = "请选择";
@@ -40635,7 +40731,7 @@ var DownListNode = /*#__PURE__*/function (_ControlNode) {
     //   this._id = valuesObj["id"];
     // }
 
-    _this._type = _ControlNode__WEBPACK_IMPORTED_MODULE_21__/* .ControlType.ctDownList */ .C.ctDownList; // if (valuesObj["name"] !== undefined) {
+    _this._type = _ControlNode__WEBPACK_IMPORTED_MODULE_23__/* .ControlType.ctDownList */ .C.ctDownList; // if (valuesObj["name"] !== undefined) {
     //   this._name = valuesObj["name"];
     // }
     // if (valuesObj["title"] !== undefined) {
@@ -40708,7 +40804,7 @@ var DownListNode = /*#__PURE__*/function (_ControlNode) {
     _this.setValuesObject(valuesObject);
 
     if (!_this.dataId) {
-      _this.dataId = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_18__/* .HOEditorFactorys.instance */ .b.instance().getFactory(hoEditorFactoryID).gernerateCode.generateID("DownList");
+      _this.dataId = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_20__/* .HOEditorFactorys.instance */ .b.instance().getFactory(hoEditorFactoryID).gernerateCode.generateID("DownList");
     }
 
     if (_this._text === "") {
@@ -40729,10 +40825,11 @@ var DownListNode = /*#__PURE__*/function (_ControlNode) {
     return _this;
   }
 
-  (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_22__/* ["default"] */ .Z)(DownListNode, [{
+  (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_25__/* ["default"] */ .Z)(DownListNode, [{
     key: "setValuesObject",
     value: function setValuesObject(valuesObject) {
-      var valuesObj = eval("(" + valuesObject + ")");
+      // const valuesObj = eval("(" + valuesObject + ")");
+      var valuesObj = valuesObject;
 
       var assignvalue = function assignvalue(target, source) {
         Object.keys(source).forEach(function (value) {
@@ -40798,6 +40895,16 @@ var DownListNode = /*#__PURE__*/function (_ControlNode) {
         this._keyValue = val;
       }
     }
+  }, {
+    key: "value",
+    get: function get() {
+      return this._value;
+    },
+    set: function set(val) {
+      if (this._value !== val) {
+        this._value = val;
+      }
+    }
   }, {
     key: "allowMultiSelect",
     get: function get() {
@@ -40866,12 +40973,12 @@ var DownListNode = /*#__PURE__*/function (_ControlNode) {
   }, {
     key: "setDownListText",
     value: function setDownListText(text) {
-      var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_18__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
+      var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_20__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
       var sPath = hoEditorFactory.docTree.getNodeLastPath(this.previousLeaf());
       var ePath = hoEditorFactory.docTree.getNodeLastPath(this);
-      var changeEvent = new _editor_events_NodeChangeEvent__WEBPACK_IMPORTED_MODULE_17__/* .NodeChangeEvent */ .G(this.hoEditorFactoryID, _DocTree__WEBPACK_IMPORTED_MODULE_19__/* .DocAction.daModifyStyle */ .gk.daModifyStyle, sPath, ePath);
+      var changeEvent = new _editor_events_NodeChangeEvent__WEBPACK_IMPORTED_MODULE_19__/* .NodeChangeEvent */ .G(this.hoEditorFactoryID, _DocTree__WEBPACK_IMPORTED_MODULE_21__/* .DocAction.daModifyStyle */ .gk.daModifyStyle, sPath, ePath);
       changeEvent.oldEndPath = ePath;
-      changeEvent.oldDrawLines = new _editor_draw_SelectRange__WEBPACK_IMPORTED_MODULE_16__/* .SelectRange */ .E(this.hoEditorFactoryID).getRangeDrawLines(sPath, ePath, true);
+      changeEvent.oldDrawLines = new _editor_draw_SelectRange__WEBPACK_IMPORTED_MODULE_18__/* .SelectRange */ .E(this.hoEditorFactoryID).getRangeDrawLines(sPath, ePath, true);
       this._text = text;
 
       if (this._text === "") {
@@ -40893,7 +41000,7 @@ var DownListNode = /*#__PURE__*/function (_ControlNode) {
     value: function node2DrawNodeRange(startIndex, endIndex) {
       // const cbStyle = HOEditorFactorys.instance().getFactory(this._hoEditorFactoryID).docTree.styles[this._styleIndex === -1 ? 0 : this._styleIndex]
       //   .combineStyle;
-      var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_18__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
+      var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_20__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
       var textStyle = hoEditorFactory.docTree.styles[this._styleIndex];
       var cbStyle;
 
@@ -40909,8 +41016,8 @@ var DownListNode = /*#__PURE__*/function (_ControlNode) {
         cbStyle.color = "#838586";
       }
 
-      var dHeight = cbStyle.getFontHeightByFontSize(cbStyle.size);
-      var dNode = new _editor_draw_drawNode_DrawDownListNode__WEBPACK_IMPORTED_MODULE_14__/* .DrawDownListNode */ .I(this._hoEditorFactoryID, this._rootPath, this, dHeight, cbStyle);
+      var dHeight = hoEditorFactory.getFontHeightByFontSize(cbStyle.size);
+      var dNode = new _editor_draw_drawNode_DrawDownListNode__WEBPACK_IMPORTED_MODULE_16__/* .DrawDownListNode */ .I(this._hoEditorFactoryID, this._rootPath, this, dHeight, cbStyle);
 
       this._drawNodes.push(dNode);
     }
@@ -40938,10 +41045,10 @@ var DownListNode = /*#__PURE__*/function (_ControlNode) {
         return dline;
       }
 
-      var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_18__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
+      var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_20__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
       var isDisPlay = true;
 
-      if (hoEditorFactory.drawTree.paintStatus === _editor_draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_15__/* .PaintState.psPreview */ .Dh.psPreview || hoEditorFactory.drawTree.paintStatus === _editor_draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_15__/* .PaintState.psPrint */ .Dh.psPrint) {
+      if (hoEditorFactory.drawTree.paintStatus === _editor_draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_17__/* .PaintState.psPreview */ .Dh.psPreview || hoEditorFactory.drawTree.paintStatus === _editor_draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_17__/* .PaintState.psPrint */ .Dh.psPrint) {
         isDisPlay = false;
       }
 
@@ -41034,13 +41141,48 @@ var DownListNode = /*#__PURE__*/function (_ControlNode) {
       var downLists = {
         item: this.downListContent
       };
-      var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_18__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
+
+      if (isCopy) {
+        return {
+          nodeType: _BaseNode__WEBPACK_IMPORTED_MODULE_22__/* .NodeType */ .Jq[_BaseNode__WEBPACK_IMPORTED_MODULE_22__/* .NodeType.ntControl */ .Jq.ntControl],
+          type: "ctDownList",
+          id: this.id,
+          dataId: this.dataId,
+          innerIdentifier: this.innerIdentifier,
+          dataMetaIdentifier: this.dataMetaIdentifier,
+          identifierFormat: this.identifierFormat,
+          isSynchro: this.isSynchro,
+          name: this.name,
+          text: this.keyValue == "" ? "" : this.text,
+          keyValue: this.keyValue,
+          value: this.value,
+          title: this.title,
+          styleIndex: this.styleIndex,
+          tipText: this.tipText,
+          labelText: this.labelText,
+          isAllowDelete: this.isAllowDelete,
+          isReadOnly: this.isReadOnly,
+          mutexSelect: this.mutexSelect,
+          allowMultiSelect: this.allowMultiSelect,
+          readType: this.readType,
+          downLists: downLists,
+          dataSource: this.bandDataSource,
+          remark: this.remark,
+          customProperty: this.customProperty
+        };
+      }
+
+      var parentid = "";
+
+      if (this.parentNode && this.parentNode instanceof _TextInputFieldNode__WEBPACK_IMPORTED_MODULE_24__/* .TextInputFieldNode */ .re) {
+        parentid = this.parentNode.id;
+      }
+
       var retObj = {
-        nodeType: _BaseNode__WEBPACK_IMPORTED_MODULE_20__/* .NodeType */ .Jq[_BaseNode__WEBPACK_IMPORTED_MODULE_20__/* .NodeType.ntControl */ .Jq.ntControl],
+        nodeType: _BaseNode__WEBPACK_IMPORTED_MODULE_22__/* .NodeType */ .Jq[_BaseNode__WEBPACK_IMPORTED_MODULE_22__/* .NodeType.ntControl */ .Jq.ntControl],
         type: "ctDownList",
-        //id: type === "copy" ? hoEditorFactory.gernerateCode.generateID("DL") : this.id,
         id: this.id,
-        //dataId: type === "copy" ? hoEditorFactory.gernerateCode.generateID("DownList") : this.dataId,
+        parentId: parentid,
         dataId: this.dataId,
         innerIdentifier: this.innerIdentifier,
         dataMetaIdentifier: this.dataMetaIdentifier,
@@ -41049,6 +41191,7 @@ var DownListNode = /*#__PURE__*/function (_ControlNode) {
         name: this.name,
         text: this.keyValue == "" ? "" : this.text,
         keyValue: this.keyValue,
+        value: this.value,
         title: this.title,
         styleIndex: this.styleIndex,
         tipText: this.tipText,
@@ -41063,11 +41206,6 @@ var DownListNode = /*#__PURE__*/function (_ControlNode) {
         remark: this.remark,
         customProperty: this.customProperty
       };
-
-      if (isCopy) {
-        return retObj;
-      }
-
       var paga = {
         "DownListNode": retObj
       };
@@ -41084,7 +41222,7 @@ var DownListNode = /*#__PURE__*/function (_ControlNode) {
       this.transType(json);
 
       if (isPaste) {
-        var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_18__/* .HOEditorFactorys.instance */ .b.instance().getFactory(hoEditorFactoryID);
+        var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_20__/* .HOEditorFactorys.instance */ .b.instance().getFactory(hoEditorFactoryID);
 
         if (hoEditorFactory.vueController.getNodeByDataID("all", json.dataId)) {
           //json.id = hoEditorFactory.gernerateCode.generateID("DL");
@@ -41096,21 +41234,28 @@ var DownListNode = /*#__PURE__*/function (_ControlNode) {
       json.isReadOnly = !json.isReadOnly ? false : json.isReadOnly;
       json.mutexSelect = !json.mutexSelect ? false : json.mutexSelect;
       json.allowMultiSelect = !json.allowMultiSelect ? false : json.allowMultiSelect;
-      json.type = parseInt(_ControlNode__WEBPACK_IMPORTED_MODULE_21__/* .ControlType */ .C[json.type]);
+      json.type = parseInt(_ControlNode__WEBPACK_IMPORTED_MODULE_23__/* .ControlType */ .C[json.type]);
       json.isSynchro = !json.isSynchro ? false : json.isSynchro;
       json.readType = json.readType ? Number(json.readType) : -1;
       var downListContent = [];
+      var value = [];
+      var text = json.text.split(",");
 
       for (var i = 0; i < json.downLists.item.length; i++) {
         downListContent.push(json.downLists.item[i]);
+
+        if (text.includes(json.downLists.item[i].text)) {
+          value.push(json.downLists.item[i].value);
+        }
       }
 
-      return new DownListNode(hoEditorFactoryID, rootNodes, pNode ? pNode : null, _BaseNode__WEBPACK_IMPORTED_MODULE_20__/* .NodeType.ntControl */ .Jq.ntControl, JSON.stringify(json), downListContent, Number(json.styleIndex));
+      json.value = value.join(",");
+      return new DownListNode(hoEditorFactoryID, rootNodes, pNode ? pNode : null, _BaseNode__WEBPACK_IMPORTED_MODULE_22__/* .NodeType.ntControl */ .Jq.ntControl, json, downListContent, Number(json.styleIndex));
     }
   }]);
 
   return DownListNode;
-}(_ControlNode__WEBPACK_IMPORTED_MODULE_21__/* .ControlNode */ .w);
+}(_ControlNode__WEBPACK_IMPORTED_MODULE_23__/* .ControlNode */ .w);
 
 /***/ }),
 
@@ -41267,7 +41412,7 @@ var FetalHeartMapNode = /*#__PURE__*/function (_MedicalExpressionNod) {
       //   cbStyle = hoEditorFactory.docTree.styles[0].combineStyle;
       // }
 
-      var dHeight = cbStyle.getFontHeightByFontSize(cbStyle.size);
+      var dHeight = hoEditorFactory.getFontHeightByFontSize(cbStyle.size);
       var bIsInsert = startIndex < 0;
       var arrValues = [this._value1, this._value2, this._value3, this._value4, this._value5, this._value6];
       var dNode = new _editor_draw_drawNode_DrawMedicalExpression__WEBPACK_IMPORTED_MODULE_6__/* .DrawMedicalExpression */ .T(this._hoEditorFactoryID, this._rootPath, this, 0, "fetalHeart", arrValues, cbStyle, dHeight * 3, 80);
@@ -41492,7 +41637,7 @@ var GestationNode = /*#__PURE__*/function (_ControlNode) {
 
       this.dStyleKey = cbStyle.getStyleKey();
       this.dColor = cbStyle.color;
-      this.dHeight = cbStyle.getFontHeightByFontSize(cbStyle.size);
+      this.dHeight = hoEditorFactory.getFontHeightByFontSize(cbStyle.size);
       this.dCombineStyle = cbStyle;
     } //根据可放置的宽度，将普通组件转换成绘制组件
 
@@ -42097,7 +42242,7 @@ var LabelNode = /*#__PURE__*/function (_ControlNode) {
         this.styleIndex = 0;
       }
 
-      var dHeight = cbStyle.getFontHeightByFontSize(cbStyle.size);
+      var dHeight = hoEditorFactory.getFontHeightByFontSize(cbStyle.size);
       var dNode = new _editor_draw_drawNode_DrawDownListNode__WEBPACK_IMPORTED_MODULE_6__/* .DrawDownListNode */ .I(this._hoEditorFactoryID, this._rootPath, this, dHeight, cbStyle);
 
       this._drawNodes.push(dNode);
@@ -42379,7 +42524,7 @@ var LightLocationMapNode = /*#__PURE__*/function (_MedicalExpressionNod) {
       //   cbStyle = hoEditorFactory.docTree.styles[0].combineStyle;
       // }
 
-      var dHeight = cbStyle.getFontHeightByFontSize(cbStyle.size);
+      var dHeight = hoEditorFactory.getFontHeightByFontSize(cbStyle.size);
       var bIsInsert = startIndex < 0;
       var arrValues = [this._value1, this._value2, this._value3, this._value4, this._value5, this._value6, this._value7, this._value8, this._value9];
       var dNode = new _editor_draw_drawNode_DrawMedicalExpression__WEBPACK_IMPORTED_MODULE_6__/* .DrawMedicalExpression */ .T(this._hoEditorFactoryID, this._rootPath, this, 0, "lightLocation", arrValues, cbStyle, dHeight * 3, 50);
@@ -42718,7 +42863,7 @@ var MarkNode = /*#__PURE__*/function (_BaseNode) {
 
       this._dStyleKey = cbStyle.getStyleKey();
       this._dColor = "#838586";
-      this._dHeight = cbStyle.getFontHeightByFontSize(cbStyle.size);
+      this._dHeight = hoEditorFactorys.getFontHeightByFontSize(cbStyle.size);
       this._dCombineStyle = cbStyle;
     }
   }, {
@@ -43275,7 +43420,7 @@ var MenstrualHistoryNode = /*#__PURE__*/function (_MedicalExpressionNod) {
       //   cbStyle = hoEditorFactory.docTree.styles[0].combineStyle;
       // }
 
-      var dHeight = cbStyle.getFontHeightByFontSize(cbStyle.size);
+      var dHeight = hoEditorFactory.getFontHeightByFontSize(cbStyle.size);
       var lineHight = dHeight;
 
       if (this._expressStyle === ExpressStyle.style1 || this._expressStyle === ExpressStyle.style3) {
@@ -44615,7 +44760,7 @@ var PermanentTeethMapNode = /*#__PURE__*/function (_MedicalExpressionNod) {
       //   cbStyle = hoEditorFactory.docTree.styles[0].combineStyle;
       // }
 
-      var dHeight = cbStyle.getFontHeightByFontSize(cbStyle.size);
+      var dHeight = hoEditorFactory.getFontHeightByFontSize(cbStyle.size);
       var bIsInsert = startIndex < 0;
       var arrValues = [this._topLeftSelected.join(","), this._topRightSelected.join(","), this._bottomLeftSelected.join(","), this._bottomRightSelected.join(",")];
       var dNode = new _editor_draw_drawNode_DrawMedicalExpression__WEBPACK_IMPORTED_MODULE_11__/* .DrawMedicalExpression */ .T(this._hoEditorFactoryID, this._rootPath, this, 0, "permanentTeeth", arrValues, cbStyle, dHeight * 2, 100);
@@ -44841,7 +44986,7 @@ var PrimaryTeethMapNode = /*#__PURE__*/function (_MedicalExpressionNod) {
       //   cbStyle = hoEditorFactory.docTree.styles[0].combineStyle;
       // }
 
-      var dHeight = cbStyle.getFontHeightByFontSize(cbStyle.size);
+      var dHeight = hoEditorFactory.getFontHeightByFontSize(cbStyle.size);
       var dWidth = 200;
       var bIsInsert = startIndex < 0;
       var arrValues = [this._topLeftSelected.join(","), this._topRightSelected.join(","), this._bottomLeftSelected.join(","), this._bottomRightSelected.join(",")];
@@ -45084,7 +45229,7 @@ var PupilMapNode = /*#__PURE__*/function (_MedicalExpressionNod) {
       //   cbStyle = hoEditorFactory.docTree.styles[0].combineStyle;
       // }
 
-      var dHeight = cbStyle.getFontHeightByFontSize(cbStyle.size);
+      var dHeight = hoEditorFactory.getFontHeightByFontSize(cbStyle.size);
       var bIsInsert = startIndex < 0;
       var arrValues = [this._value1, this._value2, this._value3, this._value4, this._value5, this._value6, this._value7];
       var dNode = new _editor_draw_drawNode_DrawMedicalExpression__WEBPACK_IMPORTED_MODULE_6__/* .DrawMedicalExpression */ .T(this._hoEditorFactoryID, this._rootPath, this, 0, "pupilMap", arrValues, cbStyle, dHeight * 3, 50);
@@ -45623,7 +45768,7 @@ var QrcodeNode = /*#__PURE__*/function (_BaseNode) {
 /* harmony import */ var D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_inherits_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(99640);
 /* harmony import */ var D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createSuper_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(28214);
 /* harmony import */ var D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_classCallCheck_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(35671);
-/* harmony import */ var D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(22342);
+/* harmony import */ var D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(22342);
 /* harmony import */ var core_js_modules_es_function_name_js__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(68309);
 /* harmony import */ var core_js_modules_es_function_name_js__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_function_name_js__WEBPACK_IMPORTED_MODULE_4__);
 /* harmony import */ var core_js_modules_es_object_to_string_js__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(41539);
@@ -45643,6 +45788,8 @@ var QrcodeNode = /*#__PURE__*/function (_BaseNode) {
 /* harmony import */ var _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(41005);
 /* harmony import */ var _BaseNode__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(50369);
 /* harmony import */ var _ControlNode__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(8395);
+/* harmony import */ var _TextInputFieldNode__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(34565);
+
 
 
 
@@ -45699,7 +45846,7 @@ var BandDataSource = /*#__PURE__*/function () {
     this.execState = ""; //执行状态
   }
 
-  (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_17__/* ["default"] */ .Z)(BandDataSource, [{
+  (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_18__/* ["default"] */ .Z)(BandDataSource, [{
     key: "DataSourceEnabled",
     get: function get() {
       return this.dataSourceEnabled;
@@ -45797,7 +45944,7 @@ var RadioAndCheckBoxInstance = /*#__PURE__*/function () {
     RadioAndCheckBoxInstance.makeDefaultValue(this);
   }
 
-  (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_17__/* ["default"] */ .Z)(RadioAndCheckBoxInstance, [{
+  (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_18__/* ["default"] */ .Z)(RadioAndCheckBoxInstance, [{
     key: "Id",
     get: function get() {
       return this.id;
@@ -46153,7 +46300,7 @@ var RadioAndCheckBoxNode = /*#__PURE__*/function (_ControlNode) {
     return _this;
   }
 
-  (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_17__/* ["default"] */ .Z)(RadioAndCheckBoxNode, [{
+  (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_18__/* ["default"] */ .Z)(RadioAndCheckBoxNode, [{
     key: "setValuesObject",
     value: function setValuesObject(valuesObject) {
       var valuesObj = eval("(" + valuesObject + ")");
@@ -46423,7 +46570,7 @@ var RadioAndCheckBoxNode = /*#__PURE__*/function (_ControlNode) {
         this.styleIndex = 0;
       }
 
-      var dHeight = cbStyle.getFontHeightByFontSize(cbStyle.size);
+      var dHeight = hoEditorFactory.getFontHeightByFontSize(cbStyle.size);
       var dNode = new _editor_draw_drawNode_DrawRadioAndCheckBox__WEBPACK_IMPORTED_MODULE_10__/* .DrawRadioAndCheckBox */ .e(this._hoEditorFactoryID, this._rootPath, this, 0, this.controlStyle, this.name, this.isSelected, this.boxAlign, this.numericValue, dHeight, cbStyle);
 
       this._drawNodes.push(dNode);
@@ -46509,17 +46656,51 @@ var RadioAndCheckBoxNode = /*#__PURE__*/function (_ControlNode) {
   }, {
     key: "node2Json",
     value: function node2Json(range, isCopy, type) {
-      var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_14__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
       var name = "";
       if (this.controlStyle === "RadioBox") name = "RB";
       if (this.controlStyle === "CheckBox") name = "CB";
+
+      if (isCopy) {
+        return {
+          nodeType: _BaseNode__WEBPACK_IMPORTED_MODULE_15__/* .NodeType */ .Jq[_BaseNode__WEBPACK_IMPORTED_MODULE_15__/* .NodeType.ntControl */ .Jq.ntControl],
+          type: "ctRadioAndCheckBox",
+          controlStyle: this.controlStyle,
+          id: this.id,
+          dataId: this.dataId,
+          name: this.name,
+          text: this.text,
+          title: this.title,
+          styleIndex: this.styleIndex,
+          checkCascadeObject: this.checkCascadeObject,
+          unCheckCascadeObject: this.unCheckCascadeObject,
+          tipText: this.tipText,
+          isAllowDelete: this.isAllowDelete,
+          groupName: this.groupName,
+          isSelected: this.isSelected,
+          boxAlign: this.boxAlign,
+          numericValue: this.numericValue,
+          additionalData: this.additionalData,
+          isTransToText: this.isTransToText,
+          isEditText: this.isEditText,
+          appendText: this.appendText,
+          readType: this.readType,
+          bandDataSource: this.bandDataSource,
+          remark: this.remark
+        };
+      }
+
+      var parentid = "";
+
+      if (this.parentNode && this.parentNode instanceof _TextInputFieldNode__WEBPACK_IMPORTED_MODULE_17__/* .TextInputFieldNode */ .re) {
+        parentid = this.parentNode.id;
+      }
+
       var retObj = {
         nodeType: _BaseNode__WEBPACK_IMPORTED_MODULE_15__/* .NodeType */ .Jq[_BaseNode__WEBPACK_IMPORTED_MODULE_15__/* .NodeType.ntControl */ .Jq.ntControl],
         type: "ctRadioAndCheckBox",
         controlStyle: this.controlStyle,
-        //id: type === "copy" ? hoEditorFactory.gernerateCode.generateID(name) : this.id,
         id: this.id,
-        //dataId: type === "copy" ? hoEditorFactory.gernerateCode.generateID(this.controlStyle) : this.dataId,
+        parentId: parentid,
         dataId: this.dataId,
         name: this.name,
         text: this.text,
@@ -46541,11 +46722,6 @@ var RadioAndCheckBoxNode = /*#__PURE__*/function (_ControlNode) {
         bandDataSource: this.bandDataSource,
         remark: this.remark
       };
-
-      if (isCopy) {
-        return retObj;
-      }
-
       var paga = {
         "RadioAndCheckBoxNode": retObj
       };
@@ -47502,7 +47678,7 @@ var SpecialCharsNode = /*#__PURE__*/function (_ControlNode) {
 
       this.dStyleKey = cbStyle.getStyleKey();
       this.dColor = cbStyle.color;
-      this.dHeight = cbStyle.getFontHeightByFontSize(cbStyle.size);
+      this.dHeight = hoEditorFactory.getFontHeightByFontSize(cbStyle.size);
       this.dCombineStyle = cbStyle;
     }
   }, {
@@ -47899,7 +48075,7 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
 
       this.dStyleKey = cbStyle.getStyleKey();
       this.dColor = cbStyle.color;
-      this.dHeight = cbStyle.getFontHeightByFontSize(cbStyle.size);
+      this.dHeight = hoEditorFactory.getFontHeightByFontSize(cbStyle.size);
       this.dCombineStyle = cbStyle;
     }
   }, {
@@ -51774,7 +51950,7 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
       for (var s = 0; s < cellNodes.length; s++) {
         var _node = cellNodes[s];
 
-        if (_node && JSON.stringify(_node) !== "{}") {
+        if (_node && _node.nodeType) {
           var _rowNo = parseInt(_node.rowNo);
 
           var colNo = parseInt(_node.colNo);
@@ -51883,7 +52059,7 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
 /* harmony import */ var D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_inherits_js__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(99640);
 /* harmony import */ var D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createSuper_js__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(28214);
 /* harmony import */ var D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_classCallCheck_js__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(35671);
-/* harmony import */ var D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_54__ = __webpack_require__(22342);
+/* harmony import */ var D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_55__ = __webpack_require__(22342);
 /* harmony import */ var core_js_modules_es_function_name_js__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(68309);
 /* harmony import */ var core_js_modules_es_function_name_js__WEBPACK_IMPORTED_MODULE_10___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_function_name_js__WEBPACK_IMPORTED_MODULE_10__);
 /* harmony import */ var core_js_modules_es_object_to_string_js__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(41539);
@@ -51896,53 +52072,56 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
 /* harmony import */ var core_js_modules_es_array_slice_js__WEBPACK_IMPORTED_MODULE_14___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_slice_js__WEBPACK_IMPORTED_MODULE_14__);
 /* harmony import */ var core_js_modules_es_json_stringify_js__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(38862);
 /* harmony import */ var core_js_modules_es_json_stringify_js__WEBPACK_IMPORTED_MODULE_15___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_json_stringify_js__WEBPACK_IMPORTED_MODULE_15__);
-/* harmony import */ var core_js_modules_es_array_includes_js__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(26699);
-/* harmony import */ var core_js_modules_es_array_includes_js__WEBPACK_IMPORTED_MODULE_16___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_includes_js__WEBPACK_IMPORTED_MODULE_16__);
-/* harmony import */ var core_js_modules_es_string_includes_js__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(32023);
-/* harmony import */ var core_js_modules_es_string_includes_js__WEBPACK_IMPORTED_MODULE_17___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_string_includes_js__WEBPACK_IMPORTED_MODULE_17__);
-/* harmony import */ var core_js_modules_es_array_splice_js__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(40561);
-/* harmony import */ var core_js_modules_es_array_splice_js__WEBPACK_IMPORTED_MODULE_18___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_splice_js__WEBPACK_IMPORTED_MODULE_18__);
-/* harmony import */ var core_js_modules_es_object_assign_js__WEBPACK_IMPORTED_MODULE_19__ = __webpack_require__(19601);
-/* harmony import */ var core_js_modules_es_object_assign_js__WEBPACK_IMPORTED_MODULE_19___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_object_assign_js__WEBPACK_IMPORTED_MODULE_19__);
-/* harmony import */ var core_js_modules_es_array_concat_js__WEBPACK_IMPORTED_MODULE_20__ = __webpack_require__(92222);
-/* harmony import */ var core_js_modules_es_array_concat_js__WEBPACK_IMPORTED_MODULE_20___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_concat_js__WEBPACK_IMPORTED_MODULE_20__);
-/* harmony import */ var core_js_modules_es_number_constructor_js__WEBPACK_IMPORTED_MODULE_21__ = __webpack_require__(9653);
-/* harmony import */ var core_js_modules_es_number_constructor_js__WEBPACK_IMPORTED_MODULE_21___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_number_constructor_js__WEBPACK_IMPORTED_MODULE_21__);
-/* harmony import */ var core_js_modules_es_error_cause_js__WEBPACK_IMPORTED_MODULE_22__ = __webpack_require__(21703);
-/* harmony import */ var core_js_modules_es_error_cause_js__WEBPACK_IMPORTED_MODULE_22___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_error_cause_js__WEBPACK_IMPORTED_MODULE_22__);
-/* harmony import */ var core_js_modules_es_regexp_exec_js__WEBPACK_IMPORTED_MODULE_23__ = __webpack_require__(74916);
-/* harmony import */ var core_js_modules_es_regexp_exec_js__WEBPACK_IMPORTED_MODULE_23___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_regexp_exec_js__WEBPACK_IMPORTED_MODULE_23__);
-/* harmony import */ var core_js_modules_es_string_split_js__WEBPACK_IMPORTED_MODULE_24__ = __webpack_require__(23123);
-/* harmony import */ var core_js_modules_es_string_split_js__WEBPACK_IMPORTED_MODULE_24___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_string_split_js__WEBPACK_IMPORTED_MODULE_24__);
-/* harmony import */ var _editor_draw_DrawLine__WEBPACK_IMPORTED_MODULE_25__ = __webpack_require__(94407);
-/* harmony import */ var _editor_draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_26__ = __webpack_require__(24093);
-/* harmony import */ var _editor_draw_SelectRange__WEBPACK_IMPORTED_MODULE_27__ = __webpack_require__(1470);
-/* harmony import */ var _editor_events_DmouseEvent__WEBPACK_IMPORTED_MODULE_28__ = __webpack_require__(94290);
-/* harmony import */ var _editor_events_Exception__WEBPACK_IMPORTED_MODULE_29__ = __webpack_require__(88702);
-/* harmony import */ var _editor_events_NodeChangeEvent__WEBPACK_IMPORTED_MODULE_30__ = __webpack_require__(34534);
-/* harmony import */ var _editor_undoRedo_NodeInsertUndoUnit__WEBPACK_IMPORTED_MODULE_31__ = __webpack_require__(12019);
-/* harmony import */ var _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_32__ = __webpack_require__(41005);
-/* harmony import */ var _DocTree__WEBPACK_IMPORTED_MODULE_33__ = __webpack_require__(23375);
-/* harmony import */ var _domNode_TextStyle__WEBPACK_IMPORTED_MODULE_34__ = __webpack_require__(74163);
-/* harmony import */ var _DomRange__WEBPACK_IMPORTED_MODULE_35__ = __webpack_require__(66828);
-/* harmony import */ var _NodePosition__WEBPACK_IMPORTED_MODULE_36__ = __webpack_require__(2242);
-/* harmony import */ var _BaseCombineNode__WEBPACK_IMPORTED_MODULE_37__ = __webpack_require__(8);
-/* harmony import */ var _BaseNode__WEBPACK_IMPORTED_MODULE_38__ = __webpack_require__(50369);
-/* harmony import */ var _ControlNode__WEBPACK_IMPORTED_MODULE_39__ = __webpack_require__(8395);
-/* harmony import */ var _DateTimeNode__WEBPACK_IMPORTED_MODULE_40__ = __webpack_require__(36395);
-/* harmony import */ var _FetalHeartMapNode__WEBPACK_IMPORTED_MODULE_41__ = __webpack_require__(50161);
-/* harmony import */ var _LightLocationMapNode__WEBPACK_IMPORTED_MODULE_42__ = __webpack_require__(84844);
-/* harmony import */ var _MarkNode__WEBPACK_IMPORTED_MODULE_43__ = __webpack_require__(15868);
-/* harmony import */ var _MedicalExpressionNode__WEBPACK_IMPORTED_MODULE_44__ = __webpack_require__(8623);
-/* harmony import */ var _MenstrualHistoryNode__WEBPACK_IMPORTED_MODULE_45__ = __webpack_require__(97724);
-/* harmony import */ var _ParagraphNode__WEBPACK_IMPORTED_MODULE_46__ = __webpack_require__(14208);
-/* harmony import */ var _PermanentTeethMapNode__WEBPACK_IMPORTED_MODULE_47__ = __webpack_require__(85028);
-/* harmony import */ var _PrimaryTeethMapNode__WEBPACK_IMPORTED_MODULE_48__ = __webpack_require__(91715);
-/* harmony import */ var _PupilMapNode__WEBPACK_IMPORTED_MODULE_49__ = __webpack_require__(43010);
-/* harmony import */ var _SignNode__WEBPACK_IMPORTED_MODULE_50__ = __webpack_require__(34450);
-/* harmony import */ var _TableFormula__WEBPACK_IMPORTED_MODULE_51__ = __webpack_require__(39869);
-/* harmony import */ var _TableNode__WEBPACK_IMPORTED_MODULE_52__ = __webpack_require__(95883);
-/* harmony import */ var _TextNode__WEBPACK_IMPORTED_MODULE_53__ = __webpack_require__(91538);
+/* harmony import */ var core_js_modules_es_regexp_exec_js__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(74916);
+/* harmony import */ var core_js_modules_es_regexp_exec_js__WEBPACK_IMPORTED_MODULE_16___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_regexp_exec_js__WEBPACK_IMPORTED_MODULE_16__);
+/* harmony import */ var core_js_modules_es_string_split_js__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(23123);
+/* harmony import */ var core_js_modules_es_string_split_js__WEBPACK_IMPORTED_MODULE_17___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_string_split_js__WEBPACK_IMPORTED_MODULE_17__);
+/* harmony import */ var core_js_modules_es_array_includes_js__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(26699);
+/* harmony import */ var core_js_modules_es_array_includes_js__WEBPACK_IMPORTED_MODULE_18___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_includes_js__WEBPACK_IMPORTED_MODULE_18__);
+/* harmony import */ var core_js_modules_es_string_includes_js__WEBPACK_IMPORTED_MODULE_19__ = __webpack_require__(32023);
+/* harmony import */ var core_js_modules_es_string_includes_js__WEBPACK_IMPORTED_MODULE_19___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_string_includes_js__WEBPACK_IMPORTED_MODULE_19__);
+/* harmony import */ var core_js_modules_es_array_join_js__WEBPACK_IMPORTED_MODULE_20__ = __webpack_require__(69600);
+/* harmony import */ var core_js_modules_es_array_join_js__WEBPACK_IMPORTED_MODULE_20___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_join_js__WEBPACK_IMPORTED_MODULE_20__);
+/* harmony import */ var core_js_modules_es_array_splice_js__WEBPACK_IMPORTED_MODULE_21__ = __webpack_require__(40561);
+/* harmony import */ var core_js_modules_es_array_splice_js__WEBPACK_IMPORTED_MODULE_21___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_splice_js__WEBPACK_IMPORTED_MODULE_21__);
+/* harmony import */ var core_js_modules_es_object_assign_js__WEBPACK_IMPORTED_MODULE_22__ = __webpack_require__(19601);
+/* harmony import */ var core_js_modules_es_object_assign_js__WEBPACK_IMPORTED_MODULE_22___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_object_assign_js__WEBPACK_IMPORTED_MODULE_22__);
+/* harmony import */ var core_js_modules_es_array_concat_js__WEBPACK_IMPORTED_MODULE_23__ = __webpack_require__(92222);
+/* harmony import */ var core_js_modules_es_array_concat_js__WEBPACK_IMPORTED_MODULE_23___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_concat_js__WEBPACK_IMPORTED_MODULE_23__);
+/* harmony import */ var core_js_modules_es_number_constructor_js__WEBPACK_IMPORTED_MODULE_24__ = __webpack_require__(9653);
+/* harmony import */ var core_js_modules_es_number_constructor_js__WEBPACK_IMPORTED_MODULE_24___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_number_constructor_js__WEBPACK_IMPORTED_MODULE_24__);
+/* harmony import */ var core_js_modules_es_error_cause_js__WEBPACK_IMPORTED_MODULE_25__ = __webpack_require__(21703);
+/* harmony import */ var core_js_modules_es_error_cause_js__WEBPACK_IMPORTED_MODULE_25___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_error_cause_js__WEBPACK_IMPORTED_MODULE_25__);
+/* harmony import */ var _editor_draw_DrawLine__WEBPACK_IMPORTED_MODULE_26__ = __webpack_require__(94407);
+/* harmony import */ var _editor_draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_27__ = __webpack_require__(24093);
+/* harmony import */ var _editor_draw_SelectRange__WEBPACK_IMPORTED_MODULE_28__ = __webpack_require__(1470);
+/* harmony import */ var _editor_events_DmouseEvent__WEBPACK_IMPORTED_MODULE_29__ = __webpack_require__(94290);
+/* harmony import */ var _editor_events_Exception__WEBPACK_IMPORTED_MODULE_30__ = __webpack_require__(88702);
+/* harmony import */ var _editor_events_NodeChangeEvent__WEBPACK_IMPORTED_MODULE_31__ = __webpack_require__(34534);
+/* harmony import */ var _editor_undoRedo_NodeInsertUndoUnit__WEBPACK_IMPORTED_MODULE_32__ = __webpack_require__(12019);
+/* harmony import */ var _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_33__ = __webpack_require__(41005);
+/* harmony import */ var _DocTree__WEBPACK_IMPORTED_MODULE_34__ = __webpack_require__(23375);
+/* harmony import */ var _domNode_TextStyle__WEBPACK_IMPORTED_MODULE_35__ = __webpack_require__(74163);
+/* harmony import */ var _DomRange__WEBPACK_IMPORTED_MODULE_36__ = __webpack_require__(66828);
+/* harmony import */ var _NodePosition__WEBPACK_IMPORTED_MODULE_37__ = __webpack_require__(2242);
+/* harmony import */ var _BaseCombineNode__WEBPACK_IMPORTED_MODULE_38__ = __webpack_require__(8);
+/* harmony import */ var _BaseNode__WEBPACK_IMPORTED_MODULE_39__ = __webpack_require__(50369);
+/* harmony import */ var _ControlNode__WEBPACK_IMPORTED_MODULE_40__ = __webpack_require__(8395);
+/* harmony import */ var _DateTimeNode__WEBPACK_IMPORTED_MODULE_41__ = __webpack_require__(36395);
+/* harmony import */ var _FetalHeartMapNode__WEBPACK_IMPORTED_MODULE_42__ = __webpack_require__(50161);
+/* harmony import */ var _LightLocationMapNode__WEBPACK_IMPORTED_MODULE_43__ = __webpack_require__(84844);
+/* harmony import */ var _MarkNode__WEBPACK_IMPORTED_MODULE_44__ = __webpack_require__(15868);
+/* harmony import */ var _MedicalExpressionNode__WEBPACK_IMPORTED_MODULE_45__ = __webpack_require__(8623);
+/* harmony import */ var _MenstrualHistoryNode__WEBPACK_IMPORTED_MODULE_46__ = __webpack_require__(97724);
+/* harmony import */ var _ParagraphNode__WEBPACK_IMPORTED_MODULE_47__ = __webpack_require__(14208);
+/* harmony import */ var _PermanentTeethMapNode__WEBPACK_IMPORTED_MODULE_48__ = __webpack_require__(85028);
+/* harmony import */ var _PrimaryTeethMapNode__WEBPACK_IMPORTED_MODULE_49__ = __webpack_require__(91715);
+/* harmony import */ var _PupilMapNode__WEBPACK_IMPORTED_MODULE_50__ = __webpack_require__(43010);
+/* harmony import */ var _SignNode__WEBPACK_IMPORTED_MODULE_51__ = __webpack_require__(34450);
+/* harmony import */ var _TableFormula__WEBPACK_IMPORTED_MODULE_52__ = __webpack_require__(39869);
+/* harmony import */ var _TableNode__WEBPACK_IMPORTED_MODULE_53__ = __webpack_require__(95883);
+/* harmony import */ var _TextNode__WEBPACK_IMPORTED_MODULE_54__ = __webpack_require__(91538);
+
 
 
 
@@ -51973,7 +52152,7 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
 /*
  * @Author: your name
  * @Date: 2020-11-03 15:17:54
- * @LastEditTime: 2022-09-29 15:51:21
+ * @LastEditTime: 2022-10-14 09:51:03
  * @LastEditors: liyanan 2441631434@qq.com
  * @Description: In User Settings Edit
  * @FilePath: \hoeditor-web\src\editor\dom\treeNode\TextInputFieldNode.ts
@@ -52063,7 +52242,7 @@ var DownListProperty = /*#__PURE__*/function () {
     DownListProperty.setDefaultImportStyle(this);
   }
 
-  (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_54__/* ["default"] */ .Z)(DownListProperty, [{
+  (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_55__/* ["default"] */ .Z)(DownListProperty, [{
     key: "allowMultiSelected",
     get: function get() {
       return this._allowMultiSelected;
@@ -52134,11 +52313,11 @@ var DownListProperty = /*#__PURE__*/function () {
     value: function setDefaultImportStyle(ret) {
       //ret._inputFieldType = InputFieldType.text;
       ret._allowMultiSelected = false;
-      ret._splitCharacter = ""; //ret._dynamicLoadList = false;
+      ret._splitCharacter = ''; //ret._dynamicLoadList = false;
       //ret._listContent = "";
 
-      ret._source = "";
-      ret._listItems = "";
+      ret._source = '';
+      ret._listItems = '';
       ret._mutexSelect = false; //ret._specialFormat = SpecialFormat.none;
 
       return ret;
@@ -52158,7 +52337,7 @@ var DataVerifyFormat = /*#__PURE__*/function () {
     DataVerifyFormat.setDefaultDataVerifyFormat(this);
   }
 
-  (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_54__/* ["default"] */ .Z)(DataVerifyFormat, [{
+  (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_55__/* ["default"] */ .Z)(DataVerifyFormat, [{
     key: "mustInputValue",
     get: function get() {
       return this._mustInputValue;
@@ -52266,7 +52445,7 @@ var BandDataSource = /*#__PURE__*/function () {
     BandDataSource.setDefaultBandDataSource(this);
   }
 
-  (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_54__/* ["default"] */ .Z)(BandDataSource, [{
+  (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_55__/* ["default"] */ .Z)(BandDataSource, [{
     key: "dataSourceEnabled",
     get: function get() {
       return this._dataSourceEnabled;
@@ -52340,9 +52519,9 @@ var BandDataSource = /*#__PURE__*/function () {
     key: "setDefaultBandDataSource",
     value: function setDefaultBandDataSource(ret) {
       ret._dataSourceEnabled = true;
-      ret._dataSource = "";
-      ret._format = "";
-      ret._visitPath = "";
+      ret._dataSource = '';
+      ret._format = '';
+      ret._visitPath = '';
       ret._isReadOnly = false;
       ret._autoUpdate = false;
       ret._executeStatus = ExecuteStatus.AlwaysExec;
@@ -52365,12 +52544,12 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
     _this = _super.call(this, hoEditorFactoryID, rootNodes, pNode, nodeType);
     _this._isSynchro = false; //是否同步
 
-    _this._labelText = "请输入"; //格式化后的显示
+    _this._labelText = '请输入'; //格式化后的显示
 
-    _this._text = "";
-    _this._name = ""; //名称
+    _this._text = '';
+    _this._name = ''; //名称
 
-    _this._tipText = ""; //提示文本
+    _this._tipText = ''; //提示文本
 
     _this._readOnlyStatus = ReadOnlyStatus.false; //内容只读状态
 
@@ -52382,12 +52561,14 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
 
     _this._enableGlobalColor = true; //启用全局文本颜色
 
-    _this._defaultValue = ""; //默认值
+    _this._defaultValue = ''; //默认值
 
     _this._alignWithBlocked = false;
     _this._readType = -1; //保存类型
 
-    _this._keyValue = ""; //选中项的key值
+    _this._keyValue = ''; //选中项的key值
+
+    _this._value = ''; //选中项的value值
 
     _this._childNodes2 = []; //this._importStyle = new ImportStyle();
 
@@ -52454,22 +52635,22 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
 
     _this.setValuesObject(valuesObject);
 
-    if (_this.labelText === "") {
-      if (_this.text === "" && _this.name !== "") {
+    if (_this.labelText === '') {
+      if (_this.text === '' && _this.name !== '') {
         _this.labelText = _this.name;
       } else {
         if (_this.inputFieldType === InputFieldType.dropDownList) {
-          _this.labelText = "请选择";
+          _this.labelText = '请选择';
         }
 
         if (_this.inputFieldType === InputFieldType.text) {
-          _this.labelText = "请输入";
+          _this.labelText = '请输入';
         }
       }
     }
 
     if (!_this._dataId) {
-      _this._dataId = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_32__/* .HOEditorFactorys.instance */ .b.instance().getFactory(hoEditorFactoryID).gernerateCode.generateID("Field");
+      _this._dataId = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_33__/* .HOEditorFactorys.instance */ .b.instance().getFactory(hoEditorFactoryID).gernerateCode.generateID('Field');
     } // const serialID = valuesObj["serialID"];
     // let name = "";
     // let readOnlyStatus = ReadOnlyStatus.false;
@@ -52540,7 +52721,7 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
    */
 
 
-  (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_54__/* ["default"] */ .Z)(TextInputFieldNode, [{
+  (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_55__/* ["default"] */ .Z)(TextInputFieldNode, [{
     key: "alignWithBlocked",
     get: function get() {
       return this._alignWithBlocked;
@@ -52566,12 +52747,12 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
 
       var assignvalue = function assignvalue(target, source) {
         Object.keys(source).forEach(function (value) {
-          if ((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_typeof_js__WEBPACK_IMPORTED_MODULE_4__/* ["default"] */ .Z)(target[value]) == "object") {
-            if (Object.prototype.toString.call(source[value]) === "[object Object]") {
+          if ((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_typeof_js__WEBPACK_IMPORTED_MODULE_4__/* ["default"] */ .Z)(target[value]) == 'object') {
+            if (Object.prototype.toString.call(source[value]) === '[object Object]') {
               assignvalue(target[value], source[value]);
             } else {
-              if (source[value] !== "" && source[value] !== null) {
-                assignvalue(target[value], eval("(" + source[value] + ")"));
+              if (source[value] !== '' && source[value] !== null) {
+                assignvalue(target[value], eval('(' + source[value] + ')'));
               }
             }
           } else {
@@ -52585,8 +52766,8 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
   }, {
     key: "mouseEvent",
     value: function mouseEvent(event) {
-      if (event.type == _editor_events_DmouseEvent__WEBPACK_IMPORTED_MODULE_28__/* .DmouseEventType.detOver */ .p.detOver) this.activity(true);
-      if (event.type == _editor_events_DmouseEvent__WEBPACK_IMPORTED_MODULE_28__/* .DmouseEventType.detOut */ .p.detOut) this.activity(false);
+      if (event.type == _editor_events_DmouseEvent__WEBPACK_IMPORTED_MODULE_29__/* .DmouseEventType.detOver */ .p.detOver) this.activity(true);
+      if (event.type == _editor_events_DmouseEvent__WEBPACK_IMPORTED_MODULE_29__/* .DmouseEventType.detOut */ .p.detOut) this.activity(false);
     } // public activity(active: boolean) {
     //   if (active) {
     //     if (this.StartMarkNode.alpha != 1) {
@@ -52685,7 +52866,7 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
       if (this._labelText !== value) {
         this._labelText = value;
 
-        if (this.text === "") {
+        if (this.text === '') {
           this.node2DrawNodeRange(0, 0);
         }
       }
@@ -52856,10 +53037,20 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
         this._keyValue = val;
       }
     }
+  }, {
+    key: "value",
+    get: function get() {
+      return this._value;
+    },
+    set: function set(val) {
+      if (this._value !== val) {
+        this._value = val;
+      }
+    }
   }, {
     key: "generateInnerCode",
     value: function generateInnerCode() {
-      return "";
+      return '';
     }
     /**
      * 获取提示文本的节点
@@ -52886,15 +53077,15 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
     value: function update(mode) {
       var _this2 = this;
 
-      var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_32__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
+      var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_33__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
       /**
        * 内容为空，显示一个点位符
        */
 
       var ph = 0;
       var needPaint = false;
-      var startPath = "";
-      var endPath = "";
+      var startPath = '';
+      var endPath = '';
       var first = this.StartMarkNode;
       var last = this.EndMarkNode;
       /**
@@ -52912,9 +53103,9 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
                 case 0:
                   //由于在表格在放置输入域后会在绘制时触发输入域重绘，此时表格还未放置于舞台，造成报错，故暂时禁用此函数
                   //熊跃龙  2021-03-19
-                  changeEvent = new _editor_events_NodeChangeEvent__WEBPACK_IMPORTED_MODULE_30__/* .NodeChangeEvent */ .G(_this2.hoEditorFactoryID, _DocTree__WEBPACK_IMPORTED_MODULE_33__/* .DocAction.daModifyStyle */ .gk.daModifyStyle, path1 || startPath, path2 || endPath);
+                  changeEvent = new _editor_events_NodeChangeEvent__WEBPACK_IMPORTED_MODULE_31__/* .NodeChangeEvent */ .G(_this2.hoEditorFactoryID, _DocTree__WEBPACK_IMPORTED_MODULE_34__/* .DocAction.daModifyStyle */ .gk.daModifyStyle, path1 || startPath, path2 || endPath);
                   changeEvent.oldEndPath = path2 || endPath;
-                  changeEvent.oldDrawLines = new _editor_draw_SelectRange__WEBPACK_IMPORTED_MODULE_27__/* .SelectRange */ .E(_this2.hoEditorFactoryID).getRangeDrawLines(path1 || startPath, path2 || endPath, true);
+                  changeEvent.oldDrawLines = new _editor_draw_SelectRange__WEBPACK_IMPORTED_MODULE_28__/* .SelectRange */ .E(_this2.hoEditorFactoryID).getRangeDrawLines(path1 || startPath, path2 || endPath, true);
                   _context.next = 5;
                   return hoEditorFactory.docTree.change(changeEvent);
 
@@ -52938,11 +53129,11 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
 
       if (mode == 0) {
         var prev = first.previousLeaf();
-        if (!prev) throw _editor_events_Exception__WEBPACK_IMPORTED_MODULE_29__/* .Exception.NodeNotFound */ .P.NodeNotFound();
+        if (!prev) throw _editor_events_Exception__WEBPACK_IMPORTED_MODULE_30__/* .Exception.NodeNotFound */ .P.NodeNotFound();
         refresh(hoEditorFactory.docTree.getNodeLastPath(prev), hoEditorFactory.docTree.getNodeLastPath(last));
         setTimeout(function () {
           prev = first.previousLeaf();
-          if (!prev) throw _editor_events_Exception__WEBPACK_IMPORTED_MODULE_29__/* .Exception.NodeNotFound */ .P.NodeNotFound();
+          if (!prev) throw _editor_events_Exception__WEBPACK_IMPORTED_MODULE_30__/* .Exception.NodeNotFound */ .P.NodeNotFound();
           refresh(hoEditorFactory.docTree.getNodeLastPath(prev), hoEditorFactory.docTree.getNodeLastPath(last));
         }, 200);
         return; //执行完后自行退出
@@ -52985,7 +53176,7 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
 
       if (this.StartMarkNode.drawNodes.length > 0 && this.EndMarkNode.drawNodes.length > 0) {
         //不空，还原
-        var bInSameLine = _editor_draw_DrawLine__WEBPACK_IMPORTED_MODULE_25__/* .DrawLine.inSameLine */ .a.inSameLine(this.StartMarkNode.drawNodes[0], this.EndMarkNode.drawNodes[0]);
+        var bInSameLine = _editor_draw_DrawLine__WEBPACK_IMPORTED_MODULE_26__/* .DrawLine.inSameLine */ .a.inSameLine(this.StartMarkNode.drawNodes[0], this.EndMarkNode.drawNodes[0]);
 
         if (fixWidthPix == 0 || !bInSameLine || usedWidth >= maxEmptWidth) {
           if (this.isEmpty()) lastWidth = 0;else lastWidth = 0;
@@ -52999,7 +53190,7 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
           var _prev = last.previousLeaf();
 
           if (!_prev) {
-            throw _editor_events_Exception__WEBPACK_IMPORTED_MODULE_29__/* .Exception.NodeNotFound */ .P.NodeNotFound();
+            throw _editor_events_Exception__WEBPACK_IMPORTED_MODULE_30__/* .Exception.NodeNotFound */ .P.NodeNotFound();
           }
 
           startPath = hoEditorFactory.docTree.getNodeLastPath(_prev);
@@ -53027,13 +53218,13 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
     value: function getFieldText(isClearValue) {
       var _this3 = this;
 
-      var text = "";
+      var text = '';
 
       var loopChildNodes = function loopChildNodes(node) {
         var nodes = node.childNodes.slice(1);
         nodes.forEach(function (childNode) {
-          if (childNode instanceof _TextNode__WEBPACK_IMPORTED_MODULE_53__/* .TextNode */ .R) {
-            var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_32__/* .HOEditorFactorys.instance */ .b.instance().getFactory(_this3.hoEditorFactoryID);
+          if (childNode instanceof _TextNode__WEBPACK_IMPORTED_MODULE_54__/* .TextNode */ .R) {
+            var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_33__/* .HOEditorFactorys.instance */ .b.instance().getFactory(_this3.hoEditorFactoryID);
             var textStyle = hoEditorFactory.docTree.styles[childNode.styleIndex];
 
             if (!textStyle) {
@@ -53043,34 +53234,34 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
             if (textStyle.deleterIndex === -1 || textStyle.deleterIndex === undefined) {
               //text += hoEditorFactory.unitConvert.replaceAll(childNode.text, '\n', ' ');
               if (textStyle.script === 1) {
-                text += "<下标>" + childNode.text + "</下标>";
+                text += '<下标>' + childNode.text + '</下标>';
               } else if (textStyle.script === 2) {
-                text += "<上标>" + childNode.text + "</上标>";
+                text += '<上标>' + childNode.text + '</上标>';
               } else {
                 text += childNode.text;
               }
             }
-          } else if (childNode instanceof _ControlNode__WEBPACK_IMPORTED_MODULE_39__/* .ControlNode */ .w) {
-            if (childNode instanceof _DateTimeNode__WEBPACK_IMPORTED_MODULE_40__/* .DateTimeNode */ .Z && (isClearValue || childNode.text == childNode.name)) {
-              text += "";
+          } else if (childNode instanceof _ControlNode__WEBPACK_IMPORTED_MODULE_40__/* .ControlNode */ .w) {
+            if (childNode instanceof _DateTimeNode__WEBPACK_IMPORTED_MODULE_41__/* .DateTimeNode */ .Z && (isClearValue || childNode.text == childNode.name)) {
+              text += '';
             } else {
               text += childNode.text;
             }
-          } else if (childNode instanceof _BaseCombineNode__WEBPACK_IMPORTED_MODULE_37__/* .BaseCombineNode */ .V) {
+          } else if (childNode instanceof _BaseCombineNode__WEBPACK_IMPORTED_MODULE_38__/* .BaseCombineNode */ .V) {
             loopChildNodes(childNode);
-          } else if (childNode instanceof _ParagraphNode__WEBPACK_IMPORTED_MODULE_46__/* .ParagraphNode */ .C) {
+          } else if (childNode instanceof _ParagraphNode__WEBPACK_IMPORTED_MODULE_47__/* .ParagraphNode */ .C) {
             text += '\n';
-          } else if (childNode instanceof _MedicalExpressionNode__WEBPACK_IMPORTED_MODULE_44__/* .MedicalExpressionNode */ .H) {
-            var expressJson = JSON.parse("{}");
-            text += "<MedicalExpress>";
+          } else if (childNode instanceof _MedicalExpressionNode__WEBPACK_IMPORTED_MODULE_45__/* .MedicalExpressionNode */ .H) {
+            var expressJson = JSON.parse('{}');
+            text += '<MedicalExpress>';
 
-            if (childNode instanceof _MenstrualHistoryNode__WEBPACK_IMPORTED_MODULE_45__/* .MenstrualHistoryNode */ .n) {
+            if (childNode instanceof _MenstrualHistoryNode__WEBPACK_IMPORTED_MODULE_46__/* .MenstrualHistoryNode */ .n) {
               expressJson.expressStyle = childNode.expressStyle;
               expressJson.menseDays = childNode.menseDays;
               expressJson.cycleDays = childNode.cycleDays;
               expressJson.menarcheAge = childNode.menarcheAge;
               expressJson.menoPauseAge = childNode.menoPauseAge;
-            } else if (childNode instanceof _PupilMapNode__WEBPACK_IMPORTED_MODULE_49__/* .PupilMapNode */ .v || childNode instanceof _LightLocationMapNode__WEBPACK_IMPORTED_MODULE_42__/* .LightLocationMapNode */ .D || childNode instanceof _FetalHeartMapNode__WEBPACK_IMPORTED_MODULE_41__/* .FetalHeartMapNode */ .t) {
+            } else if (childNode instanceof _PupilMapNode__WEBPACK_IMPORTED_MODULE_50__/* .PupilMapNode */ .v || childNode instanceof _LightLocationMapNode__WEBPACK_IMPORTED_MODULE_43__/* .LightLocationMapNode */ .D || childNode instanceof _FetalHeartMapNode__WEBPACK_IMPORTED_MODULE_42__/* .FetalHeartMapNode */ .t) {
               expressJson.value1 = childNode.value1;
               expressJson.value2 = childNode.value2;
               expressJson.value3 = childNode.value3;
@@ -53078,24 +53269,24 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
               expressJson.value5 = childNode.value5;
               expressJson.value6 = childNode.value6;
 
-              if (childNode instanceof _PupilMapNode__WEBPACK_IMPORTED_MODULE_49__/* .PupilMapNode */ .v) {
-                expressJson.expressStyle = "PupilMapNode";
+              if (childNode instanceof _PupilMapNode__WEBPACK_IMPORTED_MODULE_50__/* .PupilMapNode */ .v) {
+                expressJson.expressStyle = 'PupilMapNode';
                 expressJson.value7 = childNode.value7;
-              } else if (childNode instanceof _LightLocationMapNode__WEBPACK_IMPORTED_MODULE_42__/* .LightLocationMapNode */ .D) {
-                expressJson.expressStyle = "LightLocationMapNode";
+              } else if (childNode instanceof _LightLocationMapNode__WEBPACK_IMPORTED_MODULE_43__/* .LightLocationMapNode */ .D) {
+                expressJson.expressStyle = 'LightLocationMapNode';
                 expressJson.value7 = childNode.value7;
                 expressJson.value8 = childNode.value8;
                 expressJson.value9 = childNode.value9;
               } else {
-                expressJson.expressStyle = "FetalHeartMapNode";
+                expressJson.expressStyle = 'FetalHeartMapNode';
               }
-            } else if (childNode instanceof _PermanentTeethMapNode__WEBPACK_IMPORTED_MODULE_47__/* .PermanentTeethMapNode */ .f || childNode instanceof _PrimaryTeethMapNode__WEBPACK_IMPORTED_MODULE_48__/* .PrimaryTeethMapNode */ .x) {
-              if (childNode instanceof _PermanentTeethMapNode__WEBPACK_IMPORTED_MODULE_47__/* .PermanentTeethMapNode */ .f) {
-                expressJson.expressStyle = "PermanentTeethMapNode";
+            } else if (childNode instanceof _PermanentTeethMapNode__WEBPACK_IMPORTED_MODULE_48__/* .PermanentTeethMapNode */ .f || childNode instanceof _PrimaryTeethMapNode__WEBPACK_IMPORTED_MODULE_49__/* .PrimaryTeethMapNode */ .x) {
+              if (childNode instanceof _PermanentTeethMapNode__WEBPACK_IMPORTED_MODULE_48__/* .PermanentTeethMapNode */ .f) {
+                expressJson.expressStyle = 'PermanentTeethMapNode';
               }
 
-              if (childNode instanceof _PrimaryTeethMapNode__WEBPACK_IMPORTED_MODULE_48__/* .PrimaryTeethMapNode */ .x) {
-                expressJson.expressStyle = "PrimaryTeethMapNode";
+              if (childNode instanceof _PrimaryTeethMapNode__WEBPACK_IMPORTED_MODULE_49__/* .PrimaryTeethMapNode */ .x) {
+                expressJson.expressStyle = 'PrimaryTeethMapNode';
               }
 
               expressJson.topLeftSelected = childNode.topLeftSelected;
@@ -53105,7 +53296,7 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
             }
 
             text += JSON.stringify(expressJson);
-            text += "</MedicalExpress>";
+            text += '</MedicalExpress>';
           }
         });
       };
@@ -53120,20 +53311,27 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
             listItems = Array(JSON.parse(downListProperty.listItems));
           }
 
+          var value = [];
+          var keyValue = this.keyValue.split(',');
+
           for (var i = 0; i < listItems.length; i++) {
             var listItem = listItems[i];
 
-            if (listItem.id === this.keyValue) {
-              if (listItem.text.includes("<元素>")) {
-                var index = listItem.text.indexOf("<元素>");
-                text = listItem.text.substring(0, index);
-              }
+            if (keyValue.includes(listItem.id)) {
+              var index = listItem.text.indexOf('<元素>');
+              text += index === -1 ? listItem.text : listItem.text.substring(0, index);
+            }
+
+            if (keyValue.includes(listItem.id)) {
+              String(listItem.value) && value.push(listItem.value);
             }
           }
+
+          this.value = value.join(',');
         }
       }
 
-      if (text === "") {
+      if (text === '') {
         loopChildNodes(this);
       } //loopChildNodes(this);
 
@@ -53157,7 +53355,7 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
                   this.keyValue = keyValue;
                 }
 
-                if (!(value === "" && this.childNodes[1] instanceof _MarkNode__WEBPACK_IMPORTED_MODULE_43__/* .MarkNode */ .j)) {
+                if (!(value === '' && this.childNodes[1] instanceof _MarkNode__WEBPACK_IMPORTED_MODULE_44__/* .MarkNode */ .j)) {
                   _context2.next = 4;
                   break;
                 }
@@ -53167,13 +53365,13 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
               case 4:
                 oldValue = this._canModifyContent.valueOf();
                 this._canModifyContent = true;
-                hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_32__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
+                hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_33__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
                 startPath = this.StartMarkNode.getNodePath();
                 endPath = hoEditorFactory.docTree.getNodeLastPath(this.childNodes[this.childNodes.length - 2]);
-                aRange = new _DomRange__WEBPACK_IMPORTED_MODULE_35__/* .DomRange */ .a(this._hoEditorFactoryID, startPath, endPath);
+                aRange = new _DomRange__WEBPACK_IMPORTED_MODULE_36__/* .DomRange */ .a(this._hoEditorFactoryID, startPath, endPath);
 
-                if (!(this.childNodes[1] instanceof _MarkNode__WEBPACK_IMPORTED_MODULE_43__/* .MarkNode */ .j) && this.inputFieldType === 0) {
-                  anodes = _DomRange__WEBPACK_IMPORTED_MODULE_35__/* .DomRange.getSelectDomNodesForDelete */ .a.getSelectDomNodesForDelete(this.hoEditorFactoryID, startPath, endPath);
+                if (!(this.childNodes[1] instanceof _MarkNode__WEBPACK_IMPORTED_MODULE_44__/* .MarkNode */ .j) && this.inputFieldType === 0) {
+                  anodes = _DomRange__WEBPACK_IMPORTED_MODULE_36__/* .DomRange.getSelectDomNodesForDelete */ .a.getSelectDomNodesForDelete(this.hoEditorFactoryID, startPath, endPath);
 
                   for (i = 0; i < anodes.length; i++) {
                     anode = anodes[i];
@@ -53183,17 +53381,17 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
                     }
                   }
 
-                  hoEditorFactory.docController.deleteRange(aRange, true, "update");
+                  hoEditorFactory.docController.deleteRange(aRange, true, 'update');
                 }
 
-                if (!(value === "")) {
+                if (!(value === '')) {
                   _context2.next = 21;
                   break;
                 }
 
-                markNode = new _MarkNode__WEBPACK_IMPORTED_MODULE_43__/* .MarkNode */ .j(this._hoEditorFactoryID, this.rootNodes, this, _BaseNode__WEBPACK_IMPORTED_MODULE_38__/* .NodeType.ntText */ .Jq.ntText, this.labelText, hoEditorFactory.docTree.curStyleIndex, _MarkNode__WEBPACK_IMPORTED_MODULE_43__/* .MarkNodeType.mtContent */ .q.mtContent);
+                markNode = new _MarkNode__WEBPACK_IMPORTED_MODULE_44__/* .MarkNode */ .j(this._hoEditorFactoryID, this.rootNodes, this, _BaseNode__WEBPACK_IMPORTED_MODULE_39__/* .NodeType.ntText */ .Jq.ntText, this.labelText, hoEditorFactory.docTree.curStyleIndex, _MarkNode__WEBPACK_IMPORTED_MODULE_44__/* .MarkNodeType.mtContent */ .q.mtContent);
                 hoEditorFactory.undoService.begin();
-                hoEditorFactory.undoService.add(new _editor_undoRedo_NodeInsertUndoUnit__WEBPACK_IMPORTED_MODULE_31__/* .NodeInsertUndoUnit */ .R(this._hoEditorFactoryID, startPath, markNode));
+                hoEditorFactory.undoService.add(new _editor_undoRedo_NodeInsertUndoUnit__WEBPACK_IMPORTED_MODULE_32__/* .NodeInsertUndoUnit */ .R(this._hoEditorFactoryID, startPath, markNode));
                 hoEditorFactory.undoService.commit();
 
                 if (this._childNodes2.length === 3) {
@@ -53259,10 +53457,10 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
     value: function node2DrawNodeRange(startIndex, endIndex) {
       this.childNodes.length = 0;
       this._childNodes2.length = 0;
-      var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_32__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
+      var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_33__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
       var curStyleIndex = hoEditorFactory.docTree.curStyleIndex;
       var cbStyle = hoEditorFactory.docTree.styles[curStyleIndex].combineStyle;
-      var dHeight = cbStyle.getFontHeightByFontSize(cbStyle.size);
+      var dHeight = hoEditorFactory.getFontHeightByFontSize(cbStyle.size);
       var istart = Math.max(startIndex, 0);
       var iend = Math.min(endIndex, this.text.length - 1);
       var astyle = hoEditorFactory.docTree.styles[0];
@@ -53270,19 +53468,19 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
       //   index = astyle.changeStyleString("fontBackColor", "transparent");
       // }
 
-      this.StartMarkNode = new _MarkNode__WEBPACK_IMPORTED_MODULE_43__/* .MarkNode */ .j(this._hoEditorFactoryID, this.rootNodes, this, _BaseNode__WEBPACK_IMPORTED_MODULE_38__/* .NodeType.ntMark */ .Jq.ntMark, "|", index, _MarkNode__WEBPACK_IMPORTED_MODULE_43__/* .MarkNodeType.mtStart */ .q.mtStart);
+      this.StartMarkNode = new _MarkNode__WEBPACK_IMPORTED_MODULE_44__/* .MarkNode */ .j(this._hoEditorFactoryID, this.rootNodes, this, _BaseNode__WEBPACK_IMPORTED_MODULE_39__/* .NodeType.ntMark */ .Jq.ntMark, '|', index, _MarkNode__WEBPACK_IMPORTED_MODULE_44__/* .MarkNodeType.mtStart */ .q.mtStart);
       this.StartMarkNode.isReadOnly = true;
-      this.StartMarkNode.MarkNodeType = _MarkNode__WEBPACK_IMPORTED_MODULE_43__/* .MarkNodeType.mtStart */ .q.mtStart;
-      this.EndMarkNode = new _MarkNode__WEBPACK_IMPORTED_MODULE_43__/* .MarkNode */ .j(this._hoEditorFactoryID, this.rootNodes, this, _BaseNode__WEBPACK_IMPORTED_MODULE_38__/* .NodeType.ntMark */ .Jq.ntMark, "]", index, _MarkNode__WEBPACK_IMPORTED_MODULE_43__/* .MarkNodeType.mtEnd */ .q.mtEnd);
+      this.StartMarkNode.MarkNodeType = _MarkNode__WEBPACK_IMPORTED_MODULE_44__/* .MarkNodeType.mtStart */ .q.mtStart;
+      this.EndMarkNode = new _MarkNode__WEBPACK_IMPORTED_MODULE_44__/* .MarkNode */ .j(this._hoEditorFactoryID, this.rootNodes, this, _BaseNode__WEBPACK_IMPORTED_MODULE_39__/* .NodeType.ntMark */ .Jq.ntMark, ']', index, _MarkNode__WEBPACK_IMPORTED_MODULE_44__/* .MarkNodeType.mtEnd */ .q.mtEnd);
       this.EndMarkNode.isReadOnly = true;
-      this.EndMarkNode.MarkNodeType = _MarkNode__WEBPACK_IMPORTED_MODULE_43__/* .MarkNodeType.mtEnd */ .q.mtEnd;
+      this.EndMarkNode.MarkNodeType = _MarkNode__WEBPACK_IMPORTED_MODULE_44__/* .MarkNodeType.mtEnd */ .q.mtEnd;
       this.StartMarkNode.pair = this.EndMarkNode;
       this.EndMarkNode.pair = this.StartMarkNode;
 
       this._childNodes2.push(this.StartMarkNode);
 
       if (this.labelText.length != 0) {
-        this._childNodes2.push(new _MarkNode__WEBPACK_IMPORTED_MODULE_43__/* .MarkNode */ .j(this._hoEditorFactoryID, this.rootNodes, this, _BaseNode__WEBPACK_IMPORTED_MODULE_38__/* .NodeType.ntText */ .Jq.ntText, this.labelText, index, _MarkNode__WEBPACK_IMPORTED_MODULE_43__/* .MarkNodeType.mtContent */ .q.mtContent)); // this._labelNode = new MarkNode(this._rootNodes, this, NodeType.ntText, this.labelText, 0);
+        this._childNodes2.push(new _MarkNode__WEBPACK_IMPORTED_MODULE_44__/* .MarkNode */ .j(this._hoEditorFactoryID, this.rootNodes, this, _BaseNode__WEBPACK_IMPORTED_MODULE_39__/* .NodeType.ntText */ .Jq.ntText, this.labelText, index, _MarkNode__WEBPACK_IMPORTED_MODULE_44__/* .MarkNodeType.mtContent */ .q.mtContent)); // this._labelNode = new MarkNode(this._rootNodes, this, NodeType.ntText, this.labelText, 0);
         // this._childNodes2.push(this._labelNode);
 
       }
@@ -53291,12 +53489,12 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
 
       this._childNodes = (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_toConsumableArray_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)(this._childNodes2);
 
-      if (this.text != "") {
+      if (this.text != '') {
         if (this._childNodes2.length == 3) {
           this.childNodes.splice(1, 1);
         }
 
-        this._childNodes.splice(1, 0, new _TextNode__WEBPACK_IMPORTED_MODULE_53__/* .TextNode */ .R(this._hoEditorFactoryID, this.rootNodes, this, _BaseNode__WEBPACK_IMPORTED_MODULE_38__/* .NodeType.ntText */ .Jq.ntText, this.text, index));
+        this._childNodes.splice(1, 0, new _TextNode__WEBPACK_IMPORTED_MODULE_54__/* .TextNode */ .R(this._hoEditorFactoryID, this.rootNodes, this, _BaseNode__WEBPACK_IMPORTED_MODULE_39__/* .NodeType.ntText */ .Jq.ntText, this.text, index));
       }
     }
   }, {
@@ -53332,16 +53530,16 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
         return dline;
       }
 
-      var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_32__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
+      var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_33__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
       var endnode = hoEditorFactory.docTree.findNodePositionByPath(endPath).node;
       var isEnd = false;
 
       for (var index = 0; index < this.childNodes.length; index++) {
         var value = this.childNodes[index];
 
-        if (value instanceof _ParagraphNode__WEBPACK_IMPORTED_MODULE_46__/* .ParagraphNode */ .C) {
+        if (value instanceof _ParagraphNode__WEBPACK_IMPORTED_MODULE_47__/* .ParagraphNode */ .C) {
           if (aline.paragraphNode !== value) {
-            if (aline instanceof _editor_draw_DrawLine__WEBPACK_IMPORTED_MODULE_25__/* .DrawLine */ .a) {
+            if (aline instanceof _editor_draw_DrawLine__WEBPACK_IMPORTED_MODULE_26__/* .DrawLine */ .a) {
               aline.fitLines();
               aline.updateLineStyle();
             }
@@ -53356,7 +53554,7 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
 
           paraNode = value;
           aline = paraNode.drawlines[0];
-        } else if (value instanceof _TableNode__WEBPACK_IMPORTED_MODULE_52__/* .TableNode */ .Fh) {
+        } else if (value instanceof _TableNode__WEBPACK_IMPORTED_MODULE_53__/* .TableNode */ .Fh) {
           value.placeDNodeAfterDrawLine(paraNode, aline, endPath);
           aline = value.drawTable;
         } else {
@@ -53369,7 +53567,7 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
         }
 
         var nodePath = hoEditorFactory.docTree.getNodeLastPath(value);
-        var cresult = _NodePosition__WEBPACK_IMPORTED_MODULE_36__/* .NodePosition.treePathCompare */ .F.treePathCompare(endPath, nodePath);
+        var cresult = _NodePosition__WEBPACK_IMPORTED_MODULE_37__/* .NodePosition.treePathCompare */ .F.treePathCompare(endPath, nodePath);
 
         if (cresult <= 0) {
           break;
@@ -53379,7 +53577,7 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
       aline.fitLines();
       aline.updateLineStyle();
 
-      if (dline === aline && aline instanceof _editor_draw_DrawLine__WEBPACK_IMPORTED_MODULE_25__/* .DrawLine */ .a) {
+      if (dline === aline && aline instanceof _editor_draw_DrawLine__WEBPACK_IMPORTED_MODULE_26__/* .DrawLine */ .a) {
         this._text = this.getFieldText();
         var fixWidthPix = hoEditorFactory.unitConvert.mmConversionPx(this.fixedWidth * 10, true);
         var restWidth = aline.dWidth - aline.paragraphNode.combineParagraph.leftMarginPixes - aline.paragraphNode.combineParagraph.rightMarginPixes - this.StartMarkNode.drawNodes[0].x; //const maxEmptWidth = Math.min(aline.calcRestWidth(), fixWidthPix);
@@ -53414,7 +53612,7 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
   }, {
     key: "hasChildPath",
     value: function hasChildPath() {
-      if (this.labelText.length == 0 || this.text === "") {
+      if (this.labelText.length == 0 || this.text === '') {
         return false;
       } else {
         return true;
@@ -53429,23 +53627,23 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
   }, {
     key: "getReadyToEdit",
     value: function getReadyToEdit(callback) {
-      var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_32__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this.hoEditorFactoryID);
+      var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_33__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this.hoEditorFactoryID);
 
-      if (!this.canModifyContent && hoEditorFactory.drawTree.paintStatus !== _editor_draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_26__/* .PaintState.psDesign */ .Dh.psDesign) {
-        return [false, ""];
+      if (!this.canModifyContent && hoEditorFactory.drawTree.paintStatus !== _editor_draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_27__/* .PaintState.psDesign */ .Dh.psDesign) {
+        return [false, ''];
       }
 
       var label = this.getLabel();
 
       if (label) {
         var prev = label.previousLeaf();
-        if (!prev) throw _editor_events_Exception__WEBPACK_IMPORTED_MODULE_29__/* .Exception.NodeNotFound */ .P.NodeNotFound();
-        var path = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_32__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID).docTree.getNodeLastPath(prev);
+        if (!prev) throw _editor_events_Exception__WEBPACK_IMPORTED_MODULE_30__/* .Exception.NodeNotFound */ .P.NodeNotFound();
+        var path = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_33__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID).docTree.getNodeLastPath(prev);
         if (callback) callback(label);
         return [true, path];
       }
 
-      return [true, ""];
+      return [true, ''];
     }
     /**
      * 校验节点中的数据是否符合校验条件
@@ -53455,7 +53653,7 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
   }, {
     key: "verifyData",
     value: function verifyData() {
-      return [true, ""];
+      return [true, ''];
     }
     /**
      * 绘制后所包含字符的实际宽度
@@ -53466,20 +53664,20 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
     value: function getActualWidth() {
       var w = 0;
       this.childNodes.forEach(function (value) {
-        if (!(value instanceof _ParagraphNode__WEBPACK_IMPORTED_MODULE_46__/* .ParagraphNode */ .C)) w += value.getActualWidth();
+        if (!(value instanceof _ParagraphNode__WEBPACK_IMPORTED_MODULE_47__/* .ParagraphNode */ .C)) w += value.getActualWidth();
       });
       return w;
     }
   }, {
     key: "delete",
     value: function _delete(operType) {
-      var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_32__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this.hoEditorFactoryID);
+      var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_33__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this.hoEditorFactoryID);
 
-      if (hoEditorFactory.drawTree.paintStatus === _editor_draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_26__/* .PaintState.psDesign */ .Dh.psDesign || this.isAllowDelete) {
+      if (hoEditorFactory.drawTree.paintStatus === _editor_draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_27__/* .PaintState.psDesign */ .Dh.psDesign || this.isAllowDelete) {
         return (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_get_js__WEBPACK_IMPORTED_MODULE_5__/* ["default"] */ .Z)((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_getPrototypeOf_js__WEBPACK_IMPORTED_MODULE_6__/* ["default"] */ .Z)(TextInputFieldNode.prototype), "delete", this).call(this);
       } else {
-        if (operType !== "update") {
-          element_ui_lib_message_box__WEBPACK_IMPORTED_MODULE_0___default().alert("文本域已设置为不允许删除。请先右键元素属性设置成允许删除,再进行删除操作。", "系统提示");
+        if (operType !== 'update') {
+          element_ui_lib_message_box__WEBPACK_IMPORTED_MODULE_0___default().alert('文本域已设置为不允许删除。请先右键元素属性设置成允许删除,再进行删除操作。', '系统提示');
         } else {
           return (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_get_js__WEBPACK_IMPORTED_MODULE_5__/* ["default"] */ .Z)((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_getPrototypeOf_js__WEBPACK_IMPORTED_MODULE_6__/* ["default"] */ .Z)(TextInputFieldNode.prototype), "delete", this).call(this);
         }
@@ -53509,7 +53707,7 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
         return false;
       } else {
         for (var i = 0; i++; i < this.childNodes.length) {
-          if (this.childNodes[i] instanceof _BaseCombineNode__WEBPACK_IMPORTED_MODULE_37__/* .BaseCombineNode */ .V) {
+          if (this.childNodes[i] instanceof _BaseCombineNode__WEBPACK_IMPORTED_MODULE_38__/* .BaseCombineNode */ .V) {
             if (this.childNodes[i].removeChild(node)) return true;
           }
         }
@@ -53529,10 +53727,10 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
         return true;
       }
 
-      if (this.childNodes.length == 3 && this.childNodes[1] instanceof _MarkNode__WEBPACK_IMPORTED_MODULE_43__/* .MarkNode */ .j) {
+      if (this.childNodes.length == 3 && this.childNodes[1] instanceof _MarkNode__WEBPACK_IMPORTED_MODULE_44__/* .MarkNode */ .j) {
         var markNode = this.childNodes[1];
 
-        if (markNode.MarkNodeType === _MarkNode__WEBPACK_IMPORTED_MODULE_43__/* .MarkNodeType.mtContent */ .q.mtContent) {
+        if (markNode.MarkNodeType === _MarkNode__WEBPACK_IMPORTED_MODULE_44__/* .MarkNodeType.mtContent */ .q.mtContent) {
           return true;
         } else return false;
       }
@@ -53568,7 +53766,7 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
 
         for (var i = 1; i < ilen; i++) {
           textInputFieldNode.insertText(arr[i].text, textInputFieldNode.text.length);
-          _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_32__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID).docTree.deleteNode(arr[i]);
+          _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_33__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID).docTree.deleteNode(arr[i]);
         }
 
         return textInputFieldNode;
@@ -53589,10 +53787,10 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
         for (var i = 0; i < this.childNodes.length; i++) {
           var node = this.childNodes[i];
 
-          if (!(node instanceof _MarkNode__WEBPACK_IMPORTED_MODULE_43__/* .MarkNode */ .j && node.text.substr(0, 1) !== "C")) {
-            if (node instanceof _TableNode__WEBPACK_IMPORTED_MODULE_52__/* .TableNode */ .Fh || node instanceof TextInputFieldNode) {
+          if (!(node instanceof _MarkNode__WEBPACK_IMPORTED_MODULE_44__/* .MarkNode */ .j && node.text.substr(0, 1) !== 'C')) {
+            if (node instanceof _TableNode__WEBPACK_IMPORTED_MODULE_53__/* .TableNode */ .Fh || node instanceof TextInputFieldNode) {
               childArray.push(node.node2Json(undefined, isCopy, type, clearSign));
-            } else if (node instanceof _SignNode__WEBPACK_IMPORTED_MODULE_50__/* .SignNode */ .N) {
+            } else if (node instanceof _SignNode__WEBPACK_IMPORTED_MODULE_51__/* .SignNode */ .N) {
               if (clearSign) {
                 if (node.isTemplate) {
                   childArray.push(node.node2Json(undefined, isCopy, undefined, clearSign));
@@ -53601,11 +53799,11 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
                 childArray.push(node.node2Json(undefined, isCopy));
               }
             } else {
-              if (node instanceof _TextNode__WEBPACK_IMPORTED_MODULE_53__/* .TextNode */ .R) {
-                if (node.text !== "") {
+              if (node instanceof _TextNode__WEBPACK_IMPORTED_MODULE_54__/* .TextNode */ .R) {
+                if (node.text !== '') {
                   childArray.push(node.node2Json(undefined, isCopy));
                 }
-              } else if (node instanceof _DateTimeNode__WEBPACK_IMPORTED_MODULE_40__/* .DateTimeNode */ .Z) {
+              } else if (node instanceof _DateTimeNode__WEBPACK_IMPORTED_MODULE_41__/* .DateTimeNode */ .Z) {
                 childArray.push(node.node2Json(undefined, isCopy, undefined, clearSign));
               } else {
                 childArray.push(node.node2Json(undefined, isCopy));
@@ -53662,7 +53860,7 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
           }
 
           if (canCopy) {
-            if (!(_node instanceof _MarkNode__WEBPACK_IMPORTED_MODULE_43__/* .MarkNode */ .j && _node.text.substr(0, 1) === "C")) {
+            if (!(_node instanceof _MarkNode__WEBPACK_IMPORTED_MODULE_44__/* .MarkNode */ .j && _node.text.substr(0, 1) === 'C')) {
               childArray.push(_node.node2Json(rec, isCopy));
             }
           }
@@ -53673,23 +53871,23 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
         }
 
         if (childArray.length > 0) {
-          if (childArray[0].nodeType === "ntMark" && childArray[0].type === 0) {
-            if (childArray[childArray.length - 1].nodeType !== "ntMark") {
+          if (childArray[0].nodeType === 'ntMark' && childArray[0].type === 0) {
+            if (childArray[childArray.length - 1].nodeType !== 'ntMark') {
               childArray.splice(0, 1);
             }
 
-            if (childArray[childArray.length - 1].nodeType === "ntMark" && childArray[childArray.length - 1].type !== 2) {
+            if (childArray[childArray.length - 1].nodeType === 'ntMark' && childArray[childArray.length - 1].type !== 2) {
               childArray.splice(childArray.length - 1, 1);
               childArray.splice(0, 1);
             }
           }
 
-          if (childArray[childArray.length - 1].nodeType === "ntMark" && childArray[childArray.length - 1].type === 2) {
-            if (childArray[0].nodeType !== "ntMark") {
+          if (childArray[childArray.length - 1].nodeType === 'ntMark' && childArray[childArray.length - 1].type === 2) {
+            if (childArray[0].nodeType !== 'ntMark') {
               childArray.splice(childArray.length - 1, 1);
             }
 
-            if (childArray[0].nodeType === "ntMark" && childArray[0].type !== 0) {
+            if (childArray[0].nodeType === 'ntMark' && childArray[0].type !== 0) {
               childArray.splice(childArray.length - 1, 1);
               childArray.splice(0, 1);
             }
@@ -53704,25 +53902,60 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
           item: childArray
         };
       } else {
-        if (type === "json") {
+        if (type === 'json') {
           childNodes = childArray;
         } else {
           childNodes = {
             TempNode: childArray
           };
         }
-      } //childNodes = [...childArray];
-      //const customPropertyObj =
-
+      }
 
       this.text = this.getFieldText(clearSign);
-      var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_32__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
+
+      if (isCopy) {
+        return {
+          nodeType: 'ntField',
+          inputFieldType: InputFieldType[this.inputFieldType],
+          id: this.id,
+          dataId: this.dataId,
+          innerIdentifier: this.innerIdentifier,
+          dataMetaIdentifier: this.dataMetaIdentifier,
+          identifierFormat: this.identifierFormat,
+          isSynchro: this.isSynchro,
+          text: this.text,
+          keyValue: this.keyValue,
+          value: this.value,
+          name: this.name,
+          tipText: this.tipText,
+          labelText: this.labelText,
+          readOnlyStatus: this.readOnlyStatus,
+          fixedWidth: this.fixedWidth,
+          canModifyContent: this.canModifyContent,
+          isAllowDelete: this.isAllowDelete,
+          enableGlobalColor: this.enableGlobalColor,
+          defaultValue: this.defaultValue,
+          downListProperty: this.downListProperty,
+          dataVerifyFormat: this.dataVerifyFormat,
+          bandDataSource: this.bandDataSource,
+          customProperty: this.customProperty,
+          alignWithBlocked: this.alignWithBlocked,
+          readType: this.readType,
+          childNodes: childNodes
+        };
+      }
+
+      var parentid = '';
+
+      if (this.parentNode && this.parentNode instanceof TextInputFieldNode) {
+        parentid = this.parentNode.id;
+      }
+
       var retObj = {
-        nodeType: "ntField",
+        nodeType: 'ntField',
         inputFieldType: InputFieldType[this.inputFieldType],
-        //id: type === "copy" ? hoEditorFactory.gernerateCode.generateID("TF") : this.id,
         id: this.id,
-        //dataId: type === "copy" ? hoEditorFactory.gernerateCode.generateID("Field") : this.dataId,
+        parentId: parentid,
         dataId: this.dataId,
         innerIdentifier: this.innerIdentifier,
         dataMetaIdentifier: this.dataMetaIdentifier,
@@ -53730,6 +53963,7 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
         isSynchro: this.isSynchro,
         text: this.text,
         keyValue: this.keyValue,
+        value: this.value,
         name: this.name,
         tipText: this.tipText,
         labelText: this.labelText,
@@ -53745,23 +53979,16 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
         customProperty: this.customProperty,
         alignWithBlocked: this.alignWithBlocked,
         readType: this.readType,
-        //   isMultiLinesDisplay: this.isMultiLinesDisplay,
-        // "childNodes": childNodes
         childNodes: childNodes
       };
-
-      if (isCopy) {
-        return retObj;
-      }
-
       return {
-        "TextInputFieldNode": retObj
+        TextInputFieldNode: retObj
       };
     }
   }, {
     key: "getLeftWidth",
     value: function getLeftWidth() {
-      var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_32__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
+      var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_33__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
 
       if (this.alignWithBlocked && this.StartMarkNode && this.StartMarkNode.drawNodes.length > 0) {
         var dNode = this.StartMarkNode.drawNodes[0];
@@ -53822,19 +54049,20 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
   }, {
     key: "getTagNameCn",
     value: function getTagNameCn() {
-      return "输入域t";
+      return '输入域t';
     }
   }], [{
     key: "json2Node",
     value: function json2Node(hoEditorFactoryID, json, rootNodes, pNode, isPaste, isClearSign) {
-      var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_32__/* .HOEditorFactorys.instance */ .b.instance().getFactory(hoEditorFactoryID);
+      var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_33__/* .HOEditorFactorys.instance */ .b.instance().getFactory(hoEditorFactoryID);
+      var eachCount = 0;
       delete json.nodeType;
       this.transType(json);
 
       if (isPaste) {
-        if (hoEditorFactory.vueController.getNodeByDataID("all", json.dataId)) {
+        if (hoEditorFactory.vueController.getNodeByDataID('all', json.dataId)) {
           //json.id = hoEditorFactory.gernerateCode.generateID("TF");
-          json.dataId = hoEditorFactory.gernerateCode.generateID("Field");
+          json.dataId = hoEditorFactory.gernerateCode.generateID('Field');
         }
       }
 
@@ -53848,34 +54076,43 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
       json.isSynchro = !json.isSynchro ? false : json.isSynchro;
       json.readType = json.readType ? Number(json.readType) : -1; // json.isMultiLinesDisplay = !json.isMultiLinesDisplay ? false : json.isMultiLinesDisplay;
 
-      var temp = new TextInputFieldNode(hoEditorFactoryID, rootNodes, pNode ? pNode : null, _BaseNode__WEBPACK_IMPORTED_MODULE_38__/* .NodeType.ntField */ .Jq.ntField, json); // this.insertChild
+      var temp = new TextInputFieldNode(hoEditorFactoryID, rootNodes, pNode ? pNode : null, _BaseNode__WEBPACK_IMPORTED_MODULE_39__/* .NodeType.ntField */ .Jq.ntField, json); // this.insertChild
 
       if (json.childNodes) {
         var nodes = new Array();
 
         var getChildNodes = function getChildNodes(item) {
+          // eachCount++;
+          // if(json.name === '1-1') {
+          //     console.time(`1-1---${eachCount}`);
+          // };
           if (Array.isArray(item)) {
             //数组
             for (var i = 0; i < item.length; i++) {
-              var node = hoEditorFactory.structureConvert.convertNode(item[i], rootNodes, temp, undefined, undefined, isClearSign);
+              // if(json.name === '1-1' && item[i].name) {
+              //     console.time(`----${i}----1-1----${item[i].name}`);
+              // };
+              var node = hoEditorFactory.structureConvert.convertNode(item[i], rootNodes, temp, undefined, undefined, isClearSign); // if(json.name === '1-1' && item[i].name) {
+              //     console.timeEnd(`----${i}----1-1----${item[i].name}`);
+              // };
 
               if (node) {
-                if (node instanceof _TextNode__WEBPACK_IMPORTED_MODULE_53__/* .TextNode */ .R) {
-                  if (node.text !== "") {
+                if (node instanceof _TextNode__WEBPACK_IMPORTED_MODULE_54__/* .TextNode */ .R) {
+                  if (node.text !== '') {
                     nodes.push(node);
                   }
                 } else {
                   if (isClearSign) {
-                    if (node instanceof _SignNode__WEBPACK_IMPORTED_MODULE_50__/* .SignNode */ .N) {
-                      if (node.isTemplate && !(node.number == 0 && node.type == 0 && node.name == "")) {
+                    if (node instanceof _SignNode__WEBPACK_IMPORTED_MODULE_51__/* .SignNode */ .N) {
+                      if (node.isTemplate && !(node.number == 0 && node.type == 0 && node.name == '')) {
                         nodes.push(node);
                       }
                     } else {
                       nodes.push(node);
                     }
                   } else {
-                    if (node instanceof _SignNode__WEBPACK_IMPORTED_MODULE_50__/* .SignNode */ .N) {
-                      if (!(node.number == 0 && node.type == 0 && node.name == "")) {
+                    if (node instanceof _SignNode__WEBPACK_IMPORTED_MODULE_51__/* .SignNode */ .N) {
+                      if (!(node.number == 0 && node.type == 0 && node.name == '')) {
                         nodes.push(node);
                       }
                     } else {
@@ -53885,11 +54122,11 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
                 }
               }
 
-              if (node instanceof _MarkNode__WEBPACK_IMPORTED_MODULE_43__/* .MarkNode */ .j && node.MarkNodeType === _MarkNode__WEBPACK_IMPORTED_MODULE_43__/* .MarkNodeType.mtEnd */ .q.mtEnd && node.text.substring(0, 1) === "C") {
+              if (node instanceof _MarkNode__WEBPACK_IMPORTED_MODULE_44__/* .MarkNode */ .j && node.MarkNodeType === _MarkNode__WEBPACK_IMPORTED_MODULE_44__/* .MarkNodeType.mtEnd */ .q.mtEnd && node.text.substring(0, 1) === 'C') {
                 hoEditorFactory.structureConvert._markNodes.push(node);
               }
 
-              if (node instanceof _SignNode__WEBPACK_IMPORTED_MODULE_50__/* .SignNode */ .N && hoEditorFactory.superiorSigns.length > 0 && hoEditorFactory.superiorSigns.includes(node.customProperty.bce01)) {
+              if (node instanceof _SignNode__WEBPACK_IMPORTED_MODULE_51__/* .SignNode */ .N && hoEditorFactory.superiorSigns.length > 0 && hoEditorFactory.superiorSigns.includes(node.customProperty.bce01)) {
                 hoEditorFactory.structureConvert._superiorSign[0] = node;
               }
             }
@@ -53898,23 +54135,23 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
             var _node2 = hoEditorFactory.structureConvert.convertNode(item, rootNodes, temp, undefined, undefined, isClearSign);
 
             if (_node2) {
-              if (_node2 instanceof _TextNode__WEBPACK_IMPORTED_MODULE_53__/* .TextNode */ .R) {
-                if (_node2.text !== "") {
+              if (_node2 instanceof _TextNode__WEBPACK_IMPORTED_MODULE_54__/* .TextNode */ .R) {
+                if (_node2.text !== '') {
                   nodes.push(_node2);
                 }
               } else {
                 //nodes.push(node);
                 if (isClearSign) {
-                  if (_node2 instanceof _SignNode__WEBPACK_IMPORTED_MODULE_50__/* .SignNode */ .N) {
-                    if (_node2.isTemplate && !(_node2.number == 0 && _node2.type == 0 && _node2.name == "")) {
+                  if (_node2 instanceof _SignNode__WEBPACK_IMPORTED_MODULE_51__/* .SignNode */ .N) {
+                    if (_node2.isTemplate && !(_node2.number == 0 && _node2.type == 0 && _node2.name == '')) {
                       nodes.push(_node2);
                     }
                   } else {
                     nodes.push(_node2);
                   }
                 } else {
-                  if (_node2 instanceof _SignNode__WEBPACK_IMPORTED_MODULE_50__/* .SignNode */ .N) {
-                    if (!(_node2.number == 0 && _node2.type == 0 && _node2.name == "")) {
+                  if (_node2 instanceof _SignNode__WEBPACK_IMPORTED_MODULE_51__/* .SignNode */ .N) {
+                    if (!(_node2.number == 0 && _node2.type == 0 && _node2.name == '')) {
                       nodes.push(_node2);
                     }
                   } else {
@@ -53924,39 +54161,38 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
               }
             }
 
-            if (_node2 instanceof _MarkNode__WEBPACK_IMPORTED_MODULE_43__/* .MarkNode */ .j && _node2.MarkNodeType === _MarkNode__WEBPACK_IMPORTED_MODULE_43__/* .MarkNodeType.mtEnd */ .q.mtEnd && _node2.text.substring(0, 1) === "C") {
+            if (_node2 instanceof _MarkNode__WEBPACK_IMPORTED_MODULE_44__/* .MarkNode */ .j && _node2.MarkNodeType === _MarkNode__WEBPACK_IMPORTED_MODULE_44__/* .MarkNodeType.mtEnd */ .q.mtEnd && _node2.text.substring(0, 1) === 'C') {
               hoEditorFactory.structureConvert._markNodes.push(_node2);
             }
 
-            if (_node2 instanceof _SignNode__WEBPACK_IMPORTED_MODULE_50__/* .SignNode */ .N && hoEditorFactory.superiorSigns.length > 0 && hoEditorFactory.superiorSigns.includes(_node2.customProperty.bce01)) {
+            if (_node2 instanceof _SignNode__WEBPACK_IMPORTED_MODULE_51__/* .SignNode */ .N && hoEditorFactory.superiorSigns.length > 0 && hoEditorFactory.superiorSigns.includes(_node2.customProperty.bce01)) {
               hoEditorFactory.structureConvert._superiorSign[0] = _node2;
             }
-          }
-        };
+          } // if(json.name === '1-1') console.timeEnd(`1-1---${eachCount}`);
+
+        }; // if(json.name === '1-1') console.time("1-1--0");
+
 
         if (isPaste) {
           if (json.childNodes.item) {
             getChildNodes(json.childNodes.item);
-          } else {
-            if (json.childNodes.node) {
-              getChildNodes(json.childNodes.node);
-            }
-          }
-        } else {
-          if (json.childNodes.node) {
+          } else if (json.childNodes.node) {
             getChildNodes(json.childNodes.node);
           }
-        }
+        } else if (json.childNodes.node) {
+          getChildNodes(json.childNodes.node);
+        } // if(json.name === '1-1') console.timeEnd("1-1--0");
+
 
         if (nodes.length > 0) {
-          if (nodes[0] instanceof _MarkNode__WEBPACK_IMPORTED_MODULE_43__/* .MarkNode */ .j) {
+          if (nodes[0] instanceof _MarkNode__WEBPACK_IMPORTED_MODULE_44__/* .MarkNode */ .j) {
             var _temp$childNodes;
 
             temp.childNodes.length = 0;
 
             (_temp$childNodes = temp.childNodes).splice.apply(_temp$childNodes, [0, 0].concat(nodes));
 
-            if (temp.childNodes.length === 3 && temp.childNodes[1] instanceof _MarkNode__WEBPACK_IMPORTED_MODULE_43__/* .MarkNode */ .j) {
+            if (temp.childNodes.length === 3 && temp.childNodes[1] instanceof _MarkNode__WEBPACK_IMPORTED_MODULE_44__/* .MarkNode */ .j) {
               temp._childNodes2.splice(1, 1);
 
               temp._childNodes2.splice(1, 0, temp.childNodes[1]);
@@ -53972,20 +54208,20 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
         }
       }
 
-      if (hoEditorFactory.drawTree.paintStatus === _editor_draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_26__/* .PaintState.psDesign */ .Dh.psDesign) {
+      if (hoEditorFactory.drawTree.paintStatus === _editor_draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_27__/* .PaintState.psDesign */ .Dh.psDesign) {
         var sChildNode = temp.childNodes[0];
         var eChildNode = temp.childNodes[temp.childNodes.length - 1];
 
-        if (!(sChildNode instanceof _MarkNode__WEBPACK_IMPORTED_MODULE_43__/* .MarkNode */ .j) || sChildNode instanceof _MarkNode__WEBPACK_IMPORTED_MODULE_43__/* .MarkNode */ .j && sChildNode.MarkNodeType !== _MarkNode__WEBPACK_IMPORTED_MODULE_43__/* .MarkNodeType.mtStart */ .q.mtStart) {
-          throw new Error("经检测，病历元素“" + temp.name + "”的模板格式有问题，无法正常加载，请联系工程师进行处理。");
+        if (!(sChildNode instanceof _MarkNode__WEBPACK_IMPORTED_MODULE_44__/* .MarkNode */ .j) || sChildNode instanceof _MarkNode__WEBPACK_IMPORTED_MODULE_44__/* .MarkNode */ .j && sChildNode.MarkNodeType !== _MarkNode__WEBPACK_IMPORTED_MODULE_44__/* .MarkNodeType.mtStart */ .q.mtStart) {
+          throw new Error('经检测，病历元素“' + temp.name + '”的模板格式有问题，无法正常加载，请联系工程师进行处理。');
         }
 
-        if (!(eChildNode instanceof _MarkNode__WEBPACK_IMPORTED_MODULE_43__/* .MarkNode */ .j) || eChildNode instanceof _MarkNode__WEBPACK_IMPORTED_MODULE_43__/* .MarkNode */ .j && eChildNode.MarkNodeType !== _MarkNode__WEBPACK_IMPORTED_MODULE_43__/* .MarkNodeType.mtEnd */ .q.mtEnd) {
-          throw new Error("经检测，病历元素“" + temp.name + "”的模板格式有问题，无法正常加载，请联系工程师进行处理。");
+        if (!(eChildNode instanceof _MarkNode__WEBPACK_IMPORTED_MODULE_44__/* .MarkNode */ .j) || eChildNode instanceof _MarkNode__WEBPACK_IMPORTED_MODULE_44__/* .MarkNode */ .j && eChildNode.MarkNodeType !== _MarkNode__WEBPACK_IMPORTED_MODULE_44__/* .MarkNodeType.mtEnd */ .q.mtEnd) {
+          throw new Error('经检测，病历元素“' + temp.name + '”的模板格式有问题，无法正常加载，请联系工程师进行处理。');
         }
       }
 
-      if (temp.childNodes[1] instanceof _TableFormula__WEBPACK_IMPORTED_MODULE_51__/* .TableFormula */ .N) {
+      if (temp.childNodes[1] instanceof _TableFormula__WEBPACK_IMPORTED_MODULE_52__/* .TableFormula */ .N) {
         return temp;
       }
 
@@ -54008,23 +54244,23 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
             temp.childNodes.splice(1, temp.childNodes.length - 2);
             var styleIndex = temp.childNodes[0].styleIndex;
 
-            if (temp.text !== "") {
-              if (temp.text.includes("\\r\\n") || temp.text.includes("\\R\\N")) {
+            if (temp.text !== '') {
+              if (temp.text.includes('\\r\\n') || temp.text.includes('\\R\\N')) {
                 var lineArr = [];
 
-                if (temp.text.includes("\\r\\n")) {
-                  lineArr = temp.text.split("\\r\\n");
-                } else if (temp.text.includes("\\R\\N")) {
-                  lineArr = temp.text.split("\\R\\N");
+                if (temp.text.includes('\\r\\n')) {
+                  lineArr = temp.text.split('\\r\\n');
+                } else if (temp.text.includes('\\R\\N')) {
+                  lineArr = temp.text.split('\\R\\N');
                 }
 
                 for (var i = 0; i < lineArr.length; i++) {
                   var lineText = lineArr[i];
-                  var textNode = new _TextNode__WEBPACK_IMPORTED_MODULE_53__/* .TextNode */ .R(hoEditorFactoryID, rootNodes, temp, _BaseNode__WEBPACK_IMPORTED_MODULE_38__/* .NodeType.ntText */ .Jq.ntText, lineText, styleIndex);
+                  var textNode = new _TextNode__WEBPACK_IMPORTED_MODULE_54__/* .TextNode */ .R(hoEditorFactoryID, rootNodes, temp, _BaseNode__WEBPACK_IMPORTED_MODULE_39__/* .NodeType.ntText */ .Jq.ntText, lineText, styleIndex);
                   temp.childNodes.splice(temp.childNodes.length - 1, 0, textNode);
 
                   if (i < lineArr.length - 1) {
-                    var paraNode = new _ParagraphNode__WEBPACK_IMPORTED_MODULE_46__/* .ParagraphNode */ .C(hoEditorFactoryID, rootNodes, temp, 0);
+                    var paraNode = new _ParagraphNode__WEBPACK_IMPORTED_MODULE_47__/* .ParagraphNode */ .C(hoEditorFactoryID, rootNodes, temp, 0);
                     paraNode.styleIndex = styleIndex;
                     temp.childNodes.splice(temp.childNodes.length - 1, 0, paraNode);
                   }
@@ -54032,10 +54268,10 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
               } else {
                 var expressArr = new Array();
 
-                if (temp.text.includes("<MedicalExpress>")) {
+                if (temp.text.includes('<MedicalExpress>')) {
                   var getAllMedicalExpress = function getAllMedicalExpress(str) {
-                    var sIndex = str.lastIndexOf("<MedicalExpress>");
-                    var eIndex = str.lastIndexOf("</MedicalExpress>");
+                    var sIndex = str.lastIndexOf('<MedicalExpress>');
+                    var eIndex = str.lastIndexOf('</MedicalExpress>');
 
                     if (sIndex !== -1) {
                       var obj = {
@@ -54049,7 +54285,7 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
 
                     str = str.substring(0, sIndex);
 
-                    if (str.includes("<MedicalExpress>")) {
+                    if (str.includes('<MedicalExpress>')) {
                       getAllMedicalExpress(str);
                     }
                   };
@@ -54057,7 +54293,7 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
                   getAllMedicalExpress(temp.text);
                 }
 
-                var firstText = "";
+                var firstText = '';
                 expressArr = expressArr.reverse();
 
                 if (expressArr.length > 0) {
@@ -54073,88 +54309,114 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
                   if (json.customProperty && json.customProperty.isRemoveLineFeed) {
                     textArr.push(textStr);
                   } else {
-                    textArr = textStr.split("\n");
+                    textArr = textStr.split('\n');
                   }
 
                   var getText = function getText(atext) {
                     var result = new Array();
-                    var index1 = atext.indexOf("<上标>");
-                    var index2 = atext.indexOf("</上标>");
-                    result.push({
-                      "mark": 0,
-                      "text": atext.substring(0, index1)
-                    });
-                    result.push({
-                      "mark": 1,
-                      "text": atext.substring(index1 + 4, index2)
-                    });
+                    var index1 = -1;
+                    var index2 = -1;
+
+                    if (atext.indexOf('<上标>') >= 0) {
+                      index1 = atext.indexOf('<上标>');
+                      index2 = atext.indexOf('</上标>');
+                      result.push({
+                        mark: 0,
+                        text: atext.substring(0, index1)
+                      });
+                      result.push({
+                        mark: 1,
+                        text: atext.substring(index1 + 4, index2)
+                      });
+                    } else {
+                      index1 = atext.indexOf('<下标>');
+                      index2 = atext.indexOf('</下标>');
+                      result.push({
+                        mark: 0,
+                        text: atext.substring(0, index1)
+                      });
+                      result.push({
+                        mark: 2,
+                        text: atext.substring(index1 + 4, index2)
+                      });
+                    }
+
                     atext = atext.substring(index2 + 5, atext.length);
 
-                    if (atext.indexOf("<上标>") >= 0) {
+                    if (atext.indexOf('<上标>') >= 0 || atext.indexOf('<下标>') >= 0) {
                       getText(atext);
                     } else {
                       result.push({
-                        "mark": 0,
-                        "text": atext
+                        mark: 0,
+                        text: atext
                       });
                     }
 
                     return result;
                   };
 
-                  if (textArr[0].indexOf("<上标>") >= 0) {
+                  if (textArr[0].indexOf('<上标>') >= 0 || textArr[0].indexOf('<下标>') >= 0) {
                     var resultArr = getText(textArr[0]);
 
                     for (var k = 0; k < resultArr.length; k++) {
-                      if (resultArr[k].text != "") {
+                      if (resultArr[k].text != '') {
                         var newStyleIndex = styleIndex;
 
                         if (resultArr[k].mark == 1) {
-                          var textStyle = new _domNode_TextStyle__WEBPACK_IMPORTED_MODULE_34__/* .TextStyle */ .pn(hoEditorFactoryID);
+                          var textStyle = new _domNode_TextStyle__WEBPACK_IMPORTED_MODULE_35__/* .TextStyle */ .pn(hoEditorFactoryID);
                           textStyle.copyProperty(hoEditorFactory.docTree.styles[styleIndex], textStyle);
                           textStyle.script = 2;
                           newStyleIndex = hoEditorFactory.docTree.styleCompare(textStyle);
                         }
 
-                        var textNode0 = new _TextNode__WEBPACK_IMPORTED_MODULE_53__/* .TextNode */ .R(hoEditorFactoryID, rootNodes, temp, _BaseNode__WEBPACK_IMPORTED_MODULE_38__/* .NodeType.ntText */ .Jq.ntText, resultArr[k].text, newStyleIndex);
+                        if (resultArr[k].mark == 2) {
+                          var _textStyle = new _domNode_TextStyle__WEBPACK_IMPORTED_MODULE_35__/* .TextStyle */ .pn(hoEditorFactoryID);
+
+                          _textStyle.copyProperty(hoEditorFactory.docTree.styles[styleIndex], _textStyle);
+
+                          _textStyle.script = 1;
+                          newStyleIndex = hoEditorFactory.docTree.styleCompare(_textStyle);
+                        }
+
+                        var textNode0 = new _TextNode__WEBPACK_IMPORTED_MODULE_54__/* .TextNode */ .R(hoEditorFactoryID, rootNodes, temp, _BaseNode__WEBPACK_IMPORTED_MODULE_39__/* .NodeType.ntText */ .Jq.ntText, resultArr[k].text, newStyleIndex);
                         temp.childNodes.splice(temp.childNodes.length - 1, 0, textNode0);
                       }
                     }
                   } else {
-                    var textNode1 = new _TextNode__WEBPACK_IMPORTED_MODULE_53__/* .TextNode */ .R(hoEditorFactoryID, rootNodes, temp, _BaseNode__WEBPACK_IMPORTED_MODULE_38__/* .NodeType.ntText */ .Jq.ntText, textArr[0], styleIndex);
+                    var textNode1 = new _TextNode__WEBPACK_IMPORTED_MODULE_54__/* .TextNode */ .R(hoEditorFactoryID, rootNodes, temp, _BaseNode__WEBPACK_IMPORTED_MODULE_39__/* .NodeType.ntText */ .Jq.ntText, textArr[0], styleIndex);
                     temp.childNodes.splice(temp.childNodes.length - 1, 0, textNode1);
                   }
 
                   if (textArr.length > 1) {
                     for (var _i2 = 1; _i2 < textArr.length; _i2++) {
-                      var paragraNode = new _ParagraphNode__WEBPACK_IMPORTED_MODULE_46__/* .ParagraphNode */ .C(hoEditorFactoryID, rootNodes, temp, 0);
+                      var paragraNode = new _ParagraphNode__WEBPACK_IMPORTED_MODULE_47__/* .ParagraphNode */ .C(hoEditorFactoryID, rootNodes, temp, 0);
                       paragraNode.styleIndex = styleIndex;
                       temp.childNodes.splice(temp.childNodes.length - 1, 0, paragraNode);
 
-                      if (textArr[_i2] !== "") {
-                        if (textArr[_i2].indexOf("<上标>") >= 0) {
+                      if (textArr[_i2] !== '') {
+                        if (textArr[_i2].indexOf('<上标>') >= 0 || textArr[_i2].indexOf('<下标>') >= 0) {
                           var resultArr1 = getText(textArr[_i2]);
 
                           for (var _k = 0; _k < resultArr1.length; _k++) {
-                            if (resultArr1[_k].text != "") {
+                            if (resultArr1[_k].text != '') {
                               var _newStyleIndex = styleIndex;
 
                               if (resultArr1[_k].mark == 1) {
-                                var _textStyle = new _domNode_TextStyle__WEBPACK_IMPORTED_MODULE_34__/* .TextStyle */ .pn(hoEditorFactoryID);
+                                var _textStyle2 = new _domNode_TextStyle__WEBPACK_IMPORTED_MODULE_35__/* .TextStyle */ .pn(hoEditorFactoryID);
 
-                                _textStyle.copyProperty(hoEditorFactory.docTree.styles[styleIndex], _textStyle);
+                                _textStyle2.copyProperty(hoEditorFactory.docTree.styles[styleIndex], _textStyle2);
 
-                                _textStyle.script = 2;
-                                _newStyleIndex = hoEditorFactory.docTree.styleCompare(_textStyle);
+                                _textStyle2.script = 2;
+                                _newStyleIndex = hoEditorFactory.docTree.styleCompare(_textStyle2);
                               }
 
-                              var _textNode = new _TextNode__WEBPACK_IMPORTED_MODULE_53__/* .TextNode */ .R(hoEditorFactoryID, rootNodes, temp, _BaseNode__WEBPACK_IMPORTED_MODULE_38__/* .NodeType.ntText */ .Jq.ntText, resultArr1[_k].text, _newStyleIndex);
+                              var _textNode = new _TextNode__WEBPACK_IMPORTED_MODULE_54__/* .TextNode */ .R(hoEditorFactoryID, rootNodes, temp, _BaseNode__WEBPACK_IMPORTED_MODULE_39__/* .NodeType.ntText */ .Jq.ntText, resultArr1[_k].text, _newStyleIndex);
 
                               temp.childNodes.splice(temp.childNodes.length - 1, 0, _textNode);
                             }
                           }
                         } else {
-                          var _textNode2 = new _TextNode__WEBPACK_IMPORTED_MODULE_53__/* .TextNode */ .R(hoEditorFactoryID, rootNodes, temp, _BaseNode__WEBPACK_IMPORTED_MODULE_38__/* .NodeType.ntText */ .Jq.ntText, textArr[_i2], styleIndex);
+                          var _textNode2 = new _TextNode__WEBPACK_IMPORTED_MODULE_54__/* .TextNode */ .R(hoEditorFactoryID, rootNodes, temp, _BaseNode__WEBPACK_IMPORTED_MODULE_39__/* .NodeType.ntText */ .Jq.ntText, textArr[_i2], styleIndex);
 
                           temp.childNodes.splice(temp.childNodes.length - 1, 0, _textNode2);
                         }
@@ -54163,7 +54425,7 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
                   }
                 };
 
-                if (firstText !== "") {
+                if (firstText !== '') {
                   getChildTextNodes(firstText);
                 }
 
@@ -54174,7 +54436,7 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
                     var eIndex = expressArr[_i3].eIndex;
                     var expressJson = temp.text.substring(sIndex + 16, eIndex);
                     var expressObj = JSON.parse(expressJson);
-                    var expressStyle = _MenstrualHistoryNode__WEBPACK_IMPORTED_MODULE_45__/* .ExpressStyle */ .e[expressObj.expressStyle];
+                    var expressStyle = _MenstrualHistoryNode__WEBPACK_IMPORTED_MODULE_46__/* .ExpressStyle */ .e[expressObj.expressStyle];
 
                     if (!expressStyle) {
                       expressStyle = expressObj.expressStyle;
@@ -54182,25 +54444,25 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
 
                     var medicalExpressNode = void 0;
 
-                    if (expressStyle.includes("style")) {
+                    if (expressStyle.includes('style')) {
                       //经期史
-                      medicalExpressNode = new _MenstrualHistoryNode__WEBPACK_IMPORTED_MODULE_45__/* .MenstrualHistoryNode */ .n(hoEditorFactoryID, rootNodes, temp, _BaseNode__WEBPACK_IMPORTED_MODULE_38__/* .NodeType.ntMedicalExpression */ .Jq.ntMedicalExpression, expressStyle, expressObj.menseDays, expressObj.cycleDays, expressObj.menarcheAge, expressObj.menoPauseAge);
+                      medicalExpressNode = new _MenstrualHistoryNode__WEBPACK_IMPORTED_MODULE_46__/* .MenstrualHistoryNode */ .n(hoEditorFactoryID, rootNodes, temp, _BaseNode__WEBPACK_IMPORTED_MODULE_39__/* .NodeType.ntMedicalExpression */ .Jq.ntMedicalExpression, expressStyle, expressObj.menseDays, expressObj.cycleDays, expressObj.menarcheAge, expressObj.menoPauseAge);
                     } else {
-                      if (expressStyle === "PupilMapNode") {
-                        medicalExpressNode = new _PupilMapNode__WEBPACK_IMPORTED_MODULE_49__/* .PupilMapNode */ .v(hoEditorFactoryID, rootNodes, temp, _BaseNode__WEBPACK_IMPORTED_MODULE_38__/* .NodeType.ntMedicalExpression */ .Jq.ntMedicalExpression, expressObj.value1, expressObj.value2, expressObj.value3, expressObj.value4, expressObj.value5, expressObj.value6, expressObj.value7);
-                      } else if (expressStyle === "LightLocationMapNode") {
-                        medicalExpressNode = new _LightLocationMapNode__WEBPACK_IMPORTED_MODULE_42__/* .LightLocationMapNode */ .D(hoEditorFactoryID, rootNodes, temp, _BaseNode__WEBPACK_IMPORTED_MODULE_38__/* .NodeType.ntMedicalExpression */ .Jq.ntMedicalExpression, expressObj.value1, expressObj.value2, expressObj.value3, expressObj.value4, expressObj.value5, expressObj.value6, expressObj.value7, expressObj.value8, expressObj.value9);
-                      } else if (expressStyle === "FetalHeartMapNode") {
-                        medicalExpressNode = new _FetalHeartMapNode__WEBPACK_IMPORTED_MODULE_41__/* .FetalHeartMapNode */ .t(hoEditorFactoryID, rootNodes, temp, _BaseNode__WEBPACK_IMPORTED_MODULE_38__/* .NodeType.ntMedicalExpression */ .Jq.ntMedicalExpression, expressObj.value1, expressObj.value2, expressObj.value3, expressObj.value4, expressObj.value5, expressObj.value6);
-                      } else if (expressStyle === "PermanentTeethMapNode") {
-                        medicalExpressNode = new _PermanentTeethMapNode__WEBPACK_IMPORTED_MODULE_47__/* .PermanentTeethMapNode */ .f(hoEditorFactoryID, rootNodes, temp, _BaseNode__WEBPACK_IMPORTED_MODULE_38__/* .NodeType.ntMedicalExpression */ .Jq.ntMedicalExpression, expressObj.topLeftSelected, expressObj.topRightSelected, expressObj.bottomLeftSelected, expressObj.bottomRightSelected);
+                      if (expressStyle === 'PupilMapNode') {
+                        medicalExpressNode = new _PupilMapNode__WEBPACK_IMPORTED_MODULE_50__/* .PupilMapNode */ .v(hoEditorFactoryID, rootNodes, temp, _BaseNode__WEBPACK_IMPORTED_MODULE_39__/* .NodeType.ntMedicalExpression */ .Jq.ntMedicalExpression, expressObj.value1, expressObj.value2, expressObj.value3, expressObj.value4, expressObj.value5, expressObj.value6, expressObj.value7);
+                      } else if (expressStyle === 'LightLocationMapNode') {
+                        medicalExpressNode = new _LightLocationMapNode__WEBPACK_IMPORTED_MODULE_43__/* .LightLocationMapNode */ .D(hoEditorFactoryID, rootNodes, temp, _BaseNode__WEBPACK_IMPORTED_MODULE_39__/* .NodeType.ntMedicalExpression */ .Jq.ntMedicalExpression, expressObj.value1, expressObj.value2, expressObj.value3, expressObj.value4, expressObj.value5, expressObj.value6, expressObj.value7, expressObj.value8, expressObj.value9);
+                      } else if (expressStyle === 'FetalHeartMapNode') {
+                        medicalExpressNode = new _FetalHeartMapNode__WEBPACK_IMPORTED_MODULE_42__/* .FetalHeartMapNode */ .t(hoEditorFactoryID, rootNodes, temp, _BaseNode__WEBPACK_IMPORTED_MODULE_39__/* .NodeType.ntMedicalExpression */ .Jq.ntMedicalExpression, expressObj.value1, expressObj.value2, expressObj.value3, expressObj.value4, expressObj.value5, expressObj.value6);
+                      } else if (expressStyle === 'PermanentTeethMapNode') {
+                        medicalExpressNode = new _PermanentTeethMapNode__WEBPACK_IMPORTED_MODULE_48__/* .PermanentTeethMapNode */ .f(hoEditorFactoryID, rootNodes, temp, _BaseNode__WEBPACK_IMPORTED_MODULE_39__/* .NodeType.ntMedicalExpression */ .Jq.ntMedicalExpression, expressObj.topLeftSelected, expressObj.topRightSelected, expressObj.bottomLeftSelected, expressObj.bottomRightSelected);
                       } else {
-                        medicalExpressNode = new _PrimaryTeethMapNode__WEBPACK_IMPORTED_MODULE_48__/* .PrimaryTeethMapNode */ .x(hoEditorFactoryID, rootNodes, temp, _BaseNode__WEBPACK_IMPORTED_MODULE_38__/* .NodeType.ntMedicalExpression */ .Jq.ntMedicalExpression, expressObj.topLeftSelected, expressObj.topRightSelected, expressObj.bottomLeftSelected, expressObj.bottomRightSelected);
+                        medicalExpressNode = new _PrimaryTeethMapNode__WEBPACK_IMPORTED_MODULE_49__/* .PrimaryTeethMapNode */ .x(hoEditorFactoryID, rootNodes, temp, _BaseNode__WEBPACK_IMPORTED_MODULE_39__/* .NodeType.ntMedicalExpression */ .Jq.ntMedicalExpression, expressObj.topLeftSelected, expressObj.topRightSelected, expressObj.bottomLeftSelected, expressObj.bottomRightSelected);
                       }
                     }
 
                     temp.childNodes.splice(temp.childNodes.length - 1, 0, medicalExpressNode);
-                    var behindText = ""; //表达式后的文本串
+                    var behindText = ''; //表达式后的文本串
 
                     if (_i3 < expressArr.length - 1) {
                       behindText = temp.text.substring(eIndex + 17, expressArr[_i3 + 1].sIndex);
@@ -54223,8 +54485,8 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
             } else {
               temp._childNodes2.splice(1, temp._childNodes2.length - 2);
 
-              var markNode = new _MarkNode__WEBPACK_IMPORTED_MODULE_43__/* .MarkNode */ .j(hoEditorFactoryID, rootNodes, temp, _BaseNode__WEBPACK_IMPORTED_MODULE_38__/* .NodeType.ntText */ .Jq.ntText, temp.labelText, //hoEditorFactory.docTree.curStyleIndex,
-              styleIndex, _MarkNode__WEBPACK_IMPORTED_MODULE_43__/* .MarkNodeType.mtContent */ .q.mtContent);
+              var markNode = new _MarkNode__WEBPACK_IMPORTED_MODULE_44__/* .MarkNode */ .j(hoEditorFactoryID, rootNodes, temp, _BaseNode__WEBPACK_IMPORTED_MODULE_39__/* .NodeType.ntText */ .Jq.ntText, temp.labelText, //hoEditorFactory.docTree.curStyleIndex,
+              styleIndex, _MarkNode__WEBPACK_IMPORTED_MODULE_44__/* .MarkNodeType.mtContent */ .q.mtContent);
 
               temp._childNodes.splice(1, 0, markNode);
 
@@ -54252,19 +54514,19 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
   }, {
     key: "textInpubNodeRedraw",
     value: function textInpubNodeRedraw(hoEditorFactoryID, node) {
-      var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_32__/* .HOEditorFactorys.instance */ .b.instance().getFactory(hoEditorFactoryID);
+      var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_33__/* .HOEditorFactorys.instance */ .b.instance().getFactory(hoEditorFactoryID);
       var startPath = node.StartMarkNode.getNodePath();
       var paragraphNode = hoEditorFactory.docTree.getNodeParaNode(node.EndMarkNode);
       var endPath = hoEditorFactory.docTree.getNodeLastPath(paragraphNode);
-      var changeEvent = new _editor_events_NodeChangeEvent__WEBPACK_IMPORTED_MODULE_30__/* .NodeChangeEvent */ .G(hoEditorFactoryID, _DocTree__WEBPACK_IMPORTED_MODULE_33__/* .DocAction.daModifyStyle */ .gk.daModifyStyle, startPath, endPath);
+      var changeEvent = new _editor_events_NodeChangeEvent__WEBPACK_IMPORTED_MODULE_31__/* .NodeChangeEvent */ .G(hoEditorFactoryID, _DocTree__WEBPACK_IMPORTED_MODULE_34__/* .DocAction.daModifyStyle */ .gk.daModifyStyle, startPath, endPath);
       changeEvent.oldEndPath = endPath;
-      changeEvent.oldDrawLines = new _editor_draw_SelectRange__WEBPACK_IMPORTED_MODULE_27__/* .SelectRange */ .E(hoEditorFactoryID).getRangeDrawLines(startPath, endPath, true);
+      changeEvent.oldDrawLines = new _editor_draw_SelectRange__WEBPACK_IMPORTED_MODULE_28__/* .SelectRange */ .E(hoEditorFactoryID).getRangeDrawLines(startPath, endPath, true);
       hoEditorFactory.docTree.change(changeEvent);
     }
   }]);
 
   return TextInputFieldNode;
-}(_BaseCombineNode__WEBPACK_IMPORTED_MODULE_37__/* .BaseCombineNode */ .V);
+}(_BaseCombineNode__WEBPACK_IMPORTED_MODULE_38__/* .BaseCombineNode */ .V);
 
 /***/ }),
 
@@ -54516,7 +54778,7 @@ var TextNode = /*#__PURE__*/function (_BaseNode) {
 
       this._dStyleKey = this._dCombineStyle.getStyleKey();
       this._dColor = this._dCombineStyle.color;
-      this._dHeight = this._dCombineStyle.getFontHeightByFontSize(this._dCombineStyle.size);
+      this._dHeight = hoEditorFactory.getFontHeightByFontSize(this._dCombineStyle.size);
     }
   }, {
     key: "node2DrawNode",
@@ -55285,7 +55547,7 @@ var DrawLine = /*#__PURE__*/function (_DrawContainer) {
     _this._dHeight = hoEditorFactory.defaultLineHeight;
     var paraFontstyle = hoEditorFactory.docTree.styles[node.styleIndex];
     var size = paraFontstyle && paraFontstyle.size ? paraFontstyle.size : hoEditorFactory.docTree.defaultCombineStyle.size;
-    _this._maxFontHeight = hoEditorFactory.docTree.defaultCombineStyle.getFontHeightByFontSize(size); //this._isImgHeightForMax = false;
+    _this._maxFontHeight = hoEditorFactory.getFontHeightByFontSize(size); //this._isImgHeightForMax = false;
 
     _this._charSpace = 0;
     _this._needUpdate = true;
@@ -55589,7 +55851,7 @@ var DrawLine = /*#__PURE__*/function (_DrawContainer) {
       var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._paragraphNode.hoEditorFactoryID);
       var paraFontstyle = hoEditorFactory.docTree.styles[this._paragraphNode.styleIndex];
       var size = paraFontstyle && paraFontstyle.size ? paraFontstyle.size : hoEditorFactory.docTree.defaultCombineStyle.size;
-      var dHeight = hoEditorFactory.docTree.defaultCombineStyle.getFontHeightByFontSize(size);
+      var dHeight = hoEditorFactory.getFontHeightByFontSize(size);
       var dBaseY = 0; //文本节点DrawTextNode._Dtext.y的值
 
       var iCount = 0; //文本节点数量
@@ -62091,8 +62353,8 @@ var DrawPageCell = /*#__PURE__*/function (_DrawArea) {
     (0,classCallCheck/* default */.Z)(this, DrawPageCell);
 
     _this = _super.call(this, hoeditfactoryID, cellNode.rootPath, index, dLeft, dTop, dWidth, dHeight, dWidth, dHeight);
-    _this._drawPageTable = dPartTable;
-    _this._crossShape = null;
+    _this._drawPageTable = dPartTable; // this._crossShape = null;
+
     _this._backImg = new createjs.Shape();
     _this._touchArea = new createjs.Shape(); // this._pageIndex = pageIndex;
     // this._dPage = dPage;
@@ -62107,11 +62369,21 @@ var DrawPageCell = /*#__PURE__*/function (_DrawArea) {
     _this._dHeight = dHeight; // ((this as unknown) as DrawInfos).dHeight = dWidth;
 
     _this._discriminator = IDrawInfos/* gDrawIntfID */.t; //this._marker = new createjs.Shape();
+    // this._topBorder = new createjs.Rectangle(dLeft, dTop, dWidth, 2);
+    // this._leftBorder = new createjs.Rectangle(dLeft, dTop, 2, dHeight);
+    // this._rightBorder = new createjs.Rectangle(
+    //   dLeft + dWidth - 2,
+    //   dTop,
+    //   2,
+    //   dHeight
+    // );
+    // this._bottomBorder = new createjs.Rectangle(
+    //   dLeft,
+    //   dTop + dHeight - 2,
+    //   dWidth,
+    //   2
+    // );
 
-    _this._topBorder = new createjs.Rectangle(dLeft, dTop, dWidth, 2);
-    _this._leftBorder = new createjs.Rectangle(dLeft, dTop, 2, dHeight);
-    _this._rightBorder = new createjs.Rectangle(dLeft + dWidth - 2, dTop, 2, dHeight);
-    _this._bottomBorder = new createjs.Rectangle(dLeft, dTop + dHeight - 2, dWidth, 2);
     var innerTop = 0;
 
     if (_this._cell.drawCell.drawPageCells.length == 0) {
@@ -62273,10 +62545,9 @@ var DrawPageCell = /*#__PURE__*/function (_DrawArea) {
     },
     set: function set(value) {
       if (value !== this._dWidth) {
-        this._dWidth = value;
-        this._topBorder.width = value;
-        this._bottomBorder.width = value;
-        this._rightBorder.x = this._dLeft + this._dWidth - 2;
+        this._dWidth = value; // this._topBorder.width = value;
+        // this._bottomBorder.width = value;
+        // this._rightBorder.x = this._dLeft + this._dWidth - 2;
       }
     }
   }, {
@@ -62286,35 +62557,30 @@ var DrawPageCell = /*#__PURE__*/function (_DrawArea) {
     },
     set: function set(value) {
       if (value !== this._dHeight) {
-        this._dHeight = value;
-        this._leftBorder.height = value;
-        this._rightBorder.height = value;
-        this._bottomBorder.y = this._dTop + this._dHeight - 2;
+        this._dHeight = value; // this._leftBorder.height = value;
+        // this._rightBorder.height = value;
+        // this._bottomBorder.y = this._dTop + this._dHeight - 2;
       }
     }
   }, {
     key: "updateCrossShap",
     value: function updateCrossShap() {
       if (this._cell.cellProperty.obliqueSplitLine === TableProperty/* ObliqueSplitLine.None */.lH.None) {
-        if (this._crossShape && this.contains(this._crossShape)) {
-          this.removeChild(this._crossShape);
-        }
-
-        this._crossShape = null;
+        // if (this._crossShape && this.contains(this._crossShape)) {
+        //   this.removeChild(this._crossShape);
+        // }
+        // this._crossShape = null;
         return;
       } else {
-        if (!this._crossShape) {
-          this._crossShape = new createjs.Shape();
-        }
-
-        this._crossShape.graphics.clear();
-
-        this._crossShape.x = 0;
-        this._crossShape.y = 0;
-
-        this._crossShape.graphics.setStrokeStyle(1);
+        // if (!this._crossShape) {
+        //   this._crossShape = new createjs.Shape();
+        // }
+        // this._crossShape.graphics.clear();
+        // this._crossShape.x = 0;
+        // this._crossShape.y = 0;
+        this._backImg.graphics.setStrokeStyle(1);
 
-        this._crossShape.graphics.beginStroke("#000000");
+        this._backImg.graphics.beginStroke("#000000");
         /*表格边框与边编码，角的编码是0、1、2、3 边的编码是ABCD
          * _____A______*
          * |0       1 |
@@ -62327,91 +62593,90 @@ var DrawPageCell = /*#__PURE__*/function (_DrawArea) {
         switch (this._cell.cellProperty.obliqueSplitLine) {
           //02
           case TableProperty/* ObliqueSplitLine.TopLeftOneLine */.lH.TopLeftOneLine:
-            this._crossShape.graphics.moveTo(0, 0);
+            this._backImg.graphics.moveTo(0, 0);
 
-            this._crossShape.graphics.lineTo(this._dWidth, this._dHeight);
+            this._backImg.graphics.lineTo(this._dWidth, this._dHeight);
 
             break;
           //0213
           // case ObliqueSplitLine.ct0213:
-          //   this._crossShape.graphics.moveTo(0, 0);
-          //   this._crossShape.graphics.lineTo(this._dWidth, this._dHeight);
-          //   this._crossShape.graphics.moveTo(this._dWidth, 0);
-          //   this._crossShape.graphics.lineTo(0, this._dHeight);
+          //   this._backImg.graphics.moveTo(0, 0);
+          //   this._backImg.graphics.lineTo(this._dWidth, this._dHeight);
+          //   this._backImg.graphics.moveTo(this._dWidth, 0);
+          //   this._backImg.graphics.lineTo(0, this._dHeight);
           //   break;
 
           case TableProperty/* ObliqueSplitLine.TopLeftTwoLine */.lH.TopLeftTwoLine:
-            this._crossShape.graphics.moveTo(0, 0);
+            this._backImg.graphics.moveTo(0, 0);
 
-            this._crossShape.graphics.lineTo(this._dWidth, this._dHeight / 2);
+            this._backImg.graphics.lineTo(this._dWidth, this._dHeight / 2);
 
-            this._crossShape.graphics.moveTo(0, 0);
+            this._backImg.graphics.moveTo(0, 0);
 
-            this._crossShape.graphics.lineTo(this._dWidth / 2, this._dHeight);
+            this._backImg.graphics.lineTo(this._dWidth / 2, this._dHeight);
 
             break;
 
           case TableProperty/* ObliqueSplitLine.TopRightOneLine */.lH.TopRightOneLine:
-            this._crossShape.graphics.moveTo(this._dWidth, 0);
+            this._backImg.graphics.moveTo(this._dWidth, 0);
 
-            this._crossShape.graphics.lineTo(0, this._dHeight);
+            this._backImg.graphics.lineTo(0, this._dHeight);
 
             break;
           //1D1C
 
           case TableProperty/* ObliqueSplitLine.TopRightTwoLine */.lH.TopRightTwoLine:
-            this._crossShape.graphics.moveTo(this._dWidth, 0);
+            this._backImg.graphics.moveTo(this._dWidth, 0);
 
-            this._crossShape.graphics.lineTo(this._dWidth / 2, this._dHeight);
+            this._backImg.graphics.lineTo(this._dWidth / 2, this._dHeight);
 
-            this._crossShape.graphics.moveTo(this._dWidth, 0);
+            this._backImg.graphics.moveTo(this._dWidth, 0);
 
-            this._crossShape.graphics.lineTo(0, this._dHeight / 2);
+            this._backImg.graphics.lineTo(0, this._dHeight / 2);
 
             break;
           //ct2A2D
 
           case TableProperty/* ObliqueSplitLine.BottomRightOneLine */.lH.BottomRightOneLine:
-            this._crossShape.graphics.moveTo(0, 0);
+            this._backImg.graphics.moveTo(0, 0);
 
-            this._crossShape.graphics.lineTo(this._dWidth, this._dHeight);
+            this._backImg.graphics.lineTo(this._dWidth, this._dHeight);
 
             break;
 
           case TableProperty/* ObliqueSplitLine.BottomRightTwoLine */.lH.BottomRightTwoLine:
-            this._crossShape.graphics.moveTo(this._dWidth, this._dHeight);
+            this._backImg.graphics.moveTo(this._dWidth, this._dHeight);
 
-            this._crossShape.graphics.lineTo(0, this._dHeight / 2);
+            this._backImg.graphics.lineTo(0, this._dHeight / 2);
 
-            this._crossShape.graphics.moveTo(this._dWidth, this._dHeight);
+            this._backImg.graphics.moveTo(this._dWidth, this._dHeight);
 
-            this._crossShape.graphics.lineTo(this._dWidth / 2, 0);
+            this._backImg.graphics.lineTo(this._dWidth / 2, 0);
 
             break;
 
           case TableProperty/* ObliqueSplitLine.BottomLeftOneLine */.lH.BottomLeftOneLine:
-            this._crossShape.graphics.moveTo(0, this._dHeight);
+            this._backImg.graphics.moveTo(0, this._dHeight);
 
-            this._crossShape.graphics.lineTo(this._dWidth, 0);
+            this._backImg.graphics.lineTo(this._dWidth, 0);
 
             break;
 
           case TableProperty/* ObliqueSplitLine.BottomLeftTwoLine */.lH.BottomLeftTwoLine:
-            this._crossShape.graphics.moveTo(0, this._dHeight);
+            this._backImg.graphics.moveTo(0, this._dHeight);
 
-            this._crossShape.graphics.lineTo(this._dWidth / 2, 0);
+            this._backImg.graphics.lineTo(this._dWidth / 2, 0);
 
-            this._crossShape.graphics.moveTo(0, this._dHeight);
+            this._backImg.graphics.moveTo(0, this._dHeight);
 
-            this._crossShape.graphics.lineTo(this._dWidth, this._dHeight / 2);
+            this._backImg.graphics.lineTo(this._dWidth, this._dHeight / 2);
 
             break;
         }
-      }
+      } // if (this._crossShape && !this.contains(this._crossShape)) {
+      //   this.addChildAt(this._crossShape, 1);
+      // }
 
-      if (this._crossShape && !this.contains(this._crossShape)) {
-        this.addChildAt(this._crossShape, 1);
-      }
     }
   }, {
     key: "isFinishedPaint",
@@ -62463,9 +62728,9 @@ var DrawPageCell = /*#__PURE__*/function (_DrawArea) {
           _get$call2 = (0,slicedToArray/* default */.Z)(_get$call, 3),
           bret = _get$call2[0],
           aTop = _get$call2[1],
-          aRestHeight = _get$call2[2];
+          aRestHeight = _get$call2[2]; // this._docHeight -= dTop;
+
 
-      this._docHeight -= dTop;
       this.updateDHeight();
 
       var _this$_cell$table$get = this._cell.table.getCellRowCol(this._cell),
@@ -62558,14 +62823,12 @@ var DrawPageCell = /*#__PURE__*/function (_DrawArea) {
   }, {
     key: "startPaintBackGround",
     value: function startPaintBackGround() {
-      this._backImg.uncache();
-
+      //this._backImg.uncache();
       this._backImg.graphics.clear();
     }
   }, {
     key: "endPaintBackGround",
-    value: function endPaintBackGround(newHeight) {
-      this._backImg.cache(-1, -1, this._dWidth + 1, newHeight + 1);
+    value: function endPaintBackGround(newHeight) {// this._backImg.cache(-1, -1, this._dWidth + 1, newHeight + 1);
     }
   }, {
     key: "paintMarker",
@@ -62630,7 +62893,7 @@ var DrawPageCell = /*#__PURE__*/function (_DrawArea) {
           var dWidth = this._dWidth - 0.5;
           var height = newHeight - 0.5;
 
-          this._backImg.graphics.setStrokeStyle(1);
+          this._backImg.graphics.setStrokeStyle(0.5);
 
           if (r > this._drawPageTable.startRow) {
             y = -0.5;
@@ -62646,6 +62909,8 @@ var DrawPageCell = /*#__PURE__*/function (_DrawArea) {
         }
       }
 
+      this._backImg.graphics.endStroke();
+
       if (!this.contains(this._backImg)) {
         this.addChildAt(this._backImg, 0);
       } else {
@@ -62763,9 +63028,12 @@ var DrawPageCell = /*#__PURE__*/function (_DrawArea) {
           if (_newValignTop != this._valignTop) {
             this._valignTop = _newValignTop;
             var childCount = this._cell.drawCell.drawLines.length;
+            var dPageCell = this._cell.drawCell.drawPageCells[this._cell.drawCell.drawPageCells.length - 1];
+
+            var pageTableIndex = this._cell.table.drawTable.drawPageTables.indexOf(dPageCell._drawPageTable);
+
             var pageCellIndex = this._cell.drawCell.drawPageCells.length - 1;
-            var dPageCell = this._cell.drawCell.drawPageCells[pageCellIndex];
-            var cellrestHeight = rowHeightArr[pageCellIndex];
+            var cellrestHeight = rowHeightArr[pageTableIndex][0];
 
             for (var _i = childCount - 1; _i >= 0; _i--) {
               var dObj = this._cell.drawCell.drawLines[_i];
@@ -62774,7 +63042,8 @@ var DrawPageCell = /*#__PURE__*/function (_DrawArea) {
                 while (pageCellIndex > 0 && cellrestHeight < dObj.dHeight) {
                   pageCellIndex -= 1;
                   dPageCell = this._cell.drawCell.drawPageCells[pageCellIndex];
-                  cellrestHeight = rowHeightArr[pageCellIndex];
+                  pageTableIndex = this._cell.table.drawTable.drawPageTables.indexOf(dPageCell._drawPageTable);
+                  cellrestHeight = rowHeightArr[pageTableIndex][0];
                 }
 
                 if (!dPageCell.contains(dObj) && dObj.parent && dObj.parent.contains(dObj)) {
@@ -62810,7 +63079,8 @@ var DrawPageCell = /*#__PURE__*/function (_DrawArea) {
       var index = this.cell.drawCell.drawPageCells.indexOf(this);
       var innerTop = 0;
       var toparr = new Array();
-      var aHeight = 0;
+      var pageHeight = 0;
+      var drawTreeHeight = 0;
       var hoeditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._cell.hoEditorFactoryID);
 
       if (index == 0) {
@@ -62824,27 +63094,38 @@ var DrawPageCell = /*#__PURE__*/function (_DrawArea) {
       } else if (this._cell.cellProperty.align === TableProperty/* VAlign.vacenter */.TR.vacenter) {
         var _this$calcCellHeight = this.calcCellHeight();
 
-        var _this$calcCellHeight2 = (0,slicedToArray/* default */.Z)(_this$calcCellHeight, 2);
+        var _this$calcCellHeight2 = (0,slicedToArray/* default */.Z)(_this$calcCellHeight, 3);
 
-        aHeight = _this$calcCellHeight2[0];
-        toparr = _this$calcCellHeight2[1];
-        if (aHeight > this._cell.drawCell.docHeight) valignTop = (aHeight - this._cell.drawCell.docHeight) / 2;
+        drawTreeHeight = _this$calcCellHeight2[0];
+        pageHeight = _this$calcCellHeight2[1];
+        toparr = _this$calcCellHeight2[2];
+        if (pageHeight > this._cell.drawCell.docHeight) valignTop = (pageHeight - this._cell.drawCell.docHeight) / 2;
       } else if (this._cell.cellProperty.align === TableProperty/* VAlign.vabottom */.TR.vabottom) {
         var _this$calcCellHeight3 = this.calcCellHeight();
 
-        var _this$calcCellHeight4 = (0,slicedToArray/* default */.Z)(_this$calcCellHeight3, 2);
+        var _this$calcCellHeight4 = (0,slicedToArray/* default */.Z)(_this$calcCellHeight3, 3);
+
+        drawTreeHeight = _this$calcCellHeight4[0];
+        pageHeight = _this$calcCellHeight4[1];
+        toparr = _this$calcCellHeight4[2];
+
+        var pageTableIndex = this._cell.table.drawTable.drawPageTables.indexOf(this._drawPageTable);
 
-        aHeight = _this$calcCellHeight4[0];
-        toparr = _this$calcCellHeight4[1];
         var innerBottom = hoeditorFactory.unitConvert.mmConversionPx(this._cell.cellProperty.cellInnerMargin[1] * 10, true);
-        var restRowHeight = 0;
+        var restRowHeight = 0; //当前表格后续页剩余高度
+
+        var prevDocHeight = 0; //当前表格之前的页占用的文档高度
+
+        for (var r = pageTableIndex + 1; r < toparr.length; r++) {
+          restRowHeight += toparr[r][0];
+        }
 
-        for (var r = index; r < toparr.length; r++) {
-          restRowHeight += toparr[r];
+        for (var _r = 0; _r < pageTableIndex; _r++) {
+          prevDocHeight += toparr[_r][1];
         }
 
-        if (aHeight > this._cell.drawCell.docHeight && this._cell.drawCell.docHeight < restRowHeight) {
-          valignTop = restRowHeight - this._cell.drawCell.docHeight - innerBottom;
+        if (drawTreeHeight > this._cell.drawCell.docHeight) {
+          valignTop = pageHeight - Math.max(0, this._cell.drawCell.docHeight - restRowHeight - innerBottom - prevDocHeight);
         }
       }
 
@@ -62877,6 +63158,7 @@ var DrawPageCell = /*#__PURE__*/function (_DrawArea) {
      *
      * @returns
      * 返回单元格在所有分页上的总高度，以及每页高度数组
+     * toalHeight  pageHeight partCell.dHeight  partCell.docHeight
      */
 
   }, {
@@ -62890,6 +63172,7 @@ var DrawPageCell = /*#__PURE__*/function (_DrawArea) {
       var ret = 0;
       var hoeditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._cell.hoEditorFactoryID);
       var dTopArr = new Array();
+      var pageHeight = 0;
 
       if (this._cell.cellProperty.align == TableProperty/* VAlign.vabottom */.TR.vabottom) {
         ret = 0;
@@ -62904,39 +63187,43 @@ var DrawPageCell = /*#__PURE__*/function (_DrawArea) {
 
         var icount = this._cell.table.drawTable.drawPageTables.length;
         var index = 0;
-        var pageHeight = 0;
 
         for (var i = 0; i < icount; i++) {
-          dTopArr[index] = 0;
+          dTopArr.push([0, 0]);
 
-          for (var _r = row, _count = this._cell.rowSpan + row - 1; _r <= _count; _r++) {
-            var dTable = this._cell.table.drawTable.drawPageTables[i];
+          for (var _r2 = row, _count = this._cell.rowSpan + row - 1; _r2 <= _count; _r2++) {
+            var dTable = this._cell.table.drawTable.drawPageTables[i]; //if (dTable.parent&&dTable.parent.contains(dTable) ){ 
 
-            if (dTable.parent && dTable.parent.contains(dTable)) {
-              var _rowInfos = dTable.partRowHeights.get(_r);
+            var _rowInfos = dTable.partRowHeights.get(_r2);
 
-              if (_rowInfos) {
-                if (pageHeight < ret) {
-                  pageHeight += _rowInfos.rowHeight;
-                  dTopArr[index] += _rowInfos.rowHeight;
-                }
-              }
+            if (_rowInfos) {
+              dTopArr[index][0] += _rowInfos.rowHeight; // }
+            }
+
+            var partCell = this._cell.drawCell.getDrawPageCell(dTable);
+
+            if (partCell) {
+              dTopArr[index][1] = partCell.docHeight;
             }
 
             index += 1;
           }
         }
+
+        var dPageIndex = this._cell.table.drawTable.drawPageTables.indexOf(this._drawPageTable);
+
+        pageHeight = dTopArr[dPageIndex][0];
       } 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);
+        for (var _r3 = row, _count2 = this._cell.rowSpan + row - 1; _r3 <= _count2; _r3++) {
+          var _rowInfos2 = this._drawPageTable.partRowHeights.get(_r3);
 
           if (_rowInfos2) {
-            ret += _rowInfos2.rowHeight;
+            pageHeight += _rowInfos2.rowHeight;
           }
         }
       }
 
-      return [ret, dTopArr];
+      return [ret, pageHeight, dTopArr];
     }
   }]);
 
@@ -63756,8 +64043,9 @@ var DrawPageTable = /*#__PURE__*/function (_DrawRect) {
       }
 
       partCell.paintCellBackground(newHeight, r, c);
-      partCell.endPaintBackGround(newHeight);
       partCell.updateCrossShap();
+      partCell.endPaintBackGround(newHeight); // partCell.updateCrossShap();
+
       var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_12__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this.table.hoEditorFactoryID);
 
       if (hoEditorFactory.drawTree.paintStatus === _drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_13__/* .PaintState.psPreview */ .Dh.psPreview || hoEditorFactory.drawTree.paintStatus === _drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_13__/* .PaintState.psPrint */ .Dh.psPrint) {
@@ -64654,7 +64942,11 @@ var DrawPageTable = /*#__PURE__*/function (_DrawRect) {
               _cell2.drawCell.drawPageCells.push(dPartCell);
 
               dPartCell.y = cellRowTop;
-              dPartCell.x = aleft; //this.drawItems.push(dPartCell);
+
+              if (_mc3 > 0) {
+                dPartCell.x = aleft;
+              } //this.drawItems.push(dPartCell);
+
 
               this.addChild(dPartCell);
               var ret = dPartCell.update(dPrevPartCell, _cell2.drawCell.drawLines, startChildIndex, dPartCell.valignTop, cellMaxHeight);
@@ -67403,16 +67695,21 @@ var DrawText = /*#__PURE__*/function (_createjs$Text) {
     _this = _super.call(this, "", font, color);
     _this._startIndex = startIndex;
     var lineUsedWidth = 0;
-    _this._chinesWordWidth = _this._getMeasuredWidth("中");
+    _this._node = node;
+
+    if (node.dCombineStyle.chineseWidth == 0) {
+      node.dCombineStyle.chineseWidth = _this._getMeasuredWidth("中");
+    }
+
+    _this._chinesWordWidth = node.dCombineStyle.chineseWidth;
     _this._endIndex = -1;
     _this._docWidth = 0;
     var isFullLine = false;
     var lastTextWidth = 0;
+    _this._maxWidth = maxWidth;
 
     for (var j = startIndex, jl = text.length; j < jl; j++) {
-      if (text.charCodeAt(j) >= 10000) {
-        lastTextWidth = _this._chinesWordWidth;
-      } else lastTextWidth = _this._getMeasuredWidth(text[j]);
+      lastTextWidth = _this.getCharWidth(null, text[j]);
 
       if (lineUsedWidth + lastTextWidth > maxWidth && (j > 0 || !bPuctuation)) {
         isFullLine = true;
@@ -67433,7 +67730,7 @@ var DrawText = /*#__PURE__*/function (_createjs$Text) {
 
       if (UnitConvert/* UnitConvert.isNumEnglish */.P.isNumEnglish(aNexttext) && UnitConvert/* UnitConvert.isNumEnglish */.P.isNumEnglish(endText) && dLine && !_this.isFullLineNumEnglish(dLine, text.substr(startIndex, _this.endIndex - startIndex + 1))) {
         while (_this.endIndex >= startIndex && UnitConvert/* UnitConvert.isNumEnglish */.P.isNumEnglish(aNexttext) && UnitConvert/* UnitConvert.isNumEnglish */.P.isNumEnglish(endText)) {
-          lastTextWidth = _this._getMeasuredWidth(endText);
+          lastTextWidth = _this.getCharWidth(null, endText);
           _this.endIndex -= 1;
           _this._docWidth -= lastTextWidth;
           lineUsedWidth = lineUsedWidth - lastTextWidth - spacing;
@@ -67455,11 +67752,11 @@ var DrawText = /*#__PURE__*/function (_createjs$Text) {
       _this._endIndex = text.length - 1;
     }
 
-    _this._node = node;
     _this._dWidth = lineUsedWidth > 0 ? lineUsedWidth - spacing : 0;
 
     if (_this.endIndex > -1) {
-      _this._firstCharWidth = _this._getMeasuredWidth(node.text[startIndex]);
+      _this._firstCharWidth = _this.getCharWidth(null, node.text[startIndex]); // (this as any)._getMeasuredWidth(node.text[startIndex]);
+
       _this.text = node.text.substr(startIndex, _this._endIndex - startIndex + 1);
       _this._letterSpacing = spacing;
     } else {
@@ -67527,6 +67824,29 @@ var DrawText = /*#__PURE__*/function (_createjs$Text) {
       ctx.miterLimit = 10;
       return ctx;
     }
+  }, {
+    key: "getCharWidth",
+    value: function getCharWidth(ctx, akey) {
+      var wordW = 0;
+
+      if (akey.charCodeAt(0) >= 10000) {
+        wordW = this._chinesWordWidth;
+      } else {
+        wordW = this._node.dCombineStyle.getEnglishWidth(akey);
+
+        if (wordW == 0) {
+          if (ctx) {
+            wordW = ctx.measureText(akey).width;
+          } else {
+            wordW = this._getMeasuredWidth(akey);
+          }
+
+          this._node.dCombineStyle.setEnglishWidth(akey, wordW);
+        }
+      }
+
+      return wordW;
+    }
   }, {
     key: "_drawText",
     value: function _drawText(ctx, o, lines) {
@@ -67565,21 +67885,16 @@ var DrawText = /*#__PURE__*/function (_createjs$Text) {
       // let spaceCharAfter = 0;
       // let brecordSpace = true;
 
-      this._firstCharWidth = this._getMeasuredWidth(str[0]);
+      this._firstCharWidth = this.getCharWidth(ctx, str[0]);
 
       for (var j = 0, jl = str.length; j < jl; j++) {
         // Line needs to wrap:
-        var wordW = 0;
-
-        if (str.charCodeAt(j) >= 10000) {
-          wordW = this._chinesWordWidth;
-        } else wordW = this._getMeasuredWidth(str[j]); // if (brecordSpace && (str[j] ==' '||str[j] ==' '||str[j] =='　' )) {
+        var wordW = this.getCharWidth(ctx, str[j]); // if (brecordSpace && (str[j] ==' '||str[j] ==' '||str[j] =='　' )) {
         // 	charStart += 1;
         // } else {
         // 	brecordSpace = false;
         // }
 
-
         if (ctx instanceof CanvasRenderingContext2D) {
           //if ((ctx as any).name ==undefined ||(ctx as any).name!=='canvas2svg') {
           if (this.outline) {
@@ -67619,9 +67934,9 @@ var DrawText = /*#__PURE__*/function (_createjs$Text) {
         // 	}
         // }
         if (this.outline) {
-          ctx.strokeText(str, 0, 0, docWidth || 0xffff);
+          ctx.strokeText(str, 0, 0, docWidth || this._maxWidth);
         } else {
-          ctx.fillText(str, 0, 0, docWidth || 0xffff);
+          ctx.fillText(str, 0, 0, docWidth || this._maxWidth);
         }
       }
 
@@ -67646,11 +67961,7 @@ var DrawText = /*#__PURE__*/function (_createjs$Text) {
       var str = this.text;
 
       for (var i = 0, len = this.text.length; i < len; i++) {
-        var wordW = 0;
-
-        if (str.charCodeAt(i) >= 10000) {
-          wordW = this._chinesWordWidth;
-        } else wordW = this._getMeasuredWidth(str[i]);
+        var wordW = this.getCharWidth(null, str[i]);
 
         if (x < left + wordW + this._letterSpacing) {
           var mid = left + (wordW + this._letterSpacing) / 2;
@@ -67675,9 +67986,9 @@ var DrawText = /*#__PURE__*/function (_createjs$Text) {
       var totalWidth = 0;
 
       for (var i = 0; i <= end; i++) {
-        if (this.text.charCodeAt(i) >= 10000) {
-          textWidth = this._chinesWordWidth;
-        } else textWidth = this._getMeasuredWidth(this.text[i]);
+        textWidth = this.getCharWidth(null, this.text[i]); // if (this.text.charCodeAt(i) >= 10000) {
+        // 	textWidth = this._chinesWordWidth;
+        // } else textWidth = (this as any)._getMeasuredWidth(this.text[i]);
 
         totalWidth = totalWidth + textWidth + this._letterSpacing;
       }
@@ -75951,6 +76262,8 @@ var web_dom_collections_for_each = __webpack_require__(54747);
 var es_error_cause = __webpack_require__(21703);
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.concat.js
 var es_array_concat = __webpack_require__(92222);
+// EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.splice.js
+var es_array_splice = __webpack_require__(40561);
 // EXTERNAL MODULE: ./src/editor/dom/DocTree.ts
 var DocTree = __webpack_require__(23375);
 // EXTERNAL MODULE: ./src/editor/dom/treeNode/TextNode.ts
@@ -76100,6 +76413,7 @@ var ParagraphNode = __webpack_require__(14208);
 
 
 
+
 
 
 var Operate = /*#__PURE__*/(0,createClass/* default */.Z)(function Operate(act, ext) {
@@ -76332,7 +76646,16 @@ var NodeStyleUndoUnit = /*#__PURE__*/function () {
 
 
       this.spliteNode(range.clone());
-      var nodes = DomRange/* DomRange.getSelectDomNodesForUpdate */.a.getSelectDomNodesForUpdate(this._hoEditorFactoryID, this._oldpairs.start, this._newpairs.end); // console.log(nodes);
+      var nodes = DomRange/* DomRange.getSelectDomNodesForUpdate */.a.getSelectDomNodesForUpdate(this._hoEditorFactoryID, this._oldpairs.start, this._newpairs.end);
+
+      if (nodes.length > 0) {
+        var preNode = nodes[0].previousLeaf();
+
+        if (preNode instanceof ParagraphNode/* ParagraphNode */.C) {
+          nodes.splice(0, 0, preNode);
+        }
+      } // console.log(nodes);
+
 
       var aOperate = this._operate;
 
@@ -114592,7 +114915,7 @@ Context2D.prototype.arcTo=function(x1,y1,x2,y2,radius){throw new Error("arcTo no
    */Context2D.prototype.fillText=function(text,x,y,maxWidth){if(isNaN(x)||isNaN(y)||typeof text!=="string"){console.error("jsPDF.context2d.fillText: Invalid arguments",arguments);throw new Error("Invalid arguments passed to jsPDF.context2d.fillText");}maxWidth=isNaN(maxWidth)?undefined:maxWidth;if(isFillTransparent.call(this)){return;}var degs=rad2deg(this.ctx.transform.rotation);// We only use X axis as scale hint
 var scale=this.ctx.transform.scaleX;var acharSpace=this.letterSpacing?parseFloat(this.letterSpacing):0.0;//自定义修改  以处理宋体粗体
 if(this.font.indexOf("SimSun")>=0&&this.font.indexOf("bold")>=0){//renderingMode: "stroke",
-putText.call(this,{text:text,x:x,y:y,scale:scale,angle:degs,align:this.textAlign,maxWidth:maxWidth,renderingMode:"fillThenStroke",charSpace:acharSpace+1});}else{putText.call(this,{text:text,x:x,y:y,scale:scale,angle:degs,align:this.textAlign,maxWidth:maxWidth,charSpace:acharSpace});}};/**
+putText.call(this,{text:text,x:x,y:y,scale:scale,angle:degs,align:this.textAlign,maxWidth:maxWidth,renderingMode:"fillThenStroke",charSpace:acharSpace+0.35});}else{putText.call(this,{text:text,x:x,y:y,scale:scale,angle:degs,align:this.textAlign,maxWidth:maxWidth,charSpace:acharSpace});}};/**
    * Draws text on the canvas (no fill)
    *
    * @name strokeText
@@ -209182,15 +209505,15 @@ var map = {
 	"./pageInfoes/PageInfoes.vue": 67977,
 	"./paragraph/ParagraphDialog.vue": 32679,
 	"./poperSelect/PoperMark.vue": 93069,
-	"./poperSelect/PoperSelect.vue": 42498,
+	"./poperSelect/PoperSelect.vue": 64696,
 	"./poperTipText/PoperTipText.vue": 44523,
 	"./popers/Poper.vue": 25425,
 	"./popers/Title.vue": 40168,
 	"./printstyle/PrintLineStyle.vue": 90069,
 	"./qrCode/QrCode.vue": 67776,
 	"./radioCheckBox/RadioCheckbox.vue": 48961,
-	"./selectDialog/SelectDialog.vue": 54891,
-	"./sign/Sign.vue": 37542,
+	"./selectDialog/SelectDialog.vue": 89365,
+	"./sign/Sign.vue": 28663,
 	"./table/TableCellPoper.vue": 43529,
 	"./table/TableCellProperty.vue": 52445,
 	"./table/TableColProperty.vue": 17479,
@@ -210919,9 +211242,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=6e6c8103&
-var HoDocvue_type_template_id_6e6c8103_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_6e6c8103_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=9c9d5b12&
+var HoDocvue_type_template_id_9c9d5b12_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_9c9d5b12_staticRenderFns = []
 
 
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.filter.js
@@ -211614,7 +211937,10 @@ var DrawSelectLevel = /*#__PURE__*/function () {
           // }
           hoeditorfactory.docTree.curDomRange.endPath = endPos.path;
           hoeditorfactory.drawTree.selectRange.spEnd = endPos;
-          hoeditorfactory.drawTree.drawSelectRange();
+
+          if (endPos.path != '') {
+            hoeditorfactory.drawTree.drawSelectRange();
+          }
         }
       }
     } //return true;
@@ -212850,7 +213176,7 @@ var DrawPage = __webpack_require__(65870);
 // EXTERNAL MODULE: ./src/plugins/util.ts
 var util = __webpack_require__(33913);
 // EXTERNAL MODULE: ./src/components/controls/poperSelect/PoperSelect.vue + 8 modules
-var PoperSelect = __webpack_require__(42498);
+var PoperSelect = __webpack_require__(64696);
 // EXTERNAL MODULE: ./src/components/controls/poperSelect/PoperMark.vue + 5 modules
 var PoperMark = __webpack_require__(93069);
 ;// CONCATENATED MODULE: ./src/components/controls/poperSelect/index.ts
@@ -214562,7 +214888,7 @@ var SignNode = __webpack_require__(34450);
 // EXTERNAL MODULE: ./src/editor/dom/treeNode/ParagraphNode.ts
 var ParagraphNode = __webpack_require__(14208);
 ;// CONCATENATED MODULE: ./src/components/version.ts
-/* harmony default export */ var version = ('2.0.107');
+/* harmony default export */ var version = ('2.0.109');
 // EXTERNAL MODULE: ./src/components/controls/poperTipText/PoperTipText.vue + 5 modules
 var PoperTipText = __webpack_require__(44523);
 ;// CONCATENATED MODULE: ./src/components/controls/poperTipText/index.ts
@@ -214927,19 +215253,27 @@ var ImageNode = __webpack_require__(88389);
             if (dPage && dPage.needUpdateStage && dPage.drawDomLevel) {
               hoEditorFactory.drawPageTree.updateDrawPage(dPage.pageIndex);
               dPage.needUpdateStage = false;
+            } // intersectionRatio <= 0 代表目标页不在文档可视区内
+            // isIntersecting = true 代表目标页进入可视区 false代表离开可视区
+
+
+            if (v.isIntersecting && v.intersectionRatio == 0) {
+              console.warn('进入可视区但是相交区域=0');
             }
 
-            if (v.intersectionRatio === 0) {
-              inViewPages = inViewPages.filter(function (v) {
-                return v !== pageIndex;
+            if (v.intersectionRatio <= 0 && !v.isIntersecting) {
+              inViewPages = inViewPages.filter(function (m) {
+                return m !== pageIndex;
               });
-            } else {
-              inViewPages.includes(dPage.pageIndex) ? null : inViewPages.push(dPage.pageIndex);
+            } else if (!inViewPages.includes(pageIndex)) {
+              inViewPages.push(pageIndex);
             }
 
-            inViewPages = inViewPages.filter(function (v) {
-              return v < len;
-            }).sort();
+            inViewPages = inViewPages.filter(function (m) {
+              return m < len;
+            }).sort(function (a, b) {
+              return a < b;
+            });
           });
           _this3.inViewPages = (0,toConsumableArray/* default */.Z)(inViewPages);
           hoEditorFactory.drawTree.inViewPages = (0,toConsumableArray/* default */.Z)(inViewPages);
@@ -214948,7 +215282,7 @@ var ImageNode = __webpack_require__(88389);
       }, {
         root: null,
         rootMargin: '0px',
-        threshold: [0, 1]
+        threshold: [0, 0.8]
       });
     },
     setActiveDocIndex: function setActiveDocIndex(hoEditorId) {
@@ -215346,8 +215680,8 @@ var ImageNode = __webpack_require__(88389);
 
 var HoDoc_component = (0,componentNormalizer/* default */.Z)(
   components_HoDocvue_type_script_lang_js_,
-  HoDocvue_type_template_id_6e6c8103_render,
-  HoDocvue_type_template_id_6e6c8103_staticRenderFns,
+  HoDocvue_type_template_id_9c9d5b12_render,
+  HoDocvue_type_template_id_9c9d5b12_staticRenderFns,
   false,
   null,
   null,
@@ -216270,8 +216604,11 @@ var DrawPageTree = /*#__PURE__*/function () {
           }
         }
 
-        if (hoEditorFactory.isUseDrawingOptimization && drawArea instanceof DrawPageMainDoc/* DrawPageMainDoc */.$ && dRoots.length > 1) {
+        if (hoEditorFactory.isUseDrawingOptimization && !callFromPaint && drawArea instanceof DrawPageMainDoc/* DrawPageMainDoc */.$ && dRoots.length > 1) {
           startLine = this.calcStartLine(drawArea);
+          startIndex = startLine;
+          nextDlineTop = 0;
+          dTop = 0;
           drawArea.removeAllChildren();
         } //----------
 
@@ -217344,6 +217681,10 @@ var HTMLconverter2 = /*#__PURE__*/function () {
             size = size / 96 * 72;
           }
 
+          if (size == 11) {
+            size = 12;
+          }
+
           tmp.size = size;
         }
       }
@@ -217547,8 +217888,8 @@ var HTMLconverter2 = /*#__PURE__*/function () {
 
         for (var j = 0; j < trs.length; j++) {
           //for (let j = 0; j < rows.length; j++) {
-          var rowProperty = new TableProperty/* RowProperty */.Nr("");
-          rowProperty.isSpecifyHeight = true;
+          var rowProperty = new TableProperty/* RowProperty */.Nr(""); //rowProperty.isSpecifyHeight = true;
+
           var rowInfo = new TableNode/* RowInfos */.ii(tableNode, rowProperty);
           var height = jquery_default()(trs[j]).css("height");
 
@@ -217628,30 +217969,27 @@ var HTMLconverter2 = /*#__PURE__*/function () {
         if (td) {
           width = calcColWidth(td);
         } else {
-          var valArr = new Array();
-
-          for (var m = 0; m < rows.length; m++) {
-            if (m != maxcol && rows[m][k]) {
-              var colWidth = calcColWidth(rows[m][k]);
-              valArr.push(colWidth);
-            }
-          }
-
-          if (valArr.length == 0) {
-            width = 30;
-          } else if (valArr.length == 1) {
-            width = valArr[0];
-          } else {
-            var minVal = valArr[0];
-
-            for (var h = 1; h < valArr.length; h++) {
-              if (minVal > valArr[h]) {
-                minVal = valArr[h];
-              }
-            }
-
-            width = minVal;
-          }
+          // let valArr = new Array<number>();
+          // for (let m = 0; m < rows.length; m++) {
+          //   if (m != maxcol && rows[m][k]) {
+          //     const colWidth = calcColWidth(rows[m][k] as ChildNode);
+          //     valArr.push(colWidth);
+          //   }
+          // }
+          // if (valArr.length == 0) {
+          //   width = 30;
+          // } else if (valArr.length == 1) {
+          //   width = valArr[0];
+          // } else {
+          //   let minVal = valArr[0];
+          //   for (let h = 1; h < valArr.length; h++) {
+          //     if (minVal > valArr[h]) {
+          //       minVal = valArr[h];
+          //     }
+          //   }
+          //   width = minVal;
+          // }
+          width = 30;
         }
 
         if (width == 0) {
@@ -217898,19 +218236,36 @@ var HTMLconverter2 = /*#__PURE__*/function () {
         var result = new Array();
 
         var getText = function getText(text) {
-          var index1 = text.indexOf("<上标>");
-          var index2 = text.indexOf("<上标/>");
-          result.push({
-            "mark": 0,
-            "text": text.substring(0, index1)
-          });
-          result.push({
-            "mark": 1,
-            "text": text.substring(index1 + 4, index2)
-          });
-          text = text.substring(index2 + 5, text.length);
+          var index1 = -1;
+          var index2 = -1;
 
           if (text.indexOf("<上标>") >= 0) {
+            index1 = text.indexOf("<上标>");
+            index2 = text.indexOf("<上标/>");
+            result.push({
+              "mark": 0,
+              "text": text.substring(0, index1)
+            });
+            result.push({
+              "mark": 1,
+              "text": text.substring(index1 + 4, index2)
+            });
+          } else {
+            index1 = text.indexOf("<下标>");
+            index2 = text.indexOf("<下标/>");
+            result.push({
+              "mark": 0,
+              "text": text.substring(0, index1)
+            });
+            result.push({
+              "mark": 2,
+              "text": text.substring(index1 + 4, index2)
+            });
+          }
+
+          text = text.substring(index2 + 5, text.length);
+
+          if (text.indexOf("<上标>") >= 0 || text.indexOf("<下标>") >= 0) {
             getText(text);
           } else {
             result.push({
@@ -217920,7 +218275,7 @@ var HTMLconverter2 = /*#__PURE__*/function () {
           }
         };
 
-        if (text.indexOf("<上标>") >= 0) {
+        if (text.indexOf("<上标>") >= 0 || text.indexOf("<下标>") >= 0) {
           getText(text);
         }
 
@@ -217929,6 +218284,8 @@ var HTMLconverter2 = /*#__PURE__*/function () {
           result.forEach(function (value, key) {
             if (value.mark === 1) {
               styleobj["vertical_align"] = "super";
+            } else if (value.mark === 2) {
+              styleobj["vertical_align"] = "sub";
             } else {
               styleobj["vertical_align"] = "";
             }
@@ -217990,8 +218347,6 @@ var HTMLconverter2 = /*#__PURE__*/function () {
       var node = table.rows[r][c];
 
       if (node) {
-        var _node$childNodes;
-
         node.rowSpan = parseInt(jquery_default()(jnode).attr('rowSpan') || '1') || 1;
         node.colSpan = parseInt(jquery_default()(jnode).attr('colSpan') || '1') || 1;
         var styleobject = this.mergestyle(jquery_default()(jnode).attr("style") || '', '');
@@ -218020,22 +218375,29 @@ var HTMLconverter2 = /*#__PURE__*/function () {
         }
 
         if (tmp.length > 0 && tmp[0] instanceof ParagraphNode/* ParagraphNode */.C) {
-          node.childNodes.splice(0, node.childNodes.length);
+          node.childNodes.splice(1, node.childNodes.length);
         }
 
-        tmp.forEach(function (value) {
-          value.parentNode = node; //FIXME:这里没有考虑表格嵌套时候
+        for (var h = 0; h < tmp.length; h++) {
+          var anode = tmp[h];
+
+          if (h == 0 && anode instanceof ParagraphNode/* ParagraphNode */.C) {
+            node.childNodes[0].styleIndex = anode.styleIndex;
+            continue;
+          }
+
+          anode.parentNode = node; //FIXME:这里没有考虑表格嵌套时候
 
-          if (value instanceof ParagraphNode/* ParagraphNode */.C) {
-            value.drawlines.forEach(function (value) {
-              value.dWidth = table.colInfos[c].colWidth;
+          if (anode instanceof ParagraphNode/* ParagraphNode */.C) {
+            anode.drawlines.forEach(function (value) {
+              value.dWidth = table.colInfos[c].colWidth; //value.dHeight = table.rowInfos[r].rowHeight;
             });
           }
-        });
 
-        (_node$childNodes = node.childNodes).push.apply(_node$childNodes, tmp);
+          node.childNodes.push(anode);
+        } //node.childNodes.push(...tmp);
+        //node.cell2DrawNode(r, c);
 
-        node.cell2DrawNode(r, c);
       }
     }
   }]);
@@ -219112,78 +219474,31 @@ var StructureConvert = /*#__PURE__*/function () {
   }, {
     key: "xml2Doc",
     value: function xml2Doc(xml, isClearSign) {
-      // xml = this.replaceNodesName(xml);
-      // const x2js = new X2JS({ stripWhitespaces: false });
-      // const object = x2js.xml2js(xml);
-      // const json = JSON.parse(JSON.stringify(object));
-      // if (!json.root && !json.rvxml) {
-      //   return;
-      // }
-      // if (json.root) {
-      //   const root = json.root;
-      //   //处理页眉
-      //   let headers = root.headers.header;
-      //   if (headers.length === undefined) {
-      //     headers = Array(root.headers.header);
-      //   }
-      //   const headerArrays = new Array<Array<any>>();
-      //   for (let hi = 0; hi < headers.length; hi++) {
-      //     const index = parseInt(headers[hi].index);
-      //     let headerNodes = headers[hi].node;
-      //     if (headerNodes.length === undefined) {
-      //       headerNodes = Array(headers[hi].node);
-      //     }
-      //     for (let hj = 0; hj < headerNodes.length; hj++) {
-      //       const node = headerNodes[hj];
-      //       if (!headerArrays[index]) {
-      //         headerArrays[index] = new Array<any>();
-      //       }
-      //       headerArrays[index][hj] = node;
-      //     }
-      //   }
-      //   let footers = root.footers.footer;
-      //   if (footers.length === undefined) {
-      //     footers = Array(root.footers.footer);
-      //   }
-      //   const footerArrays = new Array<Array<any>>();
-      //   for (let fi = 0; fi < footers.length; fi++) {
-      //     const index = parseInt(footers[fi].index);
-      //     let footerNodes = footers[fi].node;
-      //     if (footerNodes.length === undefined) {
-      //       footerNodes = Array(footers[fi].node);
-      //     }
-      //     for (let fj = 0; fj < footerNodes.length; fj++) {
-      //       const node = footerNodes[fj];
-      //       if (!footerArrays[index]) {
-      //         footerArrays[index] = new Array<any>();
-      //       }
-      //       footerArrays[index][fj] = node;
-      //     }
-      //   }
-      //this.xmlBeauty(xml)
       var aobject = this.xml2Object(xml);
 
       if (aobject) {
         return this.json2Doc(aobject, isClearSign);
-      } // if (json.rvxml) {
-      //   const rvxml = json.rvxml;
-      //   return;
-      // }
-
+      }
     }
   }, {
     key: "xml2Object",
     value: function xml2Object(xml) {
-      xml = this.replaceNodesName(xml);
+      // console.time("replaceNodesName");
+      xml = this.replaceNodesName(xml); // console.timeEnd("replaceNodesName");
+
       var x2js = new (x2js_default())({
         stripWhitespaces: false
-      });
-      var object = x2js.xml2js(xml);
-      var json = JSON.parse(JSON.stringify(object));
+      }); // console.time("xml2js");
+
+      var object = x2js.xml2js(xml); // console.timeEnd("xml2js");
+      // const json = JSON.parse(JSON.stringify(object));
+
+      var json = object;
 
       if (!json.root && !json.rvxml) {
         return null;
-      }
+      } // console.time("return");
+
 
       if (json.root) {
         var root = json.root; //处理页眉
@@ -219263,7 +219578,8 @@ var StructureConvert = /*#__PURE__*/function () {
           }
         }
 
-        var footerSubDocTree = new Array();
+        var footerSubDocTree = new Array(); //   console.timeEnd("return");
+
         return {
           docProperty: root.docProperty,
           pageSettings: root.pageSettings,
@@ -219769,51 +220085,8 @@ var StructureConvert = /*#__PURE__*/function () {
   }, {
     key: "json2Doc",
     value: function json2Doc(xx, isClearSign) {
+      // console.time("json2Doc");
       var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID);
-      /*
-      const pushChildNodes = (
-        node: BaseNode | undefined,
-        temp: any,
-        rootNodes: any,
-        nodes: BaseNode[]
-      ) => {
-              if (node instanceof TextInputFieldNode) {
-          let childNodes = temp.childNodes.node;
-          if (childNodes.length === undefined) {
-            childNodes = Array(temp.childNodes.node);
-          }
-          if (childNodes) {
-            let childsMap = new Map<any, any>();
-            childsMap.set(childNodes, node);
-            do {
-              const childMap = new Map<any, any>();
-              childsMap.forEach((value, key) => {
-                childMap.clear();
-                for (let mj = 0; mj < key.length; mj++) {
-                  const childNode = hoEditorFactory.structureConvert.convertNode(
-                    key[mj],
-                    rootNodes,
-                    value
-                  );
-                  if (childNode) {
-                    if (childNode instanceof BaseCombineNode) {
-                      childNode.childNodes.forEach((value, key) => {
-                        childNode.removeChild(value);
-                      });
-                      childMap.set(key[mj].childNodes.childNode, childNode);
-                    }
-                    nodes.push(childNode);
-                  }
-                }
-              });
-              childsMap.clear();
-              childsMap = childMap;
-            } while (childsMap.size > 0);
-          }
-        }
-      };
-       */
-
       var propertyJson = xx.docProperty;
 
       if (propertyJson) {
@@ -219876,23 +220149,7 @@ var StructureConvert = /*#__PURE__*/function () {
       if (!isClearSign) {
         var comments = xx.comments;
         this._comments = comments.comment;
-      } // if (xx.logs) {
-      //   const logs = xx.logs;
-      //   let logsArr = [];
-      //   if (logs.log.length === undefined) {
-      //     logsArr = Array(logs.log);
-      //   } else {
-      //     logsArr = logs.log;
-      //   }
-      //   hoEditorFactory.docTree.logRecords = [];
-      //   for (let l = 0; l < logsArr.length; l++) {
-      //     const log = new LogRecord();
-      //     log.operator = logsArr[l].operator;
-      //     log.operTime = logsArr[l].operTime;
-      //     log.operType = logsArr[l].operType;
-      //     hoEditorFactory.docTree.logRecords.push(log);
-      //   }
-      // }
+      } // console.time("histories");
 
 
       hoEditorFactory.docTree.userHistories = [];
@@ -219909,7 +220166,9 @@ var StructureConvert = /*#__PURE__*/function () {
         Object.assign(history, historyObj);
         history.permissionLevel = Number(historyObj.permissionLevel);
         hoEditorFactory.docTree.userHistories.push(history);
-      }
+      } // console.timeEnd("histories");
+      // console.time("styles");
+
 
       var styles = xx.styles;
       hoEditorFactory.docTree.styles = [];
@@ -219938,84 +220197,17 @@ var StructureConvert = /*#__PURE__*/function () {
             v.font = '宋体';
           }
         });
-      } // for (let i = 0; i < fontStyles.length; i++) {
-      //   const fontStyle = fontStyles[i];
-      //   const textStyle = new TextStyle(this._hoEditorFactoryID);
-      //   //Object.assign(textStyle, fontStyle);
-      //   if (typeof fontStyle["size"] !== "undefined") {
-      //     textStyle.size = parseInt(fontStyle["size"]);
-      //   }
-      //   if (typeof fontStyle["font"] !== "undefined") {
-      //     textStyle.font = fontStyle["font"];
-      //   }
-      //   if (typeof fontStyle["color"] !== "undefined") {
-      //     textStyle.color = fontStyle["color"];
-      //   }
-      //   if (typeof fontStyle["backColor"] !== "undefined") {
-      //     textStyle.backColor = fontStyle["backColor"];
-      //   }
-      //   if (typeof fontStyle["bold"] !== "undefined") {
-      //     textStyle.bold = fontStyle["bold"] === "true" ? true : false;
-      //   }
-      //   if (typeof fontStyle["italic"] !== "undefined") {
-      //     textStyle.italic = fontStyle["italic"] === "true" ? true : false;
-      //   }
-      //   if (typeof fontStyle["underline"] !== "undefined") {
-      //     textStyle.underline = fontStyle["underline"] === "true" ? true : false;
-      //   }
-      //   if (typeof fontStyle["strikeout"] !== "undefined") {
-      //     textStyle.strikeout = fontStyle["strikeout"] === "true" ? true : false;
-      //   }
-      //   if (typeof fontStyle["script"] !== "undefined") {
-      //     textStyle.script = parseInt(fontStyle["script"]);
-      //   }
-      //   if (typeof fontStyle["creatorIndex"] !== "undefined") {
-      //     textStyle.creatorIndex = parseInt(fontStyle["creatorIndex"]);
-      //   }
-      //   if (typeof fontStyle["deleterIndex"] !== "undefined") {
-      //     textStyle.deleterIndex = parseInt(fontStyle["deleterIndex"]);
-      //   }
-      //   if (typeof fontStyle["commentID"] !== "undefined") {
-      //     textStyle.commentID = fontStyle["commentID"];
-      //   }
-      //   hoEditorFactory.docTree.styles.push(textStyle);
-      // }
-
+      }
 
       if (fontStyles) {
         var textStyles = this.getDocStyles("font", fontStyles);
         hoEditorFactory.docTree.styles = hoEditorFactory.docTree.styles.concat(textStyles);
-      }
+      } // console.timeEnd("styles");
+
 
       hoEditorFactory.docTree.paragraphs = [];
       var defaultParaStyle = new Paragraph/* Paragraph */.nv(this._hoEditorFactoryID);
       hoEditorFactory.docTree.paragraphs.push(defaultParaStyle); //先把默认的样式放进去
-      // for (let i = 0; i < paraStyles.length; i++) {
-      //   const paraStyle = paraStyles[i];
-      //   const paragraph: Paragraph = new Paragraph(this._hoEditorFactoryID);
-      //   if (typeof paraStyle["leftMarginMm"] !== "undefined") {
-      //     paragraph.leftMargin = parseInt(paraStyle["leftMarginMm"]);
-      //   }
-      //   if (typeof paraStyle["rightMarginMm"] !== "undefined") {
-      //     paragraph.rightMargin = parseInt(paraStyle["rightMarginMm"]);
-      //   }
-      //   if (typeof paraStyle["topMarginMm"] !== "undefined") {
-      //     paragraph.topMargin = parseInt(paraStyle["topMarginMm"]);
-      //   }
-      //   if (typeof paraStyle["bottomMarginMm"] !== "undefined") {
-      //     paragraph.bottomMargin = parseInt(paraStyle["bottomMarginMm"]);
-      //   }
-      //   if (typeof paraStyle["align"] !== "undefined") {
-      //     paragraph.align = parseInt(paraStyle["align"]);
-      //   }
-      //   if (typeof paraStyle["charSpace"] !== "undefined") {
-      //     paragraph.charSpace = parseInt(paraStyle["charSpace"]);
-      //   }
-      //   if (typeof paraStyle["lineSpace"] !== "undefined") {
-      //     paragraph.lineSpace = parseInt(paraStyle["lineSpace"]);
-      //   }
-      //   hoEditorFactory.docTree.paragraphs.push(paragraph);
-      // }
 
       if (paraStyles) {
         var parasStyles = this.getDocStyles("para", paraStyles);
@@ -220023,7 +220215,7 @@ var StructureConvert = /*#__PURE__*/function () {
       }
 
       var headersArray = xx.header;
-      var headerNodes = new Array();
+      var headerNodes = new Array(); // console.time("headersArray");
 
       if (headersArray) {
         for (var hi = 0; hi < headersArray.length; hi++) {
@@ -220080,7 +220272,9 @@ var StructureConvert = /*#__PURE__*/function () {
             }
           }
         }
-      }
+      } // console.timeEnd("headersArray");
+      // console.time("footersArray");
+
 
       var footersArray = xx.footer; // console.log(footersArray)
 
@@ -220142,7 +220336,9 @@ var StructureConvert = /*#__PURE__*/function () {
             }
           }
         }
-      }
+      } // console.timeEnd("footersArray");
+      // console.time("mainArray");
+
 
       var mainArray = xx.main;
       var mainNodes = new Array();
@@ -220152,9 +220348,16 @@ var StructureConvert = /*#__PURE__*/function () {
 
         if (!temp) {
           continue;
-        }
+        } //   if([2,10,14,19,24,40,54,65].includes(mi)) {
+        //     console.time(`${mi}_${temp.name ? temp.name : '表格'}`);
+        //   }
+
+
+        var _node3 = hoEditorFactory.structureConvert.convertNode(temp, hoEditorFactory.docTree.mainNodes, null, mainNodes, undefined, isClearSign); //   if([2,10,14,19,24,40,54,65].includes(mi)) {
+        //     console.timeEnd(`${mi}_${temp.name ? temp.name : '表格'}`);
+        //     console.log(temp);
+        //   }
 
-        var _node3 = hoEditorFactory.structureConvert.convertNode(temp, hoEditorFactory.docTree.mainNodes, null, mainNodes, undefined, isClearSign);
 
         if (_node3) {
           // if (node instanceof BaseCombineNode && temp.childNode) {
@@ -220165,28 +220368,14 @@ var StructureConvert = /*#__PURE__*/function () {
           mainNodes.push(_node3);
         } //pushChildNodes(node, temp,hoEditorFactory.docTree.mainNodes, mainNodes);
 
-      } //   const headerDocTree= new Array<SubDocTree>();
-      //   const footerDocTree= new Array<SubDocTree>();
-      //   for (let h=0;h<headerNodes.length;h++){
-      //     if (headerNodes[h]){
-      //       const subDocTree= new SubDocTree(h,"");
-      //       subDocTree.subDocNodes=headerNodes[h];
-      //       headerDocTree.push(subDocTree);
-      //     }
-      //   }
-      //   for (let f=0;f<footerNodes.length;f++){
-      //   if (footerNodes[f]){
-      //     const subDocTree= new SubDocTree(f,"");
-      //     subDocTree.subDocNodes=footerNodes[f];
-      //     footerDocTree.push(subDocTree);
-      //   }
-      // }
+      } // console.timeEnd("mainArray");
 
 
       var rtn = new Map();
       rtn.set("header", headerNodes);
       rtn.set("footer", footerNodes);
-      rtn.set("main", mainNodes);
+      rtn.set("main", mainNodes); // console.timeEnd("json2Doc");
+
       return rtn;
     }
   }, {
@@ -220306,31 +220495,11 @@ var StructureConvert = /*#__PURE__*/function () {
       temp.nodeType = BaseNode/* NodeType */.Jq[temp.nodeType];
 
       if (temp.nodeType == BaseNode/* NodeType.ntTable */.Jq.ntTable) {
-        // const cnode =hoEditorFactory.docTree.curDomRange.normalize().npStart;
-        // let paragraNode;
-        // if (cnode.node instanceof ParagraphNode) {
-        //   paragraNode = cnode.node;
-        // } else {
-        //   paragraNode = new ParagraphNode(
-        //     this._hoEditorFactoryID,
-        //    hoEditorFactory.docTree.activeNodes,
-        //    hoEditorFactory.docTree.getParentNode(cnode.path),
-        //     0
-        //   )
-        // }
-        // const paragraNode = nodes
-        //   ? (nodes[nodes.length - 1] as ParagraphNode)
-        //   : null;
-        //console.log("table", temp);
         if (isPaste && parentNode instanceof TextInputFieldNode/* TextInputFieldNode */.re) {
           message_box_default().alert("不允许将表格粘贴到文本域");
 
           return undefined;
-        } // if (isPaste && parentNode instanceof CellNode) {
-        //   MessageBox.alert("不允许将表格粘贴到表格");
-        //   return undefined;
-        // }
-
+        }
 
         var node = TableNode/* TableNode.json2Node */.Fh.json2Node(this._hoEditorFactoryID, temp, rootNodes, parentNode, isPaste, isClearSign);
         return node;
@@ -220487,11 +220656,12 @@ var StructureConvert = /*#__PURE__*/function () {
 
       var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID);
       this._superiorSign = [];
-      hoEditorFactory.isThrowError = false;
-      var nodes = hoEditorFactory.structureConvert.xml2Doc(xml, isClearSign);
-      Promise.resolve().then(function () {
-        hoEditorFactory.drawTree.updateDrawTreeFirstLine();
+      hoEditorFactory.isThrowError = false; // console.time("xml2Doc");
+
+      var nodes = hoEditorFactory.structureConvert.xml2Doc(xml, isClearSign); // console.timeEnd("xml2Doc");
 
+      Promise.resolve().then(function () {
+        //   hoEditorFactory.drawTree.updateDrawTreeFirstLine();
         _this4.openJson2Doc(nodes, callback, isDelBlockLine);
       });
     }
@@ -220504,7 +220674,7 @@ var StructureConvert = /*#__PURE__*/function () {
       callback && callback({
         text: hoEditorFactory.vueController.getDocTitle(),
         count: 0
-      });
+      }); // console.time("openJson2Doc");
 
       if (nodes) {
         var insertNode = function insertNode(array, prevNode) {
@@ -220572,32 +220742,7 @@ var StructureConvert = /*#__PURE__*/function () {
               _this5._superiorSign[0] = aNode;
             }
           }
-        }; //   1
-        //先删除全部header节点
-        // const headersArr =hoEditorFactory.docTree.headerNodes;
-        // if (headersArr.length > 0) {
-        //   for (let i = 0; i < headersArr.length; i++) {
-        //     const headerArr = headersArr[i];
-        //     if (headerArr.length > 1) {
-        //       const lastNode =hoEditorFactory.docTree.headerNodes[i][
-        //         headerArr.length - 1
-        //       ];
-        //       const endPathH =hoEditorFactory.docTree.getNodeLastPath(
-        //         lastNode
-        //       );
-        //       undoService.begin();
-        //       undoService.add(
-        //         new NodesDeleteUndoUnit(
-        //           this._hoEditorFactoryID,
-        //           "header/" + i.toString() + "/0/0",
-        //           endPathH
-        //         )
-        //       );
-        //       undoService.commit();
-        //       //HOEditorFactorys.instance().getFactory(this._hoEditorFactoryID).docTree.headerNodes[i].splice(1, headerArr.length - 1);
-        //     }
-        //   }
-        // }
+        }; //   console.time("openJson2Doc--headersArray");
         //添加header节点
 
 
@@ -220634,46 +220779,9 @@ var StructureConvert = /*#__PURE__*/function () {
             //hoEditorFactory.drawPageTree.drawHeaders[i].stage?.update();
 
           }
-        } //先删除全部mainDoc节点
-        // const rootNodes =hoEditorFactory.docTree.mainNodes;
-        // if (rootNodes.length > 1) {
-        //   const endPathM =hoEditorFactory.docTree.getNodeLastPath(
-        //    hoEditorFactory.docTree.mainNodes[rootNodes.length - 1]
-        //   );
-        //   undoService.begin();
-        //   undoService.add(
-        //     new NodesDeleteUndoUnit(this._hoEditorFactoryID, "main/0/0", endPathM)
-        //   );
-        //   undoService.commit();
-        //   //hoEditorFactory.docTree.mainNodes.splice(1,hoEditorFactory.docTree.mainNodes.length - 1);
-        // }
-        //添加mainDoc节点
-        //先删除全部footer节点
-        // const footersArr =hoEditorFactory.docTree.footerNodes;
-        // if (footersArr.length > 0) {
-        //   for (let i = 0; i < footersArr.length; i++) {
-        //     const footerArr = footersArr[i];
-        //     if (footerArr.length > 1) {
-        //       const endPathF =hoEditorFactory.docTree.getNodeLastPath(
-        //        hoEditorFactory.docTree.footerNodes[i][
-        //         footerArr.length - 1
-        //         ]
-        //       );
-        //       undoService.begin();
-        //       undoService.add(
-        //         new NodesDeleteUndoUnit(
-        //           this._hoEditorFactoryID,
-        //           "footer/" + i.toString() + "/0/0",
-        //           endPathF
-        //         )
-        //       );
-        //       undoService.commit();
-        //       //HOEditorFactorys.instance().getFactory(this._hoEditorFactoryID).docTree.footerNodes[i].splice(1, footerArr.length - 1);
-        //     }
-        //   }
-        // }
+        } //   console.timeEnd("openJson2Doc--headersArray");
+        //   console.time("openJson2Doc--footersArray");
         //添加footer节点
-        //const footersArray = nodes.get("footer");
 
 
         var footersArray = nodes.get("footer");
@@ -220710,10 +220818,8 @@ var StructureConvert = /*#__PURE__*/function () {
             // );
 
           }
-        } // for (let i = 0; i < hoEditorFactory.drawTree.drawPages.length; i++) {
-        //   hoEditorFactory.drawPageTree.calcMainDocPosition(i);
-        //   hoEditorFactory.drawTree.drawPages[i].reFreshBounds();
-        // }
+        } //   console.timeEnd("openJson2Doc--footersArray");
+        //main
 
 
         var main = nodes.get("main");
@@ -220725,13 +220831,15 @@ var StructureConvert = /*#__PURE__*/function () {
 
         insertNode(main, mPrevNode);
         var mLength = hoEditorFactory.docTree.mainNodes.length - 1;
-        var mEndPath = hoEditorFactory.docTree.getNodeLastPath(hoEditorFactory.docTree.mainNodes[mLength]);
+        var mEndPath = hoEditorFactory.docTree.getNodeLastPath(hoEditorFactory.docTree.mainNodes[mLength]); //   console.time("openJson2Doc--change");
+
         var mChangeEvent = new NodeChangeEvent/* NodeChangeEvent */.G(this._hoEditorFactoryID, DocTree/* DocAction.daInsert */.gk.daInsert, "main/0", mEndPath); // mChangeEvent.oldEndPath = mEndPath;
         // mChangeEvent.oldDrawTreeLines = new SelectRange(
         //   this._hoEditorFactory
         // ).getRangeDrawTreeLines("main/0", mEndPath);
 
-        hoEditorFactory.docTree.change(mChangeEvent);
+        hoEditorFactory.docTree.change(mChangeEvent); //   console.timeEnd("openJson2Doc--change");
+
         var comments = [];
 
         if (this._comments.length === undefined) {
@@ -220792,7 +220900,9 @@ var StructureConvert = /*#__PURE__*/function () {
 
         var formularNodes = hoEditorFactory.drawTree.formularNodes;
         formularNodes.forEach(function (value, key) {
-          if (value.formularType === TableFormula/* FormularType.ftSum */.a.ftSum || value.formularType === TableFormula/* FormularType.ftFormular */.a.ftFormular || value.formularType === TableFormula/* FormularType.ftBMI */.a.ftBMI || value.formularType === TableFormula/* FormularType.ftLaborProcess */.a.ftLaborProcess || value.formularType === TableFormula/* FormularType.ftExpectedBirthDate */.a.ftExpectedBirthDate || value.formularType === TableFormula/* FormularType.ftPregnantWeeks */.a.ftPregnantWeeks || value.formularType === TableFormula/* FormularType.ftScoreMapping */.a.ftScoreMapping) {
+          if ( //value.formularType === FormularType.ftSum
+          //|| value.formularType === FormularType.ftFormular
+          value.formularType === TableFormula/* FormularType.ftBMI */.a.ftBMI || value.formularType === TableFormula/* FormularType.ftLaborProcess */.a.ftLaborProcess || value.formularType === TableFormula/* FormularType.ftExpectedBirthDate */.a.ftExpectedBirthDate || value.formularType === TableFormula/* FormularType.ftPregnantWeeks */.a.ftPregnantWeeks || value.formularType === TableFormula/* FormularType.ftScoreMapping */.a.ftScoreMapping) {
             value.updateResult();
             value.getParentCell().drawCell.needUpdate = true;
             var prevNode = value.previousLeaf();
@@ -220818,7 +220928,7 @@ var StructureConvert = /*#__PURE__*/function () {
           text: hoEditorFactory.vueController.getDocTitle(),
           count: 0
         });
-        hoEditorFactory.isThrowError = true;
+        hoEditorFactory.isThrowError = true; //   console.timeEnd("openJson2Doc");
       }
     }
   }, {
@@ -225149,6 +225259,7 @@ var VueController = /*#__PURE__*/function () {
     value: function insertHtmlText(strHtml) {
       var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID);
       strHtml = hoEditorFactory.unitConvert.replaceAll(strHtml, "</上标>", "<上标/>");
+      strHtml = hoEditorFactory.unitConvert.replaceAll(strHtml, "</下标>", "<下标/>");
       var result = hoEditorFactory.editController.canIsEdit(hoEditorFactory);
 
       if (result) {
@@ -227804,7 +227915,7 @@ var VueController = /*#__PURE__*/function () {
 
           do {
             if (aNode) {
-              if (aNode instanceof TextNode/* TextNode */.R) {
+              if (aNode instanceof TextNode/* TextNode */.R || aNode instanceof MarkNode/* MarkNode */.j) {
                 if (mark === -1) {
                   if (content.length > 0) {
                     paraTextStrArr.push((index + 1).toString() + '|' + textCount.toString() + '|' + content); //['第几段|该段的第几个文本串|文本串内容']  （一段里面可能有很多个文本串，一段里面会有除文本节点之外的其它节点）
@@ -227815,10 +227926,12 @@ var VueController = /*#__PURE__*/function () {
                   }
                 }
 
-                var nodePath = hoEditorFactory.docTree.getNodeFirstPath(aNode);
-                nodesMap.set((index + 1).toString() + '|' + textCount.toString() + '|' + content.length, nodePath); //nodesMap<第几段|该段的第几个文本串|节点文本在该文本串的位置,'节点路径'>
+                if (aNode instanceof TextNode/* TextNode */.R) {
+                  var nodePath = hoEditorFactory.docTree.getNodeFirstPath(aNode);
+                  nodesMap.set((index + 1).toString() + '|' + textCount.toString() + '|' + content.length, nodePath); //nodesMap<第几段|该段的第几个文本串|节点文本在该文本串的位置,'节点路径'>
+                }
 
-                content = content + aNode.text;
+                content = content + (aNode instanceof MarkNode/* MarkNode */.j ? "" : aNode.text);
               } else if (aNode instanceof ControlNode/* ControlNode */.w) {
                 if (content.length > 0) {
                   paraTextStrArr.push((index + 1).toString() + '|' + textCount.toString() + '|' + content); //['第几段|该段的第几个文本串|文本串内容']  （一段里面可能有很多个文本串，一段里面会有除文本节点之外的其它节点）
@@ -227956,15 +228069,26 @@ var VueController = /*#__PURE__*/function () {
           }
 
           if (path === nodeLastPath) {
-            var _np$node, _np$node2;
+            (function () {
+              var getNextNode = function getNextNode(curNode) {
+                var nextNode = curNode.nextLeaf();
+
+                if (nextNode instanceof TextNode/* TextNode */.R) {
+                  return nextNode;
+                } else {
+                  return getNextNode(nextNode);
+                }
+              };
 
-            path = hoEditorFactory.docTree.getNodeFirstPath((_np$node = np.node) === null || _np$node === void 0 ? void 0 : _np$node.nextLeaf());
-            nodeLastPath = hoEditorFactory.docTree.getNodeLastPath((_np$node2 = np.node) === null || _np$node2 === void 0 ? void 0 : _np$node2.nextLeaf());
+              var nNode = getNextNode(np.node);
+              path = hoEditorFactory.docTree.getNodeFirstPath(nNode);
+              nodeLastPath = hoEditorFactory.docTree.getNodeLastPath(nNode);
+            })();
           } else {
-            var pathArr = path.split('/');
+            var pathArr = path.split("/");
             var value = parseInt(pathArr[pathArr.length - 1]);
             pathArr[pathArr.length - 1] = (value + 1).toString();
-            path = pathArr.join('/');
+            path = pathArr.join("/");
           }
         }
 
@@ -232613,6 +232737,11 @@ var HoLocalStorage = /*#__PURE__*/function () {
 
 
 
+
+
+
+
+
 
 
 
@@ -232659,6 +232788,7 @@ var HOEditorFactory = /*#__PURE__*/function () {
 
     this._notAllowCrossPatiPaste = false; //不允许跨病人粘贴
 
+    this._fontSizeMap = new Map();
     this._hoEditorFactoryId = id;
   }
   /**
@@ -233476,6 +233606,19 @@ var HOEditorFactory = /*#__PURE__*/function () {
         this._drawTree = null;
       }
     }
+  }, {
+    key: "getFontHeightByFontSize",
+    value: function getFontHeightByFontSize(isize) {
+      var val = this._fontSizeMap.get(isize);
+
+      if (!val) {
+        val = this.docTree.defaultCombineStyle.getFontHeightByFontSize(isize);
+
+        this._fontSizeMap.set(isize, val);
+      }
+
+      return val;
+    }
   }]);
 
   return HOEditorFactory;
@@ -234406,54 +234549,68 @@ var FontStyleMixin = /*#__PURE__*/function (_Vue) {
       var tableNodeInfo = this.getTableNodeInfo(nodes === null || nodes === void 0 ? void 0 : nodes.node);
 
       if (tableNodeInfo) {
-        var _dPage$drawDomLevel;
-
-        var dPage = hoEditorFactory.drawTree.drawPages[hoEditorFactory.drawTree.caret.pageIndex];
-        var dPageElementNode = (_dPage$drawDomLevel = dPage.drawDomLevel) === null || _dPage$drawDomLevel === void 0 ? void 0 : _dPage$drawDomLevel.domCanvas.parentElement;
-        var tableBounds = {
-          x: hoEditorFactory.pageProperty.leftMarginPixes + tableNodeInfo.tableNode.drawTable.x,
-          y: 0,
-          width: tableNodeInfo.tableNode.drawTable.dWidth,
-          height: 0,
-          cellWidth: tableNodeInfo === null || tableNodeInfo === void 0 ? void 0 : tableNodeInfo.cellNode.drawCell.dWidth,
-          cellHeight: tableNodeInfo === null || tableNodeInfo === void 0 ? void 0 : tableNodeInfo.cellNode.drawCell.dHeight,
-          cellY: 20,
-          cellX: 0
-        }; // 取当前页的表格 处理跨页情况
-
-        var drawPageTables = tableNodeInfo.tableNode.drawTable.drawPageTables;
-        var drawPageCells = tableNodeInfo.cellNode.drawCell.drawPageCells;
-        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 === currentPageIndex) {
-            tableBounds.height = v.dHeight;
-            tableBounds.y = dPage.drawMainDoc.y + v.y;
-
-            if (drawPageCells.length === drawPageTables.length) {
-              tableBounds.cellHeight = drawPageCells[key].dHeight;
+        var dNode = hoEditorFactory.drawTree.getDNodeByPath(hoEditorFactory.docTree.curDomRange.startPath);
+        var dline = hoEditorFactory.drawTree.getDrawLineByDNode(dNode);
+        var dPage = hoEditorFactory.drawPageTree.getDrawPageByDNode(dline);
+
+        if (dPage) {
+          var _dPage$drawDomLevel;
+
+          var dPageElementNode = (_dPage$drawDomLevel = dPage.drawDomLevel) === null || _dPage$drawDomLevel === void 0 ? void 0 : _dPage$drawDomLevel.domCanvas.parentElement;
+          var tableBounds = {
+            x: hoEditorFactory.pageProperty.leftMarginPixes + tableNodeInfo.tableNode.drawTable.x,
+            y: 0,
+            width: tableNodeInfo.tableNode.drawTable.dWidth,
+            height: 0,
+            cellWidth: tableNodeInfo === null || tableNodeInfo === void 0 ? void 0 : tableNodeInfo.cellNode.drawCell.dWidth,
+            cellHeight: tableNodeInfo === null || tableNodeInfo === void 0 ? void 0 : tableNodeInfo.cellNode.drawCell.dHeight,
+            cellY: 20,
+            cellX: 0
+          }; // 取当前页的表格 处理跨页情况
+
+          var drawPageTables = tableNodeInfo.tableNode.drawTable.drawPageTables;
+          var currentPageIndex = dPage.drawMainDoc.pageIndex;
+          var drawPageCells = tableNodeInfo.cellNode.drawCell.drawPageCells;
+          var drawPageTable = tableNodeInfo.tableNode.drawTable.getDrawTableByPageIndex(currentPageIndex);
+
+          if (drawPageTable) {
+            var drawPageCell = tableNodeInfo.cellNode.drawCell.getDrawPageCell(drawPageTable);
+
+            if (drawPageCell) {
+              tableBounds.cellX = drawPageCell.x + 20;
+              tableBounds.cellY = drawPageCell.y + 20;
+              tableBounds.cellWidth = drawPageCell.dWidth;
+              tableBounds.cellHeight = drawPageCell.dHeight;
+            }
+          }
+
+          drawPageTables.forEach(function (v, key) {
+            if (v.parent.pageIndex === currentPageIndex) {
+              tableBounds.height = v.dHeight;
+              tableBounds.y = dPage.drawMainDoc.y + v.y;
+
+              if (drawPageCells.length === drawPageTables.length) {
+                tableBounds.cellHeight = drawPageCells[key].dHeight;
+              }
             }
-          }
-        });
-        var aDiv = document.createElement('div');
-        aDiv.id = 'ho_table_auxiliary';
-        aDiv.style.position = 'absolute';
-        aDiv.style.left = hoEditorFactory.pageProperty.leftMarginPixes - 20 + 'px';
-        aDiv.style.top = tableBounds.y - 20 + 'px';
-        aDiv.style.height = hoEditorFactory.pageProperty.heightPixes - tableBounds.y - hoEditorFactory.pageProperty.footerYPixes + 'px';
-        aDiv.innerHTML = "\n                <div id=\"ho_table_auxiliary_left\" style=\"height: ".concat(tableBounds.height, "px\"></div>\n                <div id=\"ho_table_auxiliary_left_active\" style=\"height: ").concat(tableBounds.cellHeight, "px; top: ").concat(tableBounds.cellY, "px;\"></div>\n            ");
-        /**
-         * 上方隐藏 只处理左侧提示
-            `
-            <div id="ho_table_auxiliary_top" style="width: ${tableBounds.width}px"></div>
-            <div id="ho_table_auxiliary_top_active" style="width: ${tableBounds.cellWidth}px;left: ${tableBounds.cellX}px;"></div>
-            `
-         */
+          });
+          var aDiv = document.createElement('div');
+          aDiv.id = 'ho_table_auxiliary';
+          aDiv.style.position = 'absolute';
+          aDiv.style.left = hoEditorFactory.pageProperty.leftMarginPixes - 20 + 'px';
+          aDiv.style.top = tableBounds.y - 20 + 'px';
+          aDiv.style.height = hoEditorFactory.pageProperty.heightPixes - tableBounds.y - hoEditorFactory.pageProperty.footerYPixes + 'px';
+          aDiv.innerHTML = "\n                    <div id=\"ho_table_auxiliary_left\" style=\"height: ".concat(tableBounds.height, "px\"></div>\n                    <div id=\"ho_table_auxiliary_left_active\" style=\"height: ").concat(tableBounds.cellHeight, "px; top: ").concat(tableBounds.cellY, "px;\"></div>\n                ");
+          /**
+           * 上方隐藏 只处理左侧提示
+              `
+              <div id="ho_table_auxiliary_top" style="width: ${tableBounds.width}px"></div>
+              <div id="ho_table_auxiliary_top_active" style="width: ${tableBounds.cellWidth}px;left: ${tableBounds.cellX}px;"></div>
+              `
+          */
 
-        dPageElementNode === null || dPageElementNode === void 0 ? void 0 : dPageElementNode.appendChild(aDiv);
+          dPageElementNode === null || dPageElementNode === void 0 ? void 0 : dPageElementNode.appendChild(aDiv);
+        }
       }
     }
   }, {
@@ -234498,9 +234655,7 @@ var FontStyleMixin = /*#__PURE__*/function (_Vue) {
           canDeleteRow: tableNode.tableProperty.canDeleteRow
         };
 
-        if (tableNode.tableProperty.isAutoChangeLine && nodes) {
-          this.createTable(hoEditorFactory, nodes);
-        } else if (hoEditorFactory.isCanUseTableProperty && nodes) {
+        if ((hoEditorFactory.isCanUseTableProperty || tableNode.tableProperty.isAutoChangeLine) && nodes) {
           this.createTable(hoEditorFactory, nodes);
         }
       }
@@ -241427,7 +241582,7 @@ var HoRightMenu = /*#__PURE__*/function (_Mixins) {
     _this.emrDebug = false; // 获取全局变量 emrDebug0331
 
     _this.formularType = {
-      sum: '求和公式',
+      sum: '表格行列求和公式',
       formula: '四则运算公式',
       bmi: 'bmi计算公式',
       labor: '产程公式',