hoeditor-web 2.0.91 → 2.0.94

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. package/lib/hoeditor.common.js +175 -123
  2. package/lib/hoeditor.css +2 -2
  3. package/lib/hoeditor.umd.js +175 -123
  4. package/lib/hoeditor.umd.min.js +3 -3
  5. package/package.json +1 -1
package/lib/hoeditor.common.js CHANGED
@@ -10797,7 +10797,7 @@ var component = (0,componentNormalizer/* default */.Z)(
10797
10797
 
10798
10798
  /***/ }),
10799
10799
 
10800
- /***/ 46787:
10800
+ /***/ 64915:
10801
10801
  /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
10802
10802
 
10803
10803
  "use strict";
@@ -10809,8 +10809,8 @@ __webpack_require__.d(__webpack_exports__, {
10809
10809
  "default": function() { return /* binding */ TableCellPoper; }
10810
10810
  });
10811
10811
 
10812
- ;// 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=7fecbf90&scoped=true&
10813
- 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","text-align":"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)}
10812
+ ;// 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&
10813
+ 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)}
10814
10814
  var staticRenderFns = []
10815
10815
 
10816
10816
 
@@ -11276,10 +11276,10 @@ var HOEditorFactorys = __webpack_require__(41005);
11276
11276
  });
11277
11277
  ;// CONCATENATED MODULE: ./src/components/controls/table/TableCellPoper.vue?vue&type=script&lang=js&
11278
11278
  /* harmony default export */ var table_TableCellPopervue_type_script_lang_js_ = (TableCellPopervue_type_script_lang_js_);
11279
- ;// 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=7fecbf90&lang=scss&scoped=true&
11279
+ ;// 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&
11280
11280
  // extracted by mini-css-extract-plugin
11281
11281
 
11282
- ;// CONCATENATED MODULE: ./src/components/controls/table/TableCellPoper.vue?vue&type=style&index=0&id=7fecbf90&lang=scss&scoped=true&
11282
+ ;// CONCATENATED MODULE: ./src/components/controls/table/TableCellPoper.vue?vue&type=style&index=0&id=0b7fa5e8&lang=scss&scoped=true&
11283
11283
 
11284
11284
  // EXTERNAL MODULE: ./node_modules/@vue/vue-loader-v15/lib/runtime/componentNormalizer.js
11285
11285
  var componentNormalizer = __webpack_require__(1001);
@@ -11298,7 +11298,7 @@ var component = (0,componentNormalizer/* default */.Z)(
11298
11298
  staticRenderFns,
11299
11299
  false,
11300
11300
  null,
11301
- "7fecbf90",
11301
+ "0b7fa5e8",
11302
11302
  null
11303
11303
 
11304
11304
  )
@@ -12463,7 +12463,7 @@ var component = (0,componentNormalizer/* default */.Z)(
12463
12463
 
12464
12464
  /***/ }),
12465
12465
 
12466
- /***/ 53197:
12466
+ /***/ 20006:
12467
12467
  /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
12468
12468
 
12469
12469
  "use strict";
@@ -12475,8 +12475,8 @@ __webpack_require__.d(__webpack_exports__, {
12475
12475
  "default": function() { return /* binding */ table_TableFormula; }
12476
12476
  });
12477
12477
 
12478
- ;// 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/TableFormula.vue?vue&type=template&id=31dfdc04&
12479
- var render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"control-modal-contents table-formula-modal animation-in"},[_c('header',{staticClass:"modal-title"},[_c('span',[_vm._v(_vm._s(_vm.dialogFormTitle))]),_c('i',{staticClass:"el-icon-close modal-title-close",on:{"click":_vm.handleClose}})]),_c('section',{staticClass:"modal-content"},[_c('p',{staticStyle:{"padding":"10px 0"}},[_vm._v("请输入表单项对应的单元格编号，从左到右依次为ABCD...，从上到下依次为1234...")]),(_vm.formula === 'a1: a2' || _vm.formula === '(a1 + a2) * 2')?_c('section',[_c('div',{staticStyle:{"height":"26px","line-height":"36px","font-size":"16px"}},[_vm._v(" "+_vm._s(_vm.dialogFormTitle)+" ")]),_c('div',{staticStyle:{"height":"36px","line-height":"36px"}},[_vm._v("示例： "+_vm._s(_vm.dialogFormTitle === '表格行列求和公式' ? 'a1: a2' : '(a1 + a2) * 2'))]),_c('el-checkbox',{model:{value:(_vm.isHideZero),callback:function ($$v) {_vm.isHideZero=$$v},expression:"isHideZero"}},[_vm._v("结果为 0 不显示")]),_c('p',{staticStyle:{"height":"10px"}}),_c('el-input',{attrs:{"autocomplete":"off"},model:{value:(_vm.simpleFormula),callback:function ($$v) {_vm.simpleFormula=$$v},expression:"simpleFormula"}})],1):_vm._e(),(_vm.formula === 'bmi')?_c('section',[_c('div',{staticClass:"ho-table-features-list"},[_c('p',[_vm._v("身高")]),_c('el-input',{attrs:{"size":"mini","autocomplete":"off"},model:{value:(_vm.height),callback:function ($$v) {_vm.height=$$v},expression:"height"}})],1),_c('div',{staticClass:"ho-table-features-list"},[_c('p',[_vm._v("体重")]),_c('el-input',{attrs:{"size":"mini","autocomplete":"off"},model:{value:(_vm.weight),callback:function ($$v) {_vm.weight=$$v},expression:"weight"}})],1)]):_vm._e(),(_vm.formula === 'labor')?_c('section',[_c('el-checkbox',{model:{value:(_vm.isHideZero),callback:function ($$v) {_vm.isHideZero=$$v},expression:"isHideZero"}},[_vm._v("结果为 0 不显示")]),_c('div',{staticClass:"ho-table-features-list"},[_c('p',[_vm._v("产程类型")]),_c('el-select',{attrs:{"size":"mini"},on:{"change":_vm.laborTypeChange},model:{value:(_vm.laborType),callback:function ($$v) {_vm.laborType=$$v},expression:"laborType"}},[_c('el-option',{attrs:{"value":1,"label":"第一产程"}}),_c('el-option',{attrs:{"value":2,"label":"第二产程"}}),_c('el-option',{attrs:{"value":3,"label":"第三产程"}}),_c('el-option',{attrs:{"value":0,"label":"总产程"}})],1)],1),_c('div',{staticClass:"ho-table-features-list"},[_c('p',[_vm._v(_vm._s(['第一产程', '宫缩开始', '宫口全开', '胎儿娩出'][_vm.laborType]))]),_c('el-input',{attrs:{"size":"mini","autocomplete":"off"},model:{value:(_vm.labor1),callback:function ($$v) {_vm.labor1=$$v},expression:"labor1"}})],1),_c('div',{staticClass:"ho-table-features-list"},[_c('p',[_vm._v(_vm._s(['第二产程', '宫口全开', '胎儿娩出', '胎盘娩出'][_vm.laborType]))]),_c('el-input',{attrs:{"size":"mini","autocomplete":"off"},model:{value:(_vm.labor2),callback:function ($$v) {_vm.labor2=$$v},expression:"labor2"}})],1),(_vm.laborType === 0)?_c('div',{staticClass:"ho-table-features-list"},[_c('p',[_vm._v(_vm._s(['第三产程', '宫缩开始', '宫口全开', '胎儿娩出'][_vm.laborType]))]),_c('el-input',{attrs:{"size":"mini","autocomplete":"off"},model:{value:(_vm.labor3),callback:function ($$v) {_vm.labor3=$$v},expression:"labor3"}})],1):_vm._e()],1):_vm._e(),(_vm.formula === 'expectedDate' || _vm.formula === 'pregnantDays' || _vm.formula === 'pregnantWeeks')?_c('section',[_c('div',{staticClass:"ho-table-features-list"},[_c('p',[_vm._v("末次月经")]),_c('el-input',{attrs:{"size":"mini","autocomplete":"off"},model:{value:(_vm.expectedDate),callback:function ($$v) {_vm.expectedDate=$$v},expression:"expectedDate"}})],1)]):_vm._e(),(_vm.formula === 'ftScoreMapping')?_c('section',[_c('div',{staticClass:"ho-table-features-list"},[_c('p',{staticStyle:{"width":"220px"}},[_vm._v("分值所在的单元格编号")]),_c('el-input',{attrs:{"size":"mini","autocomplete":"off"},model:{value:(_vm.ftScoreMapping.cell),callback:function ($$v) {_vm.$set(_vm.ftScoreMapping, "cell", $$v)},expression:"ftScoreMapping.cell"}})],1),_c('div',{staticClass:"ho-table-features-list"},[_c('p',{staticStyle:{"width":"152px"}},[_vm._v("分值区间及映射值")]),_c('ul',[_vm._l((_vm.ftScoreMapping.item),function(item,index){return _c('li',[_c('el-input-number',{staticClass:"ft-score-mapping-input",attrs:{"size":"mini","controls":false,"min":0},model:{value:(item.range[0]),callback:function ($$v) {_vm.$set(item.range, 0, $$v)},expression:"item.range[0]"}}),_c('span',{staticStyle:{"padding":"0 10px"}},[_vm._v("到")]),_c('el-input-number',{staticClass:"ft-score-mapping-input",attrs:{"size":"mini","controls":false,"min":1},model:{value:(item.range[1]),callback:function ($$v) {_vm.$set(item.range, 1, $$v)},expression:"item.range[1]"}}),_c('span',{staticStyle:{"padding":"0 10px 0 0"}},[_vm._v(" :")]),_c('el-input',{staticClass:"ft-score-mapping-input",attrs:{"size":"mini","autocomplete":"off"},model:{value:(item.text),callback:function ($$v) {_vm.$set(item, "text", $$v)},expression:"item.text"}})],1)}),_c('li',[_c('el-button',{attrs:{"size":"mini"},on:{"click":_vm.addFtScoreMappingItem}},[_c('i',{staticClass:"el-icon-folder-add",staticStyle:{"font-size":"20px"}})])],1)],2)])]):_vm._e()]),_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)])}
12478
+ ;// 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/TableFormula.vue?vue&type=template&id=35e34cd4&
12479
+ var render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"control-modal-contents table-formula-modal animation-in"},[_c('header',{staticClass:"modal-title"},[_c('span',[_vm._v(_vm._s(_vm.dialogFormTitle))]),_c('i',{staticClass:"el-icon-close modal-title-close",on:{"click":_vm.handleClose}})]),_c('section',{staticClass:"modal-content",staticStyle:{"flex-direction":"column"}},[_c('p',{staticStyle:{"padding":"10px 0"}},[_vm._v("请输入表单项对应的单元格编号，从左到右依次为ABCD...，从上到下依次为1234...")]),(_vm.formula === 'a1: a2' || _vm.formula === '(a1 + a2) * 2')?_c('section',[_c('div',{staticStyle:{"height":"26px","line-height":"36px","font-size":"16px"}},[_vm._v(" "+_vm._s(_vm.dialogFormTitle)+" ")]),_c('div',{staticStyle:{"height":"36px","line-height":"36px"}},[_vm._v("示例： "+_vm._s(_vm.dialogFormTitle === '表格行列求和公式' ? 'a1: a2' : '(a1 + a2) * 2'))]),_c('el-checkbox',{model:{value:(_vm.isHideZero),callback:function ($$v) {_vm.isHideZero=$$v},expression:"isHideZero"}},[_vm._v("结果为 0 不显示")]),_c('p',{staticStyle:{"height":"10px"}}),_c('el-input',{attrs:{"autocomplete":"off"},model:{value:(_vm.simpleFormula),callback:function ($$v) {_vm.simpleFormula=$$v},expression:"simpleFormula"}})],1):_vm._e(),(_vm.formula === 'bmi')?_c('section',[_c('div',{staticClass:"ho-table-features-list"},[_c('p',[_vm._v("身高")]),_c('el-input',{attrs:{"size":"mini","autocomplete":"off"},model:{value:(_vm.height),callback:function ($$v) {_vm.height=$$v},expression:"height"}})],1),_c('div',{staticClass:"ho-table-features-list"},[_c('p',[_vm._v("体重")]),_c('el-input',{attrs:{"size":"mini","autocomplete":"off"},model:{value:(_vm.weight),callback:function ($$v) {_vm.weight=$$v},expression:"weight"}})],1)]):_vm._e(),(_vm.formula === 'labor')?_c('section',[_c('el-checkbox',{model:{value:(_vm.isHideZero),callback:function ($$v) {_vm.isHideZero=$$v},expression:"isHideZero"}},[_vm._v("结果为 0 不显示")]),_c('div',{staticClass:"ho-table-features-list"},[_c('p',[_vm._v("产程类型")]),_c('el-select',{attrs:{"size":"mini"},on:{"change":_vm.laborTypeChange},model:{value:(_vm.laborType),callback:function ($$v) {_vm.laborType=$$v},expression:"laborType"}},[_c('el-option',{attrs:{"value":1,"label":"第一产程"}}),_c('el-option',{attrs:{"value":2,"label":"第二产程"}}),_c('el-option',{attrs:{"value":3,"label":"第三产程"}}),_c('el-option',{attrs:{"value":0,"label":"总产程"}})],1)],1),_c('div',{staticClass:"ho-table-features-list"},[_c('p',[_vm._v(_vm._s(['第一产程', '宫缩开始', '宫口全开', '胎儿娩出'][_vm.laborType]))]),_c('el-input',{attrs:{"size":"mini","autocomplete":"off"},model:{value:(_vm.labor1),callback:function ($$v) {_vm.labor1=$$v},expression:"labor1"}})],1),_c('div',{staticClass:"ho-table-features-list"},[_c('p',[_vm._v(_vm._s(['第二产程', '宫口全开', '胎儿娩出', '胎盘娩出'][_vm.laborType]))]),_c('el-input',{attrs:{"size":"mini","autocomplete":"off"},model:{value:(_vm.labor2),callback:function ($$v) {_vm.labor2=$$v},expression:"labor2"}})],1),(_vm.laborType === 0)?_c('div',{staticClass:"ho-table-features-list"},[_c('p',[_vm._v(_vm._s(['第三产程', '宫缩开始', '宫口全开', '胎儿娩出'][_vm.laborType]))]),_c('el-input',{attrs:{"size":"mini","autocomplete":"off"},model:{value:(_vm.labor3),callback:function ($$v) {_vm.labor3=$$v},expression:"labor3"}})],1):_vm._e()],1):_vm._e(),(_vm.formula === 'expectedDate' || _vm.formula === 'pregnantDays' || _vm.formula === 'pregnantWeeks')?_c('section',[_c('div',{staticClass:"ho-table-features-list"},[_c('p',[_vm._v("末次月经")]),_c('el-input',{attrs:{"size":"mini","autocomplete":"off"},model:{value:(_vm.expectedDate),callback:function ($$v) {_vm.expectedDate=$$v},expression:"expectedDate"}})],1)]):_vm._e(),(_vm.formula === 'ftScoreMapping')?_c('section',[_c('div',{staticClass:"ho-table-features-list"},[_c('p',{staticStyle:{"width":"220px"}},[_vm._v("分值所在的单元格编号")]),_c('el-input',{attrs:{"size":"mini","autocomplete":"off"},model:{value:(_vm.ftScoreMapping.cell),callback:function ($$v) {_vm.$set(_vm.ftScoreMapping, "cell", $$v)},expression:"ftScoreMapping.cell"}})],1),_c('div',{staticClass:"ho-table-features-list"},[_c('p',{staticStyle:{"width":"152px"}},[_vm._v("分值区间及映射值")]),_c('ul',[_vm._l((_vm.ftScoreMapping.item),function(item,index){return _c('li',[_c('el-input-number',{staticClass:"ft-score-mapping-input",attrs:{"size":"mini","controls":false,"min":0},model:{value:(item.range[0]),callback:function ($$v) {_vm.$set(item.range, 0, $$v)},expression:"item.range[0]"}}),_c('span',{staticStyle:{"padding":"0 10px"}},[_vm._v("到")]),_c('el-input-number',{staticClass:"ft-score-mapping-input",attrs:{"size":"mini","controls":false,"min":1},model:{value:(item.range[1]),callback:function ($$v) {_vm.$set(item.range, 1, $$v)},expression:"item.range[1]"}}),_c('span',{staticStyle:{"padding":"0 10px 0 0"}},[_vm._v(" :")]),_c('el-input',{staticClass:"ft-score-mapping-input",attrs:{"size":"mini","autocomplete":"off"},model:{value:(item.text),callback:function ($$v) {_vm.$set(item, "text", $$v)},expression:"item.text"}})],1)}),_c('li',[_c('el-button',{attrs:{"size":"mini"},on:{"click":_vm.addFtScoreMappingItem}},[_c('i',{staticClass:"el-icon-folder-add",staticStyle:{"font-size":"20px"}})])],1)],2)])]):_vm._e()]),_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)])}
12480
12480
  var staticRenderFns = []
12481
12481
 
12482
12482
 
@@ -25740,6 +25740,13 @@ var SubDocManger = /*#__PURE__*/function () {
25740
25740
  get: function get() {
25741
25741
  return this._footerDocTree;
25742
25742
  }
25743
+ }, {
25744
+ key: "clear",
25745
+ value: function clear() {
25746
+ this._headerDocTree.length = 1;
25747
+ this._footerDocTree.length = 1;
25748
+ this.pageDocTree.clear();
25749
+ }
25743
25750
  }, {
25744
25751
  key: "getSubDocCopyDrawArea",
25745
25752
  value: function getSubDocCopyDrawArea(pageIndex, type) {
@@ -26278,7 +26285,8 @@ var SubDocManger = /*#__PURE__*/function () {
26278
26285
  istart = pageIndex;
26279
26286
  }
26280
26287
 
26281
- iend = Math.max(endPageIndex, pageIndex); // if (dPage && dPage.drawDomLevel) {
26288
+ iend = Math.max(endPageIndex, pageIndex);
26289
+ iend = Math.min(iend, hoEditorFactory.drawTree.drawPages.length - 1); // if (dPage && dPage.drawDomLevel) {
26282
26290
  // if (index >= 0) {
26283
26291
  // if (!onlyAfter) {
26284
26292
  // // for (let i = pageIndex - 1; i >= 0; i--) {
@@ -28149,13 +28157,13 @@ var DocController = /*#__PURE__*/function () {
28149
28157
  if (node.keyValue !== "") {
28150
28158
  node.childNodes.splice(1, node.childNodes.length - 2);
28151
28159
  var textNode = new _treeNode_TextNode__WEBPACK_IMPORTED_MODULE_27__/* .TextNode */ .R(this._hoEditorFactoryID, node.rootNodes, node, _treeNode_BaseNode__WEBPACK_IMPORTED_MODULE_24__/* .NodeType.ntText */ .Jq.ntText, values["text"], hoEditorFactory.docTree.curStyleIndex);
28152
- node.childNodes.splice(1, 0, textNode); //changeEvent.afterChangePath = hoEditorFactory.docTree.getNodeLastPath(textNode);
28160
+ node.childNodes.splice(1, 0, textNode);
28161
+ changeEvent.afterChangePath = hoEditorFactory.docTree.getNodeLastPath(textNode);
28153
28162
  } else {
28154
28163
  node.childNodes.splice(1, node.childNodes.length - 2);
28155
28164
  node.childNodes.splice(1, 0, node.childNodes2[1]);
28165
+ changeEvent.afterChangePath = ePath;
28156
28166
  }
28157
-
28158
- changeEvent.afterChangePath = ePath;
28159
28167
  } else {
28160
28168
  //changeEvent.afterChangePath = hoEditorFactory.docTree.getNodeLastPath(node);
28161
28169
  changeEvent.afterChangePath = ePath;
@@ -29592,23 +29600,24 @@ var DocController = /*#__PURE__*/function () {
29592
29600
  return hoEditorFactory.drawPageTree.stopPageEvent();
29593
29601
 
29594
29602
  case 3:
29603
+ hoEditorFactory.subDocManger.clear();
29595
29604
  hoEditorFactory.structureConvert._superiorSign = [];
29596
29605
  hoEditorFactory.drawTree.clearDrawTree();
29597
29606
  hoEditorFactory.docTree.clearDocTree();
29598
29607
  hoEditorFactory.drawPageTree.clear();
29599
29608
  hoEditorFactory.drawPageTree.initDoc();
29600
- _context.next = 10;
29609
+ _context.next = 11;
29601
29610
  return hoEditorFactory.drawTree.buildDrawTree(hoEditorFactory.subDocManger.headerDocTree[0].subDocNodes, hoEditorFactory.drawTree.headerDNodes[0]);
29602
29611
 
29603
- case 10:
29604
- _context.next = 12;
29612
+ case 11:
29613
+ _context.next = 13;
29605
29614
  return hoEditorFactory.drawTree.buildDrawTree(hoEditorFactory.subDocManger.footerDocTree[0].subDocNodes, hoEditorFactory.drawTree.footerDNodes[0]);
29606
29615
 
29607
- case 12:
29608
- _context.next = 14;
29616
+ case 13:
29617
+ _context.next = 15;
29609
29618
  return hoEditorFactory.drawTree.buildDrawTree(hoEditorFactory.docTree.mainNodes, hoEditorFactory.drawTree.mainDNodes);
29610
29619
 
29611
- case 14:
29620
+ case 15:
29612
29621
  if (hoEditorFactory.drawTree.drawPages.length == 0) hoEditorFactory.drawTree.addPage();
29613
29622
  hoEditorFactory.drawTree.drawPageCount.count = hoEditorFactory.drawTree.drawPages.length;
29614
29623
  hoEditorFactory.drawTree.activePage = hoEditorFactory.drawTree.drawPages[0];
@@ -29628,7 +29637,7 @@ var DocController = /*#__PURE__*/function () {
29628
29637
  aPage = hoEditorFactory.drawTree.drawPages[0];
29629
29638
  hoEditorFactory.undoService.clear();
29630
29639
 
29631
- case 24:
29640
+ case 25:
29632
29641
  case "end":
29633
29642
  return _context.stop();
29634
29643
  }
@@ -47433,9 +47442,10 @@ var SignNode = /*#__PURE__*/function (_BaseNode) {
47433
47442
  _this._attribute = attribute === undefined ? 0 : attribute;
47434
47443
  _this._connectChar = connectChar === undefined ? ":" : connectChar;
47435
47444
 
47436
- if (type == 3) {
47437
- // 兼容旧的患者签名
47445
+ if (fingerPrintSrc || imgSrc && !fingerPrintSrc && customProperty && !customProperty.abi02) {
47446
+ // 用自定义属性区分并兼容旧的患者签名
47438
47447
  _this._attribute = 1;
47448
+ _this._type = 3;
47439
47449
  } // if(attribute == 1) { // 患者签名修改 type == 3
47440
47450
  // this._type = 3;
47441
47451
  // }
@@ -48081,7 +48091,7 @@ var SpecialCharsNode = /*#__PURE__*/function (_ControlNode) {
48081
48091
  /* 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);
48082
48092
  /* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_typeof_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(58913);
48083
48093
  /* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_classCallCheck_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(35671);
48084
- /* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_35__ = __webpack_require__(22342);
48094
+ /* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_34__ = __webpack_require__(22342);
48085
48095
  /* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_get_js__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(61670);
48086
48096
  /* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_getPrototypeOf_js__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(24084);
48087
48097
  /* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_inherits_js__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(99640);
@@ -48112,27 +48122,24 @@ var SpecialCharsNode = /*#__PURE__*/function (_ControlNode) {
48112
48122
  /* harmony import */ var core_js_modules_es_regexp_dot_all_js__WEBPACK_IMPORTED_MODULE_19___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_regexp_dot_all_js__WEBPACK_IMPORTED_MODULE_19__);
48113
48123
  /* harmony import */ var core_js_modules_es_regexp_sticky_js__WEBPACK_IMPORTED_MODULE_20__ = __webpack_require__(88386);
48114
48124
  /* harmony import */ var core_js_modules_es_regexp_sticky_js__WEBPACK_IMPORTED_MODULE_20___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_regexp_sticky_js__WEBPACK_IMPORTED_MODULE_20__);
48115
- /* harmony import */ var core_js_modules_es_array_splice_js__WEBPACK_IMPORTED_MODULE_21__ = __webpack_require__(40561);
48116
- /* harmony import */ var core_js_modules_es_array_splice_js__WEBPACK_IMPORTED_MODULE_21___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_splice_js__WEBPACK_IMPORTED_MODULE_21__);
48117
- /* harmony import */ var core_js_modules_es_string_match_all_js__WEBPACK_IMPORTED_MODULE_22__ = __webpack_require__(76373);
48118
- /* harmony import */ var core_js_modules_es_string_match_all_js__WEBPACK_IMPORTED_MODULE_22___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_string_match_all_js__WEBPACK_IMPORTED_MODULE_22__);
48119
- /* harmony import */ var core_js_modules_es_number_to_fixed_js__WEBPACK_IMPORTED_MODULE_23__ = __webpack_require__(56977);
48120
- /* harmony import */ var core_js_modules_es_number_to_fixed_js__WEBPACK_IMPORTED_MODULE_23___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_number_to_fixed_js__WEBPACK_IMPORTED_MODULE_23__);
48121
- /* harmony import */ var core_js_modules_es_array_includes_js__WEBPACK_IMPORTED_MODULE_24__ = __webpack_require__(26699);
48122
- /* harmony import */ var core_js_modules_es_array_includes_js__WEBPACK_IMPORTED_MODULE_24___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_includes_js__WEBPACK_IMPORTED_MODULE_24__);
48123
- /* harmony import */ var core_js_modules_es_string_includes_js__WEBPACK_IMPORTED_MODULE_25__ = __webpack_require__(32023);
48124
- /* harmony import */ var core_js_modules_es_string_includes_js__WEBPACK_IMPORTED_MODULE_25___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_string_includes_js__WEBPACK_IMPORTED_MODULE_25__);
48125
- /* harmony import */ var core_js_modules_es_string_trim_js__WEBPACK_IMPORTED_MODULE_26__ = __webpack_require__(73210);
48126
- /* harmony import */ var core_js_modules_es_string_trim_js__WEBPACK_IMPORTED_MODULE_26___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_string_trim_js__WEBPACK_IMPORTED_MODULE_26__);
48127
- /* harmony import */ var _editor_draw_drawNode_DrawTableFormular__WEBPACK_IMPORTED_MODULE_27__ = __webpack_require__(46675);
48128
- /* harmony import */ var _editor_utils_ExpressionCalculator__WEBPACK_IMPORTED_MODULE_28__ = __webpack_require__(28284);
48129
- /* harmony import */ var _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_29__ = __webpack_require__(41005);
48130
- /* harmony import */ var _plugins_util__WEBPACK_IMPORTED_MODULE_30__ = __webpack_require__(33913);
48131
- /* harmony import */ var _BaseCombineNode__WEBPACK_IMPORTED_MODULE_31__ = __webpack_require__(8);
48132
- /* harmony import */ var _BaseNode__WEBPACK_IMPORTED_MODULE_32__ = __webpack_require__(50369);
48133
- /* harmony import */ var _CellNode__WEBPACK_IMPORTED_MODULE_33__ = __webpack_require__(15798);
48134
- /* harmony import */ var _ControlNode__WEBPACK_IMPORTED_MODULE_34__ = __webpack_require__(8395);
48135
-
48125
+ /* harmony import */ var core_js_modules_es_string_match_all_js__WEBPACK_IMPORTED_MODULE_21__ = __webpack_require__(76373);
48126
+ /* harmony import */ var core_js_modules_es_string_match_all_js__WEBPACK_IMPORTED_MODULE_21___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_string_match_all_js__WEBPACK_IMPORTED_MODULE_21__);
48127
+ /* harmony import */ var core_js_modules_es_number_to_fixed_js__WEBPACK_IMPORTED_MODULE_22__ = __webpack_require__(56977);
48128
+ /* harmony import */ var core_js_modules_es_number_to_fixed_js__WEBPACK_IMPORTED_MODULE_22___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_number_to_fixed_js__WEBPACK_IMPORTED_MODULE_22__);
48129
+ /* harmony import */ var core_js_modules_es_array_includes_js__WEBPACK_IMPORTED_MODULE_23__ = __webpack_require__(26699);
48130
+ /* harmony import */ var core_js_modules_es_array_includes_js__WEBPACK_IMPORTED_MODULE_23___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_includes_js__WEBPACK_IMPORTED_MODULE_23__);
48131
+ /* harmony import */ var core_js_modules_es_string_includes_js__WEBPACK_IMPORTED_MODULE_24__ = __webpack_require__(32023);
48132
+ /* harmony import */ var core_js_modules_es_string_includes_js__WEBPACK_IMPORTED_MODULE_24___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_string_includes_js__WEBPACK_IMPORTED_MODULE_24__);
48133
+ /* harmony import */ var core_js_modules_es_string_trim_js__WEBPACK_IMPORTED_MODULE_25__ = __webpack_require__(73210);
48134
+ /* harmony import */ var core_js_modules_es_string_trim_js__WEBPACK_IMPORTED_MODULE_25___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_string_trim_js__WEBPACK_IMPORTED_MODULE_25__);
48135
+ /* harmony import */ var _editor_draw_drawNode_DrawTableFormular__WEBPACK_IMPORTED_MODULE_26__ = __webpack_require__(46675);
48136
+ /* harmony import */ var _editor_utils_ExpressionCalculator__WEBPACK_IMPORTED_MODULE_27__ = __webpack_require__(28284);
48137
+ /* harmony import */ var _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_28__ = __webpack_require__(41005);
48138
+ /* harmony import */ var _plugins_util__WEBPACK_IMPORTED_MODULE_29__ = __webpack_require__(33913);
48139
+ /* harmony import */ var _BaseCombineNode__WEBPACK_IMPORTED_MODULE_30__ = __webpack_require__(8);
48140
+ /* harmony import */ var _BaseNode__WEBPACK_IMPORTED_MODULE_31__ = __webpack_require__(50369);
48141
+ /* harmony import */ var _CellNode__WEBPACK_IMPORTED_MODULE_32__ = __webpack_require__(15798);
48142
+ /* harmony import */ var _ControlNode__WEBPACK_IMPORTED_MODULE_33__ = __webpack_require__(8395);
48136
48143
 
48137
48144
 
48138
48145
 
@@ -48206,7 +48213,7 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
48206
48213
  _this._formulaStr = "";
48207
48214
  _this._hideZero = true; //计算结果为0时是否隐藏
48208
48215
 
48209
- _this._id = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_29__/* .HOEditorFactorys.instance */ .b.instance().getFactory(hoEditorFactoryID).gernerateCode.generateID("TFS");
48216
+ _this._id = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_28__/* .HOEditorFactorys.instance */ .b.instance().getFactory(hoEditorFactoryID).gernerateCode.generateID("TFS");
48210
48217
  _this._styleIndex = styleIndex;
48211
48218
  _this.isAllowDelete = true;
48212
48219
  _this._cellRange = new Array();
@@ -48229,7 +48236,7 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
48229
48236
  return _this;
48230
48237
  }
48231
48238
 
48232
- (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_35__/* ["default"] */ .Z)(TableFormula, [{
48239
+ (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_34__/* ["default"] */ .Z)(TableFormula, [{
48233
48240
  key: "setCustomProperty",
48234
48241
  value: function setCustomProperty(customProperty) {
48235
48242
  var assignvalue = function assignvalue(target, source) {
@@ -48325,7 +48332,7 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
48325
48332
  }, {
48326
48333
  key: "refreshDrawStyle",
48327
48334
  value: function refreshDrawStyle() {
48328
- var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_29__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
48335
+ var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_28__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
48329
48336
  var textStyle = hoEditorFactory.docTree.styles[this._styleIndex];
48330
48337
  var cbStyle;
48331
48338
 
@@ -48346,7 +48353,7 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
48346
48353
  value: function node2DrawNodeRange(startIndex, endIndex) {
48347
48354
  this.refreshDrawStyle(); //const text = this._hideZero && (this._text == "0" || this._text === "0.00") ? " " : this._text;
48348
48355
 
48349
- var dNode = new _editor_draw_drawNode_DrawTableFormular__WEBPACK_IMPORTED_MODULE_27__/* .DrawTableFormular */ .A(this._rootPath, this, this._text);
48356
+ var dNode = new _editor_draw_drawNode_DrawTableFormular__WEBPACK_IMPORTED_MODULE_26__/* .DrawTableFormular */ .A(this._rootPath, this, this._text);
48350
48357
 
48351
48358
  this._drawNodes.push(dNode);
48352
48359
  }
@@ -48376,7 +48383,7 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
48376
48383
 
48377
48384
  dline.addChild(this._drawNodes[0]);
48378
48385
  dline.drawItems.push(this._drawNodes[0]);
48379
- _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_29__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID).drawTree.formularNodes.set(this.id, this);
48386
+ _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_28__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID).drawTree.formularNodes.set(this.id, this);
48380
48387
  dline.fitLines();
48381
48388
  return dline.paragraphNode.getLastDrawline();
48382
48389
  }
@@ -48389,7 +48396,7 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
48389
48396
  key: "node2Json",
48390
48397
  value: function node2Json(range, isCopy) {
48391
48398
  var retObj = {
48392
- nodeType: _BaseNode__WEBPACK_IMPORTED_MODULE_32__/* .NodeType */ .Jq[this.nodeType],
48399
+ nodeType: _BaseNode__WEBPACK_IMPORTED_MODULE_31__/* .NodeType */ .Jq[this.nodeType],
48393
48400
  text: this._formulaStr,
48394
48401
  styleIndex: this.styleIndex,
48395
48402
  hideZero: this._hideZero,
@@ -48411,7 +48418,7 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
48411
48418
  var pNode = this.parentNode;
48412
48419
 
48413
48420
  while (pNode) {
48414
- if (pNode instanceof _CellNode__WEBPACK_IMPORTED_MODULE_33__/* .CellNode */ .D) {
48421
+ if (pNode instanceof _CellNode__WEBPACK_IMPORTED_MODULE_32__/* .CellNode */ .D) {
48415
48422
  return pNode;
48416
48423
  }
48417
48424
 
@@ -48542,7 +48549,7 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
48542
48549
  //const strValue = cell.getCellText().replaceAll('\n', '').replaceAll(' ', '').replaceAll('\b', '').replaceAll('\r', '');
48543
48550
 
48544
48551
 
48545
- var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_29__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
48552
+ var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_28__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
48546
48553
  var strValue = hoEditorFactory.unitConvert.replaceAll(cell.getCellText(), '\n', '');
48547
48554
  strValue = hoEditorFactory.unitConvert.replaceAll(strValue, ' ', '');
48548
48555
  strValue = hoEditorFactory.unitConvert.replaceAll(strValue, '\b', '');
@@ -48591,17 +48598,15 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
48591
48598
 
48592
48599
  var arr = new Array();
48593
48600
  arr.length = 0;
48594
- var value = new Array();
48595
-
48596
- var insertToArr = function insertToArr(str) {
48597
- var bInserted = false;
48598
-
48599
- for (var i = 0, ilen = arr.length; i < ilen; i++) {
48600
- if (str.length > arr[i].length) continue;else arr.splice(i, 0, str);
48601
- }
48602
-
48603
- if (!bInserted) arr.push(str);
48604
- };
48601
+ var value = new Array(); //const insertToArr = (str: string) => {
48602
+ // let bInserted = false;
48603
+ // for (let i = 0, ilen = arr.length; i < ilen; i++) {
48604
+ // if (str.length > arr[i].length) continue
48605
+ // else arr.splice(i, 0, str);
48606
+ // }
48607
+ //if (!bInserted)
48608
+ //arr.push(str);
48609
+ //}
48605
48610
 
48606
48611
  var cellArddressRe = new RegExp(/[a-z]+\d+/, 'g');
48607
48612
  var strRets = strFormula.matchAll(cellArddressRe);
@@ -48610,7 +48615,8 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
48610
48615
  var aRet = strRets.next();
48611
48616
 
48612
48617
  while (!aRet.done) {
48613
- insertToArr(aRet.value[0]);
48618
+ //insertToArr(aRet.value[0]);
48619
+ arr.push(aRet.value[0]);
48614
48620
  aRet = strRets.next();
48615
48621
  }
48616
48622
  }
@@ -48659,7 +48665,7 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
48659
48665
  }
48660
48666
 
48661
48667
  if (totalOk) {
48662
- var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_29__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
48668
+ var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_28__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
48663
48669
  var isRet = true;
48664
48670
 
48665
48671
  for (var m = 0; m < value.length; m++) {
@@ -48677,10 +48683,10 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
48677
48683
  }
48678
48684
 
48679
48685
  for (var k = arr.length - 1; k >= 0; k--) {
48680
- strFormula = hoEditorFactory.unitConvert.replaceAll(strFormula, arr[k], value[k]); //strFormula.replaceAll(arr[k], value[k]);
48686
+ strFormula = hoEditorFactory.unitConvert.replaceAll(strFormula, arr[k], value[k] == "" ? "0" : value[k]); //strFormula.replaceAll(arr[k], value[k]);
48681
48687
  }
48682
48688
 
48683
- var result = (0,_editor_utils_ExpressionCalculator__WEBPACK_IMPORTED_MODULE_28__/* .expressionCalculator */ .C)(strFormula);
48689
+ var result = (0,_editor_utils_ExpressionCalculator__WEBPACK_IMPORTED_MODULE_27__/* .expressionCalculator */ .C)(strFormula);
48684
48690
  strRet = result.toString() == "NaN" ? " " : result.toString();
48685
48691
  }
48686
48692
 
@@ -48785,7 +48791,7 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
48785
48791
  var eDateStr = eCell.getCellText();
48786
48792
 
48787
48793
  if (arrStr.length === 2) {
48788
- if ((0,_plugins_util__WEBPACK_IMPORTED_MODULE_30__/* .isDate */ .J_)(sDateStr) && (0,_plugins_util__WEBPACK_IMPORTED_MODULE_30__/* .isDate */ .J_)(eDateStr)) {
48794
+ if ((0,_plugins_util__WEBPACK_IMPORTED_MODULE_29__/* .isDate */ .J_)(sDateStr) && (0,_plugins_util__WEBPACK_IMPORTED_MODULE_29__/* .isDate */ .J_)(eDateStr)) {
48789
48795
  var sDate = new Date(sDateStr);
48790
48796
  var eDate = new Date(eDateStr);
48791
48797
  var sTime = sDate.getTime();
@@ -48952,7 +48958,7 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
48952
48958
  if (cell) {
48953
48959
  var lastMenstryDate = cell.getCellText();
48954
48960
 
48955
- if ((0,_plugins_util__WEBPACK_IMPORTED_MODULE_30__/* .isDate */ .J_)(lastMenstryDate)) {
48961
+ if ((0,_plugins_util__WEBPACK_IMPORTED_MODULE_29__/* .isDate */ .J_)(lastMenstryDate)) {
48956
48962
  var date = new Date(lastMenstryDate); // const year = date.getFullYear();
48957
48963
  // const month = date.getMonth()+1;
48958
48964
  // const day = date.getDate();
@@ -48997,7 +49003,7 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
48997
49003
  if (cell) {
48998
49004
  var lastMenstryDate = cell.getCellText();
48999
49005
 
49000
- if ((0,_plugins_util__WEBPACK_IMPORTED_MODULE_30__/* .isDate */ .J_)(lastMenstryDate)) {
49006
+ if ((0,_plugins_util__WEBPACK_IMPORTED_MODULE_29__/* .isDate */ .J_)(lastMenstryDate)) {
49001
49007
  var date = new Date(lastMenstryDate);
49002
49008
  var sTime = date.getTime();
49003
49009
  var eTime = Date.now();
@@ -49052,7 +49058,7 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
49052
49058
  break;
49053
49059
  }
49054
49060
 
49055
- if (node instanceof _BaseCombineNode__WEBPACK_IMPORTED_MODULE_31__/* .BaseCombineNode */ .V) {
49061
+ if (node instanceof _BaseCombineNode__WEBPACK_IMPORTED_MODULE_30__/* .BaseCombineNode */ .V) {
49056
49062
  loopNodes(node.childNodes);
49057
49063
  }
49058
49064
  }
@@ -49143,7 +49149,7 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
49143
49149
  }, {
49144
49150
  key: "delete",
49145
49151
  value: function _delete(operType) {
49146
- _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_29__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID).drawTree.formularNodes.delete(this._id);
49152
+ _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_28__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID).drawTree.formularNodes.delete(this._id);
49147
49153
 
49148
49154
  (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_get_js__WEBPACK_IMPORTED_MODULE_4__/* ["default"] */ .Z)((0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_getPrototypeOf_js__WEBPACK_IMPORTED_MODULE_5__/* ["default"] */ .Z)(TableFormula.prototype), "delete", this).call(this, operType);
49149
49155
 
@@ -49191,13 +49197,13 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
49191
49197
  formularType = json.text.indexOf(':') > 0 ? FormularType.ftSum : FormularType.ftFormular;
49192
49198
  }
49193
49199
 
49194
- var ret = new TableFormula(hoEditorFactoryID, rootNodes, pNode ? pNode : null, _BaseNode__WEBPACK_IMPORTED_MODULE_32__/* .NodeType.ntTableFormula */ .Jq.ntTableFormula, json.text, styleIndex, hideZero, formularType, json.customProperty);
49200
+ var ret = new TableFormula(hoEditorFactoryID, rootNodes, pNode ? pNode : null, _BaseNode__WEBPACK_IMPORTED_MODULE_31__/* .NodeType.ntTableFormula */ .Jq.ntTableFormula, json.text, styleIndex, hideZero, formularType, json.customProperty);
49195
49201
  return ret;
49196
49202
  }
49197
49203
  }]);
49198
49204
 
49199
49205
  return TableFormula;
49200
- }(_ControlNode__WEBPACK_IMPORTED_MODULE_34__/* .ControlNode */ .w);
49206
+ }(_ControlNode__WEBPACK_IMPORTED_MODULE_33__/* .ControlNode */ .w);
49201
49207
 
49202
49208
  /***/ }),
49203
49209
 
@@ -58448,10 +58454,10 @@ var DrawArea = /*#__PURE__*/function (_DrawRect) {
58448
58454
  commentTextShape.alpha = 1; //背景
58449
58455
 
58450
58456
  var backShape = new createjs.Shape();
58451
- backShape.graphics.setStrokeDash([4, 1], 0).setStrokeStyle(1).beginStroke("rgba(255, 0, 0, 1)").beginFill("#ffe5e5").drawRoundRect(0, 0, commentWidth - 20, comment.lineHeight, 5);
58457
+ backShape.graphics.setStrokeDash([4, 1], 0).setStrokeStyle(1).beginStroke("rgba(255, 0, 0, 1)").beginFill("#ffe5e5") //.drawRoundRect(0, 0, commentWidth - 20, comment.lineHeigh,5);
58458
+ .drawRect(0, 0, commentWidth - 20, comment.lineHeight);
58452
58459
  backShape.name = "back";
58453
- backShape.alpha = 0.5; //backShape.cache(0, 0, commentWidth - 20, comment.lineHeight, 5);
58454
- //横线
58460
+ backShape.alpha = 0.5; //横线
58455
58461
 
58456
58462
  var horizontalLine = new createjs.Shape();
58457
58463
  horizontalLine.graphics.setStrokeDash([4, 1], 0).setStrokeStyle(1).beginStroke("rgba(255, 0, 0, 1)").moveTo(nodeX, nodeY).lineTo(docWidth, nodeY);
@@ -65705,18 +65711,24 @@ var DrawRect = /*#__PURE__*/function (_DrawContainer) {
65705
65711
  /* harmony export */ "V": function() { return /* binding */ DrawSignNode; }
65706
65712
  /* harmony export */ });
65707
65713
  /* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_classCallCheck_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(35671);
65708
- /* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(22342);
65714
+ /* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(22342);
65709
65715
  /* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_inherits_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(99640);
65710
65716
  /* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createSuper_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(28214);
65711
65717
  /* harmony import */ var core_js_modules_es_regexp_exec_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(74916);
65712
65718
  /* harmony import */ var core_js_modules_es_regexp_exec_js__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_regexp_exec_js__WEBPACK_IMPORTED_MODULE_3__);
65713
65719
  /* harmony import */ var core_js_modules_es_string_split_js__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(23123);
65714
65720
  /* harmony import */ var core_js_modules_es_string_split_js__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_string_split_js__WEBPACK_IMPORTED_MODULE_4__);
65715
- /* harmony import */ var _editor_dom_treeNode_CellNode__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(15798);
65716
- /* harmony import */ var _editor_dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(34450);
65717
- /* harmony import */ var _editor_SubDocManger__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(24113);
65718
- /* harmony import */ var _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(41005);
65719
- /* harmony import */ var _DrawCombineNode__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(72392);
65721
+ /* harmony import */ var core_js_modules_es_array_includes_js__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(26699);
65722
+ /* harmony import */ var core_js_modules_es_array_includes_js__WEBPACK_IMPORTED_MODULE_5___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_includes_js__WEBPACK_IMPORTED_MODULE_5__);
65723
+ /* harmony import */ var core_js_modules_es_string_includes_js__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(32023);
65724
+ /* harmony import */ var core_js_modules_es_string_includes_js__WEBPACK_IMPORTED_MODULE_6___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_string_includes_js__WEBPACK_IMPORTED_MODULE_6__);
65725
+ /* harmony import */ var _editor_dom_treeNode_CellNode__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(15798);
65726
+ /* harmony import */ var _editor_dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(34450);
65727
+ /* harmony import */ var _editor_SubDocManger__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(24113);
65728
+ /* harmony import */ var _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(41005);
65729
+ /* harmony import */ var _DrawCombineNode__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(72392);
65730
+
65731
+
65720
65732
 
65721
65733
 
65722
65734
 
@@ -65768,7 +65780,7 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
65768
65780
  _this._connectChar = connectChar;
65769
65781
  _this._abi02 = customProperty && customProperty.abi02 ? customProperty.abi02 : ""; //this._textStyle = cbStyle.;
65770
65782
 
65771
- _this.dHeight = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_8__/* .HOEditorFactorys.instance */ .b.instance().getFactory(hoeditfactoryID).signHeight; //this.dHeight = 40;
65783
+ _this.dHeight = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_10__/* .HOEditorFactorys.instance */ .b.instance().getFactory(hoeditfactoryID).signHeight; //this.dHeight = 40;
65772
65784
 
65773
65785
  _this._textStyle = cbStyle.getStyleKey();
65774
65786
 
@@ -65776,7 +65788,7 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
65776
65788
  var signArr = imgSrc.split('\n');
65777
65789
 
65778
65790
  if (signArr.length > 1) {
65779
- _this.dHeight = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_8__/* .HOEditorFactorys.instance */ .b.instance().getFactory(hoeditfactoryID).signHeight * signArr.length; // const textStyle = new TextStyle(hoeditfactoryID);
65791
+ _this.dHeight = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_10__/* .HOEditorFactorys.instance */ .b.instance().getFactory(hoeditfactoryID).signHeight * signArr.length; // const textStyle = new TextStyle(hoeditfactoryID);
65780
65792
  // let curHeight = cbStyle.getFontHeightByFontSize(cbStyle.size) * signArr.length;
65781
65793
  // if (curHeight > this.dHeight) {
65782
65794
  // let fontSize = cbStyle.size;
@@ -65846,15 +65858,35 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
65846
65858
  }
65847
65859
 
65848
65860
  if ((imgSrc || fingerPrintSrc) && type == 1 || type == 3) {
65849
- _this.drawWriteSignNode(node);
65861
+ // 处理混乱的
65862
+ if (node.customProperty && node.customProperty.abi02) {
65863
+ // 区分图片签名和普通文本签名 并更新对应的值
65864
+ if ((imgSrc.includes('data:image/') || imgSrc.split("/").length > 1) && type == 3) {
65865
+ node.type = 1;
65866
+ _this.type = 1;
65867
+ } else if (!imgSrc.includes('data:image/') && !imgSrc.includes("/") && type == 3) {
65868
+ node.type = 2;
65869
+ _this.type = 2;
65870
+ }
65871
+
65872
+ console.warn('医生签名');
65873
+
65874
+ _this.drawSignNode();
65875
+ } else {
65876
+ console.warn('患者签名');
65877
+
65878
+ _this.drawWriteSignNode(node);
65879
+ }
65850
65880
  } else {
65881
+ console.warn('医生签名');
65882
+
65851
65883
  _this.drawSignNode();
65852
65884
  }
65853
65885
 
65854
65886
  return _this;
65855
65887
  }
65856
65888
 
65857
- (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_10__/* ["default"] */ .Z)(DrawSignNode, [{
65889
+ (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_12__/* ["default"] */ .Z)(DrawSignNode, [{
65858
65890
  key: "type",
65859
65891
  get: function get() {
65860
65892
  return this._type;
@@ -65951,7 +65983,7 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
65951
65983
 
65952
65984
  this.clear();
65953
65985
  var drawNode = this;
65954
- var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_8__/* .HOEditorFactorys.instance */ .b.instance().getFactory(drawNode.node.hoEditorFactoryID);
65986
+ var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_10__/* .HOEditorFactorys.instance */ .b.instance().getFactory(drawNode.node.hoEditorFactoryID);
65955
65987
 
65956
65988
  var drawSign = function drawSign() {
65957
65989
  if (_this2.type === 1 || _this2.type === 3) {
@@ -65959,7 +65991,7 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
65959
65991
  node.type = 3;
65960
65992
 
65961
65993
  if (_this2.imgSrc == '' && _this2.fingerPrintSrc) {
65962
- var fingerscale = drawNode.fingerPosition == _editor_dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_6__/* .FingerPosition.center */ .d.center ? 0.3 : 0.15;
65994
+ var fingerscale = drawNode.fingerPosition == _editor_dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_8__/* .FingerPosition.center */ .d.center ? 0.3 : 0.15;
65963
65995
  var fingerWidth = 256;
65964
65996
  _this2._dWidth = fingerWidth * fingerscale;
65965
65997
  node.imgWidth = _this2._dWidth;
@@ -66030,7 +66062,7 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
66030
66062
  var hitHeight = image.naturalHeight !== 0 ? image.naturalHeight : image.height;
66031
66063
  var scale = hoEditorFactory.signHeight / hitHeight < 0.4 ? 0.4 : hoEditorFactory.signHeight / hitHeight > 0.7 ? 1 : hoEditorFactory.signHeight / hitHeight;
66032
66064
 
66033
- if (drawNode.fingerPosition == _editor_dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_6__/* .FingerPosition.center */ .d.center && hoEditorFactory.signHeight / hitHeight < 0.2) {
66065
+ if (drawNode.fingerPosition == _editor_dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_8__/* .FingerPosition.center */ .d.center && hoEditorFactory.signHeight / hitHeight < 0.2) {
66034
66066
  scale = hoEditorFactory.signHeight * 1.5 / hitHeight;
66035
66067
  } // 存在自定义签字图片高度时
66036
66068
 
@@ -66045,7 +66077,7 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
66045
66077
  _fingerImage.onload = function () {
66046
66078
  var fingerWidth = _fingerImage.naturalWidth;
66047
66079
  var fingerHeight = _fingerImage.naturalHeight !== 0 ? _fingerImage.naturalHeight : _fingerImage.height;
66048
- var fingerscale = drawNode.fingerPosition == _editor_dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_6__/* .FingerPosition.center */ .d.center ? 0.3 : 0.15; // 指纹图片尺寸固定 宽:256 高:360 宽度不等于256表示已经缩放过 不需要再次缩放
66080
+ var fingerscale = drawNode.fingerPosition == _editor_dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_8__/* .FingerPosition.center */ .d.center ? 0.3 : 0.15; // 指纹图片尺寸固定 宽:256 高:360 宽度不等于256表示已经缩放过 不需要再次缩放
66049
66081
 
66050
66082
  if (fingerWidth !== 256) {
66051
66083
  fingerscale = 1;
@@ -66061,18 +66093,18 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
66061
66093
  _fingerBitmap.y = -fingerHeight * fingerscale;
66062
66094
  bitmap.y = -hitHeight * scale;
66063
66095
 
66064
- if (drawNode.fingerPosition == _editor_dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_6__/* .FingerPosition.left */ .d.left) {
66096
+ if (drawNode.fingerPosition == _editor_dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_8__/* .FingerPosition.left */ .d.left) {
66065
66097
  bitmap.x = fingerWidth * fingerscale + 5;
66066
66098
  _fingerBitmap.x = 0;
66067
66099
  _this2._dWidth = hitWidth * scale + 5 + fingerWidth * fingerscale;
66068
66100
  node.imgHeight = Math.floor(Math.max(fingerHeight * fingerscale, hitHeight * scale));
66069
66101
  _this2._dHeight = node.imgHeight;
66070
- } else if (drawNode.fingerPosition == _editor_dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_6__/* .FingerPosition.center */ .d.center) {
66102
+ } else if (drawNode.fingerPosition == _editor_dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_8__/* .FingerPosition.center */ .d.center) {
66071
66103
  _fingerBitmap.x = (hitWidth * scale - fingerWidth * fingerscale) / 2;
66072
66104
  _fingerBitmap.y = -(fingerHeight * fingerscale + currentLineHeight) / 2;
66073
66105
  bitmap.y = -(hitHeight * scale + currentLineHeight) / 2;
66074
66106
  node.imgHeight = hoEditorFactory.signHeight;
66075
- } else if (drawNode.fingerPosition == _editor_dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_6__/* .FingerPosition.right */ .d.right) {
66107
+ } else if (drawNode.fingerPosition == _editor_dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_8__/* .FingerPosition.right */ .d.right) {
66076
66108
  _fingerBitmap.x = hitWidth * scale + 5;
66077
66109
  _this2._dWidth = hitWidth * scale + 5 + fingerWidth * fingerscale;
66078
66110
  node.imgHeight = Math.floor(Math.max(fingerHeight * fingerscale, hitHeight * scale));
@@ -66081,7 +66113,7 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
66081
66113
 
66082
66114
  node.imgWidth = _this2._dWidth;
66083
66115
 
66084
- if (drawNode.fingerPosition == _editor_dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_6__/* .FingerPosition.center */ .d.center) {
66116
+ if (drawNode.fingerPosition == _editor_dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_8__/* .FingerPosition.center */ .d.center) {
66085
66117
  _this2._dWidth = 0;
66086
66118
  _this2._dHeight = 0;
66087
66119
  }
@@ -66115,10 +66147,10 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
66115
66147
  if (dArea) {
66116
66148
  var atype = hoEditorFactory.subDocManger.getHeaderFooterType(drawNode.node.getNodePath());
66117
66149
 
66118
- if (atype === _editor_SubDocManger__WEBPACK_IMPORTED_MODULE_7__/* .HeaderFooterType.hftHead */ .pi.hftHead && dArea != hoEditorFactory.drawTree.drawPages[dArea.index].drawHeader) {
66150
+ if (atype === _editor_SubDocManger__WEBPACK_IMPORTED_MODULE_9__/* .HeaderFooterType.hftHead */ .pi.hftHead && dArea != hoEditorFactory.drawTree.drawPages[dArea.index].drawHeader) {
66119
66151
  hoEditorFactory.subDocManger.copySubDocToPages(dArea, dArea.index, atype);
66120
66152
  } else {
66121
- if (atype === _editor_SubDocManger__WEBPACK_IMPORTED_MODULE_7__/* .HeaderFooterType.hftFoot */ .pi.hftFoot && dArea != hoEditorFactory.drawTree.drawPages[dArea.index].drawFooter) {
66153
+ if (atype === _editor_SubDocManger__WEBPACK_IMPORTED_MODULE_9__/* .HeaderFooterType.hftFoot */ .pi.hftFoot && dArea != hoEditorFactory.drawTree.drawPages[dArea.index].drawFooter) {
66122
66154
  hoEditorFactory.subDocManger.copySubDocToPages(dArea, dArea.index, atype);
66123
66155
  }
66124
66156
  } // hoEditorFactory.drawPageTree.updateDrawPage(dArea.index);
@@ -66177,7 +66209,7 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
66177
66209
  _this3.addChildAt(bitmap, 0);
66178
66210
  }
66179
66211
 
66180
- var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_8__/* .HOEditorFactorys.instance */ .b.instance().getFactory(drawNode.node.hoEditorFactoryID);
66212
+ var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_10__/* .HOEditorFactorys.instance */ .b.instance().getFactory(drawNode.node.hoEditorFactoryID);
66181
66213
  hoEditorFactory.loadImageCount++;
66182
66214
 
66183
66215
  image.onload = function () {
@@ -66195,7 +66227,7 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
66195
66227
 
66196
66228
  var width = hitWidth * hoEditorFactory.signHeight / image.naturalHeight; //+ this._drawText.getMeasuredWidth();
66197
66229
 
66198
- if (node.parentNode instanceof _editor_dom_treeNode_CellNode__WEBPACK_IMPORTED_MODULE_5__/* .CellNode */ .D) {
66230
+ if (node.parentNode instanceof _editor_dom_treeNode_CellNode__WEBPACK_IMPORTED_MODULE_7__/* .CellNode */ .D) {
66199
66231
  var cellWidth = node.parentNode.drawCell.dWidth;
66200
66232
 
66201
66233
  if (width > cellWidth - 5) {
@@ -66242,10 +66274,10 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
66242
66274
  if (dArea) {
66243
66275
  var atype = hoEditorFactory.subDocManger.getHeaderFooterType(_this3.node.getNodePath());
66244
66276
 
66245
- if (atype === _editor_SubDocManger__WEBPACK_IMPORTED_MODULE_7__/* .HeaderFooterType.hftHead */ .pi.hftHead && dArea != hoEditorFactory.drawTree.drawPages[dArea.index].drawHeader) {
66277
+ if (atype === _editor_SubDocManger__WEBPACK_IMPORTED_MODULE_9__/* .HeaderFooterType.hftHead */ .pi.hftHead && dArea != hoEditorFactory.drawTree.drawPages[dArea.index].drawHeader) {
66246
66278
  hoEditorFactory.subDocManger.copySubDocToPages(dArea, dArea.index, atype);
66247
66279
  } else {
66248
- if (atype === _editor_SubDocManger__WEBPACK_IMPORTED_MODULE_7__/* .HeaderFooterType.hftFoot */ .pi.hftFoot && dArea != hoEditorFactory.drawTree.drawPages[dArea.index].drawFooter) {
66280
+ if (atype === _editor_SubDocManger__WEBPACK_IMPORTED_MODULE_9__/* .HeaderFooterType.hftFoot */ .pi.hftFoot && dArea != hoEditorFactory.drawTree.drawPages[dArea.index].drawFooter) {
66249
66281
  hoEditorFactory.subDocManger.copySubDocToPages(dArea, dArea.index, atype);
66250
66282
  }
66251
66283
  }
@@ -66384,7 +66416,7 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
66384
66416
  }]);
66385
66417
 
66386
66418
  return DrawSignNode;
66387
- }(_DrawCombineNode__WEBPACK_IMPORTED_MODULE_9__/* .DrawCombineNode */ .o);
66419
+ }(_DrawCombineNode__WEBPACK_IMPORTED_MODULE_11__/* .DrawCombineNode */ .o);
66388
66420
 
66389
66421
  /***/ }),
66390
66422
 
@@ -71442,9 +71474,14 @@ var DrawTree = /*#__PURE__*/function () {
71442
71474
  paragraphNode = this.clearDrawParagraphAfterDline(dline.paragraphNode, dline, inLineIndex, e.beforeChangePath);
71443
71475
  dendDrawLine = this.drawDocInsert(paragraphNode, lineIndex, // inLineIndex,
71444
71476
  node, startChildIndex + 1, e.afterChangePath);
71445
- var endIndex = alines.length - 1; // if (paragraphNode.parentNode === null) {
71477
+ var endIndex = alines.indexOf(dendDrawLine);
71478
+
71479
+ if (hoEditorFactory.isUseDrawingOptimization) {
71480
+ endIndex = alines.length - 1;
71481
+ } // if (paragraphNode.parentNode === null) {
71446
71482
  // const darea = this.getDrawA(dline);
71447
71483
 
71484
+
71448
71485
  if (e.repaintImmediate) {
71449
71486
  if (!dArea) {
71450
71487
  return false;
@@ -212757,10 +212794,10 @@ var map = {
212757
212794
  "./radioCheckBox/RadioCheckbox.vue": 48961,
212758
212795
  "./selectDialog/SelectDialog.vue": 54891,
212759
212796
  "./sign/Sign.vue": 44801,
212760
- "./table/TableCellPoper.vue": 46787,
212797
+ "./table/TableCellPoper.vue": 64915,
212761
212798
  "./table/TableCellProperty.vue": 52445,
212762
212799
  "./table/TableColProperty.vue": 97160,
212763
- "./table/TableFormula.vue": 53197,
212800
+ "./table/TableFormula.vue": 20006,
212764
212801
  "./table/TableProperty.vue": 44680,
212765
212802
  "./table/TableRowProperty.vue": 74456,
212766
212803
  "./textDialog/TextDialog.vue": 74796,
@@ -214304,9 +214341,9 @@ var es_string_match = __webpack_require__(4723);
214304
214341
  var es_number_constructor = __webpack_require__(9653);
214305
214342
  // EXTERNAL MODULE: ./node_modules/core-js/modules/es.json.stringify.js
214306
214343
  var es_json_stringify = __webpack_require__(38862);
214307
- ;// 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=7f445433&
214308
- var HoDocvue_type_template_id_7f445433_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)}
214309
- var HoDocvue_type_template_id_7f445433_staticRenderFns = []
214344
+ ;// 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=22896312&
214345
+ var HoDocvue_type_template_id_22896312_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)}
214346
+ var HoDocvue_type_template_id_22896312_staticRenderFns = []
214310
214347
 
214311
214348
 
214312
214349
  // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.filter.js
@@ -216243,7 +216280,7 @@ var PoperMark = __webpack_require__(93069);
216243
216280
 
216244
216281
 
216245
216282
  // EXTERNAL MODULE: ./src/components/controls/table/TableCellPoper.vue + 5 modules
216246
- var TableCellPoper = __webpack_require__(46787);
216283
+ var TableCellPoper = __webpack_require__(64915);
216247
216284
  // EXTERNAL MODULE: ./src/editor/dom/treeNode/DateTimeNode.ts
216248
216285
  var DateTimeNode = __webpack_require__(36395);
216249
216286
  // EXTERNAL MODULE: ./src/editor/dom/treeNode/DownListNode.ts
@@ -217947,7 +217984,7 @@ var SignNode = __webpack_require__(34450);
217947
217984
  // EXTERNAL MODULE: ./src/editor/dom/treeNode/ParagraphNode.ts
217948
217985
  var ParagraphNode = __webpack_require__(14208);
217949
217986
  ;// CONCATENATED MODULE: ./src/components/version.ts
217950
- /* harmony default export */ var version = ('2.0.91');
217987
+ /* harmony default export */ var version = ('2.0.94');
217951
217988
  // EXTERNAL MODULE: ./src/components/controls/poperTipText/PoperTipText.vue + 5 modules
217952
217989
  var PoperTipText = __webpack_require__(91831);
217953
217990
  ;// CONCATENATED MODULE: ./src/components/controls/poperTipText/index.ts
@@ -218432,7 +218469,8 @@ var ImageNode = __webpack_require__(88389);
218432
218469
  };
218433
218470
 
218434
218471
  if (node instanceof SignNode/* SignNode */.N) {
218435
- if (node.type === 3) return false;
218472
+ // 通过自定义属性内部字段判断是否属于患者签名 指纹签名只有患者签名才会有 同时患者签名不存在自定义属性可以用是否存在某个属性确定是否是患者签名（需要确定的是imgsrc要存在 imgsrc不存在是指空签名元素）
218473
+ if (node.fingerPrintSrc || node.imgSrc && !node.fingerPrintSrc && node.customProperty && !node.customProperty.abi02) return false;
218436
218474
  this.$emit('dblNodeClick', {
218437
218475
  node: this.getCurrentSelectNode,
218438
218476
  type: 'sign'
@@ -218725,8 +218763,8 @@ var ImageNode = __webpack_require__(88389);
218725
218763
 
218726
218764
  var HoDoc_component = (0,componentNormalizer/* default */.Z)(
218727
218765
  components_HoDocvue_type_script_lang_js_,
218728
- HoDocvue_type_template_id_7f445433_render,
218729
- HoDocvue_type_template_id_7f445433_staticRenderFns,
218766
+ HoDocvue_type_template_id_22896312_render,
218767
+ HoDocvue_type_template_id_22896312_staticRenderFns,
218730
218768
  false,
218731
218769
  null,
218732
218770
  null,
@@ -219065,7 +219103,10 @@ var DrawPageTree = /*#__PURE__*/function () {
219065
219103
  return;
219066
219104
  }
219067
219105
 
219068
- this.clearAfterDTop(mainArea, dTop);
219106
+ if (hoEditorFactory.isUseDrawingOptimization) {
219107
+ this.clearAfterDTop(mainArea, dTop);
219108
+ }
219109
+
219069
219110
  var nextLine = startLine;
219070
219111
  var pageIsFull = new Map();
219071
219112
 
@@ -219121,7 +219162,7 @@ var DrawPageTree = /*#__PURE__*/function () {
219121
219162
  restHeight = drawArea.maxHeight - dTop;
219122
219163
  }
219123
219164
 
219124
- if (!isNew) {
219165
+ if (!isNew && hoEditorFactory.isUseDrawingOptimization) {
219125
219166
  break;
219126
219167
  }
219127
219168
  }
@@ -219641,7 +219682,6 @@ var DrawPageTree = /*#__PURE__*/function () {
219641
219682
  }
219642
219683
  }
219643
219684
 
219644
- this.clearAfterDTop(drawArea, dTop);
219645
219685
  drawArea.update(prevArea, dRoots, startIndex, dTop, restHeight);
219646
219686
  this.afterAreaFinishPaint(drawArea);
219647
219687
  this._startNeedUpdatePage = Math.min(drawArea.index, this._startNeedUpdatePage === -1 ? 99999 : this._startNeedUpdatePage);
@@ -230750,7 +230790,7 @@ var VueController = /*#__PURE__*/function () {
230750
230790
  var changingEvent = new NodeChangingEvent/* NodeChangingEvent */.Q(DocTree/* DocAction.daInsert */.gk.daInsert, startPath, endPath, NodeChangingEvent/* OperType.insertSign */.y.insertSign);
230751
230791
 
230752
230792
  if (hoEditorFactory.docTree.changing(changingEvent)) {
230753
- Promise.all([hoEditorFactory.docController.insertSignNode(curDomRange, 1, '患者签名', node.signor, node.signTime, node.signTimeFormat, imgSrc, node.imgWidth, node.imgHeight, node.customProperty, fingerPrintSrc, fingerPosition)]).then(function () {
230793
+ Promise.all([hoEditorFactory.docController.insertSignNode(curDomRange, 1, '患者签名', node.signor, node.signTime, node.signTimeFormat, imgSrc, node.imgWidth, node.imgHeight, {}, fingerPrintSrc, fingerPosition)]).then(function () {
230754
230794
  setTimeout(function () {
230755
230795
  callback && callback();
230756
230796
  }, 0);
@@ -233361,13 +233401,14 @@ var jspdf = __webpack_require__(53672);
233361
233401
 
233362
233402
 
233363
233403
 
233404
+
233364
233405
 
233365
233406
 
233366
233407
  /*
233367
233408
  * @Author: your name
233368
233409
  * @Date: 2021-07-31 09:25:57
233369
- * @LastEditTime: 2021-07-31 13:59:29
233370
- * @LastEditors: Please set LastEditors
233410
+ * @LastEditTime: 2022-08-26 13:53:54
233411
+ * @LastEditors: liyanan 2441631434@qq.com
233371
233412
  * @Description: In User Settings Edit
233372
233413
  * @FilePath: \hoeditor-web\src\editor\externalCall\PrintController.ts
233373
233414
  */
@@ -233676,10 +233717,21 @@ var PrintController = /*#__PURE__*/function () {
233676
233717
  });
233677
233718
 
233678
233719
  return;
233679
- }
233720
+ } // if (hoEditorFactory.isHideComments) {
233721
+ // hoEditorFactory.vueController.hideComments(true);
233722
+ // }
233723
+
233724
+
233725
+ var drawMainDocs = hoEditorFactory.drawPageTree.drawMainDocs;
233680
233726
 
233681
- if (!hoEditorFactory.isHideComments) {
233682
- hoEditorFactory.vueController.hideComments(true);
233727
+ for (var k = 0; k < drawMainDocs.length; k++) {
233728
+ for (var s = drawMainDocs[k].children.length - 1; s >= 0; s--) {
233729
+ var child = drawMainDocs[k].children[s];
233730
+
233731
+ if (child.name && child.name.substring(0, 1) === "C" && child.name.length > 15) {
233732
+ drawMainDocs[k].removeChildAt(s);
233733
+ }
233734
+ }
233683
233735
  }
233684
233736
 
233685
233737
  if (printMode && printAppoint) {
@@ -235127,7 +235179,7 @@ var HOEditorFactory = /*#__PURE__*/function () {
235127
235179
 
235128
235180
  this._isCanUseTableProperty = false; //非设计模式下是否可以使用表格、单元格、行、列属性设置
235129
235181
 
235130
- this._isUseDrawingOptimization = true; // 是否启用绘制优化 默认启用
235182
+ this._isUseDrawingOptimization = false; // 是否启用绘制优化 默认启用
235131
235183
 
235132
235184
  this._loadImageCount = 0; // 待加载的图片数量
235133
235185