hoeditor-web 2.0.96 → 2.0.99

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -10518,7 +10518,7 @@ var component = (0,componentNormalizer/* default */.Z)(
10518
10518
 
10519
10519
  /***/ }),
10520
10520
 
10521
- /***/ 44801:
10521
+ /***/ 76060:
10522
10522
  /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
10523
10523
 
10524
10524
  "use strict";
@@ -10530,11 +10530,13 @@ __webpack_require__.d(__webpack_exports__, {
10530
10530
  "default": function() { return /* binding */ Sign; }
10531
10531
  });
10532
10532
 
10533
- ;// CONCATENATED MODULE: ./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/sign/Sign.vue?vue&type=template&id=47d45612&
10533
+ ;// CONCATENATED MODULE: ./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/sign/Sign.vue?vue&type=template&id=5a3cdcd6&
10534
10534
  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)])}
10535
10535
  var staticRenderFns = []
10536
10536
 
10537
10537
 
10538
+ // EXTERNAL MODULE: ./node_modules/core-js/modules/es.function.name.js
10539
+ var es_function_name = __webpack_require__(68309);
10538
10540
  // EXTERNAL MODULE: ./node_modules/core-js/modules/es.regexp.exec.js
10539
10541
  var es_regexp_exec = __webpack_require__(74916);
10540
10542
  // EXTERNAL MODULE: ./node_modules/core-js/modules/es.string.replace.js
@@ -10555,10 +10557,10 @@ var es_array_concat = __webpack_require__(92222);
10555
10557
  var web_dom_collections_for_each = __webpack_require__(54747);
10556
10558
  // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.slice.js
10557
10559
  var es_array_slice = __webpack_require__(47042);
10558
- // EXTERNAL MODULE: ./node_modules/core-js/modules/es.function.name.js
10559
- var es_function_name = __webpack_require__(68309);
10560
- // EXTERNAL MODULE: ./src/components/controls/colorPicker/HoColorPicker.vue + 5 modules
10561
- var HoColorPicker = __webpack_require__(47328);
10560
+ // EXTERNAL MODULE: ./src/HOEditorFactorys.ts
10561
+ var HOEditorFactorys = __webpack_require__(41005);
10562
+ // EXTERNAL MODULE: ./src/editor/dom/treeNode/SignNode.ts
10563
+ var SignNode = __webpack_require__(34450);
10562
10564
  ;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40[0].rules[0].use[0]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/sign/Sign.vue?vue&type=script&lang=js&
10563
10565
 
10564
10566
 
@@ -10677,14 +10679,18 @@ var HoColorPicker = __webpack_require__(47328);
10677
10679
  //
10678
10680
  //
10679
10681
 
10682
+
10680
10683
  /* harmony default export */ var Signvue_type_script_lang_js_ = ({
10681
10684
  name: 'Sign',
10682
- components: {
10683
- HoColorPicker: HoColorPicker["default"]
10684
- },
10685
10685
  props: {
10686
10686
  vueController: {
10687
10687
  default: function _default() {}
10688
+ },
10689
+ controlStatus: {
10690
+ default: 'add'
10691
+ },
10692
+ hoEditorFactoryId: {
10693
+ default: ''
10688
10694
  }
10689
10695
  },
10690
10696
  data: function data() {
@@ -10703,7 +10709,41 @@ var HoColorPicker = __webpack_require__(47328);
10703
10709
  animationClassNames: 'control-modal-contents sign-modal animation-in'
10704
10710
  };
10705
10711
  },
10712
+ mounted: function mounted() {
10713
+ if (this.controlStatus === 'update') {
10714
+ var node = this.getCurrentSelectNode();
10715
+
10716
+ if (node) {
10717
+ this.name = node.name;
10718
+ this.signType = node.signType == 0 && node.connectMode ? 3 : node.signType;
10719
+ this.signFormat = node.signFormat;
10720
+ this.connectMode = node.connectMode;
10721
+ this.connectChar = node.connectChar;
10722
+ this.isFront = node.isFront;
10723
+ this.signTimeFormat = node.signTimeFormat;
10724
+ this.customFormatContent = node.customFormatContent;
10725
+ this.customSignFormatList = node.customSignFormatList;
10726
+ }
10727
+ }
10728
+ },
10706
10729
  methods: {
10730
+ getCurrentSelectNode: function getCurrentSelectNode() {
10731
+ var _hoEditorFactory$vueC;
10732
+
10733
+ var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this.hoEditorFactoryId);
10734
+ var domRange = {
10735
+ startPath: hoEditorFactory.docTree.curDomRange.normalize().startPath,
10736
+ endPath: hoEditorFactory.docTree.curDomRange.normalize().endPath
10737
+ };
10738
+ var node = (_hoEditorFactory$vueC = hoEditorFactory.vueController.findNodebyPath(domRange.endPath)) === null || _hoEditorFactory$vueC === void 0 ? void 0 : _hoEditorFactory$vueC.node;
10739
+ if (!node) return undefined;
10740
+
10741
+ if (node instanceof SignNode/* SignNode */.N) {
10742
+ return node;
10743
+ }
10744
+
10745
+ return null;
10746
+ },
10707
10747
  // 创建自定义签名格式
10708
10748
  createSignFormat: function createSignFormat() {
10709
10749
  var customFormat = JSON.stringify(this.customFormatContent).replace(/^\s+|\s+$/g, '');
@@ -10796,7 +10836,7 @@ var component = (0,componentNormalizer/* default */.Z)(
10796
10836
 
10797
10837
  /***/ }),
10798
10838
 
10799
- /***/ 64915:
10839
+ /***/ 91192:
10800
10840
  /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
10801
10841
 
10802
10842
  "use strict";
@@ -10808,7 +10848,7 @@ __webpack_require__.d(__webpack_exports__, {
10808
10848
  "default": function() { return /* binding */ TableCellPoper; }
10809
10849
  });
10810
10850
 
10811
- ;// CONCATENATED MODULE: ./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/table/TableCellPoper.vue?vue&type=template&id=0b7fa5e8&scoped=true&
10851
+ ;// CONCATENATED MODULE: ./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/table/TableCellPoper.vue?vue&type=template&id=958de66c&scoped=true&
10812
10852
  var render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"cell-poper-selected-modal animation-in",style:(_vm.posStyle)},[_c('div',{staticStyle:{"height":"0","overflow":"hidden"}},[_c('svg',{attrs:{"viewBox":"0 0 1303 1024","version":"1.1","xmlns":"http://www.w3.org/2000/svg","width":"16","height":"16"}},[_c('defs',[_c('g',{attrs:{"id":"selected"}},[_c('path',{attrs:{"d":"M498.688 1024c-26.996364 0-52.782545-11.636364-71.214545-32.395636L29.323636 536.017455a124.276364 124.276364 0 0 1 0-160.302546 89.181091 89.181091 0 0 1 132.747637-11.915636l11.264 11.915636L497.105455 749.288727 1133.102545 34.443636a88.994909 88.994909 0 0 1 129.489455-11.915636l11.357091 11.915636c39.098182 45.521455 39.098182 114.874182 0 160.395637l-705.629091 796.765091c-17.966545 20.48-43.194182 32.209455-69.632 32.395636","fill":"#2175FF"}})])])])]),(_vm.isCanSearch)?_c('el-input',{attrs:{"placeholder":"可搜索","size":"mini"},on:{"input":_vm.searchList},model:{value:(_vm.input),callback:function ($$v) {_vm.input=$$v},expression:"input"}}):_vm._e(),(_vm.editorProperty === 1)?_c('div',{staticClass:"select-poper"},[_c('ul',{staticClass:"list"},[_vm._l((_vm.currentList),function(item,index){return _c('li',{key:item.id,class:item.default ? 'selected' : '',on:{"click":function($event){return _vm.selectItems(item, index)}}},[_c('span',[_vm._v(_vm._s(item.text.split("<元素>")[0]))]),_c('svg',{attrs:{"viewBox":"0 0 1303 1024","version":"1.1","xmlns":"http://www.w3.org/2000/svg","width":"16","height":"16"}},[_c('use',{attrs:{"xlink:href":"#selected"}})])])}),(_vm.currentList.length === 0)?_c('li',{staticStyle:{"text-align":"center"}},[_vm._v("无选项")]):_vm._e()],2),(_vm.isAllowMultiSelect)?_c('footer',{staticStyle:{"bottom":"-43px","padding":"10px","text-align":"center"}},[_c('el-button',{staticStyle:{"padding":"5px 13px"},attrs:{"size":"mini"},on:{"click":_vm.sureSelect}},[_vm._v("确定")]),_c('el-button',{staticStyle:{"padding":"5px 13px"},attrs:{"size":"mini"},on:{"click":function($event){_vm.selected = []}}},[_vm._v("清空")]),_c('el-button',{staticStyle:{"padding":"5px 13px"},attrs:{"size":"mini"},on:{"click":_vm.handleClose}},[_vm._v("取消")])],1):_c('footer',{staticStyle:{"bottom":"-43px","padding":"10px","justify-content":"center"}},[_c('el-button',{staticStyle:{"padding":"5px 13px"},attrs:{"size":"mini"},on:{"click":_vm.handleClose}},[_vm._v("关闭")])],1)]):_vm._e(),(_vm.editorProperty === 2)?_c('div',{staticClass:"date-poper"},[(_vm.inputStyle.includes('dd'))?_c('DatePanel',{attrs:{"value":_vm.date},on:{"getValue":_vm.getTime}}):_vm._e(),(_vm.inputStyle.includes('MM') && !_vm.inputStyle.includes('dd'))?_c('DatePanel',{attrs:{"dateType":"month","value":_vm.date},on:{"getValue":_vm.getTime}}):_vm._e(),(_vm.inputStyle.includes('yyyy') && !_vm.inputStyle.includes('MM'))?_c('DatePanel',{attrs:{"dateType":"year","value":_vm.date},on:{"getValue":_vm.getTime}}):_vm._e(),(_vm.inputStyle.includes('HH'))?_c('div',{staticClass:"timepicker",staticStyle:{"padding":"8px 0"}},[_c('el-time-picker',{staticStyle:{"width":"200px"},attrs:{"type":"time","format":_vm.timeStyle,"value-format":_vm.timeStyle,"size":"mini"},model:{value:(_vm.time),callback:function ($$v) {_vm.time=$$v},expression:"time"}})],1):_vm._e(),_c('footer',[_c('el-button',{staticStyle:{"padding":"5px 13px"},attrs:{"size":"mini"},on:{"click":_vm.sureDate}},[_vm._v("确定")]),_c('el-button',{staticStyle:{"padding":"5px 13px"},attrs:{"size":"mini"},on:{"click":_vm.currentDateTime}},[_vm._v(_vm._s(_vm.inputStyle.indexOf('HH') !== -1 ? '此刻' : '今天'))]),_c('el-button',{staticStyle:{"padding":"5px 13px"},attrs:{"size":"mini"},on:{"click":function($event){return _vm.handleClose('cancel')}}},[_vm._v("取消")])],1)],1):_vm._e()],1)}
10813
10853
  var staticRenderFns = []
10814
10854
 
@@ -11275,10 +11315,10 @@ var HOEditorFactorys = __webpack_require__(41005);
11275
11315
  });
11276
11316
  ;// CONCATENATED MODULE: ./src/components/controls/table/TableCellPoper.vue?vue&type=script&lang=js&
11277
11317
  /* harmony default export */ var table_TableCellPopervue_type_script_lang_js_ = (TableCellPopervue_type_script_lang_js_);
11278
- ;// 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/table/TableCellPoper.vue?vue&type=style&index=0&id=0b7fa5e8&lang=scss&scoped=true&
11318
+ ;// 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/table/TableCellPoper.vue?vue&type=style&index=0&id=958de66c&lang=scss&scoped=true&
11279
11319
  // extracted by mini-css-extract-plugin
11280
11320
 
11281
- ;// CONCATENATED MODULE: ./src/components/controls/table/TableCellPoper.vue?vue&type=style&index=0&id=0b7fa5e8&lang=scss&scoped=true&
11321
+ ;// CONCATENATED MODULE: ./src/components/controls/table/TableCellPoper.vue?vue&type=style&index=0&id=958de66c&lang=scss&scoped=true&
11282
11322
 
11283
11323
  // EXTERNAL MODULE: ./node_modules/@vue/vue-loader-v15/lib/runtime/componentNormalizer.js
11284
11324
  var componentNormalizer = __webpack_require__(1001);
@@ -11297,7 +11337,7 @@ var component = (0,componentNormalizer/* default */.Z)(
11297
11337
  staticRenderFns,
11298
11338
  false,
11299
11339
  null,
11300
- "0b7fa5e8",
11340
+ "958de66c",
11301
11341
  null
11302
11342
 
11303
11343
  )
@@ -11958,7 +11998,7 @@ var component = (0,componentNormalizer/* default */.Z)(
11958
11998
 
11959
11999
  /***/ }),
11960
12000
 
11961
- /***/ 97160:
12001
+ /***/ 17479:
11962
12002
  /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
11963
12003
 
11964
12004
  "use strict";
@@ -11970,7 +12010,7 @@ __webpack_require__.d(__webpack_exports__, {
11970
12010
  "default": function() { return /* binding */ TableColProperty; }
11971
12011
  });
11972
12012
 
11973
- ;// CONCATENATED MODULE: ./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/table/TableColProperty.vue?vue&type=template&id=600b7f95&
12013
+ ;// CONCATENATED MODULE: ./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/table/TableColProperty.vue?vue&type=template&id=384a329a&
11974
12014
  var render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"control-modal-contents table-row-modal animation-in"},[_c('header',{staticClass:"modal-title"},[_c('span',[_vm._v("表格列属性")]),_c('i',{staticClass:"el-icon-close modal-title-close",on:{"click":_vm.handleClose}})]),_c('section',{staticClass:"modal-content"},[_c('ul',{staticClass:"control-list"},[_c('li',{staticClass:"control-item"},[_c('span',{staticClass:"label"},[_vm._v("编号")]),_c('span',{staticClass:"readonly-value"},[_vm._v(_vm._s(_vm.id))])]),_c('li',{staticClass:"control-item"},[_c('div',{staticClass:"control-item"},[_c('span',{staticClass:"label"},[_vm._v("自定义属性")]),_c('el-button',{attrs:{"size":"mini"},on:{"click":_vm.openCustomsModal}},[_vm._v("自定义属性")])],1)]),_c('li',{staticClass:"control-item"},[_c('div',{staticStyle:{"padding-right":"20px"}},[_c('el-checkbox',{on:{"change":_vm.watchParamsChange},model:{value:(_vm.isSpecifyWidth),callback:function ($$v) {_vm.isSpecifyWidth=$$v},expression:"isSpecifyWidth"}},[_vm._v("指定宽度(厘米)")])],1),_c('el-input-number',{attrs:{"size":"mini","disabled":!_vm.isSpecifyWidth,"step":1,"min":0,"precision":2,"controls":false},model:{value:(_vm.width),callback:function ($$v) {_vm.width=$$v},expression:"width"}}),_c('span',{staticStyle:{"padding-left":"10px"}},[_vm._v("当前显示宽度 "+_vm._s(_vm.colWidth)+" 厘米")])],1),_c('li',{staticClass:"control-item"},[_c('span',{staticClass:"label"},[_vm._v("垂直对齐方式")]),_c('el-select',{staticStyle:{"text-align":"left","font-size":"20px"},attrs:{"placeholder":"垂直对齐方式","size":"mini"},model:{value:(_vm.align),callback:function ($$v) {_vm.align=$$v},expression:"align"}},[_c('el-option',{attrs:{"label":"靠上","value":0}}),_c('el-option',{attrs:{"label":"居中","value":1}}),_c('el-option',{attrs:{"label":"靠下","value":2}})],1)],1),_c('li',{staticClass:"control-item"},[_c('span',{staticClass:"label"},[_vm._v("编辑器属性")]),_c('el-select',{staticStyle:{"text-align":"left","font-size":"20px"},attrs:{"placeholder":"编辑器属性","size":"mini"},on:{"change":_vm.editorPropertyChange},model:{value:(_vm.editorProperty),callback:function ($$v) {_vm.editorProperty=$$v},expression:"editorProperty"}},[_c('el-option',{attrs:{"label":"无","value":0}}),_c('el-option',{attrs:{"label":"下拉列表","value":1}}),_c('el-option',{attrs:{"label":"日期","value":2}}),_c('el-option',{attrs:{"label":"数值","value":3}}),_c('el-option',{attrs:{"label":"签名","value":4}})],1)],1),_c('li',{directives:[{name:"show",rawName:"v-show",value:(_vm.editorProperty === 4),expression:"editorProperty === 4"}],staticClass:"control-item"},[_c('div',{staticClass:"control-item"},[_c('span',{staticClass:"label"},[_vm._v("签名名称")]),_c('el-input',{attrs:{"size":"mini"},model:{value:(_vm.name),callback:function ($$v) {_vm.name=$$v},expression:"name"}})],1)]),_c('li',{directives:[{name:"show",rawName:"v-show",value:(_vm.editorProperty === 1),expression:"editorProperty === 1"}],staticClass:"control-item"},[_c('div',{staticClass:"control-item"},[_c('span',{staticClass:"label"},[_vm._v("分隔符")]),_c('el-select',{staticStyle:{"text-align":"left","font-size":"20px"},attrs:{"placeholder":"分隔符","size":"mini"},model:{value:(_vm.splitCharacter),callback:function ($$v) {_vm.splitCharacter=$$v},expression:"splitCharacter"}},[_c('el-option',{attrs:{"label":",","value":","}}),_c('el-option',{attrs:{"label":"、","value":"、"}}),_c('el-option',{attrs:{"label":"/","value":"/"}}),_c('el-option',{attrs:{"label":"-","value":"-"}})],1)],1)]),_c('li',{directives:[{name:"show",rawName:"v-show",value:(_vm.editorProperty === 1),expression:"editorProperty === 1"}],staticClass:"control-item"},[_c('div',{staticClass:"control-item"},[_c('el-checkbox',{model:{value:(_vm.allowMultiSelected),callback:function ($$v) {_vm.allowMultiSelected=$$v},expression:"allowMultiSelected"}},[_vm._v("允许多选")])],1),_c('div',{staticClass:"control-item"},[_c('el-checkbox',{model:{value:(_vm.isAllowDel),callback:function ($$v) {_vm.isAllowDel=$$v},expression:"isAllowDel"}},[_vm._v("允许被删除")])],1),_c('div',{staticClass:"control-item"},[_c('el-checkbox',{model:{value:(_vm.canModifyContent),callback:function ($$v) {_vm.canModifyContent=$$v},expression:"canModifyContent"}},[_vm._v("用户可以直接编辑修改内容")])],1)]),_c('li',{directives:[{name:"show",rawName:"v-show",value:(_vm.editorProperty === 1),expression:"editorProperty === 1"}],staticClass:"control-item"},[_c('span',{staticClass:"label"},[_vm._v("来源")]),_c('el-input',{attrs:{"size":"mini"},model:{value:(_vm.source),callback:function ($$v) {_vm.source=$$v},expression:"source"}})],1),_c('li',{directives:[{name:"show",rawName:"v-show",value:(_vm.editorProperty === 1),expression:"editorProperty === 1"}],staticClass:"control-item"},[_c('el-table',{staticStyle:{"width":"100%"},attrs:{"data":_vm.listItems,"max-height":"210px"}},[_c('el-table-column',{staticStyle:{"text-align":"center"},attrs:{"label":"","width":"32"},scopedSlots:_vm._u([{key:"default",fn:function(scope){return [_c('i',{directives:[{name:"show",rawName:"v-show",value:(scope.$index === _vm.focusIndexs),expression:"scope.$index === focusIndexs"}],staticClass:"el-icon-edit",staticStyle:{"transform":"translateX(6px)"}})]}}])}),_c('el-table-column',{attrs:{"label":"文本","width":"130"},scopedSlots:_vm._u([{key:"default",fn:function(scope){return [_c('el-input',{class:_vm.errorIndex.includes(scope.row.id) ? 'error' : '',attrs:{"size":"small"},on:{"focus":function($event){return _vm.focusIndex(scope.$index)},"input":function($event){return _vm.inputIndex(scope.$index)},"blur":function($event){return _vm.blurIndex(scope.$index)}},model:{value:(scope.row.text),callback:function ($$v) {_vm.$set(scope.row, "text", $$v)},expression:"scope.row.text"}})]}}])}),_c('el-table-column',{attrs:{"label":"值","width":"130"},scopedSlots:_vm._u([{key:"default",fn:function(scope){return [_c('el-input',{attrs:{"size":"small"},on:{"focus":function($event){return _vm.focusIndex(scope.$index)},"input":function($event){return _vm.inputIndex(scope.$index)},"blur":function($event){return _vm.blurIndex(scope.$index)}},model:{value:(scope.row.value),callback:function ($$v) {_vm.$set(scope.row, "value", $$v)},expression:"scope.row.value"}})]}}])}),_c('el-table-column',{scopedSlots:_vm._u([{key:"default",fn:function(scope){return (scope.$index !== _vm.listItems.length - 1 && _vm.focusIndexs === scope.$index)?[_c('el-button',{attrs:{"size":"mini"},on:{"click":function($event){$event.stopPropagation();return _vm.deleteCurrentRow(scope.row.id)}}},[_vm._v("删除")])]:undefined}}],null,true)})],1)],1),_c('li',{directives:[{name:"show",rawName:"v-show",value:(_vm.editorProperty === 2),expression:"editorProperty === 2"}],staticClass:"control-item"},[_c('div',{staticClass:"control-item"},[_c('span',{staticClass:"label"},[_vm._v("日期格式")]),_c('el-select',{attrs:{"placeholder":"输入样式","size":"mini"},model:{value:(_vm.inputStyle),callback:function ($$v) {_vm.inputStyle=$$v},expression:"inputStyle"}},_vm._l((_vm.dateFormatList),function(item){return _c('el-option',{key:item,attrs:{"label":item,"value":item}})}),1)],1)]),_c('li',{directives:[{name:"show",rawName:"v-show",value:(_vm.editorProperty === 3),expression:"editorProperty === 3"}],staticClass:"control-item"},[_c('div',{staticClass:"control-item"},[_c('span',{staticClass:"label"},[_vm._v("最小值")]),_c('el-input-number',{attrs:{"size":"mini","max":Number(_vm.maxNumVal),"min":0,"step":10,"controls":false},model:{value:(_vm.minNumVal),callback:function ($$v) {_vm.minNumVal=$$v},expression:"minNumVal"}})],1),_c('div',{staticClass:"control-item"},[_c('span',{staticClass:"label"},[_vm._v("最大值")]),_c('el-input-number',{attrs:{"size":"mini","min":Number(_vm.minNumVal),"step":10,"controls":false},model:{value:(_vm.maxNumVal),callback:function ($$v) {_vm.maxNumVal=$$v},expression:"maxNumVal"}})],1)])])]),_c('footer',{staticClass:"ho-modal-footer"},[_c('el-button',{attrs:{"size":"small","type":"primary"},on:{"click":_vm.sure}},[_vm._v("确定")]),_c('el-button',{staticStyle:{"margin-left":"30px"},attrs:{"size":"small"},on:{"click":_vm.handleClose}},[_vm._v("取消")])],1)])}
11975
12015
  var staticRenderFns = []
11976
12016
 
@@ -12238,13 +12278,14 @@ var getCellNode = __webpack_require__(86257);
12238
12278
  },
12239
12279
  created: function created() {
12240
12280
  var cellNode = this.getCellNodes();
12281
+ var colInfoes = null;
12241
12282
 
12242
12283
  if (cellNode !== null) {
12243
- var _this$colInfoes;
12284
+ var _colInfoes;
12244
12285
 
12245
12286
  var currentCols = cellNode.row.indexOf(cellNode);
12246
- this.colInfoes = cellNode.table.colInfos[currentCols];
12247
- var customProperties = (_this$colInfoes = this.colInfoes) === null || _this$colInfoes === void 0 ? void 0 : _this$colInfoes.colProperty.customProperties;
12287
+ colInfoes = cellNode.table.colInfos[currentCols];
12288
+ var customProperties = (_colInfoes = colInfoes) === null || _colInfoes === void 0 ? void 0 : _colInfoes.colProperty.customProperties;
12248
12289
 
12249
12290
  if (Array.isArray(customProperties) && customProperties.length > 0) {
12250
12291
  this.setCustomsValue([].concat((0,toConsumableArray/* default */.Z)(customProperties), [{
@@ -12260,11 +12301,11 @@ var getCellNode = __webpack_require__(86257);
12260
12301
  }
12261
12302
  }
12262
12303
 
12263
- if (this.colInfoes !== null) {
12304
+ if (colInfoes !== null) {
12264
12305
  var _colProperty$dateTime, _colProperty$dateTime2;
12265
12306
 
12266
12307
  var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this.hoEditorFactoryId);
12267
- var colProperty = this.colInfoes.colProperty;
12308
+ var colProperty = colInfoes.colProperty;
12268
12309
  this.id = colProperty.id ? colProperty.id : this.vueController.generateID('TB');
12269
12310
  this.editorProperty = colProperty.editorProperty ? colProperty.editorProperty : 0;
12270
12311
  this.align = colProperty.align ? colProperty.align : 0;
@@ -12284,7 +12325,7 @@ var getCellNode = __webpack_require__(86257);
12284
12325
  this.maxNumVal = colProperty.numberProperty ? colProperty.numberProperty.maxNumVal : 0;
12285
12326
  this.minNumVal = colProperty.numberProperty ? colProperty.numberProperty.minNumVal : 100;
12286
12327
  this.width = colProperty.width ? colProperty.width : 0;
12287
- this.colWidth = (hoEditorFactory.unitConvert.pxConversionMm(this.colInfoes.colWidth, false) / 10).toFixed(2);
12328
+ this.colWidth = (hoEditorFactory.unitConvert.pxConversionMm(colInfoes.colWidth, false) / 10).toFixed(2);
12288
12329
  this.isSpecifyWidth = colProperty.isSpecifyWidth ? true : false;
12289
12330
  }
12290
12331
  },
@@ -12418,14 +12459,16 @@ var getCellNode = __webpack_require__(86257);
12418
12459
  param[key] = _this[key];
12419
12460
  }
12420
12461
  });
12421
- this.vueController.colProperty(JSON.stringify(param), this.colInfoes);
12462
+ var cellNode = this.getCellNodes();
12463
+ var currentCols = cellNode.row.indexOf(cellNode);
12464
+ var colInfoes = cellNode.table.colInfos[currentCols];
12465
+ this.vueController.colProperty(JSON.stringify(param), colInfoes);
12422
12466
  this.$nextTick(function () {
12423
12467
  return _this.handleClose();
12424
12468
  });
12425
12469
  },
12426
12470
  handleClose: function handleClose() {
12427
12471
  this.$emit('closed');
12428
- this.colInfoes = null;
12429
12472
  }
12430
12473
  }
12431
12474
  });
@@ -13036,7 +13079,7 @@ var component = (0,componentNormalizer/* default */.Z)(
13036
13079
 
13037
13080
  /***/ }),
13038
13081
 
13039
- /***/ 74456:
13082
+ /***/ 9046:
13040
13083
  /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
13041
13084
 
13042
13085
  "use strict";
@@ -13048,7 +13091,7 @@ __webpack_require__.d(__webpack_exports__, {
13048
13091
  "default": function() { return /* binding */ TableRowProperty; }
13049
13092
  });
13050
13093
 
13051
- ;// CONCATENATED MODULE: ./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/table/TableRowProperty.vue?vue&type=template&id=3bd61b91&scoped=true&
13094
+ ;// CONCATENATED MODULE: ./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/table/TableRowProperty.vue?vue&type=template&id=f923cecc&scoped=true&
13052
13095
  var render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"control-modal-contents table-row-modal animation-in"},[_c('header',{staticClass:"modal-title"},[_c('span',[_vm._v("表格行属性")]),_c('i',{staticClass:"el-icon-close modal-title-close",on:{"click":_vm.handleClose}})]),_c('section',{staticClass:"modal-content"},[_c('ul',{staticClass:"control-list"},[_c('li',{staticClass:"control-item"},[_c('span',{staticClass:"label"},[_vm._v("自定义属性")]),_c('el-button',{attrs:{"size":"mini"},on:{"click":_vm.openCustomsModal}},[_vm._v("自定义属性")])],1),_c('li',{staticClass:"control-item"},[_c('span',{staticClass:"label"},[_vm._v("数据源")]),_c('el-button',{attrs:{"size":"mini"},on:{"click":_vm.openDataSourceModal}},[_vm._v("设置数据源")])],1),_c('li',{staticClass:"control-item"},[_c('div',{staticStyle:{"padding-right":"20px"}},[_c('el-checkbox',{on:{"change":_vm.watchParamsChange},model:{value:(_vm.isSpecifyHeight),callback:function ($$v) {_vm.isSpecifyHeight=$$v},expression:"isSpecifyHeight"}},[_vm._v("指定高度(厘米)")])],1),_c('el-input-number',{attrs:{"size":"mini","disabled":!_vm.isSpecifyHeight,"precision":2,"step":1,"min":0,"controls":false,"controls-position":"right"},model:{value:(_vm.rowHeight),callback:function ($$v) {_vm.rowHeight=$$v},expression:"rowHeight"}}),_c('span',{staticStyle:{"padding-left":"10px"}},[_vm._v("当前显示高度 "+_vm._s(_vm.rowHeightMm)+" 厘米")])],1),_c('li',{staticClass:"control-item",staticStyle:{"padding":"0 0 0 10px"}},[_c('el-checkbox',{attrs:{"disabled":!_vm.isSpecifyHeight},model:{value:(_vm.isLockRowHeight),callback:function ($$v) {_vm.isLockRowHeight=$$v},expression:"isLockRowHeight"}},[_vm._v("锁定行高")])],1),_c('li',{staticClass:"control-item"},[_c('div',{staticStyle:{"width":"100%"}},[_c('el-checkbox',{model:{value:(_vm.repeatAsTitleAtPageTop),callback:function ($$v) {_vm.repeatAsTitleAtPageTop=$$v},expression:"repeatAsTitleAtPageTop"}},[_vm._v("在隔页顶端以标题行形式重复出现")])],1),_c('div',{staticStyle:{"width":"100%"}},[_c('el-checkbox',{model:{value:(_vm.sameLineCanAcrossPages),callback:function ($$v) {_vm.sameLineCanAcrossPages=$$v},expression:"sameLineCanAcrossPages"}},[_vm._v("同行内容能跨页")])],1),_c('div',{staticStyle:{"width":"100%"}},[_c('el-checkbox',{model:{value:(_vm.forcedPageBreak),callback:function ($$v) {_vm.forcedPageBreak=$$v},expression:"forcedPageBreak"}},[_vm._v("强制分页")])],1),_c('div',{staticStyle:{"width":"100%"}},[_c('el-checkbox',{model:{value:(_vm.printCellBorders),callback:function ($$v) {_vm.printCellBorders=$$v},expression:"printCellBorders"}},[_vm._v("打印单元格边框线")])],1),_c('div',{staticStyle:{"width":"100%"}},[_c('el-checkbox',{model:{value:(_vm.printCellBg),callback:function ($$v) {_vm.printCellBg=$$v},expression:"printCellBg"}},[_vm._v("打印单元格背景")])],1)])])]),_c('footer',{staticClass:"ho-modal-footer"},[_c('el-button',{attrs:{"size":"small","type":"primary"},on:{"click":_vm.sure}},[_vm._v("确定")]),_c('el-button',{staticStyle:{"margin-left":"30px"},attrs:{"size":"small"},on:{"click":_vm.handleClose}},[_vm._v("取消")])],1)])}
13053
13096
  var staticRenderFns = []
13054
13097
 
@@ -13225,17 +13268,18 @@ var TableNode = __webpack_require__(95883);
13225
13268
  methods: {
13226
13269
  init: function init() {
13227
13270
  var cellNode = this.getCellNodes();
13271
+ var rowInfos = null;
13228
13272
 
13229
13273
  if (cellNode !== null) {
13230
13274
  var currentRows = cellNode.table.rows.indexOf(cellNode.row);
13231
- this.rowInfos = cellNode.table.rowInfos[currentRows];
13275
+ rowInfos = cellNode.table.rowInfos[currentRows];
13232
13276
  }
13233
13277
 
13234
- if (this.rowInfos !== null) {
13235
- this.rowProperty = this.rowInfos.rowProperty;
13278
+ if (rowInfos !== null) {
13279
+ this.rowProperty = rowInfos.rowProperty;
13236
13280
  }
13237
13281
 
13238
- if (this.rowProperty !== null && this.rowInfos !== null) {
13282
+ if (this.rowProperty !== null && rowInfos !== null) {
13239
13283
  var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this.hoEditorFactoryId);
13240
13284
  this.id = this.rowProperty.id ? this.rowProperty.id : this.vueController.generateID('TB');
13241
13285
  this.isSpecifyHeight = this.rowProperty.isSpecifyHeight;
@@ -13247,7 +13291,7 @@ var TableNode = __webpack_require__(95883);
13247
13291
  this.printCellBorders = this.rowProperty.printCellBorders;
13248
13292
  this.printCellBg = this.rowProperty.printCellBg;
13249
13293
  this.tabKeyInsNewLine = this.rowProperty.tabKeyInsNewLine;
13250
- this.rowHeightMm = (hoEditorFactory.unitConvert.pxConversionMm(this.rowInfos.rowHeight, false) / 10).toFixed(2);
13294
+ this.rowHeightMm = (hoEditorFactory.unitConvert.pxConversionMm(rowInfos.rowHeight, false) / 10).toFixed(2);
13251
13295
  }
13252
13296
  },
13253
13297
  getCellNodes: function getCellNodes() {
@@ -13328,7 +13372,15 @@ var TableNode = __webpack_require__(95883);
13328
13372
  param[key] = _this[key];
13329
13373
  }
13330
13374
  });
13331
- this.vueController.rowProperty(JSON.stringify(param), this.rowInfos);
13375
+ var cellNode = this.getCellNodes();
13376
+ var rowInfos = null;
13377
+
13378
+ if (cellNode !== null) {
13379
+ var currentRows = cellNode.table.rows.indexOf(cellNode.row);
13380
+ rowInfos = cellNode.table.rowInfos[currentRows];
13381
+ }
13382
+
13383
+ this.vueController.rowProperty(JSON.stringify(param), rowInfos);
13332
13384
  this.$nextTick(function () {
13333
13385
  return _this.handleClose();
13334
13386
  });
@@ -13342,10 +13394,10 @@ var TableNode = __webpack_require__(95883);
13342
13394
  });
13343
13395
  ;// CONCATENATED MODULE: ./src/components/controls/table/TableRowProperty.vue?vue&type=script&lang=js&
13344
13396
  /* harmony default export */ var table_TableRowPropertyvue_type_script_lang_js_ = (TableRowPropertyvue_type_script_lang_js_);
13345
- ;// 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/table/TableRowProperty.vue?vue&type=style&index=0&id=3bd61b91&lang=scss&scoped=true&
13397
+ ;// 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/table/TableRowProperty.vue?vue&type=style&index=0&id=f923cecc&lang=scss&scoped=true&
13346
13398
  // extracted by mini-css-extract-plugin
13347
13399
 
13348
- ;// CONCATENATED MODULE: ./src/components/controls/table/TableRowProperty.vue?vue&type=style&index=0&id=3bd61b91&lang=scss&scoped=true&
13400
+ ;// CONCATENATED MODULE: ./src/components/controls/table/TableRowProperty.vue?vue&type=style&index=0&id=f923cecc&lang=scss&scoped=true&
13349
13401
 
13350
13402
  // EXTERNAL MODULE: ./node_modules/@vue/vue-loader-v15/lib/runtime/componentNormalizer.js
13351
13403
  var componentNormalizer = __webpack_require__(1001);
@@ -13364,7 +13416,7 @@ var component = (0,componentNormalizer/* default */.Z)(
13364
13416
  staticRenderFns,
13365
13417
  false,
13366
13418
  null,
13367
- "3bd61b91",
13419
+ "f923cecc",
13368
13420
  null
13369
13421
 
13370
13422
  )
@@ -26541,14 +26593,14 @@ var SubDocManger = /*#__PURE__*/function () {
26541
26593
  /* harmony export */ __webpack_require__.d(__webpack_exports__, {
26542
26594
  /* harmony export */ "P": function() { return /* binding */ DocController; }
26543
26595
  /* harmony export */ });
26544
- /* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_regeneratorRuntime_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(86160);
26545
- /* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_asyncToGenerator_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(39873);
26546
- /* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createForOfIteratorHelper_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(19934);
26547
- /* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(37174);
26596
+ /* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createForOfIteratorHelper_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(19934);
26597
+ /* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(37174);
26598
+ /* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_regeneratorRuntime_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(86160);
26599
+ /* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_asyncToGenerator_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(39873);
26548
26600
  /* harmony import */ var element_ui_lib_message_box__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(86769);
26549
26601
  /* harmony import */ var element_ui_lib_message_box__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(element_ui_lib_message_box__WEBPACK_IMPORTED_MODULE_4__);
26550
26602
  /* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_classCallCheck_js__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(35671);
26551
- /* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_86__ = __webpack_require__(22342);
26603
+ /* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_87__ = __webpack_require__(22342);
26552
26604
  /* harmony import */ var core_js_modules_es_object_to_string_js__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(41539);
26553
26605
  /* harmony import */ var core_js_modules_es_object_to_string_js__WEBPACK_IMPORTED_MODULE_6___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_object_to_string_js__WEBPACK_IMPORTED_MODULE_6__);
26554
26606
  /* harmony import */ var core_js_modules_es_promise_js__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(88674);
@@ -26640,12 +26692,14 @@ var SubDocManger = /*#__PURE__*/function () {
26640
26692
  /* harmony import */ var _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_77__ = __webpack_require__(41005);
26641
26693
  /* harmony import */ var _undoRedo_ParseUndoUnit__WEBPACK_IMPORTED_MODULE_78__ = __webpack_require__(94020);
26642
26694
  /* harmony import */ var _undoRedo_TableUndos_TableInsertParagraphUndoUnit__WEBPACK_IMPORTED_MODULE_79__ = __webpack_require__(24242);
26643
- /* harmony import */ var _treeNode_SeparateCharNode__WEBPACK_IMPORTED_MODULE_80__ = __webpack_require__(9935);
26644
- /* harmony import */ var _treeNode_LabelNode__WEBPACK_IMPORTED_MODULE_81__ = __webpack_require__(89790);
26645
- /* harmony import */ var _NodePosition__WEBPACK_IMPORTED_MODULE_82__ = __webpack_require__(2242);
26646
- /* harmony import */ var _treeNode_SignNode__WEBPACK_IMPORTED_MODULE_83__ = __webpack_require__(34450);
26647
- /* harmony import */ var _events_NodeNeedModifyEvent__WEBPACK_IMPORTED_MODULE_84__ = __webpack_require__(49482);
26648
- /* harmony import */ var _treeNode_GestationNode__WEBPACK_IMPORTED_MODULE_85__ = __webpack_require__(74873);
26695
+ /* harmony import */ var _draw_DrawLine__WEBPACK_IMPORTED_MODULE_80__ = __webpack_require__(94407);
26696
+ /* harmony import */ var _treeNode_SeparateCharNode__WEBPACK_IMPORTED_MODULE_81__ = __webpack_require__(9935);
26697
+ /* harmony import */ var _treeNode_LabelNode__WEBPACK_IMPORTED_MODULE_82__ = __webpack_require__(89790);
26698
+ /* harmony import */ var _NodePosition__WEBPACK_IMPORTED_MODULE_83__ = __webpack_require__(2242);
26699
+ /* harmony import */ var _treeNode_SignNode__WEBPACK_IMPORTED_MODULE_84__ = __webpack_require__(34450);
26700
+ /* harmony import */ var _events_NodeNeedModifyEvent__WEBPACK_IMPORTED_MODULE_85__ = __webpack_require__(49482);
26701
+ /* harmony import */ var _treeNode_GestationNode__WEBPACK_IMPORTED_MODULE_86__ = __webpack_require__(74873);
26702
+
26649
26703
 
26650
26704
 
26651
26705
 
@@ -26752,7 +26806,7 @@ var DocController = /*#__PURE__*/function () {
26752
26806
  // }
26753
26807
 
26754
26808
 
26755
- (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_86__/* ["default"] */ .Z)(DocController, [{
26809
+ (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_87__/* ["default"] */ .Z)(DocController, [{
26756
26810
  key: "onInsertNodeByID",
26757
26811
  get: function get() {
26758
26812
  return this._onInsertNodeByID;
@@ -27263,7 +27317,7 @@ var DocController = /*#__PURE__*/function () {
27263
27317
 
27264
27318
  if (!domRange.isEmpty) {
27265
27319
  domRange = domRange.normalize();
27266
- } else if (hoEditorFactory.drawTree.paintStatus === _draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_28__/* .PaintState.psReview */ .Dh.psReview && !(domRange.npStart.node instanceof _treeNode_SignNode__WEBPACK_IMPORTED_MODULE_83__/* .SignNode */ .N)) {
27320
+ } else if (hoEditorFactory.drawTree.paintStatus === _draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_28__/* .PaintState.psReview */ .Dh.psReview && !(domRange.npStart.node instanceof _treeNode_SignNode__WEBPACK_IMPORTED_MODULE_84__/* .SignNode */ .N)) {
27267
27321
  element_ui_lib_message_box__WEBPACK_IMPORTED_MODULE_4___default().alert("审阅模式下,只能选中文档内容进行删除");
27268
27322
 
27269
27323
  return;
@@ -27290,183 +27344,336 @@ var DocController = /*#__PURE__*/function () {
27290
27344
 
27291
27345
  }, {
27292
27346
  key: "deleteTextBeforePath",
27293
- value: function deleteTextBeforePath(startPath) {
27294
- var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_77__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
27295
- var domRange = hoEditorFactory.docTree.curDomRange.normalize();
27347
+ value: function () {
27348
+ var _deleteTextBeforePath = (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_asyncToGenerator_js__WEBPACK_IMPORTED_MODULE_3__/* ["default"] */ .Z)( /*#__PURE__*/(0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_regeneratorRuntime_js__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z)().mark(function _callee(startPath) {
27349
+ var hoEditorFactory, domRange, nodePosition, childIndex, node, ret, topath, arr, tmp, aRange, endPath, _topath, _aRange, prevNode, cellNode, tableNode, tIndex, cIndex, preParaNode, newpath, signUserId, preNode, nextNode, path, signNode, spath, epath, newSignNode, pNode;
27296
27350
 
27297
- if (!domRange.isEmpty) {
27298
- this.deleteRange(domRange, true); // hoEditorFactory.undoService.begin();
27299
- // hoEditorFactory.undoService.add(
27300
- // new NodesDeleteUndoUnit(
27301
- // this._hoEditorFactoryID,
27302
- // domRange.startPath,
27303
- // domRange.endPath,
27304
- // true
27305
- // )
27306
- // );
27307
- // hoEditorFactory.undoService.commit();
27308
- } else {
27309
- var nodePosition = hoEditorFactory.docTree.findNodePositionByPath(startPath);
27310
- var childIndex = nodePosition.childIndex;
27311
- var node = nodePosition.node;
27351
+ return (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_regeneratorRuntime_js__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z)().wrap(function _callee$(_context) {
27352
+ while (1) {
27353
+ switch (_context.prev = _context.next) {
27354
+ case 0:
27355
+ hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_77__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
27356
+ domRange = hoEditorFactory.docTree.curDomRange.normalize();
27312
27357
 
27313
- if (node) {
27314
- if (domRange.isEmpty) {
27315
- //未选中任何区域
27316
- if (node instanceof _treeNode_TextNode__WEBPACK_IMPORTED_MODULE_27__/* .TextNode */ .R) {
27317
- //if (hoEditorFactory.docTree.docProperty.type === EmrType.etForm) {
27318
- if (node.parentNode instanceof _treeNode_CellNode__WEBPACK_IMPORTED_MODULE_57__/* .CellNode */ .D) {
27319
- var ret = node.parentNode.delCellNodeText();
27320
- if (!ret) return;
27321
- } //}
27358
+ if (domRange.isEmpty) {
27359
+ _context.next = 6;
27360
+ break;
27361
+ }
27362
+
27363
+ this.deleteRange(domRange, true); // hoEditorFactory.undoService.begin();
27364
+ // hoEditorFactory.undoService.add(
27365
+ // new NodesDeleteUndoUnit(
27366
+ // this._hoEditorFactoryID,
27367
+ // domRange.startPath,
27368
+ // domRange.endPath,
27369
+ // true
27370
+ // )
27371
+ // );
27372
+ // hoEditorFactory.undoService.commit();
27373
+
27374
+ _context.next = 124;
27375
+ break;
27376
+
27377
+ case 6:
27378
+ nodePosition = hoEditorFactory.docTree.findNodePositionByPath(startPath);
27379
+ childIndex = nodePosition.childIndex;
27380
+ node = nodePosition.node;
27381
+
27382
+ if (!node) {
27383
+ _context.next = 124;
27384
+ break;
27385
+ }
27386
+
27387
+ if (!domRange.isEmpty) {
27388
+ _context.next = 124;
27389
+ break;
27390
+ }
27391
+
27392
+ if (!(node instanceof _treeNode_TextNode__WEBPACK_IMPORTED_MODULE_27__/* .TextNode */ .R)) {
27393
+ _context.next = 36;
27394
+ break;
27395
+ }
27396
+
27397
+ if (!(node.parentNode instanceof _treeNode_CellNode__WEBPACK_IMPORTED_MODULE_57__/* .CellNode */ .D)) {
27398
+ _context.next = 16;
27399
+ break;
27400
+ }
27401
+
27402
+ ret = node.parentNode.delCellNodeText();
27403
+
27404
+ if (ret) {
27405
+ _context.next = 16;
27406
+ break;
27407
+ }
27322
27408
 
27409
+ return _context.abrupt("return");
27323
27410
 
27324
- var topath = "";
27411
+ case 16:
27412
+ //}
27413
+ topath = "";
27325
27414
 
27326
- if (childIndex > 0) {
27327
- var arr = startPath.split("/");
27415
+ if (!(childIndex > 0)) {
27416
+ _context.next = 23;
27417
+ break;
27418
+ }
27419
+
27420
+ arr = startPath.split("/");
27328
27421
  arr[arr.length - 1] = parseInt(arr[arr.length - 1]) - 1 + "";
27329
27422
  topath = arr.join("/");
27330
- } else {
27331
- var tmp = node.previousLeaf();
27423
+ _context.next = 30;
27424
+ break;
27332
27425
 
27333
- if (tmp) {
27334
- topath = hoEditorFactory.docTree.getNodeLastPath(tmp);
27335
- } else {
27336
- console.error("这里应该不会出现这种情况 2020.10.28");
27337
- return;
27426
+ case 23:
27427
+ tmp = node.previousLeaf();
27428
+
27429
+ if (!tmp) {
27430
+ _context.next = 28;
27431
+ break;
27338
27432
  }
27339
- }
27340
27433
 
27341
- hoEditorFactory.docTree.curDomRange = new _DomRange__WEBPACK_IMPORTED_MODULE_31__/* .DomRange */ .a(this._hoEditorFactoryID, topath, startPath); // hoEditorFactory.undoService.begin();
27342
- // hoEditorFactory.undoService.add(
27343
- // new NodesDeleteUndoUnit(
27344
- // this._hoEditorFactoryID,
27345
- // topath,
27346
- // startPath,
27347
- // false
27348
- // )
27349
- // );
27350
- // hoEditorFactory.undoService.commit();
27351
-
27352
- var aRange = new _DomRange__WEBPACK_IMPORTED_MODULE_31__/* .DomRange */ .a(this._hoEditorFactoryID, startPath, topath).normalize();
27353
- this.deleteRange(aRange, true);
27354
- hoEditorFactory.docTree.curDomRange = new _DomRange__WEBPACK_IMPORTED_MODULE_31__/* .DomRange */ .a(this._hoEditorFactoryID, topath, topath);
27355
- } else if (node instanceof _treeNode_MarkNode__WEBPACK_IMPORTED_MODULE_47__/* .MarkNode */ .j) {
27356
- var endPath = hoEditorFactory.docTree.getNodeLastPath(node);
27357
-
27358
- if (node.parentNode && node.parentNode instanceof _treeNode_TextInputFieldNode__WEBPACK_IMPORTED_MODULE_46__/* .TextInputFieldNode */ .re) {
27359
- if (node.parentNode.childNodes[1] instanceof _treeNode_MarkNode__WEBPACK_IMPORTED_MODULE_47__/* .MarkNode */ .j) {
27360
- startPath = hoEditorFactory.docTree.getNodeLastPath(node.parentNode.previousLeaf());
27361
- endPath = hoEditorFactory.docTree.getNodeLastPath(node.parentNode);
27362
- } else {
27363
- if (node === node.parentNode.last()) {
27364
- var _topath = hoEditorFactory.docTree.getNodeLastPath(node.previousLeaf());
27434
+ topath = hoEditorFactory.docTree.getNodeLastPath(tmp);
27435
+ _context.next = 30;
27436
+ break;
27365
27437
 
27366
- hoEditorFactory.drawTree.moveCaretToPath(_topath);
27367
- hoEditorFactory.docTree.curDomRange.setSamePath(_topath);
27368
- return;
27369
- }
27438
+ case 28:
27439
+ console.error("这里应该不会出现这种情况 2020.10.28");
27440
+ return _context.abrupt("return");
27370
27441
 
27371
- if (node === node.parentNode.first()) {
27372
- return;
27373
- }
27442
+ case 30:
27443
+ hoEditorFactory.docTree.curDomRange = new _DomRange__WEBPACK_IMPORTED_MODULE_31__/* .DomRange */ .a(this._hoEditorFactoryID, topath, startPath); // hoEditorFactory.undoService.begin();
27444
+ // hoEditorFactory.undoService.add(
27445
+ // new NodesDeleteUndoUnit(
27446
+ // this._hoEditorFactoryID,
27447
+ // topath,
27448
+ // startPath,
27449
+ // false
27450
+ // )
27451
+ // );
27452
+ // hoEditorFactory.undoService.commit();
27453
+
27454
+ aRange = new _DomRange__WEBPACK_IMPORTED_MODULE_31__/* .DomRange */ .a(this._hoEditorFactoryID, startPath, topath).normalize();
27455
+ this.deleteRange(aRange, true);
27456
+ hoEditorFactory.docTree.curDomRange = new _DomRange__WEBPACK_IMPORTED_MODULE_31__/* .DomRange */ .a(this._hoEditorFactoryID, topath, topath);
27457
+ _context.next = 124;
27458
+ break;
27459
+
27460
+ case 36:
27461
+ if (!(node instanceof _treeNode_MarkNode__WEBPACK_IMPORTED_MODULE_47__/* .MarkNode */ .j)) {
27462
+ _context.next = 55;
27463
+ break;
27374
27464
  }
27375
- }
27376
27465
 
27377
- var _aRange = new _DomRange__WEBPACK_IMPORTED_MODULE_31__/* .DomRange */ .a(this._hoEditorFactoryID, startPath, endPath //hoEditorFactory.docTree.getNodeLastPath(node)
27378
- ).normalize();
27379
-
27380
- this.deleteRange(_aRange, true); // hoEditorFactory.undoService.begin();
27381
- // hoEditorFactory.undoService.add(
27382
- // new NodesDeleteUndoUnit(
27383
- // this._hoEditorFactoryID,
27384
- // hoEditorFactory.docTree.getNodeLastPath(node),
27385
- // startPath,
27386
- // false
27387
- // )
27388
- // );
27389
- // hoEditorFactory.undoService.commit();
27390
- } else {
27391
- if (node instanceof _treeNode_ParagraphNode__WEBPACK_IMPORTED_MODULE_30__/* .ParagraphNode */ .C) {
27392
- var prevNode = node.prevSibling();
27466
+ endPath = hoEditorFactory.docTree.getNodeLastPath(node);
27393
27467
 
27394
- if (prevNode instanceof _treeNode_TableNode__WEBPACK_IMPORTED_MODULE_51__/* .TableNode */ .Fh) {
27395
- return;
27468
+ if (!(node.parentNode && node.parentNode instanceof _treeNode_TextInputFieldNode__WEBPACK_IMPORTED_MODULE_46__/* .TextInputFieldNode */ .re)) {
27469
+ _context.next = 51;
27470
+ break;
27396
27471
  }
27397
27472
 
27398
- if (prevNode == null) {
27399
- return;
27473
+ if (!(node.parentNode.childNodes[1] instanceof _treeNode_MarkNode__WEBPACK_IMPORTED_MODULE_47__/* .MarkNode */ .j)) {
27474
+ _context.next = 44;
27475
+ break;
27476
+ }
27477
+
27478
+ startPath = hoEditorFactory.docTree.getNodeLastPath(node.parentNode.previousLeaf());
27479
+ endPath = hoEditorFactory.docTree.getNodeLastPath(node.parentNode);
27480
+ _context.next = 51;
27481
+ break;
27482
+
27483
+ case 44:
27484
+ if (!(node === node.parentNode.last())) {
27485
+ _context.next = 49;
27486
+ break;
27487
+ }
27488
+
27489
+ _topath = hoEditorFactory.docTree.getNodeLastPath(node.previousLeaf());
27490
+ hoEditorFactory.drawTree.moveCaretToPath(_topath);
27491
+ hoEditorFactory.docTree.curDomRange.setSamePath(_topath);
27492
+ return _context.abrupt("return");
27493
+
27494
+ case 49:
27495
+ if (!(node === node.parentNode.first())) {
27496
+ _context.next = 51;
27497
+ break;
27498
+ }
27499
+
27500
+ return _context.abrupt("return");
27501
+
27502
+ case 51:
27503
+ _aRange = new _DomRange__WEBPACK_IMPORTED_MODULE_31__/* .DomRange */ .a(this._hoEditorFactoryID, startPath, endPath //hoEditorFactory.docTree.getNodeLastPath(node)
27504
+ ).normalize();
27505
+ this.deleteRange(_aRange, true); // hoEditorFactory.undoService.begin();
27506
+ // hoEditorFactory.undoService.add(
27507
+ // new NodesDeleteUndoUnit(
27508
+ // this._hoEditorFactoryID,
27509
+ // hoEditorFactory.docTree.getNodeLastPath(node),
27510
+ // startPath,
27511
+ // false
27512
+ // )
27513
+ // );
27514
+ // hoEditorFactory.undoService.commit();
27515
+
27516
+ _context.next = 124;
27517
+ break;
27518
+
27519
+ case 55:
27520
+ if (!(node instanceof _treeNode_ParagraphNode__WEBPACK_IMPORTED_MODULE_30__/* .ParagraphNode */ .C)) {
27521
+ _context.next = 82;
27522
+ break;
27523
+ }
27524
+
27525
+ prevNode = node.prevSibling();
27526
+
27527
+ if (!(prevNode instanceof _treeNode_TableNode__WEBPACK_IMPORTED_MODULE_51__/* .TableNode */ .Fh)) {
27528
+ _context.next = 59;
27529
+ break;
27530
+ }
27531
+
27532
+ return _context.abrupt("return");
27533
+
27534
+ case 59:
27535
+ if (!(prevNode == null)) {
27536
+ _context.next = 82;
27537
+ break;
27538
+ }
27539
+
27540
+ if (!(node.parentNode instanceof _treeNode_CellNode__WEBPACK_IMPORTED_MODULE_57__/* .CellNode */ .D)) {
27541
+ _context.next = 81;
27542
+ break;
27543
+ }
27544
+
27545
+ cellNode = node.parentNode;
27546
+ tableNode = cellNode.parentNode;
27547
+ tIndex = tableNode.childNodes.indexOf(cellNode);
27548
+ cIndex = cellNode.childNodes.indexOf(node);
27549
+ preParaNode = hoEditorFactory.docTree.getSameRectPrevParanode(tableNode.paragraphNode);
27550
+
27551
+ if (!(preParaNode && tIndex == 0 && cIndex == 0 && preParaNode.drawlines.length == 1 && preParaNode.drawlines[0] instanceof _draw_DrawLine__WEBPACK_IMPORTED_MODULE_80__/* .DrawLine */ .a && preParaNode.drawlines[0].isEmpty())) {
27552
+ _context.next = 78;
27553
+ break;
27554
+ }
27555
+
27556
+ hoEditorFactory.undoService.begin();
27557
+ hoEditorFactory.undoService.add(new _undoRedo_NodeDeleteUndoUnit__WEBPACK_IMPORTED_MODULE_37__/* .NodeDeleteUndoUnit */ .w(this._hoEditorFactoryID, tableNode.paragraphNode, tableNode.paragraphNode.getNodePath()));
27558
+ tableNode.paragraphNode = preParaNode;
27559
+ _context.next = 72;
27560
+ return hoEditorFactory.undoService.commit();
27561
+
27562
+ case 72:
27563
+ newpath = cellNode.childNodes[0].getNodePath();
27564
+ hoEditorFactory.docTree.curDomRange.setSamePath(newpath);
27565
+ hoEditorFactory.drawTree.moveCaretToPath(newpath);
27566
+ return _context.abrupt("return");
27567
+
27568
+ case 78:
27569
+ return _context.abrupt("return");
27570
+
27571
+ case 79:
27572
+ _context.next = 82;
27573
+ break;
27574
+
27575
+ case 81:
27576
+ return _context.abrupt("return");
27577
+
27578
+ case 82:
27579
+ if (!(hoEditorFactory.drawTree.paintStatus === _draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_28__/* .PaintState.psReview */ .Dh.psReview && !(node instanceof _treeNode_SignNode__WEBPACK_IMPORTED_MODULE_84__/* .SignNode */ .N))) {
27580
+ _context.next = 87;
27581
+ break;
27400
27582
  }
27401
- }
27402
27583
 
27403
- if (hoEditorFactory.drawTree.paintStatus === _draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_28__/* .PaintState.psReview */ .Dh.psReview && !(node instanceof _treeNode_SignNode__WEBPACK_IMPORTED_MODULE_83__/* .SignNode */ .N)) {
27404
27584
  element_ui_lib_message_box__WEBPACK_IMPORTED_MODULE_4___default().alert("审阅模式下,只能对文本内容进行删除");
27405
27585
 
27406
- return;
27407
- } else {
27408
- if (hoEditorFactory.drawTree.paintStatus === _draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_28__/* .PaintState.psReview */ .Dh.psReview && node instanceof _treeNode_SignNode__WEBPACK_IMPORTED_MODULE_83__/* .SignNode */ .N) {
27409
- var signUserId = node.customProperty.bce01;
27586
+ return _context.abrupt("return");
27410
27587
 
27411
- if (hoEditorFactory.userInfo.id != signUserId) {
27412
- element_ui_lib_message_box__WEBPACK_IMPORTED_MODULE_4___default().alert("不是本人签名,不允许删除!");
27588
+ case 87:
27589
+ if (!(hoEditorFactory.drawTree.paintStatus === _draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_28__/* .PaintState.psReview */ .Dh.psReview && node instanceof _treeNode_SignNode__WEBPACK_IMPORTED_MODULE_84__/* .SignNode */ .N)) {
27590
+ _context.next = 92;
27591
+ break;
27592
+ }
27413
27593
 
27414
- return;
27415
- }
27594
+ signUserId = node.customProperty.bce01;
27595
+
27596
+ if (!(hoEditorFactory.userInfo.id != signUserId)) {
27597
+ _context.next = 92;
27598
+ break;
27416
27599
  }
27417
27600
 
27418
- if (hoEditorFactory.drawTree.paintStatus !== _draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_28__/* .PaintState.psDesign */ .Dh.psDesign && node instanceof _treeNode_SignNode__WEBPACK_IMPORTED_MODULE_83__/* .SignNode */ .N) {
27419
- element_ui_lib_message_box__WEBPACK_IMPORTED_MODULE_4___default().alert("不允许使用删除键删除签名,请右键删除元素", "系统提示");
27601
+ element_ui_lib_message_box__WEBPACK_IMPORTED_MODULE_4___default().alert("不是本人签名,不允许删除!");
27420
27602
 
27421
- return;
27603
+ return _context.abrupt("return");
27604
+
27605
+ case 92:
27606
+ if (!(hoEditorFactory.drawTree.paintStatus !== _draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_28__/* .PaintState.psDesign */ .Dh.psDesign && node instanceof _treeNode_SignNode__WEBPACK_IMPORTED_MODULE_84__/* .SignNode */ .N)) {
27607
+ _context.next = 95;
27608
+ break;
27422
27609
  }
27423
27610
 
27424
- if (hoEditorFactory.drawTree.paintStatus !== _draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_28__/* .PaintState.psDesign */ .Dh.psDesign && node instanceof _treeNode_SignNode__WEBPACK_IMPORTED_MODULE_83__/* .SignNode */ .N && node.isTemplate && node.number === 0) {
27425
- element_ui_lib_message_box__WEBPACK_IMPORTED_MODULE_4___default().alert("该签名元素不允许删除!", "系统提示");
27611
+ element_ui_lib_message_box__WEBPACK_IMPORTED_MODULE_4___default().alert("不允许使用删除键删除签名,请右键删除元素", "系统提示");
27426
27612
 
27427
- return;
27613
+ return _context.abrupt("return");
27614
+
27615
+ case 95:
27616
+ if (!(hoEditorFactory.drawTree.paintStatus !== _draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_28__/* .PaintState.psDesign */ .Dh.psDesign && node instanceof _treeNode_SignNode__WEBPACK_IMPORTED_MODULE_84__/* .SignNode */ .N && node.isTemplate && node.number === 0)) {
27617
+ _context.next = 98;
27618
+ break;
27428
27619
  }
27429
27620
 
27430
- if (node instanceof _treeNode_SignNode__WEBPACK_IMPORTED_MODULE_83__/* .SignNode */ .N) {
27431
- var preNode = node.previousLeaf();
27432
- var nextNode = node.nextLeaf();
27433
-
27434
- if ((node.imgSrc !== "" || node.fingerPrintSrc !== "") && node.isTemplate && !(preNode instanceof _treeNode_SignNode__WEBPACK_IMPORTED_MODULE_83__/* .SignNode */ .N) && !(nextNode instanceof _treeNode_SignNode__WEBPACK_IMPORTED_MODULE_83__/* .SignNode */ .N)) {
27435
- var path = hoEditorFactory.docTree.getNodeLastPath(preNode);
27436
- var signNode = new _treeNode_SignNode__WEBPACK_IMPORTED_MODULE_83__/* .SignNode */ .N(this._hoEditorFactoryID, node.rootNodes, node.parentNode, _treeNode_BaseNode__WEBPACK_IMPORTED_MODULE_24__/* .NodeType.ntSign */ .Jq.ntSign, 0, 0, node.name === "" ? "医师签名" : node.name, node.signType, node.signFormat, "", "", node.signTimeFormat, "", 0, 0, {}, true, node.styleIndex, node.connectMode, node.isFront, node.allowEditSignTime);
27437
- hoEditorFactory.undoService.begin();
27438
- hoEditorFactory.undoService.add(new _undoRedo_NodeDeleteUndoUnit__WEBPACK_IMPORTED_MODULE_37__/* .NodeDeleteUndoUnit */ .w(this._hoEditorFactoryID, node, startPath));
27439
- hoEditorFactory.undoService.add(new _undoRedo_NodeInsertUndoUnit__WEBPACK_IMPORTED_MODULE_25__/* .NodeInsertUndoUnit */ .R(this._hoEditorFactoryID, path, signNode));
27440
- hoEditorFactory.undoService.commit();
27441
- return;
27442
- }
27621
+ element_ui_lib_message_box__WEBPACK_IMPORTED_MODULE_4___default().alert("该签名元素不允许删除!", "系统提示");
27443
27622
 
27444
- if (preNode instanceof _treeNode_SignNode__WEBPACK_IMPORTED_MODULE_83__/* .SignNode */ .N) {
27445
- var spath = "";
27623
+ return _context.abrupt("return");
27446
27624
 
27447
- if (node.number === 2 || node.number === 1 && node.isTemplate) {
27448
- spath = hoEditorFactory.docTree.getNodeLastPath(preNode.previousLeaf());
27449
- } else {
27450
- spath = hoEditorFactory.docTree.getNodeLastPath(preNode);
27451
- } //const spath = hoEditorFactory.docTree.getNodeLastPath(preNode);
27625
+ case 98:
27626
+ if (!(node instanceof _treeNode_SignNode__WEBPACK_IMPORTED_MODULE_84__/* .SignNode */ .N)) {
27627
+ _context.next = 119;
27628
+ break;
27629
+ }
27452
27630
 
27631
+ preNode = node.previousLeaf();
27632
+ nextNode = node.nextLeaf();
27453
27633
 
27454
- var epath = hoEditorFactory.docTree.getNodeLastPath(node);
27455
- var newSignNode = new _treeNode_SignNode__WEBPACK_IMPORTED_MODULE_83__/* .SignNode */ .N(this._hoEditorFactoryID, preNode.rootNodes, preNode.parentNode, _treeNode_BaseNode__WEBPACK_IMPORTED_MODULE_24__/* .NodeType.ntSign */ .Jq.ntSign, 1, preNode.type, preNode.name === "" ? "签名" : preNode.name, preNode.signType, preNode.signFormat, preNode.signor, preNode.signTime, preNode.signTimeFormat, preNode.imgSrc, preNode.imgWidth, preNode.imgHeight, preNode.customProperty, preNode.isTemplate ? preNode.isTemplate : node.isTemplate, //node.isTemplate,
27456
- node.styleIndex, preNode.connectMode, preNode.isFront, preNode.allowEditSignTime);
27457
- hoEditorFactory.undoService.begin();
27458
- hoEditorFactory.undoService.add(new _undoRedo_NodesDeleteUndoUnit__WEBPACK_IMPORTED_MODULE_36__/* .NodesDeleteUndoUnit */ .F(this._hoEditorFactoryID, spath, epath));
27634
+ if (!((node.imgSrc !== "" || node.fingerPrintSrc !== "") && node.isTemplate && !(preNode instanceof _treeNode_SignNode__WEBPACK_IMPORTED_MODULE_84__/* .SignNode */ .N) && !(nextNode instanceof _treeNode_SignNode__WEBPACK_IMPORTED_MODULE_84__/* .SignNode */ .N))) {
27635
+ _context.next = 109;
27636
+ break;
27637
+ }
27459
27638
 
27460
- if (node.number === 2 || node.number === 1 && node.isTemplate) {
27461
- hoEditorFactory.undoService.add(new _undoRedo_NodeInsertUndoUnit__WEBPACK_IMPORTED_MODULE_25__/* .NodeInsertUndoUnit */ .R(this._hoEditorFactoryID, spath, newSignNode));
27462
- }
27639
+ path = hoEditorFactory.docTree.getNodeLastPath(preNode);
27640
+ signNode = new _treeNode_SignNode__WEBPACK_IMPORTED_MODULE_84__/* .SignNode */ .N(this._hoEditorFactoryID, node.rootNodes, node.parentNode, _treeNode_BaseNode__WEBPACK_IMPORTED_MODULE_24__/* .NodeType.ntSign */ .Jq.ntSign, 0, 0, node.name === "" ? "医师签名" : node.name, node.signType, node.signFormat, "", "", node.signTimeFormat, "", 0, 0, {}, true, node.styleIndex, node.connectMode, node.isFront, node.allowEditSignTime);
27641
+ hoEditorFactory.undoService.begin();
27642
+ hoEditorFactory.undoService.add(new _undoRedo_NodeDeleteUndoUnit__WEBPACK_IMPORTED_MODULE_37__/* .NodeDeleteUndoUnit */ .w(this._hoEditorFactoryID, node, startPath));
27643
+ hoEditorFactory.undoService.add(new _undoRedo_NodeInsertUndoUnit__WEBPACK_IMPORTED_MODULE_25__/* .NodeInsertUndoUnit */ .R(this._hoEditorFactoryID, path, signNode));
27644
+ hoEditorFactory.undoService.commit();
27645
+ return _context.abrupt("return");
27463
27646
 
27464
- hoEditorFactory.undoService.commit();
27465
- return;
27466
- }
27647
+ case 109:
27648
+ if (!(preNode instanceof _treeNode_SignNode__WEBPACK_IMPORTED_MODULE_84__/* .SignNode */ .N)) {
27649
+ _context.next = 119;
27650
+ break;
27467
27651
  }
27468
27652
 
27469
- var pNode = node.parentNode;
27653
+ spath = "";
27654
+
27655
+ if (node.number === 2 || node.number === 1 && node.isTemplate) {
27656
+ spath = hoEditorFactory.docTree.getNodeLastPath(preNode.previousLeaf());
27657
+ } else {
27658
+ spath = hoEditorFactory.docTree.getNodeLastPath(preNode);
27659
+ } //const spath = hoEditorFactory.docTree.getNodeLastPath(preNode);
27660
+
27661
+
27662
+ epath = hoEditorFactory.docTree.getNodeLastPath(node);
27663
+ newSignNode = new _treeNode_SignNode__WEBPACK_IMPORTED_MODULE_84__/* .SignNode */ .N(this._hoEditorFactoryID, preNode.rootNodes, preNode.parentNode, _treeNode_BaseNode__WEBPACK_IMPORTED_MODULE_24__/* .NodeType.ntSign */ .Jq.ntSign, 1, preNode.type, preNode.name === "" ? "签名" : preNode.name, preNode.signType, preNode.signFormat, preNode.signor, preNode.signTime, preNode.signTimeFormat, preNode.imgSrc, preNode.imgWidth, preNode.imgHeight, preNode.customProperty, preNode.isTemplate ? preNode.isTemplate : node.isTemplate, //node.isTemplate,
27664
+ node.styleIndex, preNode.connectMode, preNode.isFront, preNode.allowEditSignTime);
27665
+ hoEditorFactory.undoService.begin();
27666
+ hoEditorFactory.undoService.add(new _undoRedo_NodesDeleteUndoUnit__WEBPACK_IMPORTED_MODULE_36__/* .NodesDeleteUndoUnit */ .F(this._hoEditorFactoryID, spath, epath));
27667
+
27668
+ if (node.number === 2 || node.number === 1 && node.isTemplate) {
27669
+ hoEditorFactory.undoService.add(new _undoRedo_NodeInsertUndoUnit__WEBPACK_IMPORTED_MODULE_25__/* .NodeInsertUndoUnit */ .R(this._hoEditorFactoryID, spath, newSignNode));
27670
+ }
27671
+
27672
+ hoEditorFactory.undoService.commit();
27673
+ return _context.abrupt("return");
27674
+
27675
+ case 119:
27676
+ pNode = node.parentNode;
27470
27677
  hoEditorFactory.undoService.begin();
27471
27678
  hoEditorFactory.undoService.add(new _undoRedo_NodeDeleteUndoUnit__WEBPACK_IMPORTED_MODULE_37__/* .NodeDeleteUndoUnit */ .w(this._hoEditorFactoryID, node, startPath));
27472
27679
  hoEditorFactory.undoService.commit();
@@ -27474,12 +27681,21 @@ var DocController = /*#__PURE__*/function () {
27474
27681
  if (pNode && pNode instanceof _treeNode_TextInputFieldNode__WEBPACK_IMPORTED_MODULE_46__/* .TextInputFieldNode */ .re && pNode.childNodes.length === 2) {
27475
27682
  this.resetEmptyInputFieldNode(hoEditorFactory, pNode);
27476
27683
  }
27477
- }
27684
+
27685
+ case 124:
27686
+ case "end":
27687
+ return _context.stop();
27478
27688
  }
27479
27689
  }
27480
- }
27690
+ }, _callee, this);
27691
+ }));
27692
+
27693
+ function deleteTextBeforePath(_x) {
27694
+ return _deleteTextBeforePath.apply(this, arguments);
27481
27695
  }
27482
- }
27696
+
27697
+ return deleteTextBeforePath;
27698
+ }()
27483
27699
  }, {
27484
27700
  key: "resetEmptyInputFieldNode",
27485
27701
  value: function resetEmptyInputFieldNode(hoEditorFactory, node) {
@@ -27591,7 +27807,7 @@ var DocController = /*#__PURE__*/function () {
27591
27807
  var drawArea = hoEditorFactory.drawPageTree.getMainRootArea(drawNode);
27592
27808
 
27593
27809
  if (drawArea) {
27594
- var nodeNeedModifyEvent = new _events_NodeNeedModifyEvent__WEBPACK_IMPORTED_MODULE_84__/* .NodeNeedModifyEvent */ .x(arange.npEnd.node, "dblclick", drawArea.index);
27810
+ var nodeNeedModifyEvent = new _events_NodeNeedModifyEvent__WEBPACK_IMPORTED_MODULE_85__/* .NodeNeedModifyEvent */ .x(arange.npEnd.node, "dblclick", drawArea.index);
27595
27811
  hoEditorFactory.docTree.nodeNeedModify(nodeNeedModifyEvent);
27596
27812
  return;
27597
27813
  } else {
@@ -28416,7 +28632,7 @@ var DocController = /*#__PURE__*/function () {
28416
28632
  if (cell && cell instanceof _treeNode_CellNode__WEBPACK_IMPORTED_MODULE_57__/* .CellNode */ .D) {
28417
28633
  if (cell.table.tableProperty.canAddRow) {
28418
28634
  var _cell$table$getCellIn = cell.table.getCellInfos(cell),
28419
- _cell$table$getCellIn2 = (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_3__/* ["default"] */ .Z)(_cell$table$getCellIn, 2),
28635
+ _cell$table$getCellIn2 = (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)(_cell$table$getCellIn, 2),
28420
28636
  r = _cell$table$getCellIn2[0],
28421
28637
  c = _cell$table$getCellIn2[1];
28422
28638
 
@@ -28464,7 +28680,7 @@ var DocController = /*#__PURE__*/function () {
28464
28680
  if (cell && cell instanceof _treeNode_CellNode__WEBPACK_IMPORTED_MODULE_57__/* .CellNode */ .D) {
28465
28681
  if (cell.table.tableProperty.canAddRow) {
28466
28682
  var _cell$table$getCellIn3 = cell.table.getCellInfos(cell),
28467
- _cell$table$getCellIn4 = (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_3__/* ["default"] */ .Z)(_cell$table$getCellIn3, 2),
28683
+ _cell$table$getCellIn4 = (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)(_cell$table$getCellIn3, 2),
28468
28684
  r = _cell$table$getCellIn4[0],
28469
28685
  c = _cell$table$getCellIn4[1];
28470
28686
 
@@ -28511,7 +28727,7 @@ var DocController = /*#__PURE__*/function () {
28511
28727
 
28512
28728
  if (cell && cell instanceof _treeNode_CellNode__WEBPACK_IMPORTED_MODULE_57__/* .CellNode */ .D) {
28513
28729
  var _cell$table$getCellIn5 = cell.table.getCellInfos(cell),
28514
- _cell$table$getCellIn6 = (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_3__/* ["default"] */ .Z)(_cell$table$getCellIn5, 2),
28730
+ _cell$table$getCellIn6 = (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)(_cell$table$getCellIn5, 2),
28515
28731
  r = _cell$table$getCellIn6[0],
28516
28732
  c = _cell$table$getCellIn6[1];
28517
28733
 
@@ -28559,7 +28775,7 @@ var DocController = /*#__PURE__*/function () {
28559
28775
 
28560
28776
  if (cell && cell instanceof _treeNode_CellNode__WEBPACK_IMPORTED_MODULE_57__/* .CellNode */ .D) {
28561
28777
  var _cell$table$getCellIn7 = cell.table.getCellInfos(cell),
28562
- _cell$table$getCellIn8 = (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_3__/* ["default"] */ .Z)(_cell$table$getCellIn7, 2),
28778
+ _cell$table$getCellIn8 = (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)(_cell$table$getCellIn7, 2),
28563
28779
  r = _cell$table$getCellIn8[0],
28564
28780
  c = _cell$table$getCellIn8[1];
28565
28781
 
@@ -28598,7 +28814,7 @@ var DocController = /*#__PURE__*/function () {
28598
28814
  key: "tableDeleteRows",
28599
28815
  value: function tableDeleteRows(aRange) {
28600
28816
  var _TableNode$getSelectT = _treeNode_TableNode__WEBPACK_IMPORTED_MODULE_51__/* .TableNode.getSelectTableRowColInfos */ .Fh.getSelectTableRowColInfos(this._hoEditorFactoryID, aRange),
28601
- _TableNode$getSelectT2 = (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_3__/* ["default"] */ .Z)(_TableNode$getSelectT, 5),
28817
+ _TableNode$getSelectT2 = (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)(_TableNode$getSelectT, 5),
28602
28818
  table = _TableNode$getSelectT2[0],
28603
28819
  r1 = _TableNode$getSelectT2[1],
28604
28820
  c1 = _TableNode$getSelectT2[2],
@@ -28653,7 +28869,7 @@ var DocController = /*#__PURE__*/function () {
28653
28869
  key: "tableDeleteCols",
28654
28870
  value: function tableDeleteCols(aRange) {
28655
28871
  var _TableNode$getSelectT3 = _treeNode_TableNode__WEBPACK_IMPORTED_MODULE_51__/* .TableNode.getSelectTableRowColInfos */ .Fh.getSelectTableRowColInfos(this._hoEditorFactoryID, aRange),
28656
- _TableNode$getSelectT4 = (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_3__/* ["default"] */ .Z)(_TableNode$getSelectT3, 5),
28872
+ _TableNode$getSelectT4 = (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)(_TableNode$getSelectT3, 5),
28657
28873
  table = _TableNode$getSelectT4[0],
28658
28874
  r1 = _TableNode$getSelectT4[1],
28659
28875
  c1 = _TableNode$getSelectT4[2],
@@ -28722,22 +28938,22 @@ var DocController = /*#__PURE__*/function () {
28722
28938
  }
28723
28939
 
28724
28940
  var _cell1$table$getCellI = cell1.table.getCellInfos(cell1),
28725
- _cell1$table$getCellI2 = (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_3__/* ["default"] */ .Z)(_cell1$table$getCellI, 2),
28941
+ _cell1$table$getCellI2 = (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)(_cell1$table$getCellI, 2),
28726
28942
  r1 = _cell1$table$getCellI2[0],
28727
28943
  c1 = _cell1$table$getCellI2[1];
28728
28944
 
28729
28945
  var _cell1$table$getCellI3 = cell1.table.getCellInfos(cell2),
28730
- _cell1$table$getCellI4 = (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_3__/* ["default"] */ .Z)(_cell1$table$getCellI3, 2),
28946
+ _cell1$table$getCellI4 = (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)(_cell1$table$getCellI3, 2),
28731
28947
  r2 = _cell1$table$getCellI4[0],
28732
28948
  c2 = _cell1$table$getCellI4[1];
28733
28949
 
28734
28950
  var _cell1$table$calcRowS = cell1.table.calcRowSpanColsSpan(r1, c1, r2, c2),
28735
- _cell1$table$calcRowS2 = (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_3__/* ["default"] */ .Z)(_cell1$table$calcRowS, 2),
28951
+ _cell1$table$calcRowS2 = (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)(_cell1$table$calcRowS, 2),
28736
28952
  rowSpan = _cell1$table$calcRowS2[0],
28737
28953
  colSpan = _cell1$table$calcRowS2[1];
28738
28954
 
28739
28955
  var _cell1$table$canMerge = cell1.table.canMergeCell(r1, c1, rowSpan, colSpan),
28740
- _cell1$table$canMerge2 = (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_3__/* ["default"] */ .Z)(_cell1$table$canMerge, 3),
28956
+ _cell1$table$canMerge2 = (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)(_cell1$table$canMerge, 3),
28741
28957
  ret = _cell1$table$canMerge2[0],
28742
28958
  aRowSpan = _cell1$table$canMerge2[1],
28743
28959
  aColSpan = _cell1$table$canMerge2[2];
@@ -28783,24 +28999,24 @@ var DocController = /*#__PURE__*/function () {
28783
28999
  var endPath = cell1.table.getNodePath();
28784
29000
 
28785
29001
  var _hoEditorFactory$draw = hoEditorFactory.drawTree.getDrawRootsByPath(endPath),
28786
- _hoEditorFactory$draw2 = (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_3__/* ["default"] */ .Z)(_hoEditorFactory$draw, 2),
29002
+ _hoEditorFactory$draw2 = (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)(_hoEditorFactory$draw, 2),
28787
29003
  dcell = _hoEditorFactory$draw2[0],
28788
29004
  dRoots = _hoEditorFactory$draw2[1];
28789
29005
 
28790
29006
  var startDline = dRoots.indexOf(cell1.table.drawTable);
28791
29007
 
28792
29008
  var _cell1$table$getCellI5 = cell1.table.getCellInfos(cell1),
28793
- _cell1$table$getCellI6 = (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_3__/* ["default"] */ .Z)(_cell1$table$getCellI5, 2),
29009
+ _cell1$table$getCellI6 = (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)(_cell1$table$getCellI5, 2),
28794
29010
  r1 = _cell1$table$getCellI6[0],
28795
29011
  c1 = _cell1$table$getCellI6[1];
28796
29012
 
28797
29013
  var _cell1$table$getCellI7 = cell1.table.getCellInfos(cell2),
28798
- _cell1$table$getCellI8 = (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_3__/* ["default"] */ .Z)(_cell1$table$getCellI7, 2),
29014
+ _cell1$table$getCellI8 = (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)(_cell1$table$getCellI7, 2),
28799
29015
  r2 = _cell1$table$getCellI8[0],
28800
29016
  c2 = _cell1$table$getCellI8[1];
28801
29017
 
28802
29018
  var _cell1$table$calcRowS3 = cell1.table.calcRowSpanColsSpan(r1, c1, r2, c2),
28803
- _cell1$table$calcRowS4 = (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_3__/* ["default"] */ .Z)(_cell1$table$calcRowS3, 2),
29019
+ _cell1$table$calcRowS4 = (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)(_cell1$table$calcRowS3, 2),
28804
29020
  rowSpan = _cell1$table$calcRowS4[0],
28805
29021
  colSpan = _cell1$table$calcRowS4[1]; // cell1.table.mergeCells(r1, c1, rowSpan, colSpan);
28806
29022
 
@@ -28978,7 +29194,7 @@ var DocController = /*#__PURE__*/function () {
28978
29194
  var cellProperty = new _TableProperty__WEBPACK_IMPORTED_MODULE_58__/* .CellProperty */ .$W(objectValues);
28979
29195
  cellNode.cellProperty = cellProperty;
28980
29196
  cellNode.drawCell.drawPageCells.forEach(function (pcell) {
28981
- pcell.valignTop = pcell.calcValignTop();
29197
+ pcell.valignTop = pcell.calcValignTop()[0];
28982
29198
  });
28983
29199
  }
28984
29200
  /**
@@ -29199,7 +29415,7 @@ var DocController = /*#__PURE__*/function () {
29199
29415
  var nodesMap = object.obj1;
29200
29416
  var indexsMap = object.obj2;
29201
29417
 
29202
- var _iterator = (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createForOfIteratorHelper_js__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z)(indexsMap.values()),
29418
+ var _iterator = (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createForOfIteratorHelper_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z)(indexsMap.values()),
29203
29419
  _step;
29204
29420
 
29205
29421
  try {
@@ -29589,14 +29805,14 @@ var DocController = /*#__PURE__*/function () {
29589
29805
  }, {
29590
29806
  key: "initBlankDoc",
29591
29807
  value: function () {
29592
- var _initBlankDoc = (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_asyncToGenerator_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)( /*#__PURE__*/(0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_regeneratorRuntime_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z)().mark(function _callee() {
29808
+ var _initBlankDoc = (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_asyncToGenerator_js__WEBPACK_IMPORTED_MODULE_3__/* ["default"] */ .Z)( /*#__PURE__*/(0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_regeneratorRuntime_js__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z)().mark(function _callee2() {
29593
29809
  var hoEditorFactory, firstNode, strFirstPath, aPage;
29594
- return (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_regeneratorRuntime_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z)().wrap(function _callee$(_context) {
29810
+ return (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_regeneratorRuntime_js__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z)().wrap(function _callee2$(_context2) {
29595
29811
  while (1) {
29596
- switch (_context.prev = _context.next) {
29812
+ switch (_context2.prev = _context2.next) {
29597
29813
  case 0:
29598
29814
  hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_77__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
29599
- _context.next = 3;
29815
+ _context2.next = 3;
29600
29816
  return hoEditorFactory.drawPageTree.stopPageEvent();
29601
29817
 
29602
29818
  case 3:
@@ -29606,15 +29822,15 @@ var DocController = /*#__PURE__*/function () {
29606
29822
  hoEditorFactory.docTree.clearDocTree();
29607
29823
  hoEditorFactory.drawPageTree.clear();
29608
29824
  hoEditorFactory.drawPageTree.initDoc();
29609
- _context.next = 11;
29825
+ _context2.next = 11;
29610
29826
  return hoEditorFactory.drawTree.buildDrawTree(hoEditorFactory.subDocManger.headerDocTree[0].subDocNodes, hoEditorFactory.drawTree.headerDNodes[0]);
29611
29827
 
29612
29828
  case 11:
29613
- _context.next = 13;
29829
+ _context2.next = 13;
29614
29830
  return hoEditorFactory.drawTree.buildDrawTree(hoEditorFactory.subDocManger.footerDocTree[0].subDocNodes, hoEditorFactory.drawTree.footerDNodes[0]);
29615
29831
 
29616
29832
  case 13:
29617
- _context.next = 15;
29833
+ _context2.next = 15;
29618
29834
  return hoEditorFactory.drawTree.buildDrawTree(hoEditorFactory.docTree.mainNodes, hoEditorFactory.drawTree.mainDNodes);
29619
29835
 
29620
29836
  case 15:
@@ -29639,10 +29855,10 @@ var DocController = /*#__PURE__*/function () {
29639
29855
 
29640
29856
  case 25:
29641
29857
  case "end":
29642
- return _context.stop();
29858
+ return _context2.stop();
29643
29859
  }
29644
29860
  }
29645
- }, _callee, this);
29861
+ }, _callee2, this);
29646
29862
  }));
29647
29863
 
29648
29864
  function initBlankDoc() {
@@ -29975,7 +30191,7 @@ var DocController = /*#__PURE__*/function () {
29975
30191
 
29976
30192
  hoeditorfactory.undoService.begin();
29977
30193
  var newParaPath = paraNode.getNodePath();
29978
- var separateCharNode = new _treeNode_SeparateCharNode__WEBPACK_IMPORTED_MODULE_80__/* .SeparateCharNode */ .O(this._hoEditorFactoryID, np.roots, parentNode, _treeNode_BaseNode__WEBPACK_IMPORTED_MODULE_24__/* .NodeType.ntSeparateChar */ .Jq.ntSeparateChar, width, color);
30194
+ var separateCharNode = new _treeNode_SeparateCharNode__WEBPACK_IMPORTED_MODULE_81__/* .SeparateCharNode */ .O(this._hoEditorFactoryID, np.roots, parentNode, _treeNode_BaseNode__WEBPACK_IMPORTED_MODULE_24__/* .NodeType.ntSeparateChar */ .Jq.ntSeparateChar, width, color);
29979
30195
  hoeditorfactory.undoService.add(new _undoRedo_NodeInsertUndoUnit__WEBPACK_IMPORTED_MODULE_25__/* .NodeInsertUndoUnit */ .R(this._hoEditorFactoryID, newParaPath, separateCharNode));
29980
30196
  hoeditorfactory.undoService.commit();
29981
30197
  }
@@ -29999,7 +30215,7 @@ var DocController = /*#__PURE__*/function () {
29999
30215
  if (np) {
30000
30216
  var node = np.node;
30001
30217
 
30002
- if (node instanceof _treeNode_GestationNode__WEBPACK_IMPORTED_MODULE_85__/* .GestationNode */ .G) {
30218
+ if (node instanceof _treeNode_GestationNode__WEBPACK_IMPORTED_MODULE_86__/* .GestationNode */ .G) {
30003
30219
  hoEditorFactory.undoService.begin();
30004
30220
  hoEditorFactory.undoService.add(new _undoRedo_NodeDeleteUndoUnit__WEBPACK_IMPORTED_MODULE_37__/* .NodeDeleteUndoUnit */ .w(this._hoEditorFactoryID, node, startPath, "update"));
30005
30221
  startPath = hoEditorFactory.docTree.getNodeLastPath(node.previousLeaf());
@@ -30008,7 +30224,7 @@ var DocController = /*#__PURE__*/function () {
30008
30224
  }
30009
30225
 
30010
30226
  var parentNode = hoEditorFactory.docTree.getParentNode(startPath);
30011
- var gestationNode = new _treeNode_GestationNode__WEBPACK_IMPORTED_MODULE_85__/* .GestationNode */ .G(this._hoEditorFactoryID, domRange.npStart.roots, parentNode, _treeNode_BaseNode__WEBPACK_IMPORTED_MODULE_24__/* .NodeType.ntGestation */ .Jq.ntGestation, lastMenstruationDate, usedDate, hoEditorFactory.docTree.curStyleIndex); //插入节点
30227
+ var gestationNode = new _treeNode_GestationNode__WEBPACK_IMPORTED_MODULE_86__/* .GestationNode */ .G(this._hoEditorFactoryID, domRange.npStart.roots, parentNode, _treeNode_BaseNode__WEBPACK_IMPORTED_MODULE_24__/* .NodeType.ntGestation */ .Jq.ntGestation, lastMenstruationDate, usedDate, hoEditorFactory.docTree.curStyleIndex); //插入节点
30012
30228
 
30013
30229
  if (operType === "add") {
30014
30230
  hoEditorFactory.undoService.begin();
@@ -30020,12 +30236,12 @@ var DocController = /*#__PURE__*/function () {
30020
30236
  }, {
30021
30237
  key: "textToLabel",
30022
30238
  value: function () {
30023
- var _textToLabel = (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_asyncToGenerator_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)( /*#__PURE__*/(0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_regeneratorRuntime_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z)().mark(function _callee2(range) {
30239
+ var _textToLabel = (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_asyncToGenerator_js__WEBPACK_IMPORTED_MODULE_3__/* ["default"] */ .Z)( /*#__PURE__*/(0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_regeneratorRuntime_js__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z)().mark(function _callee3(range) {
30024
30240
  var hoeditorfactory, astart, aend, sChildIndex, eChildIndex, anode, startPath, endPath, drawNode, i, text, pathArr, _pathArr, labelNode, delRange, anodeEndPath, result;
30025
30241
 
30026
- return (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_regeneratorRuntime_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z)().wrap(function _callee2$(_context2) {
30242
+ return (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_regeneratorRuntime_js__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z)().wrap(function _callee3$(_context3) {
30027
30243
  while (1) {
30028
- switch (_context2.prev = _context2.next) {
30244
+ switch (_context3.prev = _context3.next) {
30029
30245
  case 0:
30030
30246
  hoeditorfactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_77__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
30031
30247
  astart = range.npStart.node;
@@ -30038,12 +30254,12 @@ var DocController = /*#__PURE__*/function () {
30038
30254
 
30039
30255
  case 8:
30040
30256
  if (!anode) {
30041
- _context2.next = 34;
30257
+ _context3.next = 34;
30042
30258
  break;
30043
30259
  }
30044
30260
 
30045
30261
  if (!(anode instanceof _treeNode_TextNode__WEBPACK_IMPORTED_MODULE_27__/* .TextNode */ .R)) {
30046
- _context2.next = 32;
30262
+ _context3.next = 32;
30047
30263
  break;
30048
30264
  }
30049
30265
 
@@ -30052,21 +30268,21 @@ var DocController = /*#__PURE__*/function () {
30052
30268
 
30053
30269
  case 12:
30054
30270
  if (!(i < anode.drawNodes.length)) {
30055
- _context2.next = 19;
30271
+ _context3.next = 19;
30056
30272
  break;
30057
30273
  }
30058
30274
 
30059
30275
  if (!(sChildIndex < anode.drawNodes[i].endIndex)) {
30060
- _context2.next = 16;
30276
+ _context3.next = 16;
30061
30277
  break;
30062
30278
  }
30063
30279
 
30064
30280
  drawNode = anode.drawNodes[i];
30065
- return _context2.abrupt("break", 19);
30281
+ return _context3.abrupt("break", 19);
30066
30282
 
30067
30283
  case 16:
30068
30284
  i++;
30069
- _context2.next = 12;
30285
+ _context3.next = 12;
30070
30286
  break;
30071
30287
 
30072
30288
  case 19:
@@ -30107,9 +30323,9 @@ var DocController = /*#__PURE__*/function () {
30107
30323
  }
30108
30324
  }
30109
30325
 
30110
- labelNode = new _treeNode_LabelNode__WEBPACK_IMPORTED_MODULE_81__/* .LabelNode */ .P(this._hoEditorFactoryID, range.npStart.roots, anode.parentNode, _treeNode_BaseNode__WEBPACK_IMPORTED_MODULE_24__/* .NodeType.ntLabel */ .Jq.ntLabel, text, anode.styleIndex);
30326
+ labelNode = new _treeNode_LabelNode__WEBPACK_IMPORTED_MODULE_82__/* .LabelNode */ .P(this._hoEditorFactoryID, range.npStart.roots, anode.parentNode, _treeNode_BaseNode__WEBPACK_IMPORTED_MODULE_24__/* .NodeType.ntLabel */ .Jq.ntLabel, text, anode.styleIndex);
30111
30327
  delRange = new _DomRange__WEBPACK_IMPORTED_MODULE_31__/* .DomRange */ .a(this._hoEditorFactoryID, startPath, endPath);
30112
- _context2.next = 28;
30328
+ _context3.next = 28;
30113
30329
  return this.deleteRange(delRange, true);
30114
30330
 
30115
30331
  case 28:
@@ -30123,7 +30339,7 @@ var DocController = /*#__PURE__*/function () {
30123
30339
 
30124
30340
  if (anode) {
30125
30341
  anodeEndPath = hoeditorfactory.docTree.getNodeLastPath(anode);
30126
- result = _NodePosition__WEBPACK_IMPORTED_MODULE_82__/* .NodePosition.treePathCompare */ .F.treePathCompare(anodeEndPath, range.startPath);
30342
+ result = _NodePosition__WEBPACK_IMPORTED_MODULE_83__/* .NodePosition.treePathCompare */ .F.treePathCompare(anodeEndPath, range.startPath);
30127
30343
 
30128
30344
  if (result <= 0) {
30129
30345
  anode = null;
@@ -30132,19 +30348,19 @@ var DocController = /*#__PURE__*/function () {
30132
30348
 
30133
30349
  case 34:
30134
30350
  if (anode && astart.previousLeaf() && anode !== astart.previousLeaf()) {
30135
- _context2.next = 8;
30351
+ _context3.next = 8;
30136
30352
  break;
30137
30353
  }
30138
30354
 
30139
30355
  case 35:
30140
30356
  case "end":
30141
- return _context2.stop();
30357
+ return _context3.stop();
30142
30358
  }
30143
30359
  }
30144
- }, _callee2, this);
30360
+ }, _callee3, this);
30145
30361
  }));
30146
30362
 
30147
- function textToLabel(_x) {
30363
+ function textToLabel(_x2) {
30148
30364
  return _textToLabel.apply(this, arguments);
30149
30365
  }
30150
30366
 
@@ -30188,7 +30404,7 @@ var DocController = /*#__PURE__*/function () {
30188
30404
  var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_77__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
30189
30405
  var startPath = domRange.startPath;
30190
30406
  var parentNode = hoEditorFactory.docTree.getParentNode(startPath);
30191
- var signNode = new _treeNode_SignNode__WEBPACK_IMPORTED_MODULE_83__/* .SignNode */ .N(this._hoEditorFactoryID, domRange.npStart.roots, parentNode, _treeNode_BaseNode__WEBPACK_IMPORTED_MODULE_24__/* .NodeType.ntSign */ .Jq.ntSign, 0, 0, name, signType, signFormat, "", "", signTimeFormat, "", 0, 0, {}, true, hoEditorFactory.docTree.curStyleIndex, connectMode, isFront, allowEditSignTime, undefined, undefined, attribute, connectChar); //插入该表达式节点
30407
+ var signNode = new _treeNode_SignNode__WEBPACK_IMPORTED_MODULE_84__/* .SignNode */ .N(this._hoEditorFactoryID, domRange.npStart.roots, parentNode, _treeNode_BaseNode__WEBPACK_IMPORTED_MODULE_24__/* .NodeType.ntSign */ .Jq.ntSign, 0, 0, name, signType, signFormat, "", "", signTimeFormat, "", 0, 0, {}, true, hoEditorFactory.docTree.curStyleIndex, connectMode, isFront, allowEditSignTime, undefined, undefined, attribute, connectChar); //插入该表达式节点
30192
30408
 
30193
30409
  hoEditorFactory.undoService.begin();
30194
30410
  hoEditorFactory.undoService.add(new _undoRedo_NodeInsertUndoUnit__WEBPACK_IMPORTED_MODULE_25__/* .NodeInsertUndoUnit */ .R(this._hoEditorFactoryID, startPath, signNode));
@@ -30218,7 +30434,7 @@ var DocController = /*#__PURE__*/function () {
30218
30434
  // }
30219
30435
  // }
30220
30436
 
30221
- var signNode = new _treeNode_SignNode__WEBPACK_IMPORTED_MODULE_83__/* .SignNode */ .N(this._hoEditorFactoryID, domRange.npStart.roots, parentNode, _treeNode_BaseNode__WEBPACK_IMPORTED_MODULE_24__/* .NodeType.ntSign */ .Jq.ntSign, 1, type, name, 0, "医师签名", signor, signTime, signTimeFormat, imgSrc, imgWidth, imgHeight, customProperty, false, hoEditorFactory.docTree.curStyleIndex, undefined, undefined, undefined, fingerPrintSrc, fingerPosition); //插入该表达式节点
30437
+ var signNode = new _treeNode_SignNode__WEBPACK_IMPORTED_MODULE_84__/* .SignNode */ .N(this._hoEditorFactoryID, domRange.npStart.roots, parentNode, _treeNode_BaseNode__WEBPACK_IMPORTED_MODULE_24__/* .NodeType.ntSign */ .Jq.ntSign, 1, type, name, 0, "医师签名", signor, signTime, signTimeFormat, imgSrc, imgWidth, imgHeight, customProperty, false, hoEditorFactory.docTree.curStyleIndex, undefined, undefined, undefined, fingerPrintSrc, fingerPosition); //插入该表达式节点
30222
30438
 
30223
30439
  hoEditorFactory.undoService.begin();
30224
30440
  hoEditorFactory.undoService.add(new _undoRedo_NodeInsertUndoUnit__WEBPACK_IMPORTED_MODULE_25__/* .NodeInsertUndoUnit */ .R(this._hoEditorFactoryID, startPath, signNode));
@@ -30282,7 +30498,7 @@ var DocController = /*#__PURE__*/function () {
30282
30498
  }
30283
30499
  }
30284
30500
 
30285
- var newSignNode = new _treeNode_SignNode__WEBPACK_IMPORTED_MODULE_83__/* .SignNode */ .N(this._hoEditorFactoryID, node.rootNodes, node.parentNode, _treeNode_BaseNode__WEBPACK_IMPORTED_MODULE_24__/* .NodeType.ntSign */ .Jq.ntSign, 2, type, name, node.signType, node.signFormat, signor, signTime, node.signTimeFormat, imgSrc, imgWidth, imgHeight, customProperty, false, node.styleIndex, node.connectMode, type == 1 && node.signType == 1 ? true : node.isFront, node.allowEditSignTime, fingerPrintSrc, fingerPosition); //插入该表达式节点
30501
+ var newSignNode = new _treeNode_SignNode__WEBPACK_IMPORTED_MODULE_84__/* .SignNode */ .N(this._hoEditorFactoryID, node.rootNodes, node.parentNode, _treeNode_BaseNode__WEBPACK_IMPORTED_MODULE_24__/* .NodeType.ntSign */ .Jq.ntSign, 2, type, name, node.signType, node.signFormat, signor, signTime, node.signTimeFormat, imgSrc, imgWidth, imgHeight, customProperty, false, node.styleIndex, node.connectMode, type == 1 && node.signType == 1 ? true : node.isFront, node.allowEditSignTime, fingerPrintSrc, fingerPosition); //插入该表达式节点
30286
30502
 
30287
30503
  hoEditorFactory.undoService.begin();
30288
30504
  hoEditorFactory.undoService.add(new _undoRedo_NodeInsertUndoUnit__WEBPACK_IMPORTED_MODULE_25__/* .NodeInsertUndoUnit */ .R(this._hoEditorFactoryID, sPath, newSignNode));
@@ -30412,7 +30628,7 @@ var DocController = /*#__PURE__*/function () {
30412
30628
  var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_77__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
30413
30629
 
30414
30630
  var _cell$table$canMergeC = cell.table.canMergeCell(r, c, rowSpan, colSpan),
30415
- _cell$table$canMergeC2 = (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_3__/* ["default"] */ .Z)(_cell$table$canMergeC, 3),
30631
+ _cell$table$canMergeC2 = (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)(_cell$table$canMergeC, 3),
30416
30632
  ret = _cell$table$canMergeC2[0],
30417
30633
  aRowSpan = _cell$table$canMergeC2[1],
30418
30634
  aColSpan = _cell$table$canMergeC2[2];
@@ -49472,15 +49688,17 @@ var RowInfos = /*#__PURE__*/function () {
49472
49688
 
49473
49689
  var r = this._table.rowInfos.indexOf(this);
49474
49690
 
49475
- for (var i = 0; i < this._table.colCount; i++) {
49476
- var _this$_table$getMainC = this._table.getMainCell(r, i),
49477
- _this$_table$getMainC2 = (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_5__/* ["default"] */ .Z)(_this$_table$getMainC, 3),
49478
- mainCell = _this$_table$getMainC2[0],
49479
- mr = _this$_table$getMainC2[1],
49480
- mc = _this$_table$getMainC2[2];
49691
+ if (r >= 0) {
49692
+ for (var i = 0; i < this._table.colCount; i++) {
49693
+ var _this$_table$getMainC = this._table.getMainCell(r, i),
49694
+ _this$_table$getMainC2 = (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_5__/* ["default"] */ .Z)(_this$_table$getMainC, 3),
49695
+ mainCell = _this$_table$getMainC2[0],
49696
+ mr = _this$_table$getMainC2[1],
49697
+ mc = _this$_table$getMainC2[2];
49481
49698
 
49482
- if (mainCell.cellProperty.align !== _TableProperty__WEBPACK_IMPORTED_MODULE_30__/* .VAlign.vatop */ .TR.vatop) {
49483
- mainCell.drawCell.needUpdate = true;
49699
+ if (mainCell.cellProperty.align !== _TableProperty__WEBPACK_IMPORTED_MODULE_30__/* .VAlign.vatop */ .TR.vatop) {
49700
+ mainCell.drawCell.needUpdate = true;
49701
+ }
49484
49702
  }
49485
49703
  }
49486
49704
  }
@@ -55592,6 +55810,8 @@ var UnitConvert = __webpack_require__(38100);
55592
55810
  var BaseNode = __webpack_require__(50369);
55593
55811
  // EXTERNAL MODULE: ./src/editor/draw/drawNode/DrawDownListNode.ts
55594
55812
  var DrawDownListNode = __webpack_require__(63756);
55813
+ // EXTERNAL MODULE: ./src/editor/dom/treeNode/TextInputFieldNode.ts
55814
+ var TextInputFieldNode = __webpack_require__(34565);
55595
55815
  ;// CONCATENATED MODULE: ./src/editor/draw/DrawLine.ts
55596
55816
 
55597
55817
 
@@ -55613,6 +55833,7 @@ var DrawDownListNode = __webpack_require__(63756);
55613
55833
 
55614
55834
 
55615
55835
 
55836
+
55616
55837
 
55617
55838
 
55618
55839
  var DrawLine = /*#__PURE__*/function (_DrawContainer) {
@@ -56227,6 +56448,10 @@ var DrawLine = /*#__PURE__*/function (_DrawContainer) {
56227
56448
  break;
56228
56449
  }
56229
56450
  }
56451
+
56452
+ if (Paragraph/* Align.alright */.xM.alright && this.paragraphNode.parentNode instanceof TextInputFieldNode/* TextInputFieldNode */.re && this.paragraphNode.parentNode.alignWithBlocked) {
56453
+ usedWidth = 0;
56454
+ }
56230
56455
  /**
56231
56456
  * 返回字间距
56232
56457
  * @param index 字序号
@@ -63056,9 +63281,12 @@ var DrawPageCell = /*#__PURE__*/function (_DrawArea) {
63056
63281
  }
63057
63282
  }, {
63058
63283
  key: "afterHeightChanged",
63059
- value: function afterHeightChanged(oldHeight, newHeight) {
63060
- if (this._cell.cellProperty.align != TableProperty/* VAlign.vatop */.TR.vatop) {
63061
- var newValignTop = this.calcValignTop();
63284
+ value: function afterHeightChanged() {
63285
+ if (this._cell.cellProperty.align == TableProperty/* VAlign.vacenter */.TR.vacenter) {
63286
+ var _this$calcValignTop = this.calcValignTop(),
63287
+ _this$calcValignTop2 = (0,slicedToArray/* default */.Z)(_this$calcValignTop, 2),
63288
+ newValignTop = _this$calcValignTop2[0],
63289
+ topArr = _this$calcValignTop2[1];
63062
63290
 
63063
63291
  if (newValignTop != this._valignTop) {
63064
63292
  var adjustValignTop = newValignTop - this._valignTop;
@@ -63070,6 +63298,56 @@ var DrawPageCell = /*#__PURE__*/function (_DrawArea) {
63070
63298
  }
63071
63299
  }
63072
63300
  }
63301
+ } else if (this._cell.cellProperty.align == TableProperty/* VAlign.vabottom */.TR.vabottom) {
63302
+ var _this$calcValignTop3 = this.calcValignTop(),
63303
+ _this$calcValignTop4 = (0,slicedToArray/* default */.Z)(_this$calcValignTop3, 2),
63304
+ _newValignTop = _this$calcValignTop4[0],
63305
+ rowHeightArr = _this$calcValignTop4[1];
63306
+
63307
+ if (rowHeightArr) {
63308
+ // const getPlace=(dTop:number,dPageCellIndex: number,dHeight:number):[number,number]=>{
63309
+ // let index=0;
63310
+ // let newTop=dTop;
63311
+ // let rowHeight=0;
63312
+ // for (let i=0;i<topArr.length;i++ ){
63313
+ // if (dTop+dHeight<topArr[i]){
63314
+ // index=i;
63315
+ // break;
63316
+ // }
63317
+ // else {
63318
+ // newTop-=topArr[i]
63319
+ // }
63320
+ // }
63321
+ // return [index,newTop]
63322
+ // }
63323
+ if (_newValignTop != this._valignTop) {
63324
+ this._valignTop = _newValignTop;
63325
+ var childCount = this._cell.drawCell.drawLines.length;
63326
+ var pageCellIndex = this._cell.drawCell.drawPageCells.length - 1;
63327
+ var dPageCell = this._cell.drawCell.drawPageCells[pageCellIndex];
63328
+ var cellrestHeight = rowHeightArr[pageCellIndex];
63329
+
63330
+ for (var _i = childCount - 1; _i >= 0; _i--) {
63331
+ var dObj = this._cell.drawCell.drawLines[_i];
63332
+
63333
+ if (dObj instanceof DrawLine/* DrawLine */.a || dObj instanceof DrawPageTable/* DrawPageTable */.ox) {
63334
+ while (pageCellIndex > 0 && cellrestHeight < dObj.dHeight) {
63335
+ pageCellIndex -= 1;
63336
+ dPageCell = this._cell.drawCell.drawPageCells[pageCellIndex];
63337
+ cellrestHeight = rowHeightArr[pageCellIndex];
63338
+ }
63339
+
63340
+ if (!dPageCell.contains(dObj) && dObj.parent && dObj.parent.contains(dObj)) {
63341
+ dObj.parent.removeChild(dObj);
63342
+ }
63343
+
63344
+ dObj.y = cellrestHeight - dObj.dHeight - dObj.paragraphNode.combineParagraph.lineSpace;
63345
+ cellrestHeight = dObj.y;
63346
+ dPageCell.addChild(dObj); // const [pageCellIndex,newTop]=getPlace(dTop,index,dObj.dHeight);
63347
+ }
63348
+ }
63349
+ }
63350
+ }
63073
63351
  }
63074
63352
  }
63075
63353
  }, {
@@ -63091,9 +63369,12 @@ var DrawPageCell = /*#__PURE__*/function (_DrawArea) {
63091
63369
  value: function calcValignTop() {
63092
63370
  var index = this.cell.drawCell.drawPageCells.indexOf(this);
63093
63371
  var innerTop = 0;
63372
+ var toparr = new Array();
63373
+ var aHeight = 0;
63374
+ var hoeditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._cell.hoEditorFactoryID);
63094
63375
 
63095
63376
  if (index == 0) {
63096
- innerTop = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._cell.hoEditorFactoryID).unitConvert.mmConversionPx(this._cell.cellProperty.cellInnerMargin[0] * 10, true);
63377
+ innerTop = hoeditorFactory.unitConvert.mmConversionPx(this._cell.cellProperty.cellInnerMargin[0] * 10, true);
63097
63378
  }
63098
63379
 
63099
63380
  var valignTop = innerTop;
@@ -63101,34 +63382,63 @@ var DrawPageCell = /*#__PURE__*/function (_DrawArea) {
63101
63382
  if (this._cell.cellProperty.align === TableProperty/* VAlign.vatop */.TR.vatop) {
63102
63383
  valignTop = innerTop;
63103
63384
  } else if (this._cell.cellProperty.align === TableProperty/* VAlign.vacenter */.TR.vacenter) {
63104
- var aHeight = this.calcCellHeight();
63385
+ var _this$calcCellHeight = this.calcCellHeight();
63386
+
63387
+ var _this$calcCellHeight2 = (0,slicedToArray/* default */.Z)(_this$calcCellHeight, 2);
63388
+
63389
+ aHeight = _this$calcCellHeight2[0];
63390
+ toparr = _this$calcCellHeight2[1];
63105
63391
  if (aHeight > this._cell.drawCell.docHeight) valignTop = (aHeight - this._cell.drawCell.docHeight) / 2;
63106
63392
  } else if (this._cell.cellProperty.align === TableProperty/* VAlign.vabottom */.TR.vabottom) {
63107
- var _aHeight = this.calcCellHeight();
63393
+ var _this$calcCellHeight3 = this.calcCellHeight();
63394
+
63395
+ var _this$calcCellHeight4 = (0,slicedToArray/* default */.Z)(_this$calcCellHeight3, 2);
63396
+
63397
+ aHeight = _this$calcCellHeight4[0];
63398
+ toparr = _this$calcCellHeight4[1];
63399
+ var innerBottom = hoeditorFactory.unitConvert.mmConversionPx(this._cell.cellProperty.cellInnerMargin[1] * 10, true);
63400
+ var restRowHeight = 0;
63108
63401
 
63109
- var innerBottom = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._cell.hoEditorFactoryID).unitConvert.mmConversionPx(this._cell.cellProperty.cellInnerMargin[1] * 10, true);
63110
- if (_aHeight > this._cell.drawCell.docHeight) valignTop = _aHeight - this._cell.drawCell.docHeight - innerBottom;
63402
+ for (var r = index; r < toparr.length; r++) {
63403
+ restRowHeight += toparr[r];
63404
+ }
63405
+
63406
+ if (aHeight > this._cell.drawCell.docHeight && this._cell.drawCell.docHeight < restRowHeight) {
63407
+ valignTop = restRowHeight - this._cell.drawCell.docHeight - innerBottom;
63408
+ }
63111
63409
  }
63112
63410
 
63113
- return valignTop;
63411
+ return [valignTop, toparr];
63114
63412
  }
63115
63413
  }, {
63116
63414
  key: "update",
63117
63415
  value: function update(prevDrawArea, dlines, startIndex, dTop, restHeight) {
63118
- var valignTop = dTop; // if (startIndex === 0) {
63416
+ var valignTop = dTop;
63417
+
63418
+ if (this._cell.cellProperty.align == TableProperty/* VAlign.vabottom */.TR.vabottom) {
63419
+ valignTop = this.calcValignTop()[0];
63420
+ this._valignTop = valignTop;
63421
+ } // if (startIndex === 0) {
63119
63422
  // valignTop=this.calcValignTop();
63120
63423
  // this._valignTop=valignTop;
63121
63424
  // }
63122
63425
 
63426
+
63123
63427
  this._startDline = startIndex;
63124
63428
 
63125
63429
  var ret = (0,get/* default */.Z)((0,getPrototypeOf/* default */.Z)(DrawPageCell.prototype), "update", this).call(this, prevDrawArea, dlines, startIndex, valignTop, restHeight);
63126
63430
 
63127
- this._docHeight -= valignTop;
63431
+ this._docHeight = Math.max(0, this._docHeight - valignTop);
63128
63432
  this.updateDHeight();
63129
63433
  return ret; // this.updateTouchArea(this._dHeight);
63130
63434
  // this.paintCellBackground(this._dHeight);
63131
63435
  }
63436
+ /**
63437
+ *
63438
+ * @returns
63439
+ * 返回单元格在所有分页上的总高度,以及每页高度数组
63440
+ */
63441
+
63132
63442
  }, {
63133
63443
  key: "calcCellHeight",
63134
63444
  value: function calcCellHeight() {
@@ -63138,16 +63448,55 @@ var DrawPageCell = /*#__PURE__*/function (_DrawArea) {
63138
63448
  c = _this$_cell$table$get6[1];
63139
63449
 
63140
63450
  var ret = 0;
63451
+ var hoeditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._cell.hoEditorFactoryID);
63452
+ var dTopArr = new Array();
63453
+
63454
+ if (this._cell.cellProperty.align == TableProperty/* VAlign.vabottom */.TR.vabottom) {
63455
+ ret = 0;
63456
+
63457
+ for (var r = row, count = this._cell.rowSpan + row - 1; r <= count; r++) {
63458
+ var rowInfos = this._cell.table.rowInfos[r];
63459
+
63460
+ if (rowInfos) {
63461
+ ret += rowInfos.rowHeight;
63462
+ }
63463
+ }
63464
+
63465
+ var icount = this._cell.table.drawTable.drawPageTables.length;
63466
+ var index = 0;
63467
+ var pageHeight = 0;
63468
+
63469
+ for (var i = 0; i < icount; i++) {
63470
+ dTopArr[index] = 0;
63471
+
63472
+ for (var _r = row, _count = this._cell.rowSpan + row - 1; _r <= _count; _r++) {
63473
+ var dTable = this._cell.table.drawTable.drawPageTables[i];
63474
+
63475
+ if (dTable.parent && dTable.parent.contains(dTable)) {
63476
+ var _rowInfos = dTable.partRowHeights.get(_r);
63141
63477
 
63142
- for (var r = row, count = this._cell.rowSpan + row - 1; r <= count; r++) {
63143
- var rowInfos = this._drawPageTable.partRowHeights.get(r);
63478
+ if (_rowInfos) {
63479
+ if (pageHeight < ret) {
63480
+ pageHeight += _rowInfos.rowHeight;
63481
+ dTopArr[index] += _rowInfos.rowHeight;
63482
+ }
63483
+ }
63484
+ }
63485
+
63486
+ index += 1;
63487
+ }
63488
+ }
63489
+ } else if (this._cell.cellProperty.align == TableProperty/* VAlign.vacenter */.TR.vacenter) {
63490
+ for (var _r2 = row, _count2 = this._cell.rowSpan + row - 1; _r2 <= _count2; _r2++) {
63491
+ var _rowInfos2 = this._drawPageTable.partRowHeights.get(_r2);
63144
63492
 
63145
- if (rowInfos) {
63146
- ret += rowInfos.rowHeight;
63493
+ if (_rowInfos2) {
63494
+ ret += _rowInfos2.rowHeight;
63495
+ }
63147
63496
  }
63148
63497
  }
63149
63498
 
63150
- return ret;
63499
+ return [ret, dTopArr];
63151
63500
  }
63152
63501
  }]);
63153
63502
 
@@ -63798,7 +64147,7 @@ var DrawPageTable = /*#__PURE__*/function (_DrawRect) {
63798
64147
  if (partCell) {
63799
64148
  var oldHeight = partCell.dHeight;
63800
64149
  partCell.dHeight = newHeight;
63801
- partCell.afterHeightChanged(oldHeight, newHeight);
64150
+ partCell.afterHeightChanged();
63802
64151
 
63803
64152
  if (partCell.cell.rowSpan > 1) {
63804
64153
  var index = partCell.cell.drawCell.drawPageCells.indexOf(partCell) - 1;
@@ -66668,6 +67017,7 @@ var DrawTable = /*#__PURE__*/function (_DrawRect) {
66668
67017
  key: "updateRowHeight",
66669
67018
  value: function updateRowHeight(r) {
66670
67019
  var dHeight = _editor_dom_treeNode_TableNode__WEBPACK_IMPORTED_MODULE_13__/* .gDefaultRowHeight */ .dT;
67020
+ var bottonAlignCell = new Array();
66671
67021
  var rowPorpertyHeight = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_14__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID).unitConvert.mmConversionPx(this._table.rowInfos[r].rowProperty.rowHeight * 10, false);
66672
67022
 
66673
67023
  if (this._table.rowInfos[r].rowProperty.isSpecifyHeight) {
@@ -66682,6 +67032,10 @@ var DrawTable = /*#__PURE__*/function (_DrawRect) {
66682
67032
  for (var c = 0; c < this._table.colCount; c++) {
66683
67033
  var aCell = this._table.rows[r][c];
66684
67034
 
67035
+ if (aCell && aCell.cellProperty.align == _editor_dom_TableProperty__WEBPACK_IMPORTED_MODULE_11__/* .VAlign.vabottom */ .TR.vabottom) {
67036
+ bottonAlignCell.push(aCell);
67037
+ }
67038
+
66685
67039
  if (aCell && aCell.rowSpan === 1 && aCell.drawCell.dHeight > dHeight) {
66686
67040
  dHeight = aCell.drawCell.dHeight; // let nextValue = aCell.drawCell.drawPageCells.values().next();
66687
67041
  // while (!nextValue.done) {
@@ -66719,6 +67073,10 @@ var DrawTable = /*#__PURE__*/function (_DrawRect) {
66719
67073
  if (dHeight > rowPorpertyHeight) this._table.rowInfos[r].rowHeight = rowPorpertyHeight;else this._table.rowInfos[r].rowHeight = dHeight;
66720
67074
  } else this._table.rowInfos[r].rowHeight = dHeight;
66721
67075
  }
67076
+
67077
+ for (var _c = 0; _c < bottonAlignCell.length; _c++) {
67078
+ bottonAlignCell[_c].drawCell.needUpdate = true;
67079
+ }
66722
67080
  } // for (let c = 0; c < this._table.colCount; c++) {
66723
67081
  // const aCell = this._table.rows[r][c];
66724
67082
  // if (aCell) {
@@ -66850,7 +67208,24 @@ var DrawTable = /*#__PURE__*/function (_DrawRect) {
66850
67208
 
66851
67209
  this.finishUpdate();
66852
67210
  }
66853
- }
67211
+ } // for (let i=0;i<this._drawPageTables.length-1;i++){
67212
+ // let c=0;
67213
+ // while (c<this._table.colCount){
67214
+ // const [cell,mr,mc]= this._table.getMainCell(dPageTable.endRow,c);
67215
+ // let inc=1;
67216
+ // if (cell){
67217
+ // if (cell.cellProperty.align==VAlign.vabottom){
67218
+ // const pageCell= cell.drawCell.getDrawPageCell(dPageTable);
67219
+ // if (pageCell){
67220
+ // pageCell.afterHeightChanged()
67221
+ // }
67222
+ // inc=cell.rowSpan;
67223
+ // }
67224
+ // c+=inc;
67225
+ // }
67226
+ // }
67227
+ // }
67228
+
66854
67229
 
66855
67230
  rowTop = dTop + dPageTable.dHeight;
66856
67231
 
@@ -70144,6 +70519,8 @@ var TableFormula = __webpack_require__(39869);
70144
70519
  var DrawConfig = __webpack_require__(39353);
70145
70520
  // EXTERNAL MODULE: ./src/editor/draw/drawNode/DrawSignNode.ts
70146
70521
  var DrawSignNode = __webpack_require__(91390);
70522
+ // EXTERNAL MODULE: ./src/editor/dom/TableProperty.ts
70523
+ var TableProperty = __webpack_require__(68183);
70147
70524
  ;// CONCATENATED MODULE: ./src/editor/draw/drawTree/DrawTree.ts
70148
70525
 
70149
70526
 
@@ -70206,6 +70583,7 @@ var DrawSignNode = __webpack_require__(91390);
70206
70583
 
70207
70584
 
70208
70585
 
70586
+
70209
70587
 
70210
70588
 
70211
70589
  //当前的显示状态,psDesign为设计状态,psEdit为正常编辑状态 psPreview为打印预览态态 psPrint 正在打印状态, psReview审阅状态
@@ -72599,20 +72977,38 @@ var DrawTree = /*#__PURE__*/function () {
72599
72977
 
72600
72978
  var _index2 = dPlace.cell.drawCell.drawPageCells.indexOf(dPlace);
72601
72979
 
72602
- while (_index2 > 0) {
72603
- aPrevPlace = dPlace.cell.drawCell.drawPageCells[_index2 - 1];
72980
+ if (dPlace.cell.cellProperty.align != TableProperty/* VAlign.vabottom */.TR.vabottom) {
72981
+ while (_index2 > 0) {
72982
+ aPrevPlace = dPlace.cell.drawCell.drawPageCells[_index2 - 1];
72604
72983
 
72605
- if (!aPrevPlace.isEmpty()) {
72606
- var rootArea = hoeditfactory.drawPageTree.getMainRootArea(aPrevPlace);
72984
+ if (!aPrevPlace.isEmpty()) {
72985
+ var rootArea = hoeditfactory.drawPageTree.getMainRootArea(aPrevPlace);
72607
72986
 
72608
- if (rootArea) {
72609
- aPage = this._drawPages[rootArea.index];
72987
+ if (rootArea) {
72988
+ aPage = this._drawPages[rootArea.index];
72989
+ }
72990
+
72991
+ return this.getStagePosition(aPage, aPrevPlace, x, 99999999);
72610
72992
  }
72611
72993
 
72612
- return this.getStagePosition(aPage, aPrevPlace, x, 99999999);
72994
+ _index2 -= 1;
72613
72995
  }
72996
+ } else {
72997
+ while (_index2 < dPlace.cell.drawCell.drawPageCells.length - 1) {
72998
+ aPrevPlace = dPlace.cell.drawCell.drawPageCells[_index2 + 1];
72614
72999
 
72615
- _index2 -= 1;
73000
+ if (!aPrevPlace.isEmpty()) {
73001
+ var _rootArea = hoeditfactory.drawPageTree.getMainRootArea(aPrevPlace);
73002
+
73003
+ if (_rootArea) {
73004
+ aPage = this._drawPages[_rootArea.index];
73005
+ }
73006
+
73007
+ return this.getStagePosition(aPage, aPrevPlace, x, 99999999);
73008
+ }
73009
+
73010
+ _index2 += 1;
73011
+ }
72616
73012
  }
72617
73013
  } // if (dPlace instanceof DrawCell) {
72618
73014
  // dItems = (dPlace as DrawCell).drawLxines;
@@ -212783,13 +213179,13 @@ var map = {
212783
213179
  "./qrCode/QrCode.vue": 67776,
212784
213180
  "./radioCheckBox/RadioCheckbox.vue": 48961,
212785
213181
  "./selectDialog/SelectDialog.vue": 54891,
212786
- "./sign/Sign.vue": 44801,
212787
- "./table/TableCellPoper.vue": 64915,
213182
+ "./sign/Sign.vue": 76060,
213183
+ "./table/TableCellPoper.vue": 91192,
212788
213184
  "./table/TableCellProperty.vue": 52445,
212789
- "./table/TableColProperty.vue": 97160,
213185
+ "./table/TableColProperty.vue": 17479,
212790
213186
  "./table/TableFormula.vue": 20006,
212791
213187
  "./table/TableProperty.vue": 44680,
212792
- "./table/TableRowProperty.vue": 74456,
213188
+ "./table/TableRowProperty.vue": 9046,
212793
213189
  "./textDialog/TextDialog.vue": 74796,
212794
213190
  "./upload/CanvasImageDialog.vue": 49532,
212795
213191
  "./upload/UploadImageDialog.vue": 97599
@@ -214331,9 +214727,9 @@ var es_string_match = __webpack_require__(4723);
214331
214727
  var es_number_constructor = __webpack_require__(9653);
214332
214728
  // EXTERNAL MODULE: ./node_modules/core-js/modules/es.json.stringify.js
214333
214729
  var es_json_stringify = __webpack_require__(38862);
214334
- ;// CONCATENATED MODULE: ./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/HoDoc.vue?vue&type=template&id=5f466836&
214335
- var HoDocvue_type_template_id_5f466836_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{class:_vm.docClassNames},[_c('div',{ref:"editorArea",staticClass:"editors"},[(_vm.drawPageLength > 0)?_c('div',{staticClass:"editor",on:{"click":function($event){return _vm.setActiveDocIndex(_vm.hoEditorId)}}},[_vm._l((_vm.drawPageCount.count),function(pgIndex){return [_c('HoPage',{key:pgIndex - 1,attrs:{"data-id":pgIndex - 1,"index":pgIndex - 1,"docIndex":_vm.docIndex,"canvasWidth":_vm.canvasParams.width,"canvasHeight":_vm.canvasParams.height,"currentActivePages":_vm.activePageIndex.index,"hoEditorId":_vm.hoEditorId,"hoEditorFactoryIdList":_vm.hoEditorFactoryIdList,"mouseMoveNodes":_vm.mouseMoveNodes,"viewableAreaObserver":_vm.viewableAreaObserver,"inViewPages":_vm.inViewPages,"canvasHeadFootPos":_vm.canvasHeadFootPos,"poperTipPos":_vm.poperTipPos,"textStyle":_vm.textStyle,"aiInfo":_vm.aiInfo},on:{"pageReady":_vm.pageReady,"canvasRightClick":_vm.mouseRightClickEvent},scopedSlots:_vm._u([{key:"hoPageHead",fn:function(){return [_vm._t("hoDocHead")]},proxy:true},{key:"hoPageFoot",fn:function(){return [_vm._t("hoDocFoot")]},proxy:true}],null,true)})]})],2):_vm._e()]),(_vm.poperType === 'datePoper' || _vm.poperType === 'selectPoper')?_c('PoperSelectModal',{attrs:{"poperType":_vm.poperType,"poperSelectList":_vm.poperSelectList,"poperPos":_vm.poperPos,"hoEditorId":_vm.hoEditorId},on:{"poperClose":_vm.poperClose}}):_vm._e(),_c('PoperMark',{directives:[{name:"show",rawName:"v-show",value:(_vm.poperType === 'datePoper' || _vm.poperType === 'selectPoper' || _vm.poperType === 'table-cell-poper'),expression:"poperType === 'datePoper' || poperType === 'selectPoper' || poperType === 'table-cell-poper'"}]}),(_vm.poperType === 'table-cell-poper')?_c('TableCellPoper',{attrs:{"poperNode":_vm.nodeValue,"poperPos":_vm.poperPos},on:{"poperClose":_vm.poperClose}}):_vm._e(),_c('HoToPage',{attrs:{"hoEditorId":_vm.hoEditorId,"inViewPages":_vm.inViewPages}}),_c('PoperTipText',{attrs:{"isPoperText":_vm.isPoperText,"poperText":_vm.poperText,"poperPos":_vm.poperTextPos},on:{"poperTextClose":_vm.poperTextClose}}),_c('ul',{directives:[{name:"click-outside",rawName:"v-click-outside",value:(function () { return (_vm.isCreateRightMenuModal = false); }),expression:"() => (isCreateRightMenuModal = false)"},{name:"show",rawName:"v-show",value:(_vm.isCreateRightMenuModal),expression:"isCreateRightMenuModal"}],ref:"rightMenuModal",staticClass:"create-right-menu"},[(_vm.showCommentsBtn)?_c('li',{staticClass:"mouse-menu-item",on:{"click":_vm.hideComments}},[_vm._v(_vm._s(_vm.isHideComments ? '显示' : '隐藏')+"批注")]):_vm._e(),(_vm.showDeleteSignMenu)?_c('li',{staticClass:"mouse-menu-item",on:{"click":_vm.deleteSignNode}},[_vm._v("删除签名")]):_vm._e(),_c('li',{staticClass:"mouse-menu-item"},[_vm._v(" 编辑器内核版本:   "),_c('span',{staticStyle:{"font-size":"14px","color":"#0a77e3"}},[_vm._v("v "+_vm._s(_vm.version))])])])],1)}
214336
- var HoDocvue_type_template_id_5f466836_staticRenderFns = []
214730
+ ;// CONCATENATED MODULE: ./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/HoDoc.vue?vue&type=template&id=6a4e96d0&
214731
+ var HoDocvue_type_template_id_6a4e96d0_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{class:_vm.docClassNames},[_c('div',{ref:"editorArea",staticClass:"editors"},[(_vm.drawPageLength > 0)?_c('div',{staticClass:"editor",on:{"click":function($event){return _vm.setActiveDocIndex(_vm.hoEditorId)}}},[_vm._l((_vm.drawPageCount.count),function(pgIndex){return [_c('HoPage',{key:pgIndex - 1,attrs:{"data-id":pgIndex - 1,"index":pgIndex - 1,"docIndex":_vm.docIndex,"canvasWidth":_vm.canvasParams.width,"canvasHeight":_vm.canvasParams.height,"currentActivePages":_vm.activePageIndex.index,"hoEditorId":_vm.hoEditorId,"hoEditorFactoryIdList":_vm.hoEditorFactoryIdList,"mouseMoveNodes":_vm.mouseMoveNodes,"viewableAreaObserver":_vm.viewableAreaObserver,"inViewPages":_vm.inViewPages,"canvasHeadFootPos":_vm.canvasHeadFootPos,"poperTipPos":_vm.poperTipPos,"textStyle":_vm.textStyle,"aiInfo":_vm.aiInfo},on:{"pageReady":_vm.pageReady,"canvasRightClick":_vm.mouseRightClickEvent},scopedSlots:_vm._u([{key:"hoPageHead",fn:function(){return [_vm._t("hoDocHead")]},proxy:true},{key:"hoPageFoot",fn:function(){return [_vm._t("hoDocFoot")]},proxy:true}],null,true)})]})],2):_vm._e()]),(_vm.poperType === 'datePoper' || _vm.poperType === 'selectPoper')?_c('PoperSelectModal',{attrs:{"poperType":_vm.poperType,"poperSelectList":_vm.poperSelectList,"poperPos":_vm.poperPos,"hoEditorId":_vm.hoEditorId},on:{"poperClose":_vm.poperClose}}):_vm._e(),_c('PoperMark',{directives:[{name:"show",rawName:"v-show",value:(_vm.poperType === 'datePoper' || _vm.poperType === 'selectPoper' || _vm.poperType === 'table-cell-poper'),expression:"poperType === 'datePoper' || poperType === 'selectPoper' || poperType === 'table-cell-poper'"}]}),(_vm.poperType === 'table-cell-poper')?_c('TableCellPoper',{attrs:{"poperNode":_vm.nodeValue,"poperPos":_vm.poperPos},on:{"poperClose":_vm.poperClose}}):_vm._e(),_c('HoToPage',{attrs:{"hoEditorId":_vm.hoEditorId,"inViewPages":_vm.inViewPages}}),_c('PoperTipText',{attrs:{"isPoperText":_vm.isPoperText,"poperText":_vm.poperText,"poperPos":_vm.poperTextPos},on:{"poperTextClose":_vm.poperTextClose}}),_c('ul',{directives:[{name:"click-outside",rawName:"v-click-outside",value:(function () { return (_vm.isCreateRightMenuModal = false); }),expression:"() => (isCreateRightMenuModal = false)"},{name:"show",rawName:"v-show",value:(_vm.isCreateRightMenuModal),expression:"isCreateRightMenuModal"}],ref:"rightMenuModal",staticClass:"create-right-menu"},[(_vm.showCommentsBtn)?_c('li',{staticClass:"mouse-menu-item",on:{"click":_vm.hideComments}},[_vm._v(_vm._s(_vm.isHideComments ? '显示' : '隐藏')+"批注")]):_vm._e(),(_vm.showDeleteSignMenu)?_c('li',{staticClass:"mouse-menu-item",on:{"click":_vm.deleteSignNode}},[_vm._v("删除签名")]):_vm._e(),_c('li',{staticClass:"mouse-menu-item"},[_vm._v(" 编辑器内核版本:   "),_c('span',{staticStyle:{"font-size":"14px","color":"#0a77e3"}},[_vm._v("v "+_vm._s(_vm.version))])])])],1)}
214732
+ var HoDocvue_type_template_id_6a4e96d0_staticRenderFns = []
214337
214733
 
214338
214734
 
214339
214735
  // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.filter.js
@@ -216270,7 +216666,7 @@ var PoperMark = __webpack_require__(93069);
216270
216666
 
216271
216667
 
216272
216668
  // EXTERNAL MODULE: ./src/components/controls/table/TableCellPoper.vue + 5 modules
216273
- var TableCellPoper = __webpack_require__(64915);
216669
+ var TableCellPoper = __webpack_require__(91192);
216274
216670
  // EXTERNAL MODULE: ./src/editor/dom/treeNode/DateTimeNode.ts
216275
216671
  var DateTimeNode = __webpack_require__(36395);
216276
216672
  // EXTERNAL MODULE: ./src/editor/dom/treeNode/DownListNode.ts
@@ -217974,7 +218370,7 @@ var SignNode = __webpack_require__(34450);
217974
218370
  // EXTERNAL MODULE: ./src/editor/dom/treeNode/ParagraphNode.ts
217975
218371
  var ParagraphNode = __webpack_require__(14208);
217976
218372
  ;// CONCATENATED MODULE: ./src/components/version.ts
217977
- /* harmony default export */ var version = ('2.0.96');
218373
+ /* harmony default export */ var version = ('2.0.99');
217978
218374
  // EXTERNAL MODULE: ./src/components/controls/poperTipText/PoperTipText.vue + 5 modules
217979
218375
  var PoperTipText = __webpack_require__(91831);
217980
218376
  ;// CONCATENATED MODULE: ./src/components/controls/poperTipText/index.ts
@@ -218249,7 +218645,7 @@ var ImageNode = __webpack_require__(88389);
218249
218645
  hoEditorFactory.nodeMouseMove.isUseTipText = this.isUseTipText;
218250
218646
  }
218251
218647
  },
218252
- inject: ['setRightClickNodeValue', 'setDblclickNodeValue', 'setUpdateNodeValue', 'getRightClickNodeValue'],
218648
+ inject: ['setRightClickNodeValue', 'setDblclickNodeValue', 'setUpdateNodeValue', 'getRightClickNodeValue', 'setControlProperty'],
218253
218649
  created: function created() {
218254
218650
  var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this.hoEditorId);
218255
218651
  hoEditorFactory.hoEditorFactoryIndex = this.docIndex;
@@ -218459,6 +218855,10 @@ var ImageNode = __webpack_require__(88389);
218459
218855
  };
218460
218856
 
218461
218857
  if (node instanceof SignNode/* SignNode */.N) {
218858
+ // if(hoEditorFactory.drawTree.paintStatus === 0 && !node.imgSrc && !node.fingerPrintSrc) {
218859
+ // this.setControlProperty('sign', 'update', '');
218860
+ // return;
218861
+ // }
218462
218862
  // 通过自定义属性内部字段判断是否属于患者签名 指纹签名只有患者签名才会有 同时患者签名不存在自定义属性可以用是否存在某个属性确定是否是患者签名(需要确定的是imgsrc要存在 imgsrc不存在是指空签名元素)
218463
218863
  if (node.fingerPrintSrc || node.imgSrc && !node.fingerPrintSrc && node.customProperty && !node.customProperty.created_date) return false;
218464
218864
  this.$emit('dblNodeClick', {
@@ -218753,8 +219153,8 @@ var ImageNode = __webpack_require__(88389);
218753
219153
 
218754
219154
  var HoDoc_component = (0,componentNormalizer/* default */.Z)(
218755
219155
  components_HoDocvue_type_script_lang_js_,
218756
- HoDocvue_type_template_id_5f466836_render,
218757
- HoDocvue_type_template_id_5f466836_staticRenderFns,
219156
+ HoDocvue_type_template_id_6a4e96d0_render,
219157
+ HoDocvue_type_template_id_6a4e96d0_staticRenderFns,
218758
219158
  false,
218759
219159
  null,
218760
219160
  null,
@@ -218807,6 +219207,7 @@ var TableNode = __webpack_require__(95883);
218807
219207
 
218808
219208
 
218809
219209
 
219210
+
218810
219211
 
218811
219212
 
218812
219213
  var NeedDrawPageInfo = /*#__PURE__*/function () {
@@ -219011,17 +219412,6 @@ var DrawPageTree = /*#__PURE__*/function () {
219011
219412
  return [ret, isNew];
219012
219413
  } //拆分成页
219013
219414
 
219014
- }, {
219015
- key: "clearAfterDTop",
219016
- value: function clearAfterDTop(dDrawArea, dTop) {
219017
- var numChildren = dDrawArea.children.length - 1;
219018
-
219019
- for (var i = numChildren; i >= 0; i--) {
219020
- if (dDrawArea.children[i].y > dTop) {
219021
- dDrawArea.removeChildAt(i);
219022
- }
219023
- }
219024
- }
219025
219415
  }, {
219026
219416
  key: "paint",
219027
219417
  value: function paint(aDrawArea, dRoots, startLine, endLine) {
@@ -219094,7 +219484,7 @@ var DrawPageTree = /*#__PURE__*/function () {
219094
219484
  }
219095
219485
 
219096
219486
  if (hoEditorFactory.isUseDrawingOptimization) {
219097
- this.clearAfterDTop(mainArea, dTop);
219487
+ this.clearAreas([mainArea]);
219098
219488
  }
219099
219489
 
219100
219490
  var nextLine = startLine;
@@ -219601,7 +219991,7 @@ var DrawPageTree = /*#__PURE__*/function () {
219601
219991
  }
219602
219992
 
219603
219993
  var startPaintWithUpdate = this._startNeedUpdatePage === -1 && this._endNeedUpdatePage === -1;
219604
- var imaxViewPage = Math.max.apply(Math, (0,toConsumableArray/* default */.Z)(hoEditorFactory.drawTree.inViewPages));
219994
+ var imaxViewPage = Math.max.apply(Math, (0,toConsumableArray/* default */.Z)(hoEditorFactory.drawTree.inViewPages).concat([this._drawMainDocs.length - 1]));
219605
219995
 
219606
219996
  try {
219607
219997
  if (this._oldPageCount === 0) {
@@ -220436,8 +220826,6 @@ var message_box_default = /*#__PURE__*/__webpack_require__.n(message_box);
220436
220826
  var es_string_ends_with = __webpack_require__(27852);
220437
220827
  // EXTERNAL MODULE: ./node_modules/core-js/modules/es.object.assign.js
220438
220828
  var es_object_assign = __webpack_require__(19601);
220439
- // EXTERNAL MODULE: ./node_modules/core-js/modules/es.number.to-fixed.js
220440
- var es_number_to_fixed = __webpack_require__(56977);
220441
220829
  // EXTERNAL MODULE: ./node_modules/jquery/dist/jquery.js
220442
220830
  var jquery = __webpack_require__(19755);
220443
220831
  var jquery_default = /*#__PURE__*/__webpack_require__.n(jquery);
@@ -220484,7 +220872,6 @@ var Paragraph = __webpack_require__(53570);
220484
220872
 
220485
220873
 
220486
220874
 
220487
-
220488
220875
 
220489
220876
 
220490
220877
  var HTMLconverter2 = /*#__PURE__*/function () {
@@ -220890,6 +221277,7 @@ var HTMLconverter2 = /*#__PURE__*/function () {
220890
221277
  }, {
220891
221278
  key: "SetTableProperty",
220892
221279
  value: function SetTableProperty(jnode, tableNode) {
221280
+ var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID);
220893
221281
  var tconstents = jquery_default()(jnode).children();
220894
221282
  var rowInfos = new Array();
220895
221283
  var colInfos = new Array();
@@ -220901,22 +221289,25 @@ var HTMLconverter2 = /*#__PURE__*/function () {
220901
221289
 
220902
221290
  for (var j = 0; j < trs.length; j++) {
220903
221291
  var rowProperty = new TableProperty/* RowProperty */.Nr("");
221292
+ rowProperty.isSpecifyHeight = true;
220904
221293
  var rowInfo = new TableNode/* RowInfos */.ii(tableNode, rowProperty);
220905
- var height = jquery_default()(trs[i]).css("height");
221294
+ var height = jquery_default()(trs[j]).css("height");
220906
221295
 
220907
221296
  if (height && height != "0px") {
220908
221297
  var heightNum = 0;
220909
221298
 
220910
221299
  if (height.indexOf("pt") > 0) {
220911
221300
  heightNum = parseFloat(height.substring(0, height.indexOf("pt")));
221301
+ heightNum = hoEditorFactory.unitConvert.fontPt2Pix(heightNum);
220912
221302
  }
220913
221303
 
220914
221304
  if (height.indexOf("px") > 0) {
220915
221305
  heightNum = parseFloat(height.substring(0, height.indexOf("px")));
220916
- }
221306
+ } //heightNum = parseFloat(((heightNum * 96) / 72).toFixed(2));
221307
+
220917
221308
 
220918
- heightNum = parseFloat((heightNum * 96 / 72).toFixed(2));
220919
221309
  rowInfo.rowHeight = heightNum;
221310
+ rowInfo.rowProperty.rowHeight = hoEditorFactory.unitConvert.pxConversionMm(heightNum, false) * 0.1;
220920
221311
  }
220921
221312
 
220922
221313
  rowInfos.push(rowInfo);
@@ -220937,17 +221328,18 @@ var HTMLconverter2 = /*#__PURE__*/function () {
220937
221328
  var widthNum = 0;
220938
221329
 
220939
221330
  if (width.indexOf("pt") > 0) {
220940
- widthNum = parseFloat(width.substring(0, width.indexOf("pt")));
221331
+ widthNum = parseFloat(width.substring(0, width.indexOf("pt"))); //widthNum = parseFloat(((widthNum * 96) / 72).toFixed(2));
221332
+
221333
+ widthNum = hoEditorFactory.unitConvert.fontPt2Pix(widthNum);
220941
221334
  }
220942
221335
 
220943
221336
  if (width.indexOf("px") > 0) {
220944
221337
  widthNum = parseFloat(width.substring(0, width.indexOf("px")));
220945
- }
220946
-
220947
- widthNum = parseFloat((widthNum * 96 / 72).toFixed(2)); // if (widthNum == 0) {
221338
+ } // if (widthNum == 0) {
220948
221339
  // widthNum = 20;
220949
221340
  // }
220950
221341
 
221342
+
220951
221343
  var colProperty = new TableProperty/* ColProperty */.Ti("");
220952
221344
  var colInfo = new TableNode/* ColInfos */.ZE(tableNode, widthNum, colProperty);
220953
221345
  colInfos.push(colInfo);
@@ -221059,9 +221451,9 @@ var HTMLconverter2 = /*#__PURE__*/function () {
221059
221451
  this.copyCellNode(cell, lntable, _i4, _j2);
221060
221452
  } else lntable.rows[_i4][_j2] = undefined;
221061
221453
  }
221062
- }
221454
+ } //lntable.node2DrawNode();
221455
+
221063
221456
 
221064
- lntable.node2DrawNode();
221065
221457
  return [lntable];
221066
221458
  }
221067
221459
  }
@@ -221238,6 +221630,8 @@ var HTMLconverter2 = /*#__PURE__*/function () {
221238
221630
  }();
221239
221631
  // EXTERNAL MODULE: ./node_modules/@babel/runtime/helpers/esm/typeof.js
221240
221632
  var esm_typeof = __webpack_require__(58913);
221633
+ // EXTERNAL MODULE: ./node_modules/core-js/modules/es.number.to-fixed.js
221634
+ var es_number_to_fixed = __webpack_require__(56977);
221241
221635
  // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.find.js
221242
221636
  var es_array_find = __webpack_require__(69826);
221243
221637
  // EXTERNAL MODULE: ./node_modules/core-js/modules/es.string.replace-all.js
@@ -227269,8 +227663,23 @@ var VueController = /*#__PURE__*/function () {
227269
227663
  }, {
227270
227664
  key: "getDocXml",
227271
227665
  value: function getDocXml(beauty, isValidStyle, clearSign) {
227272
- var ret = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID).structureConvert.doc2Xml('xml', beauty, isValidStyle, clearSign);
227273
- return ret;
227666
+ var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID);
227667
+
227668
+ if (beauty && isValidStyle) {
227669
+ hoEditorFactory.contentIsModify.isModify = false;
227670
+ var stack = hoEditorFactory.undoService.stack;
227671
+
227672
+ if (stack.length > 0) {
227673
+ var lastUnRedo = stack[stack.length - 1];
227674
+ var undoUnits = lastUnRedo.undoUnits;
227675
+ var undoUnit = undoUnits[undoUnits.length - 1];
227676
+ hoEditorFactory.lastSaveTime = undoUnit.opTime;
227677
+ } else {
227678
+ hoEditorFactory.lastSaveTime = new Date(Date.now());
227679
+ }
227680
+ }
227681
+
227682
+ return hoEditorFactory.structureConvert.doc2Xml('xml', beauty, isValidStyle, clearSign);
227274
227683
  }
227275
227684
  /**
227276
227685
  * 返回编辑后的表单json数据
@@ -230099,6 +230508,29 @@ var VueController = /*#__PURE__*/function () {
230099
230508
 
230100
230509
  return isModify;
230101
230510
  }
230511
+ /**
230512
+ * 文档修改信息
230513
+ */
230514
+
230515
+ }, {
230516
+ key: "getDocModifyInfo",
230517
+ value: function getDocModifyInfo() {
230518
+ var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID);
230519
+ var modifyInfo = {
230520
+ lastSaveTime: new Date(hoEditorFactory.lastSaveTime).getTime(),
230521
+ lastModifyTime: -1
230522
+ };
230523
+ var stack = hoEditorFactory.undoService.stack;
230524
+
230525
+ if (stack.length > 0) {
230526
+ var lastUnRedo = stack[stack.length - 1];
230527
+ var undoUnits = lastUnRedo.undoUnits;
230528
+ var undoUnit = undoUnits[undoUnits.length - 1];
230529
+ modifyInfo.lastModifyTime = new Date(undoUnit.opTime).getTime();
230530
+ }
230531
+
230532
+ return modifyInfo;
230533
+ }
230102
230534
  /**
230103
230535
  * 获取当前病历中的所有元素
230104
230536
  * @returns 返回元素是{id,name,text,json}的数据
@@ -236946,12 +237378,13 @@ var FontStyleMixin = /*#__PURE__*/function (_Vue) {
236946
237378
 
236947
237379
  var drawPageTables = tableNodeInfo.tableNode.drawTable.drawPageTables;
236948
237380
  var drawPageCells = tableNodeInfo.cellNode.drawCell.drawPageCells;
236949
- tableBounds.cellX = drawPageCells[0].x + 20;
236950
- tableBounds.cellY = drawPageCells[0].y + 20;
236951
- tableBounds.cellWidth = drawPageCells[0].dWidth;
236952
- tableBounds.cellHeight = drawPageCells[0].dHeight;
237381
+ var currentPageIndex = dPage.drawMainDoc.pageIndex;
237382
+ tableBounds.cellX = drawPageCells[currentPageIndex].x + 20;
237383
+ tableBounds.cellY = drawPageCells[currentPageIndex].y + 20;
237384
+ tableBounds.cellWidth = drawPageCells[currentPageIndex].dWidth;
237385
+ tableBounds.cellHeight = drawPageCells[currentPageIndex].dHeight;
236953
237386
  drawPageTables.forEach(function (v, key) {
236954
- if (v.parent.pageIndex === dPage.drawMainDoc.pageIndex) {
237387
+ if (v.parent.pageIndex === currentPageIndex) {
236955
237388
  tableBounds.height = v.dHeight;
236956
237389
  tableBounds.y = dPage.drawMainDoc.y + v.y;
236957
237390