hoeditor-web 3.0.45 → 3.0.46

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.
@@ -39222,7 +39222,11 @@ var DocController = /*#__PURE__*/function () {
39222
39222
  var np = hoEditorFactory.docTree.findNodePositionByPath(arange.startPath);
39223
39223
  var parentNode = hoEditorFactory.docTree.getParentNode(arange.startPath);
39224
39224
  if (parentNode instanceof _treeNode_TextInputFieldNode__WEBPACK_IMPORTED_MODULE_45__/* .TextInputFieldNode */ .re) {
39225
- ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_91__/* ["default"].warn */ .Z.warn("不能在文本域中插入表格");
39225
+ ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_91__/* ["default"].warn */ .Z.warn("不允许在文本域内插入表格");
39226
+ return;
39227
+ }
39228
+ if (parentNode instanceof _treeNode_CellNode__WEBPACK_IMPORTED_MODULE_56__/* .CellNode */ .D) {
39229
+ ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_91__/* ["default"].warn */ .Z.warn("不允许在表格内再插入表格");
39226
39230
  return;
39227
39231
  }
39228
39232
  // const nextParaNode = new ParagraphNode(
@@ -53308,8 +53312,9 @@ var LabelNode = /*#__PURE__*/function (_ControlNode) {
53308
53312
  drawNode.children.splice(i, 1);
53309
53313
  }
53310
53314
  }
53315
+ var color = hoEditorFactory.option.getColorByLevel(14);
53311
53316
  var backColor = new createjs.Shape();
53312
- backColor.graphics.clear().beginFill("#C9CCCD").drawRect(0, -drawNode.dHeight, drawNode.dWidth, drawNode.dHeight + 2);
53317
+ backColor.graphics.clear().beginFill(color).drawRect(0, -drawNode.dHeight, drawNode.dWidth, drawNode.dHeight + 2);
53313
53318
  backColor.name = "backColor";
53314
53319
  drawNode.addChildAt(backColor, 0);
53315
53320
  } else {
@@ -66659,6 +66664,7 @@ var DrawLine = /*#__PURE__*/function (_DrawContainer) {
66659
66664
  var charspace = this._paragraphNode.combineParagraph.charSpace;
66660
66665
  var spacing = 0;
66661
66666
  var imageHeight = 0;
66667
+ var maxFontHeight = 0;
66662
66668
  //1.返回dWidth并计算actualWidth(实际需要占用的宽度),dHeight
66663
66669
  for (var i = 0; i < this.drawItems.length; i++) {
66664
66670
  var dWidth = 0;
@@ -66667,10 +66673,10 @@ var DrawLine = /*#__PURE__*/function (_DrawContainer) {
66667
66673
  dWidth = dItem.dWidth;
66668
66674
  dBaseY = Math.min(dItem.baseY, dBaseY);
66669
66675
  iCount += dItem.charCount;
66670
- this._maxFontHeight = Math.max(this._maxFontHeight, dItem.dHeight);
66676
+ maxFontHeight = Math.max(maxFontHeight, dItem.dHeight);
66671
66677
  } else if (dItem instanceof DrawMarkNode/* DrawMarkNode */.I) {
66672
66678
  dWidth = dItem.node.width;
66673
- this._maxFontHeight = Math.max(this._maxFontHeight, dItem.dHeight);
66679
+ maxFontHeight = Math.max(maxFontHeight, dItem.dHeight);
66674
66680
  } else if (dItem instanceof DrawDownListNode/* DrawDownListNode */.I) {
66675
66681
  dWidth = dItem.dWidth;
66676
66682
  iCount += dItem.charCount;
@@ -66718,6 +66724,8 @@ var DrawLine = /*#__PURE__*/function (_DrawContainer) {
66718
66724
  // }
66719
66725
  // this._actualWidth+=this.children[i]
66720
66726
  }
66727
+
66728
+ this._maxFontHeight = maxFontHeight;
66721
66729
  //最后一个字不计算字间距位置
66722
66730
  this._docHeight = dHeight;
66723
66731
  dHeight = this.adjustDHeight(dHeight);
@@ -79817,6 +79825,9 @@ var EditorController = /*#__PURE__*/function () {
79817
79825
  var aiInfo = hoeditorfactory.drawTree.caret.aiInfo;
79818
79826
  if (aiInfo.aiText && aiInfo.pageIndex === aiInfo.lastPosition[0] && aiInfo.x === aiInfo.lastPosition[1] && aiInfo.y === aiInfo.lastPosition[2]) {
79819
79827
  hoeditorfactory.vueController.insertText(aiInfo.aiText);
79828
+ setTimeout(function () {
79829
+ hoeditorfactory.vueController.getCaretPreviousText();
79830
+ }, 30);
79820
79831
  return false;
79821
79832
  }
79822
79833
  }
@@ -81786,16 +81797,18 @@ var DrawTree = /*#__PURE__*/function () {
81786
81797
  if (hoEditorFactory.docTree.curOnDragNode) {
81787
81798
  this._caret.visible = false;
81788
81799
  }
81789
- var anode = hoEditorFactory.docTree.curDomRange.normalize().npEnd.node;
81790
- if (anode) {
81791
- if (anode.parentNode instanceof TextInputFieldNode/* TextInputFieldNode */.re && !anode.parentNode.canModifyContent) {
81792
- if (!(anode instanceof MarkNode/* MarkNode */.j && anode.MarkNodeType == 2)) {
81800
+ if (this.paintStatus != PaintState.psDesign) {
81801
+ var anode = hoEditorFactory.docTree.curDomRange.normalize().npEnd.node;
81802
+ if (anode) {
81803
+ if (anode.parentNode instanceof TextInputFieldNode/* TextInputFieldNode */.re && !anode.parentNode.canModifyContent) {
81804
+ if (!(anode instanceof MarkNode/* MarkNode */.j && anode.MarkNodeType == 2)) {
81805
+ this._caret.visible = false;
81806
+ }
81807
+ }
81808
+ if (anode instanceof JumpButtonNode/* JumpButtonNode */.a) {
81793
81809
  this._caret.visible = false;
81794
81810
  }
81795
81811
  }
81796
- if (anode instanceof JumpButtonNode/* JumpButtonNode */.a) {
81797
- this._caret.visible = false;
81798
- }
81799
81812
  }
81800
81813
  //console.timeEnd("文档change事件");
81801
81814
  return true;
@@ -82092,7 +82105,6 @@ var DrawTree = /*#__PURE__*/function () {
82092
82105
  }, {
82093
82106
  key: "onSelectChanged",
82094
82107
  value: function onSelectChanged(e) {
82095
- var _endNp$node;
82096
82108
  var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID);
82097
82109
  if (e.newRange.startPath === "" || e.newRange.endPath === "") {
82098
82110
  return false;
@@ -82128,15 +82140,18 @@ var DrawTree = /*#__PURE__*/function () {
82128
82140
  if (hoEditorFactory.docTree.curOnDragNode) {
82129
82141
  this._caret.visible = false;
82130
82142
  }
82131
- var pNode = (_endNp$node = endNp.node) === null || _endNp$node === void 0 ? void 0 : _endNp$node.parentNode;
82132
- if (pNode instanceof TextInputFieldNode/* TextInputFieldNode */.re && !pNode.canModifyContent) {
82133
- if (!(endNp.node instanceof MarkNode/* MarkNode */.j && endNp.node.MarkNodeType == 2)) {
82143
+ if (this.paintStatus != PaintState.psDesign) {
82144
+ var _endNp$node;
82145
+ var pNode = (_endNp$node = endNp.node) === null || _endNp$node === void 0 ? void 0 : _endNp$node.parentNode;
82146
+ if (pNode instanceof TextInputFieldNode/* TextInputFieldNode */.re && !pNode.canModifyContent) {
82147
+ if (!(endNp.node instanceof MarkNode/* MarkNode */.j && endNp.node.MarkNodeType == 2)) {
82148
+ this._caret.visible = false;
82149
+ }
82150
+ }
82151
+ if (endNp.node instanceof JumpButtonNode/* JumpButtonNode */.a) {
82134
82152
  this._caret.visible = false;
82135
82153
  }
82136
82154
  }
82137
- if (endNp.node instanceof JumpButtonNode/* JumpButtonNode */.a) {
82138
- this._caret.visible = false;
82139
- }
82140
82155
  return true;
82141
82156
  }
82142
82157
  }, {
@@ -82404,19 +82419,21 @@ var DrawTree = /*#__PURE__*/function () {
82404
82419
  if (hoEditorFactory.docTree.curOnDragNode) {
82405
82420
  this._caret.visible = false;
82406
82421
  }
82407
- if (dNode instanceof DrawTextNode/* DrawTextNode */.v && (dNode.node instanceof TextNode/* TextNode */.R || dNode.node instanceof MarkNode/* MarkNode */.j)) {
82408
- var _np4 = hoEditorFactory.docTree.findNodePositionByPath(strPath);
82409
- if (_np4) {
82410
- var _np4$node;
82411
- var pNode = (_np4$node = _np4.node) === null || _np4$node === void 0 ? void 0 : _np4$node.parentNode;
82412
- if (pNode instanceof TextInputFieldNode/* TextInputFieldNode */.re && !pNode.canModifyContent) {
82413
- if (!(_np4.node instanceof MarkNode/* MarkNode */.j && _np4.node.MarkNodeType == 2)) {
82422
+ if (this.paintStatus != PaintState.psDesign) {
82423
+ if (dNode instanceof DrawTextNode/* DrawTextNode */.v && (dNode.node instanceof TextNode/* TextNode */.R || dNode.node instanceof MarkNode/* MarkNode */.j)) {
82424
+ var _np4 = hoEditorFactory.docTree.findNodePositionByPath(strPath);
82425
+ if (_np4) {
82426
+ var _np4$node;
82427
+ var pNode = (_np4$node = _np4.node) === null || _np4$node === void 0 ? void 0 : _np4$node.parentNode;
82428
+ if (pNode instanceof TextInputFieldNode/* TextInputFieldNode */.re && !pNode.canModifyContent) {
82429
+ if (!(_np4.node instanceof MarkNode/* MarkNode */.j && _np4.node.MarkNodeType == 2)) {
82430
+ this._caret.visible = false;
82431
+ }
82432
+ }
82433
+ if (_np4.node instanceof JumpButtonNode/* JumpButtonNode */.a) {
82414
82434
  this._caret.visible = false;
82415
82435
  }
82416
82436
  }
82417
- if (_np4.node instanceof JumpButtonNode/* JumpButtonNode */.a) {
82418
- this._caret.visible = false;
82419
- }
82420
82437
  }
82421
82438
  }
82422
82439
  }
@@ -232294,8 +232311,6 @@ var DrawConfig = __webpack_require__(37616);
232294
232311
  var DrawHeader = __webpack_require__(5328);
232295
232312
  // EXTERNAL MODULE: ./src/editor/draw/drawArea/DrawFooter.ts
232296
232313
  var DrawFooter = __webpack_require__(114);
232297
- // EXTERNAL MODULE: ./src/editor/dom/treeNode/TextInputFieldNode.ts
232298
- var TextInputFieldNode = __webpack_require__(90161);
232299
232314
  ;// CONCATENATED MODULE: ./src/editor/draw/DrawSelectLevel.ts
232300
232315
 
232301
232316
 
@@ -232326,7 +232341,6 @@ var TextInputFieldNode = __webpack_require__(90161);
232326
232341
 
232327
232342
 
232328
232343
 
232329
-
232330
232344
 
232331
232345
 
232332
232346
  var DrawSelectLevel = /*#__PURE__*/function () {
@@ -232751,17 +232765,18 @@ var DrawSelectLevel = /*#__PURE__*/function () {
232751
232765
  // hoeditorfactory.docTree.curDomRange
232752
232766
  // );
232753
232767
  // hoeditorfactory.docTree.selectChange(selchange);
232754
- setTimeout(function () {
232755
- var curDomRange = hoeditorfactory.docTree.curDomRange.normalize();
232756
- var node = curDomRange.npEnd.node;
232757
- if (node instanceof TextInputFieldNode/* TextInputFieldNode */.re && node.text === '') {
232758
- hoeditorfactory.vueController.getCaretPreviousText();
232759
- } else if ((node === null || node === void 0 ? void 0 : node.parentNode) instanceof TextInputFieldNode/* TextInputFieldNode */.re && node.parentNode.text === '') {
232760
- hoeditorfactory.vueController.getCaretPreviousText();
232761
- }
232762
- }, 0);
232768
+ // setTimeout(() => {
232769
+ // const curDomRange = hoeditorfactory.docTree.curDomRange.normalize();
232770
+ // const node = curDomRange.npEnd.node;
232771
+ // if (node instanceof TextInputFieldNode && node.text === '') {
232772
+ // hoeditorfactory.vueController.getCaretPreviousText();
232773
+ // } else if (node?.parentNode instanceof TextInputFieldNode && node.parentNode.text === '') {
232774
+ // hoeditorfactory.vueController.getCaretPreviousText();
232775
+ // }
232776
+ // }, 0);
232763
232777
  }
232764
232778
  }
232779
+
232765
232780
  return true;
232766
232781
  }
232767
232782
  }, {
@@ -233201,9 +233216,9 @@ var component = (0,componentNormalizer/* default */.Z)(
233201
233216
  )
233202
233217
 
233203
233218
  /* harmony default export */ var HoHeadFoot = (component.exports);
233204
- ;// 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/ai/AiModels.vue?vue&type=template&id=31c99e6c&
233219
+ ;// 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/ai/AiModels.vue?vue&type=template&id=03dd3b4a&
233205
233220
 
233206
- var AiModelsvue_type_template_id_31c99e6c_render = function render() {
233221
+ var AiModelsvue_type_template_id_03dd3b4a_render = function render() {
233207
233222
  var _vm = this,
233208
233223
  _c = _vm._self._c;
233209
233224
  return _vm.aiInfo.aiText && _vm.aiInfo.pageIndex === _vm.aiInfo.lastPosition[0] && _vm.aiInfo.x === _vm.aiInfo.lastPosition[1] && _vm.aiInfo.y === _vm.aiInfo.lastPosition[2] ? _c('div', {
@@ -233227,12 +233242,10 @@ var AiModelsvue_type_template_id_31c99e6c_render = function render() {
233227
233242
  style: (0,objectSpread2/* default */.Z)({}, _vm.fontStyle)
233228
233243
  }, [_vm._v(" " + _vm._s(_vm.aiInfo.aiText) + " ")])]) : _vm._e();
233229
233244
  };
233230
- var AiModelsvue_type_template_id_31c99e6c_staticRenderFns = [];
233245
+ var AiModelsvue_type_template_id_03dd3b4a_staticRenderFns = [];
233231
233246
 
233232
- ;// CONCATENATED MODULE: ./src/components/ai/AiModels.vue?vue&type=template&id=31c99e6c&
233247
+ ;// CONCATENATED MODULE: ./src/components/ai/AiModels.vue?vue&type=template&id=03dd3b4a&
233233
233248
 
233234
- // EXTERNAL MODULE: ./node_modules/core-js/modules/es.string.bold.js
233235
- var es_string_bold = __webpack_require__(50915);
233236
233249
  // EXTERNAL MODULE: ./node_modules/core-js/modules/es.string.italics.js
233237
233250
  var es_string_italics = __webpack_require__(58734);
233238
233251
  // EXTERNAL MODULE: ./src/editor/Caret.ts
@@ -233246,7 +233259,6 @@ var TextStyle = __webpack_require__(29899);
233246
233259
 
233247
233260
 
233248
233261
 
233249
-
233250
233262
  /* harmony default export */ var AiModelsvue_type_script_lang_js_ = ({
233251
233263
  name: 'AiModels',
233252
233264
  props: {
@@ -233289,10 +233301,16 @@ var TextStyle = __webpack_require__(29899);
233289
233301
  handler: function handler() {
233290
233302
  this.initStyle();
233291
233303
  }
233304
+ },
233305
+ aiInfo: {
233306
+ deep: true,
233307
+ handler: function handler() {}
233292
233308
  }
233293
233309
  },
233294
233310
  mounted: function mounted() {
233295
- this.init();
233311
+ if (this.aiInfo.aiText) {
233312
+ this.init();
233313
+ }
233296
233314
  },
233297
233315
  methods: {
233298
233316
  init: function init() {
@@ -233312,7 +233330,7 @@ var TextStyle = __webpack_require__(29899);
233312
233330
  this.fontStyle = {
233313
233331
  'font-family': this.styles.font,
233314
233332
  'font-size': this.styles.size / 0.75 + 'px',
233315
- 'font-weight': this.styles.bold ? 'bold' : 'normal',
233333
+ // 'font-weight': this.styles.bold ? 'bold' : 'normal',
233316
233334
  'font-style': this.styles.italic ? 'normal' : 'normal',
233317
233335
  'text-decoration': this.styles.underline ? 'underline' : 'normal',
233318
233336
  'padding-top': (this.aiInfo.height - this.styles.size / 0.75) / 2 + 'px',
@@ -233325,10 +233343,10 @@ var TextStyle = __webpack_require__(29899);
233325
233343
  });
233326
233344
  ;// CONCATENATED MODULE: ./src/components/ai/AiModels.vue?vue&type=script&lang=js&
233327
233345
  /* harmony default export */ var ai_AiModelsvue_type_script_lang_js_ = (AiModelsvue_type_script_lang_js_);
233328
- ;// 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/ai/AiModels.vue?vue&type=style&index=0&id=31c99e6c&prod&lang=scss&
233346
+ ;// 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/ai/AiModels.vue?vue&type=style&index=0&id=03dd3b4a&prod&lang=scss&
233329
233347
  // extracted by mini-css-extract-plugin
233330
233348
 
233331
- ;// CONCATENATED MODULE: ./src/components/ai/AiModels.vue?vue&type=style&index=0&id=31c99e6c&prod&lang=scss&
233349
+ ;// CONCATENATED MODULE: ./src/components/ai/AiModels.vue?vue&type=style&index=0&id=03dd3b4a&prod&lang=scss&
233332
233350
 
233333
233351
  ;// CONCATENATED MODULE: ./src/components/ai/AiModels.vue
233334
233352
 
@@ -233341,8 +233359,8 @@ var TextStyle = __webpack_require__(29899);
233341
233359
 
233342
233360
  var AiModels_component = (0,componentNormalizer/* default */.Z)(
233343
233361
  ai_AiModelsvue_type_script_lang_js_,
233344
- AiModelsvue_type_template_id_31c99e6c_render,
233345
- AiModelsvue_type_template_id_31c99e6c_staticRenderFns,
233362
+ AiModelsvue_type_template_id_03dd3b4a_render,
233363
+ AiModelsvue_type_template_id_03dd3b4a_staticRenderFns,
233346
233364
  false,
233347
233365
  null,
233348
233366
  null,
@@ -233704,6 +233722,8 @@ var TableCellPoper = __webpack_require__(21277);
233704
233722
  var DateTimeNode = __webpack_require__(92501);
233705
233723
  // EXTERNAL MODULE: ./src/editor/dom/treeNode/DownListNode.ts
233706
233724
  var DownListNode = __webpack_require__(45712);
233725
+ // EXTERNAL MODULE: ./src/editor/dom/treeNode/TextInputFieldNode.ts
233726
+ var TextInputFieldNode = __webpack_require__(90161);
233707
233727
  // EXTERNAL MODULE: ./node_modules/core-js/modules/es.promise.js
233708
233728
  var es_promise = __webpack_require__(88674);
233709
233729
  // EXTERNAL MODULE: ./node_modules/core-js/modules/es.string.trim.js
@@ -235390,7 +235410,7 @@ var ParagraphNode = __webpack_require__(67945);
235390
235410
  // EXTERNAL MODULE: ./src/editor/dom/treeNode/MarkNode.ts
235391
235411
  var MarkNode = __webpack_require__(57727);
235392
235412
  ;// CONCATENATED MODULE: ./src/components/version.ts
235393
- /* harmony default export */ var version = ('3.0.45');
235413
+ /* harmony default export */ var version = ('3.0.46');
235394
235414
  // EXTERNAL MODULE: ./src/components/controls/poperTipText/PoperTipText.vue + 5 modules
235395
235415
  var PoperTipText = __webpack_require__(15845);
235396
235416
  ;// CONCATENATED MODULE: ./src/components/controls/poperTipText/index.ts
@@ -237684,7 +237704,7 @@ var UserInfo = __webpack_require__(14871);
237684
237704
  /*
237685
237705
  * @Author: your name
237686
237706
  * @Date: 2021-06-21 17:47:51
237687
- * @LastEditTime: 2022-07-18 14:39:07
237707
+ * @LastEditTime: 2023-04-04 09:35:58
237688
237708
  * @LastEditors: liyanan 2441631434@qq.com
237689
237709
  * @Description: In User Settings Edit
237690
237710
  * @FilePath: \hoeditor-web\src\editor\runTimeInfo\Option.ts
@@ -237700,7 +237720,8 @@ var Option_Option = /*#__PURE__*/function () {
237700
237720
  (0,esm_defineProperty/* default */.Z)(this, "_dateTimeColor", "#FBFAD0");
237701
237721
  (0,esm_defineProperty/* default */.Z)(this, "_downListColor", "#D2ECB1");
237702
237722
  (0,esm_defineProperty/* default */.Z)(this, "_downListColor2", "#D2ACB1");
237703
- (0,esm_defineProperty/* default */.Z)(this, "_signColor", "transparent");
237723
+ (0,esm_defineProperty/* default */.Z)(this, "_signColor", "#D2ACB1");
237724
+ (0,esm_defineProperty/* default */.Z)(this, "_labelColor", "#C9CCCD");
237704
237725
  this._hoEditorFactoryID = hoEditorFactoryID;
237705
237726
  }
237706
237727
  (0,esm_createClass/* default */.Z)(Option, [{
@@ -237714,6 +237735,7 @@ var Option_Option = /*#__PURE__*/function () {
237714
237735
  //下拉列表元素颜色//#D2ECB1
237715
237736
  //下拉列表默认元素颜色
237716
237737
  //签名元素颜色
237738
+ //标签颜色
237717
237739
  function get() {
237718
237740
  return this._hoEditorFactoryID;
237719
237741
  },
@@ -237784,9 +237806,17 @@ var Option_Option = /*#__PURE__*/function () {
237784
237806
  set: function set(value) {
237785
237807
  this._signColor = value;
237786
237808
  }
237809
+ }, {
237810
+ key: "labelColor",
237811
+ get: function get() {
237812
+ return this._labelColor;
237813
+ },
237814
+ set: function set(value) {
237815
+ this._labelColor = value;
237816
+ }
237787
237817
  }, {
237788
237818
  key: "setReviewLevelColor",
237789
- value: function setReviewLevelColor(Lev1Color, Lev2Color, Lev3Color, fieldColor, dateTimeColor, downListColor, downListColor2, signColor) {
237819
+ value: function setReviewLevelColor(Lev1Color, Lev2Color, Lev3Color, fieldColor, dateTimeColor, downListColor, downListColor2, signColor, labelColor) {
237790
237820
  Lev1Color && (this._reviewLev1Color = Lev1Color);
237791
237821
  Lev2Color && (this._reviewLev2Color = Lev2Color);
237792
237822
  Lev3Color && (this._reviewLev3Color = Lev3Color);
@@ -237795,6 +237825,7 @@ var Option_Option = /*#__PURE__*/function () {
237795
237825
  downListColor && (this._downListColor = downListColor);
237796
237826
  downListColor2 && (this._downListColor2 = downListColor2);
237797
237827
  signColor && (this._signColor = signColor);
237828
+ labelColor && (this._labelColor = labelColor);
237798
237829
  }
237799
237830
  }, {
237800
237831
  key: "getColorByLevel",
@@ -237815,6 +237846,8 @@ var Option_Option = /*#__PURE__*/function () {
237815
237846
  return this._reviewLev3Color;
237816
237847
  } else if (level === 13) {
237817
237848
  return this._signColor;
237849
+ } else if (level === 14) {
237850
+ return this._labelColor;
237818
237851
  } else {
237819
237852
  return "transparent";
237820
237853
  }
@@ -237968,6 +238001,8 @@ var message = __webpack_require__(40735);
237968
238001
  var es_string_replace_all = __webpack_require__(68757);
237969
238002
  // EXTERNAL MODULE: ./node_modules/core-js/modules/es.string.ends-with.js
237970
238003
  var es_string_ends_with = __webpack_require__(27852);
238004
+ // EXTERNAL MODULE: ./node_modules/core-js/modules/es.string.bold.js
238005
+ var es_string_bold = __webpack_require__(50915);
237971
238006
  // EXTERNAL MODULE: ./node_modules/core-js/modules/es.object.assign.js
237972
238007
  var es_object_assign = __webpack_require__(19601);
237973
238008
  // EXTERNAL MODULE: ./node_modules/jquery/dist/jquery.js
@@ -244676,7 +244711,7 @@ var VueController = /*#__PURE__*/function () {
244676
244711
  value: function setReviewLevelColor(option) {
244677
244712
  var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID);
244678
244713
  var opt = new Option_Option(this.hoEditorFactoryID);
244679
- opt.setReviewLevelColor(option.reviewLev1Color, option.reviewLev2Color, option.reviewLev3Color, option.fieldColor, option.dateTimeColor, option.downListColor, option.downListColor2, option.signColor);
244714
+ opt.setReviewLevelColor(option.reviewLev1Color, option.reviewLev2Color, option.reviewLev3Color, option.fieldColor, option.dateTimeColor, option.downListColor, option.downListColor2, option.signColor, option.labelColor);
244680
244715
  hoEditorFactory.option = opt;
244681
244716
  }
244682
244717
  /**
@@ -245792,12 +245827,15 @@ var VueController = /*#__PURE__*/function () {
245792
245827
  lastNode.printAsSinglePage = printAsSinglePage;
245793
245828
  lastNode.docId = docId && docId !== '' ? docId : hoEditorFactory.gernerateCode.generateID('DocId');
245794
245829
  }
245830
+ } else {
245831
+ nodes[0].printAsSinglePage = printAsSinglePage;
245832
+ nodes[0].docId = docId && docId !== '' ? docId : hoEditorFactory.gernerateCode.generateID('DocId');
245795
245833
  }
245796
- if (mainNodes.length > 1 && lastNode instanceof ParagraphNode/* ParagraphNode */.C) {
245797
- nodes.splice(0, 1);
245798
- lastNode.printAsSinglePage = printAsSinglePage;
245799
- lastNode.docId = docId && docId !== '' ? docId : hoEditorFactory.gernerateCode.generateID('DocId');
245800
- }
245834
+ // if (mainNodes.length > 1 && lastNode instanceof ParagraphNode) {
245835
+ // nodes.splice(0, 1);
245836
+ // lastNode.printAsSinglePage = printAsSinglePage;
245837
+ // lastNode.docId = docId && docId !== '' ? docId : hoEditorFactory.gernerateCode.generateID('DocId');
245838
+ // }
245801
245839
  } else {
245802
245840
  nodes[0].printAsSinglePage = printAsSinglePage;
245803
245841
  nodes[0].docId = docId && docId !== '' ? docId : hoEditorFactory.gernerateCode.generateID('DocId');
@@ -247964,7 +248002,9 @@ var VueController = /*#__PURE__*/function () {
247964
248002
  key: "initAiFunc",
247965
248003
  value: function initAiFunc(getAiText) {
247966
248004
  var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID);
247967
- hoEditorFactory.aiTextFunc = getAiText;
248005
+ if (hoEditorFactory.drawTree.paintStatus === DrawTree/* PaintState.psEdit */.Dh.psEdit) {
248006
+ hoEditorFactory.aiTextFunc = getAiText;
248007
+ }
247968
248008
  }
247969
248009
  /**
247970
248010
  * 查询光标所在位置之前的文本内容
@@ -250481,6 +250521,15 @@ var EditController = /*#__PURE__*/function () {
250481
250521
  });
250482
250522
  parentNode.table.update();
250483
250523
  return;
250524
+ } else {
250525
+ if (parentNode instanceof CellNode/* CellNode */.D && nodes.length > 0) {
250526
+ for (var g = 0; g < nodes.length; g++) {
250527
+ if (nodes[g] instanceof TableNode/* TableNode */.Fh) {
250528
+ message/* default.warn */.Z.warn("不允许在表格内插入表格");
250529
+ return;
250530
+ }
250531
+ }
250532
+ }
250484
250533
  }
250485
250534
  if (!hoeditorfactory.pasteBase) {
250486
250535
  for (var n = 0; n < nodes.length; n++) {
@@ -254151,6 +254200,9 @@ var HoLocalStorage = /*#__PURE__*/function () {
254151
254200
  (0,esm_createClass/* default */.Z)(HoLocalStorage, [{
254152
254201
  key: "initHoWebSql",
254153
254202
  value: function initHoWebSql() {
254203
+ localforage_default().config({
254204
+ driver: (localforage_default()).INDEXEDDB
254205
+ });
254154
254206
  this._ho_web = localforage_default().createInstance({
254155
254207
  name: '_ho_web',
254156
254208
  storeName: this._storeName
@@ -255560,7 +255612,7 @@ var formularType = {
255560
255612
  5: 'pregnantWeeks',
255561
255613
  6: 'ftScoreMapping',
255562
255614
  7: 'bodySurfaceArea',
255563
- 8: 'ftCalcDays' //计算天数
255615
+ 8: 'ftCalcDays' //计算住院天数
255564
255616
  };
255565
255617
 
255566
255618
  var getFormula = function getFormula(tableFormular) {
@@ -260568,8 +260620,8 @@ var ToolControl_component = (0,componentNormalizer/* default */.Z)(
260568
260620
  )
260569
260621
 
260570
260622
  /* harmony default export */ var ToolControl = (ToolControl_component.exports);
260571
- ;// 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/toolbar/insert/ToolTable.vue?vue&type=template&id=753fa24b&
260572
- var ToolTablevue_type_template_id_753fa24b_render = function render() {
260623
+ ;// 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/toolbar/insert/ToolTable.vue?vue&type=template&id=c3a519ae&
260624
+ var ToolTablevue_type_template_id_c3a519ae_render = function render() {
260573
260625
  var _vm = this,
260574
260626
  _c = _vm._self._c;
260575
260627
  return _c('div', {
@@ -260628,9 +260680,7 @@ var ToolTablevue_type_template_id_753fa24b_render = function render() {
260628
260680
  })], 2), _c('p', {
260629
260681
  staticClass: "table-bottom-title",
260630
260682
  on: {
260631
- "click": function click($event) {
260632
- return _vm.$emit('setModalStatus', ['table-formula', 'add', ['自定义表格行列', 'costumRowColumns']]);
260633
- }
260683
+ "click": _vm.customRowCol
260634
260684
  }
260635
260685
  }, [_vm._v("自定义行列数")])])])], 1)], 1)], 2)], 1) : _vm._e(), _c('HoTableFeatures', {
260636
260686
  attrs: {
@@ -260643,10 +260693,10 @@ var ToolTablevue_type_template_id_753fa24b_render = function render() {
260643
260693
  }
260644
260694
  }), _vm._t("hoTableItem")], 2);
260645
260695
  };
260646
- var ToolTablevue_type_template_id_753fa24b_staticRenderFns = [];
260696
+ var ToolTablevue_type_template_id_c3a519ae_staticRenderFns = [];
260647
260697
 
260648
- ;// 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/toolbar/insert/HoTableFeatures.vue?vue&type=template&id=6ecf79fe&
260649
- var HoTableFeaturesvue_type_template_id_6ecf79fe_render = function render() {
260698
+ ;// 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/toolbar/insert/HoTableFeatures.vue?vue&type=template&id=9b687288&
260699
+ var HoTableFeaturesvue_type_template_id_9b687288_render = function render() {
260650
260700
  var _vm = this,
260651
260701
  _c = _vm._self._c;
260652
260702
  return _c('div', {
@@ -260693,7 +260743,7 @@ var HoTableFeaturesvue_type_template_id_6ecf79fe_render = function render() {
260693
260743
  key: "bodySurfaceArea"
260694
260744
  }, [_vm._v("体表面积")]), _c('a-menu-item', {
260695
260745
  key: "ftCalcDays"
260696
- }, [_vm._v("计算天数")])], 1)], 1)], 2)], 1) : _vm._e(), _vm.table.insertRowAbove && _vm.tableProperty.canAddRow ? _c('div', {
260746
+ }, [_vm._v("计算住院天数")])], 1)], 1)], 2)], 1) : _vm._e(), _vm.table.insertRowAbove && _vm.tableProperty.canAddRow ? _c('div', {
260697
260747
  directives: [{
260698
260748
  name: "debounce",
260699
260749
  rawName: "v-debounce:1000.click",
@@ -260851,7 +260901,7 @@ var HoTableFeaturesvue_type_template_id_6ecf79fe_render = function render() {
260851
260901
  staticClass: "ho-emr-tool-item"
260852
260902
  }, [_c('span', [_vm._v("取消合并单元格")])]) : _vm._e()]);
260853
260903
  };
260854
- var HoTableFeaturesvue_type_template_id_6ecf79fe_staticRenderFns = [];
260904
+ var HoTableFeaturesvue_type_template_id_9b687288_staticRenderFns = [];
260855
260905
 
260856
260906
  ;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/toolbar/insert/HoTableFeatures.vue?vue&type=script&lang=js&
260857
260907
 
@@ -261012,7 +261062,7 @@ var HoTableFeaturesvue_type_template_id_6ecf79fe_staticRenderFns = [];
261012
261062
  expectedDate: '预产期计算公式',
261013
261063
  ftScoreMapping: '分值映射计算公式',
261014
261064
  bodySurfaceArea: '体表面积公式',
261015
- ftCalcDays: '计算天数公式'
261065
+ ftCalcDays: '计算住院天数公式'
261016
261066
  };
261017
261067
  if (formula[formulaType] === 'code') {
261018
261068
  this.setCellCode();
@@ -261087,8 +261137,8 @@ var HoTableFeaturesvue_type_template_id_6ecf79fe_staticRenderFns = [];
261087
261137
  ;
261088
261138
  var HoTableFeatures_component = (0,componentNormalizer/* default */.Z)(
261089
261139
  insert_HoTableFeaturesvue_type_script_lang_js_,
261090
- HoTableFeaturesvue_type_template_id_6ecf79fe_render,
261091
- HoTableFeaturesvue_type_template_id_6ecf79fe_staticRenderFns,
261140
+ HoTableFeaturesvue_type_template_id_9b687288_render,
261141
+ HoTableFeaturesvue_type_template_id_9b687288_staticRenderFns,
261092
261142
  false,
261093
261143
  null,
261094
261144
  null,
@@ -261099,6 +261149,9 @@ var HoTableFeatures_component = (0,componentNormalizer/* default */.Z)(
261099
261149
  /* harmony default export */ var HoTableFeatures = (HoTableFeatures_component.exports);
261100
261150
  ;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/toolbar/insert/ToolTable.vue?vue&type=script&lang=js&
261101
261151
 
261152
+
261153
+
261154
+
261102
261155
  /* harmony default export */ var ToolTablevue_type_script_lang_js_ = ({
261103
261156
  name: 'ToolTable',
261104
261157
  components: {
@@ -261127,7 +261180,34 @@ var HoTableFeatures_component = (0,componentNormalizer/* default */.Z)(
261127
261180
  };
261128
261181
  },
261129
261182
  methods: {
261183
+ customRowCol: function customRowCol() {
261184
+ var _this$vueController$g = this.vueController.getDomRange().inSameTable(),
261185
+ _this$vueController$g2 = (0,esm_slicedToArray/* default */.Z)(_this$vueController$g, 2),
261186
+ isInTable = _this$vueController$g2[0],
261187
+ tableNode = _this$vueController$g2[1];
261188
+ if (isInTable || tableNode) {
261189
+ message/* default.warn */.Z.warn({
261190
+ content: '不能在表格内插入表格!',
261191
+ duration: 3,
261192
+ offset: 120
261193
+ });
261194
+ return;
261195
+ }
261196
+ this.$emit('setModalStatus', ['table-formula', 'add', ['自定义表格行列', 'costumRowColumns']]);
261197
+ },
261130
261198
  createdTables: function createdTables() {
261199
+ var _this$vueController$g3 = this.vueController.getDomRange().inSameTable(),
261200
+ _this$vueController$g4 = (0,esm_slicedToArray/* default */.Z)(_this$vueController$g3, 2),
261201
+ isInTable = _this$vueController$g4[0],
261202
+ tableNode = _this$vueController$g4[1];
261203
+ if (isInTable || tableNode) {
261204
+ message/* default.warn */.Z.warn({
261205
+ content: '不能在表格内插入表格!',
261206
+ duration: 3,
261207
+ offset: 120
261208
+ });
261209
+ return;
261210
+ }
261131
261211
  this.vueController.insertTable(this.rows, this.columns);
261132
261212
  },
261133
261213
  clearData: function clearData() {
@@ -261175,10 +261255,10 @@ var HoTableFeatures_component = (0,componentNormalizer/* default */.Z)(
261175
261255
  });
261176
261256
  ;// CONCATENATED MODULE: ./src/components/toolbar/insert/ToolTable.vue?vue&type=script&lang=js&
261177
261257
  /* harmony default export */ var insert_ToolTablevue_type_script_lang_js_ = (ToolTablevue_type_script_lang_js_);
261178
- ;// 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/toolbar/insert/ToolTable.vue?vue&type=style&index=0&id=753fa24b&prod&lang=scss&
261258
+ ;// 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/toolbar/insert/ToolTable.vue?vue&type=style&index=0&id=c3a519ae&prod&lang=scss&
261179
261259
  // extracted by mini-css-extract-plugin
261180
261260
 
261181
- ;// CONCATENATED MODULE: ./src/components/toolbar/insert/ToolTable.vue?vue&type=style&index=0&id=753fa24b&prod&lang=scss&
261261
+ ;// CONCATENATED MODULE: ./src/components/toolbar/insert/ToolTable.vue?vue&type=style&index=0&id=c3a519ae&prod&lang=scss&
261182
261262
 
261183
261263
  ;// CONCATENATED MODULE: ./src/components/toolbar/insert/ToolTable.vue
261184
261264
 
@@ -261191,8 +261271,8 @@ var HoTableFeatures_component = (0,componentNormalizer/* default */.Z)(
261191
261271
 
261192
261272
  var ToolTable_component = (0,componentNormalizer/* default */.Z)(
261193
261273
  insert_ToolTablevue_type_script_lang_js_,
261194
- ToolTablevue_type_template_id_753fa24b_render,
261195
- ToolTablevue_type_template_id_753fa24b_staticRenderFns,
261274
+ ToolTablevue_type_template_id_c3a519ae_render,
261275
+ ToolTablevue_type_template_id_c3a519ae_staticRenderFns,
261196
261276
  false,
261197
261277
  null,
261198
261278
  null,
@@ -262527,7 +262607,7 @@ var popper = __webpack_require__(95551);
262527
262607
  pregnantWeeks: '孕周公式',
262528
262608
  ftScoreMapping: '分值映射公式',
262529
262609
  bodySurfaceArea: '体表面积公式',
262530
- ftCalcDays: '计算天数公式'
262610
+ ftCalcDays: '计算住院天数公式'
262531
262611
  },
262532
262612
  isPasted: false,
262533
262613
  isWebview: false,