hoeditor-web 3.0.53 → 3.0.54

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -5764,7 +5764,7 @@ var component = (0,componentNormalizer/* default */.Z)(
5764
5764
 
5765
5765
  /***/ }),
5766
5766
 
5767
- /***/ 7981:
5767
+ /***/ 66053:
5768
5768
  /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
5769
5769
 
5770
5770
  "use strict";
@@ -5776,7 +5776,7 @@ __webpack_require__.d(__webpack_exports__, {
5776
5776
  "default": function() { return /* binding */ ExpressionForm; }
5777
5777
  });
5778
5778
 
5779
- ;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/expressionForm/ExpressionForm.vue?vue&type=template&id=06607b98&
5779
+ ;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/expressionForm/ExpressionForm.vue?vue&type=template&id=3bb70df0&
5780
5780
  var render = function render() {
5781
5781
  var _vm = this,
5782
5782
  _c = _vm._self._c;
@@ -5832,7 +5832,13 @@ var render = function render() {
5832
5832
  staticClass: "expression-item"
5833
5833
  }, [_c('span', {
5834
5834
  staticClass: "expression-item-label"
5835
- }, [_vm._v("末次月经/绝经年龄")]), _vm.isUseDate ? _c('a-date-picker', {
5835
+ }, [_vm._v("末次月经/绝经年龄")]), _c('a-date-picker', {
5836
+ directives: [{
5837
+ name: "show",
5838
+ rawName: "v-show",
5839
+ value: _vm.isUseDate,
5840
+ expression: "isUseDate"
5841
+ }],
5836
5842
  attrs: {
5837
5843
  "prefix-icon": "null",
5838
5844
  "type": "date",
@@ -5848,7 +5854,13 @@ var render = function render() {
5848
5854
  },
5849
5855
  expression: "menstrualHistory.menoPauseAge"
5850
5856
  }
5851
- }) : _vm._e(), !_vm.isUseDate ? _c('a-input', {
5857
+ }), _c('a-input', {
5858
+ directives: [{
5859
+ name: "show",
5860
+ rawName: "v-show",
5861
+ value: !_vm.isUseDate,
5862
+ expression: "!isUseDate"
5863
+ }],
5852
5864
  attrs: {
5853
5865
  "type": "text"
5854
5866
  },
@@ -5864,7 +5876,7 @@ var render = function render() {
5864
5876
  "slot": "addonAfter"
5865
5877
  },
5866
5878
  slot: "addonAfter"
5867
- }, [_vm._v(_vm._s(_vm.menoPauseAgeText))]) : _vm._e()]) : _vm._e()], 1)]), _c('div', {
5879
+ }, [_vm._v(_vm._s(_vm.menoPauseAgeText))]) : _vm._e()])], 1)]), _c('div', {
5868
5880
  staticClass: "expression-item"
5869
5881
  }, [_c('span', {
5870
5882
  staticClass: "expression-item-label"
@@ -6674,14 +6686,12 @@ var staticRenderFns = [function () {
6674
6686
  }, [_c('li', [_vm._v("第二乳磨牙")]), _c('li', [_vm._v("第一乳磨牙")]), _c('li', [_vm._v("乳尖牙")]), _c('li', [_vm._v("乳侧切牙")]), _c('li', [_vm._v("乳中切牙")]), _c('li', [_vm._v("乳中切牙")]), _c('li', [_vm._v("乳侧切牙")]), _c('li', [_vm._v("乳尖牙")]), _c('li', [_vm._v("第一乳磨牙")]), _c('li', [_vm._v("第二乳磨牙")])]);
6675
6687
  }];
6676
6688
 
6677
- ;// CONCATENATED MODULE: ./src/components/controls/expressionForm/ExpressionForm.vue?vue&type=template&id=06607b98&
6689
+ ;// CONCATENATED MODULE: ./src/components/controls/expressionForm/ExpressionForm.vue?vue&type=template&id=3bb70df0&
6678
6690
 
6679
6691
  // EXTERNAL MODULE: ./node_modules/@babel/runtime/helpers/esm/objectSpread2.js
6680
6692
  var objectSpread2 = __webpack_require__(63442);
6681
6693
  // EXTERNAL MODULE: ./node_modules/@babel/runtime/helpers/esm/toConsumableArray.js + 3 modules
6682
6694
  var toConsumableArray = __webpack_require__(61748);
6683
- // EXTERNAL MODULE: ./node_modules/core-js/modules/es.number.constructor.js
6684
- var es_number_constructor = __webpack_require__(9653);
6685
6695
  // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.includes.js
6686
6696
  var es_array_includes = __webpack_require__(26699);
6687
6697
  // EXTERNAL MODULE: ./node_modules/core-js/modules/es.string.includes.js
@@ -6734,7 +6744,6 @@ var zh_cn = __webpack_require__(83839);
6734
6744
 
6735
6745
 
6736
6746
 
6737
-
6738
6747
  /* harmony default export */ var ExpressionFormvue_type_script_lang_js_ = ({
6739
6748
  name: 'ExpressionForm',
6740
6749
  data: function data() {
@@ -6818,16 +6827,16 @@ var zh_cn = __webpack_require__(83839);
6818
6827
  }
6819
6828
  },
6820
6829
  watch: {
6821
- 'menstrualHistory.menoPauseAge': {
6822
- deep: true,
6823
- handler: function handler() {
6824
- if (Number(this.menstrualHistory.menoPauseAge) && parseInt(this.menstrualHistory.menoPauseAge)) {
6825
- this.menoPauseAgeText = '岁';
6826
- } else {
6827
- this.menoPauseAgeText = '';
6828
- }
6829
- }
6830
- }
6830
+ // 'menstrualHistory.menoPauseAge': {
6831
+ // deep: true,
6832
+ // handler() {
6833
+ // if ((Number(this.menstrualHistory.menoPauseAge) && parseInt(this.menstrualHistory.menoPauseAge)) || this.menstrualHistory.menoPauseAge == '') {
6834
+ // this.menoPauseAgeText = '岁';
6835
+ // } else {
6836
+ // this.menoPauseAgeText = '';
6837
+ // }
6838
+ // },
6839
+ // },
6831
6840
  },
6832
6841
  computed: {
6833
6842
  controlType: function controlType() {
@@ -7116,10 +7125,10 @@ var zh_cn = __webpack_require__(83839);
7116
7125
  });
7117
7126
  ;// CONCATENATED MODULE: ./src/components/controls/expressionForm/ExpressionForm.vue?vue&type=script&lang=js&
7118
7127
  /* harmony default export */ var expressionForm_ExpressionFormvue_type_script_lang_js_ = (ExpressionFormvue_type_script_lang_js_);
7119
- ;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/expressionForm/ExpressionForm.vue?vue&type=style&index=0&id=06607b98&prod&lang=scss&
7128
+ ;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/expressionForm/ExpressionForm.vue?vue&type=style&index=0&id=3bb70df0&prod&lang=scss&
7120
7129
  // extracted by mini-css-extract-plugin
7121
7130
 
7122
- ;// CONCATENATED MODULE: ./src/components/controls/expressionForm/ExpressionForm.vue?vue&type=style&index=0&id=06607b98&prod&lang=scss&
7131
+ ;// CONCATENATED MODULE: ./src/components/controls/expressionForm/ExpressionForm.vue?vue&type=style&index=0&id=3bb70df0&prod&lang=scss&
7123
7132
 
7124
7133
  // EXTERNAL MODULE: ./node_modules/@vue/vue-loader-v15/lib/runtime/componentNormalizer.js
7125
7134
  var componentNormalizer = __webpack_require__(70713);
@@ -8877,7 +8886,7 @@ var component = (0,componentNormalizer/* default */.Z)(
8877
8886
 
8878
8887
  /***/ }),
8879
8888
 
8880
- /***/ 78773:
8889
+ /***/ 85778:
8881
8890
  /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
8882
8891
 
8883
8892
  "use strict";
@@ -8897,7 +8906,7 @@ var es_string_includes = __webpack_require__(32023);
8897
8906
  var es_regexp_exec = __webpack_require__(74916);
8898
8907
  // EXTERNAL MODULE: ./node_modules/core-js/modules/es.string.replace.js
8899
8908
  var es_string_replace = __webpack_require__(15306);
8900
- ;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/poperSelect/PoperSelect.vue?vue&type=template&id=63ef43d4&
8909
+ ;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/poperSelect/PoperSelect.vue?vue&type=template&id=5888a1e4&
8901
8910
 
8902
8911
 
8903
8912
 
@@ -9285,7 +9294,7 @@ var render = function render() {
9285
9294
  };
9286
9295
  var staticRenderFns = [];
9287
9296
 
9288
- ;// CONCATENATED MODULE: ./src/components/controls/poperSelect/PoperSelect.vue?vue&type=template&id=63ef43d4&
9297
+ ;// CONCATENATED MODULE: ./src/components/controls/poperSelect/PoperSelect.vue?vue&type=template&id=5888a1e4&
9289
9298
 
9290
9299
  // EXTERNAL MODULE: ./node_modules/@babel/runtime/helpers/esm/toConsumableArray.js + 3 modules
9291
9300
  var toConsumableArray = __webpack_require__(61748);
@@ -11362,7 +11371,8 @@ var type = __webpack_require__(41542);
11362
11371
  // 保存打开表单时的节点路径
11363
11372
  endPath: '',
11364
11373
  calendarInstance: null,
11365
- calendarTimeInstance: null
11374
+ calendarTimeInstance: null,
11375
+ isSelected: false
11366
11376
  };
11367
11377
  },
11368
11378
  computed: {
@@ -11798,6 +11808,7 @@ var type = __webpack_require__(41542);
11798
11808
  */
11799
11809
  selectItemsChange: function selectItemsChange(value) {
11800
11810
  var _this8 = this;
11811
+ if (this.isSelected) return; // 单选时已选过不在进入选择
11801
11812
  if (!this.isAllowMultiSelect) {
11802
11813
  var item = {};
11803
11814
  var selectItemIndex = 0;
@@ -11809,6 +11820,7 @@ var type = __webpack_require__(41542);
11809
11820
  }
11810
11821
  });
11811
11822
  item.selected = !item.selected;
11823
+ this.isSelected = true;
11812
11824
  this.poperSelectList.splice(selectItemIndex, 1, item);
11813
11825
  this.currentList = (0,toConsumableArray/* default */.Z)(this.poperSelectList);
11814
11826
  this.sureSelect();
@@ -11843,10 +11855,12 @@ var type = __webpack_require__(41542);
11843
11855
  },
11844
11856
  selectItems: function selectItems(item, index) {
11845
11857
  var _this9 = this;
11858
+ if (this.isSelected) return; // 单选时已选过不在进入选择
11846
11859
  if (!this.isAllowMultiSelect) {
11847
11860
  this.poperSelectList.forEach(function (v) {
11848
11861
  v.selected = false;
11849
11862
  });
11863
+ this.isSelected = true;
11850
11864
  item.selected = !item.selected;
11851
11865
  this.poperSelectList.splice(index, 1, item);
11852
11866
  this.currentList = (0,toConsumableArray/* default */.Z)(this.poperSelectList);
@@ -11976,16 +11990,12 @@ var type = __webpack_require__(41542);
11976
11990
  this.textParam.keyValue = keyValue;
11977
11991
  this.textParam.value = value;
11978
11992
  if (this.textParam.downListProperty.allowMultiSelected && !this.textParam.insCheckSyncUpdateList) {
11979
- hoEditorFactory.vueController.updateTextInputField(this.textParam);
11980
- } else if (this.textParam.downListProperty.allowMultiSelected && this.textParam.insCheckSyncUpdateList) {
11981
- // hoEditorFactory.vueController.updateTextInputField(this.textParam);
11982
- // console.log(text, value, keyValue, this.selectedList);
11983
11993
  // hoEditorFactory.vueController.updateTextInputField(this.textParam);
11994
+ hoEditorFactory.elementController.updateTextInputFieldValue(currentPoperNode, text, currentPoperNode.customProperty, keyValue, value);
11995
+ } else if (this.textParam.downListProperty.allowMultiSelected && this.textParam.insCheckSyncUpdateList) {
11984
11996
  var checkText = '<span>' + textArr.join('') + '</span>';
11985
11997
  hoEditorFactory.vueController.insertHtmlText(checkText, checkText, keyValue, this.selectedList, true);
11986
11998
  } else {
11987
- // const customProperty = this.getCustomProperty ? this.getCustomProperty() : {};
11988
-
11989
11999
  hoEditorFactory.elementController.updateTextInputFieldValue(currentPoperNode, text, currentPoperNode.customProperty, keyValue, value);
11990
12000
  }
11991
12001
  }
@@ -12022,6 +12032,7 @@ var type = __webpack_require__(41542);
12022
12032
  this.poppernIstance && this.poppernIstance.update();
12023
12033
  },
12024
12034
  handleClose: function handleClose() {
12035
+ this.isSelected = false;
12025
12036
  this.removeListerner();
12026
12037
  this.$emit('poperClose');
12027
12038
  console.timeEnd('下拉选中时间');
@@ -12038,10 +12049,10 @@ var type = __webpack_require__(41542);
12038
12049
  });
12039
12050
  ;// CONCATENATED MODULE: ./src/components/controls/poperSelect/PoperSelect.vue?vue&type=script&lang=js&
12040
12051
  /* harmony default export */ var poperSelect_PoperSelectvue_type_script_lang_js_ = (PoperSelectvue_type_script_lang_js_);
12041
- ;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/poperSelect/PoperSelect.vue?vue&type=style&index=0&id=63ef43d4&prod&lang=scss&
12052
+ ;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/poperSelect/PoperSelect.vue?vue&type=style&index=0&id=5888a1e4&prod&lang=scss&
12042
12053
  // extracted by mini-css-extract-plugin
12043
12054
 
12044
- ;// CONCATENATED MODULE: ./src/components/controls/poperSelect/PoperSelect.vue?vue&type=style&index=0&id=63ef43d4&prod&lang=scss&
12055
+ ;// CONCATENATED MODULE: ./src/components/controls/poperSelect/PoperSelect.vue?vue&type=style&index=0&id=5888a1e4&prod&lang=scss&
12045
12056
 
12046
12057
  // EXTERNAL MODULE: ./node_modules/@vue/vue-loader-v15/lib/runtime/componentNormalizer.js
12047
12058
  var componentNormalizer = __webpack_require__(70713);
@@ -35939,7 +35950,7 @@ var Print = /*#__PURE__*/function () {
35939
35950
  key: "printToPDF",
35940
35951
  value: function () {
35941
35952
  var _printToPDF = (0,asyncToGenerator/* default */.Z)( /*#__PURE__*/(0,regeneratorRuntime/* default */.Z)().mark(function _callee2(hoEditorFactoryID, PDF, type, fileName, reslove, positionY, format) {
35942
- var hoEditorFactory, dPage, docHeight, dHeight, startPageNum, svgBox, orientation, width, height, last, pageNumber, startPageNumOver, _iterator, _step, index, cpage, mainHeight, lastDline, dShape, posIndex, posY, _dShape, svg2pdfOptions, _cpage$drawDomLevel, _cpage$drawDomLevel$s, ctx, pageSize, _cpage$drawDomLevel2, _cpage$drawDomLevel2$, _ctx, _ctx2, _svgBox2, svgData, _ctx3, _cpage$drawDomLevel$s2, _svgBox, printStyle, exportHtml, url, link, _last, otherPageNumber, i, name;
35953
+ var hoEditorFactory, dPage, docHeight, dHeight, startPageNum, svgBox, orientation, width, height, last, pageNumber, startPageNumOver, _iterator, _step, index, cpage, children, mainHeight, lastDline, dShape, posIndex, posY, _dShape, svg2pdfOptions, _cpage$drawDomLevel, _cpage$drawDomLevel$s, ctx, pageSize, _cpage$drawDomLevel2, _cpage$drawDomLevel2$, _ctx, _ctx2, _svgBox2, svgData, _ctx3, _cpage$drawDomLevel$s2, _svgBox, printStyle, exportHtml, url, link, _last, otherPageNumber, i, name;
35943
35954
  return (0,regeneratorRuntime/* default */.Z)().wrap(function _callee2$(_context3) {
35944
35955
  while (1) {
35945
35956
  switch (_context3.prev = _context3.next) {
@@ -35991,7 +36002,7 @@ var Print = /*#__PURE__*/function () {
35991
36002
  _iterator.s();
35992
36003
  case 19:
35993
36004
  if ((_step = _iterator.n()).done) {
35994
- _context3.next = 66;
36005
+ _context3.next = 67;
35995
36006
  break;
35996
36007
  }
35997
36008
  index = _step.value;
@@ -36000,22 +36011,32 @@ var Print = /*#__PURE__*/function () {
36000
36011
  break;
36001
36012
  }
36002
36013
  message/* default.info */.Z.info('请进行翻页');
36003
- return _context3.abrupt("continue", 64);
36014
+ return _context3.abrupt("continue", 65);
36004
36015
  case 24:
36005
36016
  last = index;
36006
36017
  if (!(index < hoEditorFactory.startPageNum)) {
36007
36018
  _context3.next = 27;
36008
36019
  break;
36009
36020
  }
36010
- return _context3.abrupt("break", 66);
36021
+ return _context3.abrupt("break", 67);
36011
36022
  case 27:
36012
- cpage = hoEditorFactory.drawTree.drawPages[index];
36013
- if (!(index === hoEditorFactory.drawTree.drawPages.length - 1 && cpage.drawMainDoc.children.length === 2 && !(cpage.drawMainDoc.children[0] instanceof DrawPageTable/* DrawPageTable */.ox) && cpage.drawMainDoc.children[1] && cpage.drawMainDoc.children[1].drawItems.length === 0)) {
36014
- _context3.next = 30;
36023
+ cpage = hoEditorFactory.drawTree.drawPages[index]; // if (
36024
+ // index === hoEditorFactory.drawTree.drawPages.length - 1 &&
36025
+ // cpage.drawMainDoc.children.length === 2 &&
36026
+ // !(cpage.drawMainDoc.children[0] instanceof DrawPageTable) &&
36027
+ // cpage.drawMainDoc.children[1] &&
36028
+ // (cpage.drawMainDoc.children[1] as any).drawItems.length === 0
36029
+ // ) {
36030
+ // console.log('??????');
36031
+ // break;
36032
+ // }
36033
+ children = cpage.drawMainDoc.children;
36034
+ if (!(children.length == 2 && !(children[0] instanceof DrawPageTable/* DrawPageTable */.ox) && children[1] && children[1].drawItems.length == 0 || children.length == 1 && children[0] instanceof DrawLine/* DrawLine */.a && children[0].drawItems.length == 0)) {
36035
+ _context3.next = 31;
36015
36036
  break;
36016
36037
  }
36017
- return _context3.abrupt("break", 66);
36018
- case 30:
36038
+ return _context3.abrupt("continue", 65);
36039
+ case 31:
36019
36040
  if (cpage.drawDomLevel && !cpage.drawDomLevel.stage) {
36020
36041
  cpage.drawDomLevel.bindStage();
36021
36042
  cpage.needUpdateStage = true;
@@ -36023,8 +36044,8 @@ var Print = /*#__PURE__*/function () {
36023
36044
  // 合并续打: 上一页还有空余时续打起始页隐藏页脚
36024
36045
  if (index === hoEditorFactory.startPageNum && positionY) {
36025
36046
  mainHeight = cpage.drawMainDoc.y;
36026
- if (cpage.drawMainDoc.children.length > 0) {
36027
- lastDline = cpage.drawMainDoc.children[cpage.drawMainDoc.children.length - 1];
36047
+ if (children.length > 0) {
36048
+ lastDline = children[children.length - 1];
36028
36049
  mainHeight += lastDline.y + lastDline.dHeight;
36029
36050
  }
36030
36051
  if (mainHeight - positionY <= 10) {
@@ -36065,7 +36086,7 @@ var Print = /*#__PURE__*/function () {
36065
36086
  }
36066
36087
  }
36067
36088
  if (!(hoEditorFactory.isUseImagePrint && type !== 'html')) {
36068
- _context3.next = 49;
36089
+ _context3.next = 50;
36069
36090
  break;
36070
36091
  }
36071
36092
  PDF === null || PDF === void 0 ? void 0 : PDF.addPage();
@@ -36085,9 +36106,9 @@ var Print = /*#__PURE__*/function () {
36085
36106
 
36086
36107
  ctx && ((_cpage$drawDomLevel = cpage.drawDomLevel) === null || _cpage$drawDomLevel === void 0 ? void 0 : (_cpage$drawDomLevel$s = _cpage$drawDomLevel.stage) === null || _cpage$drawDomLevel$s === void 0 ? void 0 : _cpage$drawDomLevel$s.draw(ctx));
36087
36108
  ctx = null;
36088
- _context3.next = 63;
36109
+ _context3.next = 64;
36089
36110
  break;
36090
- case 49:
36111
+ case 50:
36091
36112
  _ctx = new canvas2svg({
36092
36113
  width: width,
36093
36114
  height: height,
@@ -36095,61 +36116,61 @@ var Print = /*#__PURE__*/function () {
36095
36116
  });
36096
36117
  _ctx && ((_cpage$drawDomLevel2 = cpage.drawDomLevel) === null || _cpage$drawDomLevel2 === void 0 ? void 0 : (_cpage$drawDomLevel2$ = _cpage$drawDomLevel2.stage) === null || _cpage$drawDomLevel2$ === void 0 ? void 0 : _cpage$drawDomLevel2$.draw(_ctx));
36097
36118
  if (!(type === 'html')) {
36098
- _context3.next = 56;
36119
+ _context3.next = 57;
36099
36120
  break;
36100
36121
  }
36101
36122
  svgData = (_ctx2 = _ctx) === null || _ctx2 === void 0 ? void 0 : _ctx2.getSvg();
36102
36123
  svgData && ((_svgBox2 = svgBox) === null || _svgBox2 === void 0 ? void 0 : _svgBox2.appendChild(svgData));
36103
- _context3.next = 62;
36124
+ _context3.next = 63;
36104
36125
  break;
36105
- case 56:
36126
+ case 57:
36106
36127
  PDF === null || PDF === void 0 ? void 0 : PDF.addPage();
36107
36128
  pageNumber++;
36108
36129
  _context3.t0 = PDF;
36109
36130
  if (!_context3.t0) {
36110
- _context3.next = 62;
36131
+ _context3.next = 63;
36111
36132
  break;
36112
36133
  }
36113
- _context3.next = 62;
36134
+ _context3.next = 63;
36114
36135
  return svg2pdf((_ctx3 = _ctx) === null || _ctx3 === void 0 ? void 0 : _ctx3.getSvg(), PDF, svg2pdfOptions);
36115
- case 62:
36116
- _ctx = null;
36117
36136
  case 63:
36137
+ _ctx = null;
36138
+ case 64:
36118
36139
  if (index > 0 && cpage.drawDomLevel) {
36119
36140
  (_cpage$drawDomLevel$s2 = cpage.drawDomLevel.stage) === null || _cpage$drawDomLevel$s2 === void 0 ? void 0 : _cpage$drawDomLevel$s2.removeAllChildren();
36120
36141
  cpage.drawDomLevel.clearStage();
36121
36142
  }
36122
36143
  // index > 0 && cpage.drawDomLevel?.clearStage();
36123
- case 64:
36144
+ case 65:
36124
36145
  _context3.next = 19;
36125
36146
  break;
36126
- case 66:
36127
- _context3.next = 71;
36147
+ case 67:
36148
+ _context3.next = 72;
36128
36149
  break;
36129
- case 68:
36130
- _context3.prev = 68;
36150
+ case 69:
36151
+ _context3.prev = 69;
36131
36152
  _context3.t1 = _context3["catch"](17);
36132
36153
  _iterator.e(_context3.t1);
36133
- case 71:
36134
- _context3.prev = 71;
36154
+ case 72:
36155
+ _context3.prev = 72;
36135
36156
  _iterator.f();
36136
- return _context3.finish(71);
36137
- case 74:
36157
+ return _context3.finish(72);
36158
+ case 75:
36138
36159
  console.timeEnd('绘制svg和生成pdf');
36139
36160
  if (hoEditorFactory.printStatus.printRange !== PrintRange.prSelected) hoEditorFactory.printStatus.recordLastPosByPageIndex(last);
36140
36161
  hoEditorFactory.printStatus.DrawPrintRange().PrintOver();
36141
36162
  if (!(type === 'html')) {
36142
- _context3.next = 94;
36163
+ _context3.next = 95;
36143
36164
  break;
36144
36165
  }
36145
36166
  if (!(svgBox && svgBox.childNodes.length === 0)) {
36146
- _context3.next = 82;
36167
+ _context3.next = 83;
36147
36168
  break;
36148
36169
  }
36149
36170
  message/* default.info */.Z.info('无新增内容');
36150
36171
  reslove && reslove('printend');
36151
36172
  return _context3.abrupt("return");
36152
- case 82:
36173
+ case 83:
36153
36174
  printStyle = (0,util/* createPrintHTMLStyle */.j_)(hoEditorFactory.pageProperty.pageSize, orientation);
36154
36175
  exportHtml = "\n <!DOCTYPE html>\n <html lang=\"en\">\n <head>\n <meta charset=\"utf-8\">\n <style>".concat(printStyle.innerHTML, "</style>\n </head>\n <body>").concat((_svgBox = svgBox) === null || _svgBox === void 0 ? void 0 : _svgBox.innerHTML, "</body>\n </html>\n ");
36155
36176
  url = window.URL.createObjectURL(new Blob([exportHtml], {
@@ -36166,20 +36187,20 @@ var Print = /*#__PURE__*/function () {
36166
36187
  }, 100);
36167
36188
  reslove && reslove('printend');
36168
36189
  return _context3.abrupt("return");
36169
- case 94:
36190
+ case 95:
36170
36191
  if (!(positionY || hoEditorFactory.startPageNum !== 0 && positionY !== undefined)) {
36171
- _context3.next = 100;
36192
+ _context3.next = 101;
36172
36193
  break;
36173
36194
  }
36174
36195
  _last = hoEditorFactory.printStatus.printRecord.last();
36175
36196
  if (!(_last && hoEditorFactory.startPageNum == _last[0] && positionY === _last[1])) {
36176
- _context3.next = 100;
36197
+ _context3.next = 101;
36177
36198
  break;
36178
36199
  }
36179
36200
  message/* default.info */.Z.info('无新增内容无法续打,如果要打印最后一份病历,请打开打印记录,删除最近一次打印记录');
36180
36201
  reslove && reslove('printend');
36181
36202
  return _context3.abrupt("return");
36182
- case 100:
36203
+ case 101:
36183
36204
  if (type === 'pdf') {
36184
36205
  PDF === null || PDF === void 0 ? void 0 : PDF.deletePage(1);
36185
36206
  PDF === null || PDF === void 0 ? void 0 : PDF.save(fileName + '.pdf');
@@ -36202,12 +36223,12 @@ var Print = /*#__PURE__*/function () {
36202
36223
  PDF && this.openDataUriInWindow(PDF, name, hoEditorFactory.pageProperty.widthPixes, hoEditorFactory.printSilently);
36203
36224
  }
36204
36225
  reslove && reslove('printend');
36205
- case 102:
36226
+ case 103:
36206
36227
  case "end":
36207
36228
  return _context3.stop();
36208
36229
  }
36209
36230
  }
36210
- }, _callee2, this, [[17, 68, 71, 74]]);
36231
+ }, _callee2, this, [[17, 69, 72, 75]]);
36211
36232
  }));
36212
36233
  function printToPDF(_x2, _x3, _x4, _x5, _x6, _x7, _x8) {
36213
36234
  return _printToPDF.apply(this, arguments);
@@ -36218,7 +36239,7 @@ var Print = /*#__PURE__*/function () {
36218
36239
  key: "createPDFBase64",
36219
36240
  value: function () {
36220
36241
  var _createPDFBase = (0,asyncToGenerator/* default */.Z)( /*#__PURE__*/(0,regeneratorRuntime/* default */.Z)().mark(function _callee3(hoEditorFactoryID, reslove, PDF) {
36221
- var hoEditorFactory, orientation, svgBox, last, pageNumber, _iterator2, _step2, _cpage$drawDomLevel5, index, cpage, _cpage$drawDomLevel3, _cpage$drawDomLevel3$, ctx, _cpage$drawDomLevel4, _cpage$drawDomLevel4$, _ctx5, _ctx4;
36242
+ var hoEditorFactory, orientation, svgBox, last, pageNumber, _iterator2, _step2, _cpage$drawDomLevel5, index, cpage, children, _cpage$drawDomLevel3, _cpage$drawDomLevel3$, ctx, _cpage$drawDomLevel4, _cpage$drawDomLevel4$, _ctx5, _ctx4;
36222
36243
  return (0,regeneratorRuntime/* default */.Z)().wrap(function _callee3$(_context4) {
36223
36244
  while (1) {
36224
36245
  switch (_context4.prev = _context4.next) {
@@ -36239,7 +36260,7 @@ var Print = /*#__PURE__*/function () {
36239
36260
  _iterator2.s();
36240
36261
  case 12:
36241
36262
  if ((_step2 = _iterator2.n()).done) {
36242
- _context4.next = 42;
36263
+ _context4.next = 43;
36243
36264
  break;
36244
36265
  }
36245
36266
  index = _step2.value;
@@ -36248,16 +36269,25 @@ var Print = /*#__PURE__*/function () {
36248
36269
  break;
36249
36270
  }
36250
36271
  message/* default.info */.Z.info('请进行翻页');
36251
- return _context4.abrupt("continue", 40);
36272
+ return _context4.abrupt("continue", 41);
36252
36273
  case 17:
36253
36274
  last = index;
36254
- cpage = hoEditorFactory.drawTree.drawPages[index];
36255
- if (!(index === hoEditorFactory.drawTree.drawPages.length - 1 && cpage.drawMainDoc.children.length === 2 && !(cpage.drawMainDoc.children[0] instanceof DrawPageTable/* DrawPageTable */.ox) && cpage.drawMainDoc.children[1] && cpage.drawMainDoc.children[1].drawItems.length === 0)) {
36256
- _context4.next = 21;
36275
+ cpage = hoEditorFactory.drawTree.drawPages[index]; // if (
36276
+ // index === hoEditorFactory.drawTree.drawPages.length - 1 &&
36277
+ // cpage.drawMainDoc.children.length === 2 &&
36278
+ // !(cpage.drawMainDoc.children[0] instanceof DrawPageTable) &&
36279
+ // cpage.drawMainDoc.children[1] &&
36280
+ // (cpage.drawMainDoc.children[1] as any).drawItems.length === 0
36281
+ // ) {
36282
+ // break;
36283
+ // }
36284
+ children = cpage.drawMainDoc.children;
36285
+ if (!(children.length == 2 && !(children[0] instanceof DrawPageTable/* DrawPageTable */.ox) && children[1] && children[1].drawItems.length == 0 || children.length == 1 && children[0] instanceof DrawLine/* DrawLine */.a && children[0].drawItems.length == 0)) {
36286
+ _context4.next = 22;
36257
36287
  break;
36258
36288
  }
36259
- return _context4.abrupt("break", 42);
36260
- case 21:
36289
+ return _context4.abrupt("continue", 41);
36290
+ case 22:
36261
36291
  if (cpage.drawDomLevel && !cpage.drawDomLevel.stage) {
36262
36292
  cpage.drawDomLevel.bindStage();
36263
36293
  cpage.needUpdateStage = true;
@@ -36267,7 +36297,7 @@ var Print = /*#__PURE__*/function () {
36267
36297
  cpage.needUpdateStage = false;
36268
36298
  }
36269
36299
  if (!hoEditorFactory.isUseImagePrint) {
36270
- _context4.next = 32;
36300
+ _context4.next = 33;
36271
36301
  break;
36272
36302
  }
36273
36303
  PDF === null || PDF === void 0 ? void 0 : PDF.addPage();
@@ -36276,9 +36306,9 @@ var Print = /*#__PURE__*/function () {
36276
36306
  window.printBlack = hoEditorFactory.printBlack;
36277
36307
  ctx && ((_cpage$drawDomLevel3 = cpage.drawDomLevel) === null || _cpage$drawDomLevel3 === void 0 ? void 0 : (_cpage$drawDomLevel3$ = _cpage$drawDomLevel3.stage) === null || _cpage$drawDomLevel3$ === void 0 ? void 0 : _cpage$drawDomLevel3$.draw(ctx));
36278
36308
  ctx = null;
36279
- _context4.next = 39;
36309
+ _context4.next = 40;
36280
36310
  break;
36281
- case 32:
36311
+ case 33:
36282
36312
  _ctx4 = new canvas2svg({
36283
36313
  width: hoEditorFactory.pageProperty.widthPixes,
36284
36314
  height: orientation === 'l' ? hoEditorFactory.pageProperty.heightPixes - 1 : hoEditorFactory.pageProperty.heightPixes,
@@ -36287,38 +36317,38 @@ var Print = /*#__PURE__*/function () {
36287
36317
  _ctx4 && ((_cpage$drawDomLevel4 = cpage.drawDomLevel) === null || _cpage$drawDomLevel4 === void 0 ? void 0 : (_cpage$drawDomLevel4$ = _cpage$drawDomLevel4.stage) === null || _cpage$drawDomLevel4$ === void 0 ? void 0 : _cpage$drawDomLevel4$.draw(_ctx4));
36288
36318
  PDF.addPage();
36289
36319
  pageNumber++;
36290
- _context4.next = 38;
36320
+ _context4.next = 39;
36291
36321
  return svg2pdf((_ctx5 = _ctx4) === null || _ctx5 === void 0 ? void 0 : _ctx5.getSvg(), PDF);
36292
- case 38:
36293
- _ctx4 = null;
36294
36322
  case 39:
36295
- index > 0 && ((_cpage$drawDomLevel5 = cpage.drawDomLevel) === null || _cpage$drawDomLevel5 === void 0 ? void 0 : _cpage$drawDomLevel5.clearStage());
36323
+ _ctx4 = null;
36296
36324
  case 40:
36325
+ index > 0 && ((_cpage$drawDomLevel5 = cpage.drawDomLevel) === null || _cpage$drawDomLevel5 === void 0 ? void 0 : _cpage$drawDomLevel5.clearStage());
36326
+ case 41:
36297
36327
  _context4.next = 12;
36298
36328
  break;
36299
- case 42:
36300
- _context4.next = 47;
36329
+ case 43:
36330
+ _context4.next = 48;
36301
36331
  break;
36302
- case 44:
36303
- _context4.prev = 44;
36332
+ case 45:
36333
+ _context4.prev = 45;
36304
36334
  _context4.t0 = _context4["catch"](10);
36305
36335
  _iterator2.e(_context4.t0);
36306
- case 47:
36307
- _context4.prev = 47;
36336
+ case 48:
36337
+ _context4.prev = 48;
36308
36338
  _iterator2.f();
36309
- return _context4.finish(47);
36310
- case 50:
36339
+ return _context4.finish(48);
36340
+ case 51:
36311
36341
  if (hoEditorFactory.printStatus.printRange !== PrintRange.prSelected) {
36312
36342
  hoEditorFactory.printStatus.recordLastPosByPageIndex(last);
36313
36343
  }
36314
36344
  hoEditorFactory.printStatus.DrawPrintRange().PrintOver();
36315
36345
  reslove && reslove(pageNumber);
36316
- case 53:
36346
+ case 54:
36317
36347
  case "end":
36318
36348
  return _context4.stop();
36319
36349
  }
36320
36350
  }
36321
- }, _callee3, null, [[10, 44, 47, 50]]);
36351
+ }, _callee3, null, [[10, 45, 48, 51]]);
36322
36352
  }));
36323
36353
  function createPDFBase64(_x9, _x10, _x11) {
36324
36354
  return _createPDFBase.apply(this, arguments);
@@ -36329,7 +36359,7 @@ var Print = /*#__PURE__*/function () {
36329
36359
  key: "createHTML",
36330
36360
  value: function () {
36331
36361
  var _createHTML = (0,asyncToGenerator/* default */.Z)( /*#__PURE__*/(0,regeneratorRuntime/* default */.Z)().mark(function _callee4(hoEditorFactoryID, reslove, htmlText) {
36332
- var hoEditorFactory, svgBox, orientation, width, height, last, _iterator3, _step3, _cpage$drawDomLevel6, _cpage$drawDomLevel6$, _cpage$drawDomLevel7, index, cpage, ctx, svgData, printStyle;
36362
+ var hoEditorFactory, svgBox, orientation, width, height, last, _iterator3, _step3, _cpage$drawDomLevel6, _cpage$drawDomLevel6$, _cpage$drawDomLevel7, index, cpage, children, ctx, svgData, printStyle;
36333
36363
  return (0,regeneratorRuntime/* default */.Z)().wrap(function _callee4$(_context5) {
36334
36364
  while (1) {
36335
36365
  switch (_context5.prev = _context5.next) {
@@ -36348,7 +36378,7 @@ var Print = /*#__PURE__*/function () {
36348
36378
  _iterator3.s();
36349
36379
  case 12:
36350
36380
  if ((_step3 = _iterator3.n()).done) {
36351
- _context5.next = 30;
36381
+ _context5.next = 31;
36352
36382
  break;
36353
36383
  }
36354
36384
  index = _step3.value;
@@ -36357,16 +36387,25 @@ var Print = /*#__PURE__*/function () {
36357
36387
  break;
36358
36388
  }
36359
36389
  message/* default.info */.Z.info('请进行翻页');
36360
- return _context5.abrupt("continue", 28);
36390
+ return _context5.abrupt("continue", 29);
36361
36391
  case 17:
36362
36392
  last = index;
36363
- cpage = hoEditorFactory.drawTree.drawPages[index];
36364
- if (!(index === hoEditorFactory.drawTree.drawPages.length - 1 && cpage.drawMainDoc.children.length === 2 && !(cpage.drawMainDoc.children[0] instanceof DrawPageTable/* DrawPageTable */.ox) && cpage.drawMainDoc.children[1] && cpage.drawMainDoc.children[1].drawItems.length === 0)) {
36365
- _context5.next = 21;
36393
+ cpage = hoEditorFactory.drawTree.drawPages[index]; // if (
36394
+ // index === hoEditorFactory.drawTree.drawPages.length - 1 &&
36395
+ // cpage.drawMainDoc.children.length === 2 &&
36396
+ // !(cpage.drawMainDoc.children[0] instanceof DrawPageTable) &&
36397
+ // cpage.drawMainDoc.children[1] &&
36398
+ // (cpage.drawMainDoc.children[1] as any).drawItems.length === 0
36399
+ // ) {
36400
+ // break;
36401
+ // }
36402
+ children = cpage.drawMainDoc.children;
36403
+ if (!(children.length == 2 && !(children[0] instanceof DrawPageTable/* DrawPageTable */.ox) && children[1] && children[1].drawItems.length == 0 || children.length == 1 && children[0] instanceof DrawLine/* DrawLine */.a && children[0].drawItems.length == 0)) {
36404
+ _context5.next = 22;
36366
36405
  break;
36367
36406
  }
36368
- return _context5.abrupt("break", 30);
36369
- case 21:
36407
+ return _context5.abrupt("continue", 29);
36408
+ case 22:
36370
36409
  if (cpage.drawDomLevel && !cpage.drawDomLevel.stage) {
36371
36410
  cpage.drawDomLevel.bindStage();
36372
36411
  cpage.needUpdateStage = true;
@@ -36384,21 +36423,21 @@ var Print = /*#__PURE__*/function () {
36384
36423
  svgData = ctx === null || ctx === void 0 ? void 0 : ctx.getSvg();
36385
36424
  svgBox === null || svgBox === void 0 ? void 0 : svgBox.appendChild(svgData);
36386
36425
  index > 0 && ((_cpage$drawDomLevel7 = cpage.drawDomLevel) === null || _cpage$drawDomLevel7 === void 0 ? void 0 : _cpage$drawDomLevel7.clearStage());
36387
- case 28:
36426
+ case 29:
36388
36427
  _context5.next = 12;
36389
36428
  break;
36390
- case 30:
36391
- _context5.next = 35;
36429
+ case 31:
36430
+ _context5.next = 36;
36392
36431
  break;
36393
- case 32:
36394
- _context5.prev = 32;
36432
+ case 33:
36433
+ _context5.prev = 33;
36395
36434
  _context5.t0 = _context5["catch"](10);
36396
36435
  _iterator3.e(_context5.t0);
36397
- case 35:
36398
- _context5.prev = 35;
36436
+ case 36:
36437
+ _context5.prev = 36;
36399
36438
  _iterator3.f();
36400
- return _context5.finish(35);
36401
- case 38:
36439
+ return _context5.finish(36);
36440
+ case 39:
36402
36441
  if (hoEditorFactory.printStatus.printRange !== PrintRange.prSelected) {
36403
36442
  hoEditorFactory.printStatus.recordLastPosByPageIndex(last);
36404
36443
  }
@@ -36406,12 +36445,12 @@ var Print = /*#__PURE__*/function () {
36406
36445
  printStyle = (0,util/* createPrintHTMLStyle */.j_)(hoEditorFactory.pageProperty.pageSize, orientation);
36407
36446
  htmlText.text = "\n <!DOCTYPE html>\n <html lang=\"en\">\n <head>\n <meta charset=\"utf-8\">\n <style>".concat(printStyle.innerHTML, "</style>\n </head>\n <body>").concat(svgBox === null || svgBox === void 0 ? void 0 : svgBox.innerHTML, "</body>\n </html>\n ");
36408
36447
  reslove && reslove('printend');
36409
- case 43:
36448
+ case 44:
36410
36449
  case "end":
36411
36450
  return _context5.stop();
36412
36451
  }
36413
36452
  }
36414
- }, _callee4, null, [[10, 32, 35, 38]]);
36453
+ }, _callee4, null, [[10, 33, 36, 39]]);
36415
36454
  }));
36416
36455
  function createHTML(_x12, _x13, _x14) {
36417
36456
  return _createHTML.apply(this, arguments);
@@ -36422,7 +36461,7 @@ var Print = /*#__PURE__*/function () {
36422
36461
  key: "printAllNew",
36423
36462
  value: function () {
36424
36463
  var _printAllNew = (0,asyncToGenerator/* default */.Z)( /*#__PURE__*/(0,regeneratorRuntime/* default */.Z)().mark(function _callee5(hoEditorFactoryID, reslove, PDF, position, isPrintFirstDoc) {
36425
- var hoEditorFactory, a4Size, svgBox, last, widthPixes, heightPixes, orientation, formats, format, svg2pdfOptions, firstPageIndex, _iterator4, _step4, _cpage$drawDomLevel10, index, cpage, _cpage$drawDomLevel8, _cpage$drawDomLevel8$, pageSize, ctx, _cpage$drawDomLevel9, _cpage$drawDomLevel9$, _ctx7, _ctx6, lastPos;
36464
+ var hoEditorFactory, a4Size, svgBox, last, widthPixes, heightPixes, orientation, formats, format, svg2pdfOptions, firstPageIndex, _iterator4, _step4, _cpage$drawDomLevel10, index, cpage, children, _cpage$drawDomLevel8, _cpage$drawDomLevel8$, pageSize, ctx, _cpage$drawDomLevel9, _cpage$drawDomLevel9$, _ctx7, _ctx6, lastPos;
36426
36465
  return (0,regeneratorRuntime/* default */.Z)().wrap(function _callee5$(_context6) {
36427
36466
  while (1) {
36428
36467
  switch (_context6.prev = _context6.next) {
@@ -36471,7 +36510,7 @@ var Print = /*#__PURE__*/function () {
36471
36510
  _iterator4.s();
36472
36511
  case 19:
36473
36512
  if ((_step4 = _iterator4.n()).done) {
36474
- _context6.next = 54;
36513
+ _context6.next = 55;
36475
36514
  break;
36476
36515
  }
36477
36516
  index = _step4.value;
@@ -36480,13 +36519,13 @@ var Print = /*#__PURE__*/function () {
36480
36519
  break;
36481
36520
  }
36482
36521
  message/* default.info */.Z.info('请进行翻页');
36483
- return _context6.abrupt("continue", 52);
36522
+ return _context6.abrupt("continue", 53);
36484
36523
  case 24:
36485
36524
  if (!(index < firstPageIndex)) {
36486
36525
  _context6.next = 26;
36487
36526
  break;
36488
36527
  }
36489
- return _context6.abrupt("continue", 52);
36528
+ return _context6.abrupt("continue", 53);
36490
36529
  case 26:
36491
36530
  last = index;
36492
36531
  cpage = hoEditorFactory.drawTree.drawPages[index];
@@ -36498,14 +36537,25 @@ var Print = /*#__PURE__*/function () {
36498
36537
  cpage.drawDomLevel.stage.update();
36499
36538
  cpage.needUpdateStage = false;
36500
36539
  }
36501
- if (!(index === hoEditorFactory.drawTree.drawPages.length - 1 && cpage.drawMainDoc.children.length === 2 && !(cpage.drawMainDoc.children[0] instanceof DrawPageTable/* DrawPageTable */.ox) && cpage.drawMainDoc.children[1] && cpage.drawMainDoc.children[1].drawItems.length === 0)) {
36502
- _context6.next = 32;
36540
+ // if (
36541
+ // index === hoEditorFactory.drawTree.drawPages.length - 1 &&
36542
+ // cpage.drawMainDoc.children.length === 2 &&
36543
+ // !(cpage.drawMainDoc.children[0] instanceof DrawPageTable) &&
36544
+ // cpage.drawMainDoc.children[1] &&
36545
+ // (cpage.drawMainDoc.children[1] as any).drawItems.length === 0
36546
+ // ) {
36547
+ // console.log('??????');
36548
+ // break;
36549
+ // }
36550
+ children = cpage.drawMainDoc.children;
36551
+ if (!(children.length == 2 && !(children[0] instanceof DrawPageTable/* DrawPageTable */.ox) && children[1] && children[1].drawItems.length == 0 || children.length == 1 && children[0] instanceof DrawLine/* DrawLine */.a && children[0].drawItems.length == 0)) {
36552
+ _context6.next = 33;
36503
36553
  break;
36504
36554
  }
36505
- return _context6.abrupt("break", 54);
36506
- case 32:
36555
+ return _context6.abrupt("continue", 53);
36556
+ case 33:
36507
36557
  if (!hoEditorFactory.isUseImagePrint) {
36508
- _context6.next = 45;
36558
+ _context6.next = 46;
36509
36559
  break;
36510
36560
  }
36511
36561
  pageSize = JSON.stringify([hoEditorFactory.pageProperty.widthMm, hoEditorFactory.pageProperty.heightMm]);
@@ -36537,9 +36587,9 @@ var Print = /*#__PURE__*/function () {
36537
36587
  ctx.posY = svg2pdfOptions.y;
36538
36588
  ctx && ((_cpage$drawDomLevel8 = cpage.drawDomLevel) === null || _cpage$drawDomLevel8 === void 0 ? void 0 : (_cpage$drawDomLevel8$ = _cpage$drawDomLevel8.stage) === null || _cpage$drawDomLevel8$ === void 0 ? void 0 : _cpage$drawDomLevel8$.draw(ctx));
36539
36589
  ctx = null;
36540
- _context6.next = 51;
36590
+ _context6.next = 52;
36541
36591
  break;
36542
- case 45:
36592
+ case 46:
36543
36593
  _ctx6 = new canvas2svg({
36544
36594
  width: widthPixes,
36545
36595
  height: orientation === 'l' ? heightPixes - 1 : heightPixes,
@@ -36551,27 +36601,27 @@ var Print = /*#__PURE__*/function () {
36551
36601
  } else {
36552
36602
  PDF === null || PDF === void 0 ? void 0 : PDF.addPage(format, orientation);
36553
36603
  }
36554
- _context6.next = 50;
36604
+ _context6.next = 51;
36555
36605
  return svg2pdf((_ctx7 = _ctx6) === null || _ctx7 === void 0 ? void 0 : _ctx7.getSvg(), PDF, svg2pdfOptions);
36556
- case 50:
36557
- _ctx6 = null;
36558
36606
  case 51:
36559
- index > 0 && ((_cpage$drawDomLevel10 = cpage.drawDomLevel) === null || _cpage$drawDomLevel10 === void 0 ? void 0 : _cpage$drawDomLevel10.clearStage());
36607
+ _ctx6 = null;
36560
36608
  case 52:
36609
+ index > 0 && ((_cpage$drawDomLevel10 = cpage.drawDomLevel) === null || _cpage$drawDomLevel10 === void 0 ? void 0 : _cpage$drawDomLevel10.clearStage());
36610
+ case 53:
36561
36611
  _context6.next = 19;
36562
36612
  break;
36563
- case 54:
36564
- _context6.next = 59;
36613
+ case 55:
36614
+ _context6.next = 60;
36565
36615
  break;
36566
- case 56:
36567
- _context6.prev = 56;
36616
+ case 57:
36617
+ _context6.prev = 57;
36568
36618
  _context6.t0 = _context6["catch"](17);
36569
36619
  _iterator4.e(_context6.t0);
36570
- case 59:
36571
- _context6.prev = 59;
36620
+ case 60:
36621
+ _context6.prev = 60;
36572
36622
  _iterator4.f();
36573
- return _context6.finish(59);
36574
- case 62:
36623
+ return _context6.finish(60);
36624
+ case 63:
36575
36625
  if (hoEditorFactory.printStatus.printRange !== PrintRange.prSelected) {
36576
36626
  hoEditorFactory.printStatus.recordLastPosByPageIndex(last);
36577
36627
  }
@@ -36585,12 +36635,12 @@ var Print = /*#__PURE__*/function () {
36585
36635
  }
36586
36636
  hoEditorFactory.printStatus.DrawPrintRange().PrintOver();
36587
36637
  reslove();
36588
- case 66:
36638
+ case 67:
36589
36639
  case "end":
36590
36640
  return _context6.stop();
36591
36641
  }
36592
36642
  }
36593
- }, _callee5, null, [[17, 56, 59, 62]]);
36643
+ }, _callee5, null, [[17, 57, 60, 63]]);
36594
36644
  }));
36595
36645
  function printAllNew(_x15, _x16, _x17, _x18, _x19) {
36596
36646
  return _printAllNew.apply(this, arguments);
@@ -37894,7 +37944,7 @@ var DocController = /*#__PURE__*/function () {
37894
37944
  }
37895
37945
  }, {
37896
37946
  key: "insertALine",
37897
- value: function insertALine(hoEditorFactory, path, lineText, roots, pNode, curTextStyle, node, childIndex, isEndLine, aresolve, oldCanModifyContent) {
37947
+ value: function insertALine(hoEditorFactory, path, lineText, roots, pNode, curTextStyle, node, childIndex, isEndLine, aresolve, oldCanModifyContent, isUpdate) {
37898
37948
  var _this = this;
37899
37949
  // const startTagLen = "<元素>".length;
37900
37950
  // let istart = lineText.indexOf("<元素>");
@@ -37973,7 +38023,7 @@ var DocController = /*#__PURE__*/function () {
37973
38023
  strPath = hoEditorFactory.docTree.getNodeLastPath(textNode);
37974
38024
  } else {
37975
38025
  var _textNode = new _treeNode_TextNode__WEBPACK_IMPORTED_MODULE_26__/* .TextNode */ .R(_this._hoEditorFactoryID, roots, pNode, _treeNode_BaseNode__WEBPACK_IMPORTED_MODULE_23__/* .NodeType.ntText */ .Jq.ntText, aText, hoEditorFactory.docTree.curStyleIndex);
37976
- strPath = _this.insertNodeByPath(strPath, _textNode, oldCanModifyContent == undefined ? false : true, isHasRelateEle && index > 1 ? true : false);
38026
+ strPath = _this.insertNodeByPath(strPath, _textNode, isUpdate, isHasRelateEle && index > 1 ? true : false);
37977
38027
  }
37978
38028
  } else {
37979
38029
  var styleIndex = hoEditorFactory.docTree.curStyleIndex;
@@ -37986,7 +38036,7 @@ var DocController = /*#__PURE__*/function () {
37986
38036
  styleIndex = hoEditorFactory.docTree.styleCompare(newStyle);
37987
38037
  }
37988
38038
  var _textNode2 = new _treeNode_TextNode__WEBPACK_IMPORTED_MODULE_26__/* .TextNode */ .R(_this._hoEditorFactoryID, roots, pNode, _treeNode_BaseNode__WEBPACK_IMPORTED_MODULE_23__/* .NodeType.ntText */ .Jq.ntText, aText, styleIndex);
37989
- strPath = _this.insertNodeByPath(strPath, _textNode2, oldCanModifyContent == undefined ? false : true, isHasRelateEle && index > 1 ? true : false);
38039
+ strPath = _this.insertNodeByPath(strPath, _textNode2, isUpdate, isHasRelateEle && index > 1 ? true : false);
37990
38040
  }
37991
38041
  // if (index === arrSubString.length - 1 && isEndLine && oldCanModifyContent !== undefined && pNode instanceof TextInputFieldNode) {
37992
38042
  // pNode.canModifyContent = oldCanModifyContent;
@@ -38110,7 +38160,14 @@ var DocController = /*#__PURE__*/function () {
38110
38160
  if (pNode instanceof _treeNode_TextInputFieldNode__WEBPACK_IMPORTED_MODULE_45__/* .TextInputFieldNode */ .re) {
38111
38161
  pNode.canModifyContent = canModifyContent;
38112
38162
  }
38113
- strPath = _this2.insertALine(hoEditorFactory, strPath, text, nodePosition.roots, pNode, curTextStyle, node, nodePosition.childIndex, index === lines.length - 1, resolve, oldCanModifyContent);
38163
+ var isUpdate = false;
38164
+ if (oldCanModifyContent !== undefined) {
38165
+ isUpdate = true;
38166
+ if (pNode instanceof _treeNode_TextInputFieldNode__WEBPACK_IMPORTED_MODULE_45__/* .TextInputFieldNode */ .re && pNode.downListProperty.isMultiLinesDisplay && index > 0) {
38167
+ isUpdate = false;
38168
+ }
38169
+ }
38170
+ strPath = _this2.insertALine(hoEditorFactory, strPath, text, nodePosition.roots, pNode, curTextStyle, node, nodePosition.childIndex, index === lines.length - 1, resolve, oldCanModifyContent, isUpdate);
38114
38171
  }
38115
38172
  });
38116
38173
  });
@@ -44852,7 +44909,8 @@ var PageProperty = /*#__PURE__*/function () {
44852
44909
  this._widthPixes = hoEditorFactory.unitConvert.mmConversionPx(this._widthMm + this._commentWidthMm, true);
44853
44910
  this._commentWidthPixes = hoEditorFactory.unitConvert.mmConversionPx(this._commentWidthMm, true);
44854
44911
  this._rightMarginPixes = hoEditorFactory.unitConvert.mmConversionPx(this._rightMarginMm + this._commentWidthMm, true);
44855
- var width = Math.floor(this._widthPixes * _draw_DrawConfig__WEBPACK_IMPORTED_MODULE_9__/* .DrawConfig.instance */ .f.instance().scaleXY) % 2 === 1 ? Math.floor(this._widthPixes * _draw_DrawConfig__WEBPACK_IMPORTED_MODULE_9__/* .DrawConfig.instance */ .f.instance().scaleXY) + 1 : Math.floor(this._widthPixes * _draw_DrawConfig__WEBPACK_IMPORTED_MODULE_9__/* .DrawConfig.instance */ .f.instance().scaleXY);
44912
+ var scaleXY = _draw_DrawConfig__WEBPACK_IMPORTED_MODULE_9__/* .DrawConfig.instance */ .f.instance().scaleXY;
44913
+ var width = Math.floor(this._widthPixes * scaleXY) % 2 === 1 ? Math.floor(this._widthPixes * scaleXY) + 1 : Math.floor(this._widthPixes * scaleXY);
44856
44914
  this._canvasParams.width = width;
44857
44915
  }
44858
44916
  }
@@ -44868,7 +44926,8 @@ var PageProperty = /*#__PURE__*/function () {
44868
44926
  this._widthPixes = hoeditorfacotry.unitConvert.mmConversionPx(this._widthMm + this._commentWidthMm, true);
44869
44927
  hoeditorfacotry.drawTree.updateDrawTreeFirstLine();
44870
44928
  }
44871
- var width = Math.floor(this._widthPixes * _draw_DrawConfig__WEBPACK_IMPORTED_MODULE_9__/* .DrawConfig.instance */ .f.instance().scaleXY) % 2 === 1 ? Math.floor(this._widthPixes * _draw_DrawConfig__WEBPACK_IMPORTED_MODULE_9__/* .DrawConfig.instance */ .f.instance().scaleXY) + 1 : Math.floor(this._widthPixes * _draw_DrawConfig__WEBPACK_IMPORTED_MODULE_9__/* .DrawConfig.instance */ .f.instance().scaleXY);
44929
+ var scaleXY = _draw_DrawConfig__WEBPACK_IMPORTED_MODULE_9__/* .DrawConfig.instance */ .f.instance().scaleXY;
44930
+ var width = Math.floor(this._widthPixes * scaleXY) % 2 === 1 ? Math.floor(this._widthPixes * scaleXY) + 1 : Math.floor(this._widthPixes * scaleXY);
44872
44931
  this._canvasParams.width = width;
44873
44932
  }
44874
44933
  }, {
@@ -44881,7 +44940,8 @@ var PageProperty = /*#__PURE__*/function () {
44881
44940
  this._heightMm = value;
44882
44941
  this._heightPixes = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_8__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID).unitConvert.mmConversionPx(this._heightMm, false);
44883
44942
  }
44884
- var height = Math.floor(this._heightPixes * _draw_DrawConfig__WEBPACK_IMPORTED_MODULE_9__/* .DrawConfig.instance */ .f.instance().scaleXY) % 2 === 1 ? Math.floor(this._heightPixes * _draw_DrawConfig__WEBPACK_IMPORTED_MODULE_9__/* .DrawConfig.instance */ .f.instance().scaleXY) + 1 : Math.floor(this._heightPixes * _draw_DrawConfig__WEBPACK_IMPORTED_MODULE_9__/* .DrawConfig.instance */ .f.instance().scaleXY);
44943
+ var scaleXY = _draw_DrawConfig__WEBPACK_IMPORTED_MODULE_9__/* .DrawConfig.instance */ .f.instance().scaleXY;
44944
+ var height = Math.floor(this._heightPixes * scaleXY) % 2 === 1 ? Math.floor(this._heightPixes * scaleXY) + 1 : Math.floor(this._heightPixes * scaleXY);
44885
44945
  this._canvasParams.height = height;
44886
44946
  }
44887
44947
  }, {
@@ -44905,7 +44965,7 @@ var PageProperty = /*#__PURE__*/function () {
44905
44965
  if (value !== this._bottomMarginMm) {
44906
44966
  this._bottomMarginMm = value;
44907
44967
  this._bottomMarginPixes = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_8__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID).unitConvert.mmConversionPx(this._bottomMarginMm, false);
44908
- // this._canvasHeadFootPos.footerY = this._heightPixes - this._bottomMarginPixes;
44968
+ // this._canvasHeadFootPos.footerY = this._heightPixes - this._bottomMarginPixes;
44909
44969
  }
44910
44970
  }
44911
44971
  }, {
@@ -55242,6 +55302,8 @@ var ParagraphNode = /*#__PURE__*/function (_BaseNode) {
55242
55302
  var index = this._drawLines.length;
55243
55303
  if (index > 0) {
55244
55304
  var prevLine = this._drawLines[index - 1];
55305
+ prevLine.x = this.combineParagraph.leftMarginPixes + ileft;
55306
+ prevLine.dWidth = paragraphWidth - this.combineParagraph.leftMarginPixes - this.combineParagraph.rightMarginPixes;
55245
55307
  if (prevLine instanceof _editor_draw_DrawLine__WEBPACK_IMPORTED_MODULE_15__/* .DrawLine */ .a) prevLine.updateLineStyle();
55246
55308
  }
55247
55309
  var aline = new _editor_draw_DrawLine__WEBPACK_IMPORTED_MODULE_15__/* .DrawLine */ .a(this._rootPath, this, index, paragraphWidth);
@@ -55551,9 +55613,9 @@ var ParagraphNode = /*#__PURE__*/function (_BaseNode) {
55551
55613
  styleIndex: this._paraNo,
55552
55614
  textStyleNo: this.styleIndex,
55553
55615
  printAsSinglePage: this.printAsSinglePage,
55616
+ forceChangeHeader: this.forceChangeHeader,
55554
55617
  docId: this.docId,
55555
- customProperty: this.customProperty,
55556
- forceChangeHeader: this.forceChangeHeader
55618
+ customProperty: this.customProperty
55557
55619
  };
55558
55620
  return paga;
55559
55621
  }
@@ -55563,9 +55625,9 @@ var ParagraphNode = /*#__PURE__*/function (_BaseNode) {
55563
55625
  styleIndex: this._paraNo,
55564
55626
  textStyleNo: this.styleIndex,
55565
55627
  printAsSinglePage: this.printAsSinglePage,
55628
+ forceChangeHeader: this.forceChangeHeader,
55566
55629
  docId: this.docId,
55567
- customProperty: this.customProperty,
55568
- forceChangeHeader: this.forceChangeHeader
55630
+ customProperty: this.customProperty
55569
55631
  }
55570
55632
  };
55571
55633
  }
@@ -55625,8 +55687,6 @@ var ParagraphNode = /*#__PURE__*/function (_BaseNode) {
55625
55687
  paragraphNode.printAsSinglePage = json.printAsSinglePage ? json.printAsSinglePage === "true" ? true : false : false;
55626
55688
  paragraphNode.forceChangeHeader = json.forceChangeHeader ? json.forceChangeHeader === "true" ? true : false : false;
55627
55689
  paragraphNode.styleIndex = json.textStyleNo ? Number(json.textStyleNo) : 0;
55628
- // paragraphNode._dHeight = Number(json.height);
55629
- // paragraphNode._dTop = Number(json.top);
55630
55690
  return paragraphNode;
55631
55691
  }
55632
55692
  }]);
@@ -63099,7 +63159,7 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
63099
63159
  /*
63100
63160
  * @Author: your name
63101
63161
  * @Date: 2020-11-03 15:17:54
63102
- * @LastEditTime: 2023-04-23 10:48:49
63162
+ * @LastEditTime: 2023-04-28 09:27:36
63103
63163
  * @LastEditors: liyanan 2441631434@qq.com
63104
63164
  * @Description: In User Settings Edit
63105
63165
  * @FilePath: \hoeditor-web\src\editor\dom\treeNode\TextInputFieldNode.ts
@@ -63550,6 +63610,7 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
63550
63610
  (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_58__/* ["default"] */ .Z)((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_5__/* ["default"] */ .Z)(_this), "_value", '');
63551
63611
  (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_58__/* ["default"] */ .Z)((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_5__/* ["default"] */ .Z)(_this), "_insCheckSyncUpdateList", false);
63552
63612
  (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_58__/* ["default"] */ .Z)((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_5__/* ["default"] */ .Z)(_this), "_hideDuringPrint", false);
63613
+ (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_58__/* ["default"] */ .Z)((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_5__/* ["default"] */ .Z)(_this), "_isElementLink", false);
63553
63614
  (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_58__/* ["default"] */ .Z)((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_5__/* ["default"] */ .Z)(_this), "_childNodes2", void 0);
63554
63615
  (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_58__/* ["default"] */ .Z)((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_5__/* ["default"] */ .Z)(_this), "StartMarkNode", void 0);
63555
63616
  (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_58__/* ["default"] */ .Z)((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_5__/* ["default"] */ .Z)(_this), "EndMarkNode", void 0);
@@ -63724,7 +63785,8 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
63724
63785
  //选中项的key值
63725
63786
  //选中项的value值
63726
63787
  //插入检查检验同步更新列表项
63727
- //打印时是否隐藏
63788
+ //打印时隐藏
63789
+ //是否进行元素联动
63728
63790
  /**
63729
63791
  * Getter alignWithBlocked
63730
63792
  * @return {boolean}
@@ -64082,6 +64144,16 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
64082
64144
  this._hideDuringPrint = val;
64083
64145
  }
64084
64146
  }
64147
+ }, {
64148
+ key: "isElementLink",
64149
+ get: function get() {
64150
+ return this._isElementLink;
64151
+ },
64152
+ set: function set(val) {
64153
+ if (this._isElementLink !== val) {
64154
+ this._isElementLink = val;
64155
+ }
64156
+ }
64085
64157
  }, {
64086
64158
  key: "generateInnerCode",
64087
64159
  value: function generateInnerCode() {
@@ -64981,6 +65053,7 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
64981
65053
  readType: this.readType,
64982
65054
  insCheckSyncUpdateList: this.insCheckSyncUpdateList,
64983
65055
  hideDuringPrint: this.hideDuringPrint,
65056
+ isElementLink: this.isElementLink,
64984
65057
  childNodes: childNodes
64985
65058
  };
64986
65059
  return {
@@ -65071,6 +65144,7 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
65071
65144
  json.readType = json.readType ? Number(json.readType) : -1;
65072
65145
  json.insCheckSyncUpdateList = !json.insCheckSyncUpdateList ? false : json.insCheckSyncUpdateList;
65073
65146
  json.hideDuringPrint = !json.hideDuringPrint ? false : json.hideDuringPrint;
65147
+ json.isElementLink = !json.isElementLink ? false : json.isElementLink;
65074
65148
  var temp = new TextInputFieldNode(hoEditorFactoryID, rootNodes, pNode ? pNode : null, _BaseNode__WEBPACK_IMPORTED_MODULE_40__/* .NodeType.ntField */ .Jq.ntField, json);
65075
65149
  // this.insertChild
65076
65150
  if (json.childNodes) {
@@ -66750,8 +66824,8 @@ var DrawLine = /*#__PURE__*/function (_DrawContainer) {
66750
66824
  // this.paragraphNode.getParagraphLeftWidth()[1] - this.paragraphNode.combineParagraph.leftMarginPixes
66751
66825
  // - this.paragraphNode.combineParagraph.rightMarginPixes;
66752
66826
  // if (this.paragraphNode.parentNode instanceof TextInputFieldNode)
66753
- // this.x = this.paragraphNode.getParagraphLeftWidth()[0] + this.paragraphNode.combineParagraph.leftMarginPixes
66754
- // else this.x = this.paragraphNode.combineParagraph.leftMarginPixes
66827
+ this.x = this.paragraphNode.getParagraphLeftWidth()[0] + this.paragraphNode.combineParagraph.leftMarginPixes;
66828
+ //else this.x = this.paragraphNode.combineParagraph.leftMarginPixes
66755
66829
  //文字摆放开始位置
66756
66830
  //this.paragraphNode.combineParagraph.leftMarginPixes;
66757
66831
  //字间距,分散对齐:计算宽度时候使用默认字间距
@@ -68480,8 +68554,8 @@ var DrawArea = /*#__PURE__*/function (_DrawRect) {
68480
68554
  dline.drawPageTables[j].parent.removeChild(dline.drawPageTables[j]);
68481
68555
  }
68482
68556
  }
68557
+ dline.drawPageTables.splice(index, dline.drawPageTables.length);
68483
68558
  }
68484
- dline.drawPageTables.splice(index, dline.drawPageTables.length);
68485
68559
  }
68486
68560
  this._endDline = nextDline - 1;
68487
68561
  this.clearOverDitem(dlines, nextDline);
@@ -73285,7 +73359,8 @@ var DrawPageCell = /*#__PURE__*/function (_DrawArea) {
73285
73359
  }, {
73286
73360
  key: "endPaintBackGround",
73287
73361
  value: function endPaintBackGround(newHeight) {
73288
- // this._backImg.cache(-1, -1, this._dWidth + 1, newHeight + 1);
73362
+ //this._backImg.cache(-1, -1, this._dWidth + 1, newHeight + 1);
73363
+ this._backImg.graphics.endStroke();
73289
73364
  }
73290
73365
  }, {
73291
73366
  key: "paintMarker",
@@ -79848,17 +79923,21 @@ var EditorController = /*#__PURE__*/function () {
79848
79923
  if (!metaKey && !altKey) {
79849
79924
  if (keyCode === 37) {
79850
79925
  hoeditorfactory.docController.directionKey('left'); //左移
79926
+ hoeditorfactory.drawTree.caret.aiInfo.aiText = '';
79851
79927
  } else if (keyCode === 39) {
79852
79928
  hoeditorfactory.docController.directionKey('right'); //右移
79929
+ hoeditorfactory.drawTree.caret.aiInfo.aiText = '';
79853
79930
  } else if (keyCode === 38) {
79854
79931
  if (!ctrlKey) {
79855
79932
  hoeditorfactory.docController.directionKey('up'); //上移
79933
+ hoeditorfactory.drawTree.caret.aiInfo.aiText = '';
79856
79934
  } else {
79857
79935
  return true;
79858
79936
  }
79859
79937
  } else if (keyCode === 40) {
79860
79938
  if (!ctrlKey) {
79861
79939
  hoeditorfactory.docController.directionKey('down'); //下移
79940
+ hoeditorfactory.drawTree.caret.aiInfo.aiText = '';
79862
79941
  } else {
79863
79942
  return true;
79864
79943
  }
@@ -84276,41 +84355,50 @@ var DrawTree = /*#__PURE__*/function () {
84276
84355
  }, {
84277
84356
  key: "updateDrawFormular",
84278
84357
  value: function updateDrawFormular(cell) {
84279
- var _this5 = this;
84280
84358
  var hoeditfactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID);
84281
84359
  var _cell$table$getCellIn = cell.table.getCellInfos(cell),
84282
84360
  _cell$table$getCellIn2 = (0,slicedToArray/* default */.Z)(_cell$table$getCellIn, 2),
84283
84361
  r = _cell$table$getCellIn2[0],
84284
84362
  c = _cell$table$getCellIn2[1];
84363
+ var isNeedUpdate = false;
84285
84364
  this.formularNodes.forEach(function (value, key) {
84286
- if (value.parentNode && value.parentNode instanceof TextInputFieldNode/* TextInputFieldNode */.re) {
84287
- if (value.parentNode.childNodes.length === 0) {
84288
- value.parentNode.node2DrawNode();
84289
- }
84290
- value.parentNode.update();
84291
- }
84292
- var isCellInFormula = value.isCellInFormula(cell, r, c);
84293
- if (isCellInFormula || value.formularType === TableFormula/* FormularType.ftBMI */.a.ftBMI || value.formularType === TableFormula/* FormularType.ftLaborProcess */.a.ftLaborProcess || value.formularType === TableFormula/* FormularType.ftExpectedBirthDate */.a.ftExpectedBirthDate || value.formularType === TableFormula/* FormularType.ftPregnantWeeks */.a.ftPregnantWeeks || value.formularType === TableFormula/* FormularType.ftScoreMapping */.a.ftScoreMapping || value.formularType === TableFormula/* FormularType.ftBodySurfaceArea */.a.ftBodySurfaceArea || value.formularType === TableFormula/* FormularType.ftCalcDays */.a.ftCalcDays) {
84294
- //const str = value.formulaStr;
84295
- value.updateResult();
84296
- value.getParentCell().drawCell.needUpdate = true;
84297
- if (isCellInFormula) {
84298
- _this5.updateDrawFormular(value.getParentCell());
84299
- }
84300
- var prevNode = value.previousLeaf();
84301
- if (!prevNode) {
84302
- throw new Error('错误的绘制位置');
84303
- }
84304
- var startPath = hoeditfactory.docTree.getNodeLastPath(prevNode);
84305
- var changeEvent = new NodeChangeEvent/* NodeChangeEvent */.G(_this5._hoEditorFactoryID, DocTree/* DocAction.daModifyStyle */.gk.daModifyStyle, startPath, startPath);
84306
- changeEvent.oldEndPath = startPath;
84307
- changeEvent.oldDrawLines = new SelectRange/* SelectRange */.E(_this5._hoEditorFactoryID).getRangeDrawLines(startPath, startPath, false);
84308
- hoeditfactory.docTree.change(changeEvent);
84309
- if (value.parentNode && value.parentNode instanceof TextInputFieldNode/* TextInputFieldNode */.re) {
84310
- value.parentNode.update();
84365
+ var pnode = value.getParentCell();
84366
+ if (cell.table == pnode.table) {
84367
+ // if (value.parentNode && value.parentNode instanceof TextInputFieldNode) {
84368
+ // if (value.parentNode.childNodes.length === 0) {
84369
+ // value.parentNode.node2DrawNode();
84370
+ // }
84371
+ // value.parentNode.update();
84372
+ // }
84373
+ var isCellInFormula = value.isCellInFormula(cell, r, c);
84374
+ if (isCellInFormula || value.formularType === TableFormula/* FormularType.ftBMI */.a.ftBMI || value.formularType === TableFormula/* FormularType.ftLaborProcess */.a.ftLaborProcess || value.formularType === TableFormula/* FormularType.ftExpectedBirthDate */.a.ftExpectedBirthDate || value.formularType === TableFormula/* FormularType.ftPregnantWeeks */.a.ftPregnantWeeks || value.formularType === TableFormula/* FormularType.ftScoreMapping */.a.ftScoreMapping || value.formularType === TableFormula/* FormularType.ftBodySurfaceArea */.a.ftBodySurfaceArea || value.formularType === TableFormula/* FormularType.ftCalcDays */.a.ftCalcDays) {
84375
+ //const str = value.formulaStr;
84376
+ value.updateResult();
84377
+ value.getParentCell().drawCell.needUpdate = true;
84378
+ isNeedUpdate = true;
84379
+ // if (isCellInFormula) {
84380
+ // this.updateDrawFormular(value.getParentCell());
84381
+ // }
84382
+ // const prevNode = value.previousLeaf();
84383
+ // if (!prevNode) {
84384
+ // throw new Error('错误的绘制位置');
84385
+ // }
84386
+ // const startPath = hoeditfactory.docTree.getNodeLastPath(prevNode);
84387
+ // const changeEvent = new NodeChangeEvent(this._hoEditorFactoryID,
84388
+ // DocAction.daModifyStyle, startPath, startPath)
84389
+ // changeEvent.oldEndPath = startPath;
84390
+ // changeEvent.oldDrawLines = new SelectRange(this._hoEditorFactoryID).getRangeDrawLines(startPath, startPath, false)
84391
+ // hoeditfactory.docTree.change(changeEvent);
84392
+ // if (value.parentNode && value.parentNode instanceof TextInputFieldNode) {
84393
+ // value.parentNode.update();
84394
+ // }
84311
84395
  }
84312
84396
  }
84313
84397
  });
84398
+
84399
+ if (isNeedUpdate) {
84400
+ cell.table.update();
84401
+ }
84314
84402
  }
84315
84403
  }, {
84316
84404
  key: "setCaretVisible",
@@ -195948,7 +196036,7 @@ var map = {
195948
196036
  "./dataSource/DataSource.vue": 9238,
195949
196037
  "./dateDialog/DateDialog.vue": 12144,
195950
196038
  "./delimiter/Delimiter.vue": 31861,
195951
- "./expressionForm/ExpressionForm.vue": 7981,
196039
+ "./expressionForm/ExpressionForm.vue": 66053,
195952
196040
  "./findReplace/FindReplace.vue": 25918,
195953
196041
  "./gestation/Gestation.vue": 6251,
195954
196042
  "./hoprint/HoPrint.vue": 62321,
@@ -195957,7 +196045,7 @@ var map = {
195957
196045
  "./pageInfoes/PageInfoes.vue": 17481,
195958
196046
  "./paragraph/ParagraphDialog.vue": 54949,
195959
196047
  "./poperSelect/PoperMark.vue": 71472,
195960
- "./poperSelect/PoperSelect.vue": 78773,
196048
+ "./poperSelect/PoperSelect.vue": 85778,
195961
196049
  "./poperTipText/PoperTipText.vue": 15845,
195962
196050
  "./popers/Poper.vue": 57937,
195963
196051
  "./popers/Title.vue": 89987,
@@ -232960,6 +233048,8 @@ var DrawSelectLevel = /*#__PURE__*/function () {
232960
233048
  } else {
232961
233049
  if (lastPath == startPos.path) {
232962
233050
  hoeditorfactory.vueController.getCaretPreviousText(nextNode.parentNode.text);
233051
+ } else {
233052
+ hoeditorfactory.drawTree.caret.aiInfo.aiText = '';
232963
233053
  }
232964
233054
  }
232965
233055
  }
@@ -233877,7 +233967,7 @@ var DrawPage = __webpack_require__(72722);
233877
233967
  // EXTERNAL MODULE: ./src/plugins/util.ts
233878
233968
  var plugins_util = __webpack_require__(62783);
233879
233969
  // EXTERNAL MODULE: ./src/components/controls/poperSelect/PoperSelect.vue + 9 modules
233880
- var PoperSelect = __webpack_require__(78773);
233970
+ var PoperSelect = __webpack_require__(85778);
233881
233971
  // EXTERNAL MODULE: ./src/components/controls/poperSelect/PoperMark.vue + 5 modules
233882
233972
  var PoperMark = __webpack_require__(71472);
233883
233973
  ;// CONCATENATED MODULE: ./src/components/controls/poperSelect/index.ts
@@ -235576,7 +235666,7 @@ var ParagraphNode = __webpack_require__(67945);
235576
235666
  // EXTERNAL MODULE: ./src/editor/dom/treeNode/MarkNode.ts
235577
235667
  var MarkNode = __webpack_require__(57727);
235578
235668
  ;// CONCATENATED MODULE: ./src/components/version.ts
235579
- /* harmony default export */ var version = ('3.0.53');
235669
+ /* harmony default export */ var version = ('3.0.54');
235580
235670
  // EXTERNAL MODULE: ./src/components/controls/poperTipText/PoperTipText.vue + 5 modules
235581
235671
  var PoperTipText = __webpack_require__(15845);
235582
235672
  ;// CONCATENATED MODULE: ./src/components/controls/poperTipText/index.ts
@@ -241332,50 +241422,15 @@ var StructureConvert = /*#__PURE__*/function () {
241332
241422
  if (value.formularType === TableFormula/* FormularType.ftSum */.a.ftSum || value.formularType === TableFormula/* FormularType.ftFormular */.a.ftFormular || value.formularType === TableFormula/* FormularType.ftBMI */.a.ftBMI || value.formularType === TableFormula/* FormularType.ftLaborProcess */.a.ftLaborProcess || value.formularType === TableFormula/* FormularType.ftExpectedBirthDate */.a.ftExpectedBirthDate || value.formularType === TableFormula/* FormularType.ftPregnantWeeks */.a.ftPregnantWeeks || value.formularType === TableFormula/* FormularType.ftScoreMapping */.a.ftScoreMapping || value.formularType === TableFormula/* FormularType.ftBodySurfaceArea */.a.ftBodySurfaceArea || value.formularType === TableFormula/* FormularType.ftCalcDays */.a.ftCalcDays) {
241333
241423
  value.updateResult();
241334
241424
  value.getParentCell().drawCell.needUpdate = true;
241335
- // const prevNode = value.previousLeaf();
241336
- // if (!prevNode) {
241337
- // throw new Error('错误的绘制位置');
241338
- // }
241339
241425
  var table = value.getParentCell().table;
241340
241426
  if (!tableArr.includes(table)) {
241341
241427
  tableArr.push(table);
241342
241428
  }
241343
- // const startPath = hoEditorFactory.docTree.getNodeLastPath(prevNode);
241344
- // const changeEvent = new NodeChangeEvent(this._hoEditorFactoryID,
241345
- // DocAction.daModifyStyle, startPath, startPath)
241346
- // changeEvent.oldEndPath = startPath;
241347
- // changeEvent.oldDrawLines = new SelectRange(this._hoEditorFactoryID).getRangeDrawLines(startPath, startPath, false)
241348
- // hangeEvent.repaintImmediate=false;
241349
- //hoEditorFactory.docTree.change(changeEvent);
241350
241429
  }
241351
241430
  });
241352
-
241353
241431
  for (var t = tableArr.length - 1; t >= 0; t--) {
241354
- // const table=tableArr[t];
241355
241432
  tableArr[t].update();
241356
- // const dpos = hoEditorFactory.drawTree.getDlineDrawRootLists(
241357
- // table.drawTable
241358
- // );
241359
- // const mainArea = hoEditorFactory.drawPageTree.getMainRootArea(
241360
- // table.drawTable.drawPageTables[0]
241361
- // );
241362
- // if (mainArea) {
241363
- // let drawTop = table.drawTable.drawPageTables[0].y;
241364
- // if (mainArea.contains(table.drawTable.drawPageTables[0]) && table.drawTable.drawPageTables[0] instanceof DrawPageTable
241365
- // && (table.drawTable.drawPageTables[0] as DrawPageTable).table.drawTable.drawPageTables.indexOf(table.drawTable.drawPageTables[0] as DrawPageTable) > 0
241366
- // ) {
241367
- // drawTop = 0
241368
- // }
241369
- // hoEditorFactory.drawPageTree.update(
241370
- // mainArea,
241371
- // dpos[0].drawRoots,
241372
- // drawTop,
241373
- // dpos[0].index,
241374
- // dpos[0].index
241375
- // );
241376
- // }
241377
241433
  }
241378
-
241379
241434
  var errorsMap = hoEditorFactory.drawTree.errorsMap;
241380
241435
  if (errorsMap.size > 0) {
241381
241436
  var area = hoEditorFactory.drawPageTree.drawMainDocs[0];
@@ -249700,6 +249755,20 @@ var VueController = /*#__PURE__*/function () {
249700
249755
  var newDomRangeCur = new DomRange/* DomRange */.a(this._hoEditorFactoryID, nodePathCur, nodePathCur);
249701
249756
  hoEditorFactory.docController.insertRadioAndCheckBox("update", newDomRangeCur, nodeObjectStr, node.styleIndex);
249702
249757
  }
249758
+ //是否是空页
249759
+ }, {
249760
+ key: "isEmptyPage",
249761
+ value: function isEmptyPage(index) {
249762
+ var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID);
249763
+ var drawMainDoc = hoEditorFactory.drawPageTree.drawMainDocs[index];
249764
+ if (drawMainDoc) {
249765
+ var children = drawMainDoc.children;
249766
+ if (children.length == 1 && children[0] instanceof DrawLine/* DrawLine */.a && children[0].drawItems.length == 0) {
249767
+ return true;
249768
+ }
249769
+ }
249770
+ return false;
249771
+ }
249703
249772
  }]);
249704
249773
  return VueController;
249705
249774
  }();
@@ -250742,14 +250811,18 @@ var EditController = /*#__PURE__*/function () {
250742
250811
  }
250743
250812
  //粘贴完重新绘制一下计算公式
250744
250813
  var formularNodes = hoeditorfactory.drawTree.formularNodes;
250814
+ var isNeedUpdate = false;
250745
250815
  formularNodes.forEach(function (value) {
250746
250816
  var acell = value.getParentCell();
250747
250817
  if (acell.table == parentNode.table) {
250748
250818
  value.updateResult();
250749
250819
  acell.drawCell.needUpdate = true;
250820
+ isNeedUpdate = true;
250750
250821
  }
250751
250822
  });
250752
- parentNode.table.update();
250823
+ if (isNeedUpdate) {
250824
+ parentNode.table.update();
250825
+ }
250753
250826
  return;
250754
250827
  } else {
250755
250828
  if (parentNode instanceof CellNode/* CellNode */.D && nodes.length > 0) {
@@ -253196,9 +253269,9 @@ var PrintController = /*#__PURE__*/function () {
253196
253269
  if (this._waitPrint) {
253197
253270
  this.printPromisePDF();
253198
253271
  }
253199
- if (this._waitSavepdf) {
253200
- this.saveAsPDF();
253201
- }
253272
+ // if (this._waitSavepdf) {
253273
+ // this.saveAsPDF();
253274
+ // }
253202
253275
  }
253203
253276
  }, {
253204
253277
  key: "clearJsPDF",
@@ -253219,54 +253292,62 @@ var PrintController = /*#__PURE__*/function () {
253219
253292
  value: function saveAsPDF(pdfName, type, isSpecial) {
253220
253293
  var _this3 = this;
253221
253294
  var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID);
253222
- if (!this._isSetFont) {
253223
- this._waitSavepdf = true;
253224
- return;
253225
- }
253226
- var fileType = type ? type : 'pdf';
253227
- var fileName = pdfName ? pdfName : hoEditorFactory.vueController.getDocTitle() ? hoEditorFactory.vueController.getDocTitle() : '电子病历文档';
253228
- // 保存打印前文档状态 内容
253229
- var beforePrintStatus = hoEditorFactory.drawTree.paintStatus;
253230
- var xml = hoEditorFactory.vueController.getDocXml(true);
253231
- var hPromise = Promise.resolve();
253232
- hPromise = hPromise.then(function () {
253233
- return new Promise(function (resolve) {
253234
- hoEditorFactory.printStatus.printMode = 0;
253235
- hoEditorFactory.drawTree.paintStatus = DrawTree/* PaintState.psPreview */.Dh.psPreview;
253236
- hoEditorFactory.drawTree.rebuildAllDrawLine(false, resolve);
253295
+ var print = function print() {
253296
+ var fileType = type ? type : 'pdf';
253297
+ var fileName = pdfName ? pdfName : hoEditorFactory.vueController.getDocTitle() ? hoEditorFactory.vueController.getDocTitle() : '电子病历文档';
253298
+ // 保存打印前文档状态 和 内容
253299
+ var beforePrintStatus = hoEditorFactory.drawTree.paintStatus;
253300
+ var xml = hoEditorFactory.vueController.getDocXml(true);
253301
+ var hPromise = Promise.resolve();
253302
+ hPromise = hPromise.then(function () {
253303
+ return new Promise(function (resolve) {
253304
+ hoEditorFactory.printStatus.printMode = 0;
253305
+ hoEditorFactory.drawTree.paintStatus = DrawTree/* PaintState.psPreview */.Dh.psPreview;
253306
+ hoEditorFactory.drawTree.rebuildAllDrawLine(false, resolve);
253307
+ });
253237
253308
  });
253238
- });
253239
- hPromise = hPromise.then(function () {
253240
- return new Promise(function (resolve) {
253241
- var orientation = hoEditorFactory.pageProperty.widthMm > hoEditorFactory.pageProperty.heightMm ? 'l' : 'p';
253242
- var format = [hoEditorFactory.pageProperty.widthPixes, hoEditorFactory.pageProperty.heightPixes];
253243
- if (hoEditorFactory.isFixedPrintToA4 == '1' && isSpecial) {
253244
- format = _this3._a4Size[orientation];
253245
- }
253246
- var pageSize = JSON.stringify([hoEditorFactory.pageProperty.widthMm, hoEditorFactory.pageProperty.heightMm]);
253247
- if (hoEditorFactory.isFixedPrintToA4 == '2' && ['[148,210]', '[210,148]'].includes(pageSize)) {
253248
- format = [793, 1122];
253249
- orientation = 'p';
253250
- }
253251
- var options = {
253252
- orientation: orientation,
253253
- unit: 'px',
253254
- format: format,
253255
- hotfixes: ['px_scaling'],
253256
- compress: true
253257
- };
253258
- _this3.PDF = null;
253259
- _this3.PDF = new jspdf/* default */.ZP(options);
253260
- // PDF.setFont("SimSun");
253261
- PrintStatus/* Print.printToPDF */.Kh.printToPDF(_this3._hoEditorFactoryID, _this3.PDF, fileType, fileName, resolve, undefined, format);
253309
+ hPromise = hPromise.then(function () {
253310
+ return new Promise(function (resolve) {
253311
+ var orientation = hoEditorFactory.pageProperty.widthMm > hoEditorFactory.pageProperty.heightMm ? 'l' : 'p';
253312
+ var format = [hoEditorFactory.pageProperty.widthPixes, hoEditorFactory.pageProperty.heightPixes];
253313
+ if (hoEditorFactory.isFixedPrintToA4 == '1' && isSpecial) {
253314
+ format = _this3._a4Size[orientation];
253315
+ }
253316
+ var pageSize = JSON.stringify([hoEditorFactory.pageProperty.widthMm, hoEditorFactory.pageProperty.heightMm]);
253317
+ if (hoEditorFactory.isFixedPrintToA4 == '2' && ['[148,210]', '[210,148]'].includes(pageSize)) {
253318
+ format = [793, 1122];
253319
+ orientation = 'p';
253320
+ }
253321
+ var options = {
253322
+ orientation: orientation,
253323
+ unit: 'px',
253324
+ format: format,
253325
+ hotfixes: ['px_scaling'],
253326
+ compress: true
253327
+ };
253328
+ _this3.PDF = null;
253329
+ _this3.PDF = new jspdf/* default */.ZP(options);
253330
+ // PDF.setFont("SimSun");
253331
+ PrintStatus/* Print.printToPDF */.Kh.printToPDF(_this3._hoEditorFactoryID, _this3.PDF, fileType, fileName, resolve, undefined, format);
253332
+ });
253262
253333
  });
253263
- });
253264
- hPromise.then(function (resolve) {
253265
- // 恢复文档状态 和 内容;
253266
- hoEditorFactory.drawTree.paintStatus = beforePrintStatus;
253267
- hoEditorFactory.vueController.openXml(xml);
253268
- _this3.clearJsPDF();
253269
- });
253334
+ hPromise.then(function (resolve) {
253335
+ // 恢复文档状态 和 内容;
253336
+ hoEditorFactory.drawTree.paintStatus = beforePrintStatus;
253337
+ hoEditorFactory.vueController.openXml(xml);
253338
+ _this3.clearJsPDF();
253339
+ });
253340
+ };
253341
+ if (!this._isSetFont) {
253342
+ hoEditorFactory.vueController.hoLocalStorage().loadFontString().then(function (font) {
253343
+ if (font) {
253344
+ _this3.setjsPDFFonts(font);
253345
+ print();
253346
+ }
253347
+ });
253348
+ } else {
253349
+ print();
253350
+ }
253270
253351
  }
253271
253352
  /**
253272
253353
  * 打印
@@ -262921,7 +263002,7 @@ var popper = __webpack_require__(95551);
262921
263002
  formularType: {
262922
263003
  sum: '表格行列求和公式',
262923
263004
  formula: '四则运算公式',
262924
- bmi: 'bmi计算公式',
263005
+ bmi: 'BMI计算公式',
262925
263006
  labor: '产程公式',
262926
263007
  expectedDate: '预产期公式',
262927
263008
  pregnantWeeks: '孕周公式',