hoeditor-web 3.1.161 → 3.1.163

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. package/lib/hoeditor.css +18044 -1
  2. package/lib/hoeditor.umd.js +650 -573
  3. package/lib/hoeditor.umd.min.js +10 -10
  4. package/package.json +1 -1
package/lib/hoeditor.umd.js CHANGED
@@ -17134,7 +17134,7 @@ var component = (0,componentNormalizer/* default */.Z)(
17134
17134
 
17135
17135
  /***/ }),
17136
17136
 
17137
- /***/ 19363:
17137
+ /***/ 21166:
17138
17138
  /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
17139
17139
 
17140
17140
  "use strict";
@@ -17154,7 +17154,7 @@ var es_string_includes = __webpack_require__(32023);
17154
17154
  var es_regexp_exec = __webpack_require__(74916);
17155
17155
  // EXTERNAL MODULE: ./node_modules/core-js/modules/es.string.replace.js
17156
17156
  var es_string_replace = __webpack_require__(15306);
17157
- ;// 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/table/TableCellPoper.vue?vue&type=template&id=7a33549e&
17157
+ ;// 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/table/TableCellPoper.vue?vue&type=template&id=a1731b98&
17158
17158
 
17159
17159
 
17160
17160
 
@@ -17420,7 +17420,7 @@ var render = function render() {
17420
17420
  };
17421
17421
  var staticRenderFns = [];
17422
17422
 
17423
- ;// CONCATENATED MODULE: ./src/components/controls/table/TableCellPoper.vue?vue&type=template&id=7a33549e&
17423
+ ;// CONCATENATED MODULE: ./src/components/controls/table/TableCellPoper.vue?vue&type=template&id=a1731b98&
17424
17424
 
17425
17425
  // EXTERNAL MODULE: ./node_modules/@babel/runtime/helpers/esm/toConsumableArray.js + 3 modules
17426
17426
  var toConsumableArray = __webpack_require__(61748);
@@ -17919,10 +17919,10 @@ var popper = __webpack_require__(95551);
17919
17919
  });
17920
17920
  ;// CONCATENATED MODULE: ./src/components/controls/table/TableCellPoper.vue?vue&type=script&lang=js&
17921
17921
  /* harmony default export */ var table_TableCellPopervue_type_script_lang_js_ = (TableCellPopervue_type_script_lang_js_);
17922
- ;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-32.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-32.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-32.use[2]!./node_modules/less-loader/dist/cjs.js??clonedRuleSet-32.use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/table/TableCellPoper.vue?vue&type=style&index=0&id=7a33549e&prod&lang=less&
17922
+ ;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-32.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-32.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-32.use[2]!./node_modules/less-loader/dist/cjs.js??clonedRuleSet-32.use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/table/TableCellPoper.vue?vue&type=style&index=0&id=a1731b98&prod&lang=less&
17923
17923
  // extracted by mini-css-extract-plugin
17924
17924
 
17925
- ;// CONCATENATED MODULE: ./src/components/controls/table/TableCellPoper.vue?vue&type=style&index=0&id=7a33549e&prod&lang=less&
17925
+ ;// CONCATENATED MODULE: ./src/components/controls/table/TableCellPoper.vue?vue&type=style&index=0&id=a1731b98&prod&lang=less&
17926
17926
 
17927
17927
  // EXTERNAL MODULE: ./node_modules/@vue/vue-loader-v15/lib/runtime/componentNormalizer.js
17928
17928
  var componentNormalizer = __webpack_require__(70713);
@@ -18603,7 +18603,7 @@ var component = (0,componentNormalizer/* default */.Z)(
18603
18603
 
18604
18604
  /***/ }),
18605
18605
 
18606
- /***/ 90546:
18606
+ /***/ 14278:
18607
18607
  /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
18608
18608
 
18609
18609
  "use strict";
@@ -18619,7 +18619,7 @@ __webpack_require__.d(__webpack_exports__, {
18619
18619
  var es_array_includes = __webpack_require__(26699);
18620
18620
  // EXTERNAL MODULE: ./node_modules/core-js/modules/es.string.includes.js
18621
18621
  var es_string_includes = __webpack_require__(32023);
18622
- ;// 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/table/TableCellProperty.vue?vue&type=template&id=8849ff10&
18622
+ ;// 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/table/TableCellProperty.vue?vue&type=template&id=082cc123&
18623
18623
 
18624
18624
 
18625
18625
  var render = function render() {
@@ -19278,7 +19278,34 @@ var render = function render() {
19278
19278
  },
19279
19279
  expression: "isAutoInputCurDate"
19280
19280
  }
19281
- }, [_vm._v("双击设置当前日期时间")])], 1)])] : _vm.editorProperty === 7 ? [_c('li', {
19281
+ }, [_vm._v("双击设置当前日期时间")])], 1)]), _c('li', {
19282
+ staticClass: "control-item"
19283
+ }, [_c('div', {
19284
+ staticClass: "control-item"
19285
+ }, [_c('a-checkbox', {
19286
+ model: {
19287
+ value: _vm.isUpdateNextDays,
19288
+ callback: function callback($$v) {
19289
+ _vm.isUpdateNextDays = $$v;
19290
+ },
19291
+ expression: "isUpdateNextDays"
19292
+ }
19293
+ }, [_vm._v("设置间隔天数")]), _c('a-input-number', {
19294
+ staticStyle: {
19295
+ "width": "100px"
19296
+ },
19297
+ attrs: {
19298
+ "min": 0,
19299
+ "size": "small"
19300
+ },
19301
+ model: {
19302
+ value: _vm.daysInterval,
19303
+ callback: function callback($$v) {
19304
+ _vm.daysInterval = $$v;
19305
+ },
19306
+ expression: "daysInterval"
19307
+ }
19308
+ }), _c('span', [_vm._v("天")])], 1)])] : _vm.editorProperty === 7 ? [_c('li', {
19282
19309
  staticClass: "control-item"
19283
19310
  }, [_c('span', {
19284
19311
  staticClass: "label"
@@ -19410,7 +19437,7 @@ var render = function render() {
19410
19437
  };
19411
19438
  var staticRenderFns = [];
19412
19439
 
19413
- ;// CONCATENATED MODULE: ./src/components/controls/table/TableCellProperty.vue?vue&type=template&id=8849ff10&
19440
+ ;// CONCATENATED MODULE: ./src/components/controls/table/TableCellProperty.vue?vue&type=template&id=082cc123&
19414
19441
 
19415
19442
  // EXTERNAL MODULE: ./node_modules/@babel/runtime/helpers/esm/slicedToArray.js + 3 modules
19416
19443
  var slicedToArray = __webpack_require__(27222);
@@ -19571,10 +19598,12 @@ var columns = [{
19571
19598
  // 斜分割线
19572
19599
  endPath: '',
19573
19600
  tableInfo: null,
19574
- formula: '' // 公式
19601
+ formula: '',
19602
+ // 公式
19603
+ isUpdateNextDays: false,
19604
+ daysInterval: 0
19575
19605
  };
19576
19606
  },
19577
-
19578
19607
  inject: ['hoEditorProvider'],
19579
19608
  computed: {
19580
19609
  customProperties: function customProperties() {
@@ -19593,7 +19622,7 @@ var columns = [{
19593
19622
  this.endPath = hoEditorFactory.docTree.curDomRange.normalize().endPath;
19594
19623
  var cellNode = this.getCellNodes();
19595
19624
  if (cellNode !== null) {
19596
- this.id = cellNode !== null && cellNode !== void 0 && cellNode.cellProperty.id ? cellNode.cellProperty.id : this.vueController.generateID('TB');
19625
+ // this.id = cellNode?.cellProperty.id ? cellNode.cellProperty.id : this.vueController.generateID('TB');
19597
19626
  this.lightCellBorders = cellNode.cellProperty.lightCellBorders;
19598
19627
  this.title = cellNode.cellProperty.title ? cellNode.cellProperty.title : '';
19599
19628
  this.align = cellNode.cellProperty.align;
@@ -19648,6 +19677,8 @@ var columns = [{
19648
19677
  if (dateTimeProperty) {
19649
19678
  this.inputStyle = dateTimeProperty.inputStyle ? dateTimeProperty.inputStyle : 'yyyy-MM-dd';
19650
19679
  this.isAutoInputCurDate = dateTimeProperty.isAutoInputCurDate !== undefined ? dateTimeProperty.isAutoInputCurDate : false;
19680
+ this.daysInterval = dateTimeProperty.daysInterval ? dateTimeProperty.daysInterval : 0;
19681
+ this.isUpdateNextDays = dateTimeProperty.isUpdateNextDays ? dateTimeProperty.isUpdateNextDays : false;
19651
19682
  }
19652
19683
  this.obliqueSplitLine = cellNode.cellProperty.obliqueSplitLine;
19653
19684
  }
@@ -19789,7 +19820,9 @@ var columns = [{
19789
19820
  } else if (this.editorProperty === 2) {
19790
19821
  params.dateTimeProperty = {
19791
19822
  inputStyle: this.inputStyle,
19792
- isAutoInputCurDate: this.isAutoInputCurDate
19823
+ isAutoInputCurDate: this.isAutoInputCurDate,
19824
+ daysInterval: this.daysInterval,
19825
+ isUpdateNextDays: this.isUpdateNextDays
19793
19826
  };
19794
19827
  params.downListProperty = undefined;
19795
19828
  }
@@ -19813,10 +19846,10 @@ var columns = [{
19813
19846
  });
19814
19847
  ;// CONCATENATED MODULE: ./src/components/controls/table/TableCellProperty.vue?vue&type=script&lang=js&
19815
19848
  /* harmony default export */ var table_TableCellPropertyvue_type_script_lang_js_ = (TableCellPropertyvue_type_script_lang_js_);
19816
- ;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-32.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-32.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-32.use[2]!./node_modules/less-loader/dist/cjs.js??clonedRuleSet-32.use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/table/TableCellProperty.vue?vue&type=style&index=0&id=8849ff10&prod&lang=less&
19849
+ ;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-32.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-32.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-32.use[2]!./node_modules/less-loader/dist/cjs.js??clonedRuleSet-32.use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/table/TableCellProperty.vue?vue&type=style&index=0&id=082cc123&prod&lang=less&
19817
19850
  // extracted by mini-css-extract-plugin
19818
19851
 
19819
- ;// CONCATENATED MODULE: ./src/components/controls/table/TableCellProperty.vue?vue&type=style&index=0&id=8849ff10&prod&lang=less&
19852
+ ;// CONCATENATED MODULE: ./src/components/controls/table/TableCellProperty.vue?vue&type=style&index=0&id=082cc123&prod&lang=less&
19820
19853
 
19821
19854
  // EXTERNAL MODULE: ./node_modules/@vue/vue-loader-v15/lib/runtime/componentNormalizer.js
19822
19855
  var componentNormalizer = __webpack_require__(70713);
@@ -19844,7 +19877,7 @@ var component = (0,componentNormalizer/* default */.Z)(
19844
19877
 
19845
19878
  /***/ }),
19846
19879
 
19847
- /***/ 16154:
19880
+ /***/ 3828:
19848
19881
  /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
19849
19882
 
19850
19883
  "use strict";
@@ -19864,7 +19897,7 @@ var es_array_includes = __webpack_require__(26699);
19864
19897
  var es_string_includes = __webpack_require__(32023);
19865
19898
  // EXTERNAL MODULE: ./node_modules/core-js/modules/es.number.constructor.js
19866
19899
  var es_number_constructor = __webpack_require__(9653);
19867
- ;// 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/table/TableColProperty.vue?vue&type=template&id=0e76e24b&
19900
+ ;// 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/table/TableColProperty.vue?vue&type=template&id=7c2da566&
19868
19901
 
19869
19902
 
19870
19903
 
@@ -20314,7 +20347,7 @@ var render = function render() {
20314
20347
  };
20315
20348
  var staticRenderFns = [];
20316
20349
 
20317
- ;// CONCATENATED MODULE: ./src/components/controls/table/TableColProperty.vue?vue&type=template&id=0e76e24b&
20350
+ ;// CONCATENATED MODULE: ./src/components/controls/table/TableColProperty.vue?vue&type=template&id=7c2da566&
20318
20351
 
20319
20352
  // EXTERNAL MODULE: ./node_modules/@babel/runtime/helpers/esm/toConsumableArray.js + 3 modules
20320
20353
  var toConsumableArray = __webpack_require__(61748);
@@ -20629,10 +20662,10 @@ var getCellNode = __webpack_require__(5986);
20629
20662
  });
20630
20663
  ;// CONCATENATED MODULE: ./src/components/controls/table/TableColProperty.vue?vue&type=script&lang=js&
20631
20664
  /* harmony default export */ var table_TableColPropertyvue_type_script_lang_js_ = (TableColPropertyvue_type_script_lang_js_);
20632
- ;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-32.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-32.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-32.use[2]!./node_modules/less-loader/dist/cjs.js??clonedRuleSet-32.use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/table/TableColProperty.vue?vue&type=style&index=0&id=0e76e24b&prod&lang=less&
20665
+ ;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-32.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-32.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-32.use[2]!./node_modules/less-loader/dist/cjs.js??clonedRuleSet-32.use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/table/TableColProperty.vue?vue&type=style&index=0&id=7c2da566&prod&lang=less&
20633
20666
  // extracted by mini-css-extract-plugin
20634
20667
 
20635
- ;// CONCATENATED MODULE: ./src/components/controls/table/TableColProperty.vue?vue&type=style&index=0&id=0e76e24b&prod&lang=less&
20668
+ ;// CONCATENATED MODULE: ./src/components/controls/table/TableColProperty.vue?vue&type=style&index=0&id=7c2da566&prod&lang=less&
20636
20669
 
20637
20670
  // EXTERNAL MODULE: ./node_modules/@vue/vue-loader-v15/lib/runtime/componentNormalizer.js
20638
20671
  var componentNormalizer = __webpack_require__(70713);
@@ -33321,22 +33354,24 @@ var Caret = /*#__PURE__*/function () {
33321
33354
  value: function setPage(pageIndex) {
33322
33355
  var hoeditorfacotry = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_3__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditoryFactoryID);
33323
33356
  var newPage = hoeditorfacotry.drawTree.drawPages[pageIndex];
33324
- if (this._pageIndex !== pageIndex) {
33325
- if (this._pageIndex >= 0) {
33326
- var oldPage = hoeditorfacotry.drawTree.drawPages[this._pageIndex];
33327
- if (oldPage && oldPage.drawSelectLevel) {
33328
- var canvas = oldPage.drawSelectLevel.selectCanvas;
33329
- if (canvas.parentNode && this.div_cursor.parentNode === canvas.parentNode) {
33330
- canvas.parentNode.removeChild(this.div_cursor);
33357
+ if (newPage) {
33358
+ if (this._pageIndex !== pageIndex) {
33359
+ if (this._pageIndex >= 0) {
33360
+ var oldPage = hoeditorfacotry.drawTree.drawPages[this._pageIndex];
33361
+ if (oldPage && oldPage.drawSelectLevel) {
33362
+ var canvas = oldPage.drawSelectLevel.selectCanvas;
33363
+ if (canvas.parentNode && this.div_cursor.parentNode === canvas.parentNode) {
33364
+ canvas.parentNode.removeChild(this.div_cursor);
33365
+ }
33331
33366
  }
33332
33367
  }
33368
+ this._pageIndex = pageIndex;
33333
33369
  }
33334
- this._pageIndex = pageIndex;
33335
- }
33336
- if (pageIndex >= 0 && newPage.drawSelectLevel) {
33337
- var _canvas = newPage.drawSelectLevel.selectCanvas;
33338
- if (_canvas.parentNode) {
33339
- _canvas.parentNode.appendChild(this.div_cursor);
33370
+ if (pageIndex >= 0 && newPage.drawSelectLevel) {
33371
+ var _canvas = newPage.drawSelectLevel.selectCanvas;
33372
+ if (_canvas.parentNode) {
33373
+ _canvas.parentNode.appendChild(this.div_cursor);
33374
+ }
33340
33375
  }
33341
33376
  }
33342
33377
  }
@@ -36058,13 +36093,11 @@ var Print = /*#__PURE__*/function () {
36058
36093
  }
36059
36094
  return _context4.abrupt("continue", 40);
36060
36095
  case 32:
36061
- // if(hoEditorFactory.vueController.isEmptyPage(index)) {
36062
- // console.log(`第${index + 1}页 ==> ???`);
36063
- // continue;
36064
- // }
36065
36096
  if (cpage.drawDomLevel && !cpage.drawDomLevel.stage) {
36066
36097
  cpage.drawDomLevel.bindStage();
36067
36098
  cpage.needUpdateStage = true;
36099
+ } else if (cpage.drawDomLevel && cpage.drawDomLevel.stage) {
36100
+ cpage.drawDomLevel.bindStage();
36068
36101
  }
36069
36102
  // 合并续打： 上一页还有空余时续打起始页隐藏页脚
36070
36103
  if (index === hoEditorFactory.startPageNum && positionY) {
@@ -36336,6 +36369,8 @@ var Print = /*#__PURE__*/function () {
36336
36369
  if (cpage.drawDomLevel && !cpage.drawDomLevel.stage) {
36337
36370
  cpage.drawDomLevel.bindStage();
36338
36371
  cpage.needUpdateStage = true;
36372
+ } else if (cpage.drawDomLevel && cpage.drawDomLevel.stage) {
36373
+ cpage.drawDomLevel.bindStage();
36339
36374
  }
36340
36375
  if (cpage.needUpdateStage && cpage.drawDomLevel && cpage.drawDomLevel.stage) {
36341
36376
  cpage.drawDomLevel.stage.update();
@@ -36424,6 +36459,8 @@ var Print = /*#__PURE__*/function () {
36424
36459
  if (cpage.drawDomLevel && !cpage.drawDomLevel.stage) {
36425
36460
  cpage.drawDomLevel.bindStage();
36426
36461
  cpage.needUpdateStage = true;
36462
+ } else if (cpage.drawDomLevel && cpage.drawDomLevel.stage) {
36463
+ cpage.drawDomLevel.bindStage();
36427
36464
  }
36428
36465
  if (cpage.needUpdateStage && cpage.drawDomLevel && cpage.drawDomLevel.stage) {
36429
36466
  cpage.drawDomLevel.stage.update();
@@ -36543,6 +36580,8 @@ var Print = /*#__PURE__*/function () {
36543
36580
  if (cpage.drawDomLevel && !cpage.drawDomLevel.stage) {
36544
36581
  cpage.drawDomLevel.bindStage();
36545
36582
  cpage.needUpdateStage = true;
36583
+ } else if (cpage.drawDomLevel && cpage.drawDomLevel.stage) {
36584
+ cpage.drawDomLevel.bindStage();
36546
36585
  }
36547
36586
  if (cpage.needUpdateStage && cpage.drawDomLevel && cpage.drawDomLevel.stage) {
36548
36587
  cpage.drawDomLevel.stage.update();
@@ -45405,7 +45444,6 @@ var PaintRowLineStyle;
45405
45444
  PaintRowLineStyle[PaintRowLineStyle["dot"] = 4] = "dot";
45406
45445
  })(PaintRowLineStyle || (PaintRowLineStyle = {})); //绘制行线样式{实线,虚线,点划线,双点划线,点线}
45407
45446
  var PageProperty = /*#__PURE__*/function () {
45408
- //批注宽度(像素)
45409
45447
  function PageProperty(hoEditorFactoryID) {
45410
45448
  (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_classCallCheck_js__WEBPACK_IMPORTED_MODULE_3__/* ["default"] */ .Z)(this, PageProperty);
45411
45449
  //private static _instance: PageProperty;
@@ -45420,17 +45458,17 @@ var PageProperty = /*#__PURE__*/function () {
45420
45458
  //打印方向
45421
45459
  (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_5__/* ["default"] */ .Z)(this, "_isPaintBorder", false);
45422
45460
  // 是否绘制边框
45423
- (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_5__/* ["default"] */ .Z)(this, "_borderColor", "#000000");
45461
+ (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_5__/* ["default"] */ .Z)(this, "_borderColor", '#000000');
45424
45462
  //边框颜色
45425
45463
  (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_5__/* ["default"] */ .Z)(this, "_paintRowLine", PaintRowLineStyle.solid);
45426
45464
  //绘制行线样式
45427
- (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_5__/* ["default"] */ .Z)(this, "_pageSize", "A4");
45465
+ (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_5__/* ["default"] */ .Z)(this, "_pageSize", 'A4');
45428
45466
  //纸张大小
45429
45467
  (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_5__/* ["default"] */ .Z)(this, "_widthMm", 210);
45430
45468
  //页宽(毫米)
45431
45469
  (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_5__/* ["default"] */ .Z)(this, "_heightMm", 297);
45432
45470
  //页高(毫米)
45433
- (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_5__/* ["default"] */ .Z)(this, "_source", "");
45471
+ (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_5__/* ["default"] */ .Z)(this, "_source", '');
45434
45472
  //来源
45435
45473
  (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_5__/* ["default"] */ .Z)(this, "_topMarginMm", 25);
45436
45474
  //页上边距(毫米)
@@ -45458,13 +45496,13 @@ var PageProperty = /*#__PURE__*/function () {
45458
45496
  // 监听画布宽高变化
45459
45497
  (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_5__/* ["default"] */ .Z)(this, "_canvasHeadFootPos", void 0);
45460
45498
  // 监听页眉页脚 Y 坐标
45461
- (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_5__/* ["default"] */ .Z)(this, "_fontFormat", "宋体");
45499
+ (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_5__/* ["default"] */ .Z)(this, "_fontFormat", '宋体');
45462
45500
  //字体
45463
45501
  (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_5__/* ["default"] */ .Z)(this, "_fontSize", 14);
45464
45502
  //字号
45465
- (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_5__/* ["default"] */ .Z)(this, "_fontColor", "#000000");
45503
+ (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_5__/* ["default"] */ .Z)(this, "_fontColor", '#000000');
45466
45504
  //字体颜色
45467
- (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_5__/* ["default"] */ .Z)(this, "_backColor", "transparent");
45505
+ (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_5__/* ["default"] */ .Z)(this, "_backColor", 'transparent');
45468
45506
  //字体背景颜色
45469
45507
  (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_5__/* ["default"] */ .Z)(this, "_paraAlign", _domNode_Paragraph__WEBPACK_IMPORTED_MODULE_13__/* .Align */ .xM.alSpaceEqually);
45470
45508
  //段落对齐方式
@@ -45490,6 +45528,10 @@ var PageProperty = /*#__PURE__*/function () {
45490
45528
  (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_5__/* ["default"] */ .Z)(this, "_footerYPixes", void 0);
45491
45529
  //页脚距页边距(像素)
45492
45530
  (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_5__/* ["default"] */ .Z)(this, "_commentWidthPixes", void 0);
45531
+ //批注宽度(像素)
45532
+ (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_5__/* ["default"] */ .Z)(this, "_drawLineUnderline", false);
45533
+ (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_5__/* ["default"] */ .Z)(this, "_lineUnderlineColor", '#000000');
45534
+ (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_5__/* ["default"] */ .Z)(this, "_lineUnderlineStyle", 0);
45493
45535
  this._hoEditorFactoryID = hoEditorFactoryID;
45494
45536
  this.mmConversionPx();
45495
45537
  }
@@ -45510,16 +45552,16 @@ var PageProperty = /*#__PURE__*/function () {
45510
45552
  }, {
45511
45553
  key: "setPageProperty",
45512
45554
  value: function setPageProperty(objectValues) {
45513
- if (objectValues !== "") {
45514
- var valuesObj = eval("(" + objectValues + ")");
45555
+ if (objectValues !== '') {
45556
+ var valuesObj = eval('(' + objectValues + ')');
45515
45557
  var assignvalue = function assignvalue(target, source) {
45516
45558
  Object.keys(source).forEach(function (value) {
45517
- if ((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_typeof_js__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z)(target[value]) == "object") {
45518
- if (Object.prototype.toString.call(source[value]) === "[object Object]") {
45559
+ if ((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_typeof_js__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z)(target[value]) == 'object') {
45560
+ if (Object.prototype.toString.call(source[value]) === '[object Object]') {
45519
45561
  assignvalue(target[value], source[value]);
45520
45562
  } else {
45521
- if (source[value] !== "" && source[value] !== null) {
45522
- assignvalue(target[value], eval("(" + source[value] + ")"));
45563
+ if (source[value] !== '' && source[value] !== null) {
45564
+ assignvalue(target[value], eval('(' + source[value] + ')'));
45523
45565
  }
45524
45566
  }
45525
45567
  } else target[value] = source[value];
@@ -45539,7 +45581,7 @@ var PageProperty = /*#__PURE__*/function () {
45539
45581
  while (1) switch (_context.prev = _context.next) {
45540
45582
  case 0:
45541
45583
  hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_11__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID);
45542
- if (type === "text") {
45584
+ if (type === 'text') {
45543
45585
  defaultStyle = new _domNode_TextStyle__WEBPACK_IMPORTED_MODULE_14__/* .CombineStyle */ .xc(this._hoEditorFactoryID);
45544
45586
  _domNode_TextStyle__WEBPACK_IMPORTED_MODULE_14__/* .CombineStyle */ .xc.makeDefaultStyle(this._hoEditorFactoryID, defaultStyle);
45545
45587
  hoEditorFactory.docTree._defaultCombineStyle = defaultStyle;
@@ -45547,7 +45589,7 @@ var PageProperty = /*#__PURE__*/function () {
45547
45589
  hoEditorFactory.docTree.styles.splice(0, 1);
45548
45590
  hoEditorFactory.docTree.styles.splice(0, 0, firstStyle);
45549
45591
  }
45550
- if (type === "para") {
45592
+ if (type === 'para') {
45551
45593
  hoEditorFactory.docTree._defaultCombineParagraph = new _domNode_Paragraph__WEBPACK_IMPORTED_MODULE_13__/* .CombineParagraph */ .kh(this._hoEditorFactoryID, null);
45552
45594
  hoEditorFactory.docTree._defaultCombineParagraph.defaultCombineParagraph(hoEditorFactory.docTree._defaultCombineParagraph);
45553
45595
  paragraph = new _domNode_Paragraph__WEBPACK_IMPORTED_MODULE_13__/* .Paragraph */ .nv(this._hoEditorFactoryID);
@@ -45607,6 +45649,36 @@ var PageProperty = /*#__PURE__*/function () {
45607
45649
  this._paintRowLine = value;
45608
45650
  }
45609
45651
  }
45652
+ }, {
45653
+ key: "drawLineUnderline",
45654
+ get: function get() {
45655
+ return this._drawLineUnderline;
45656
+ },
45657
+ set: function set(value) {
45658
+ if (value !== this._drawLineUnderline) {
45659
+ this._drawLineUnderline = value;
45660
+ }
45661
+ }
45662
+ }, {
45663
+ key: "lineUnderlineColor",
45664
+ get: function get() {
45665
+ return this._lineUnderlineColor;
45666
+ },
45667
+ set: function set(value) {
45668
+ if (value !== this._lineUnderlineColor) {
45669
+ this._lineUnderlineColor = value;
45670
+ }
45671
+ }
45672
+ }, {
45673
+ key: "lineUnderlineStyle",
45674
+ get: function get() {
45675
+ return this._lineUnderlineStyle;
45676
+ },
45677
+ set: function set(value) {
45678
+ if (value !== this._lineUnderlineStyle) {
45679
+ this._lineUnderlineStyle = value;
45680
+ }
45681
+ }
45610
45682
  }, {
45611
45683
  key: "pageSize",
45612
45684
  get: function get() {
@@ -45799,7 +45871,7 @@ var PageProperty = /*#__PURE__*/function () {
45799
45871
  set: function set(value) {
45800
45872
  if (value !== this._fontFormat) {
45801
45873
  this._fontFormat = value;
45802
- this.setDefaultStyle("text");
45874
+ this.setDefaultStyle('text');
45803
45875
  }
45804
45876
  }
45805
45877
  }, {
@@ -45810,7 +45882,7 @@ var PageProperty = /*#__PURE__*/function () {
45810
45882
  set: function set(value) {
45811
45883
  if (value !== this._fontSize) {
45812
45884
  this._fontSize = value;
45813
- this.setDefaultStyle("text");
45885
+ this.setDefaultStyle('text');
45814
45886
  var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_11__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID);
45815
45887
  var defaultLineHeight = Math.round(hoEditorFactory.getFontHeightByFontSize(this.fontSize));
45816
45888
  hoEditorFactory.defaultLineHeight = defaultLineHeight;
@@ -45824,7 +45896,7 @@ var PageProperty = /*#__PURE__*/function () {
45824
45896
  set: function set(value) {
45825
45897
  if (value !== this._fontColor) {
45826
45898
  this._fontColor = value;
45827
- this.setDefaultStyle("text");
45899
+ this.setDefaultStyle('text');
45828
45900
  }
45829
45901
  }
45830
45902
  }, {
@@ -45835,7 +45907,7 @@ var PageProperty = /*#__PURE__*/function () {
45835
45907
  set: function set(value) {
45836
45908
  if (value !== this._backColor) {
45837
45909
  this._backColor = value;
45838
- this.setDefaultStyle("text");
45910
+ this.setDefaultStyle('text');
45839
45911
  }
45840
45912
  }
45841
45913
  }, {
@@ -45846,7 +45918,7 @@ var PageProperty = /*#__PURE__*/function () {
45846
45918
  set: function set(value) {
45847
45919
  if (value !== this._paraAlign) {
45848
45920
  this._paraAlign = value;
45849
- this.setDefaultStyle("para");
45921
+ this.setDefaultStyle('para');
45850
45922
  }
45851
45923
  }
45852
45924
  }, {
@@ -45857,7 +45929,7 @@ var PageProperty = /*#__PURE__*/function () {
45857
45929
  set: function set(value) {
45858
45930
  if (value !== this._charSpace) {
45859
45931
  this._charSpace = value;
45860
- this.setDefaultStyle("para");
45932
+ this.setDefaultStyle('para');
45861
45933
  }
45862
45934
  }
45863
45935
  }, {
@@ -45868,7 +45940,7 @@ var PageProperty = /*#__PURE__*/function () {
45868
45940
  set: function set(value) {
45869
45941
  if (value !== this._lineHeight) {
45870
45942
  this._lineHeight = value;
45871
- this.setDefaultStyle("para");
45943
+ this.setDefaultStyle('para');
45872
45944
  }
45873
45945
  }
45874
45946
  }, {
@@ -45949,7 +46021,7 @@ var PageProperty = /*#__PURE__*/function () {
45949
46021
  }], [{
45950
46022
  key: "whiteList",
45951
46023
  value: function whiteList() {
45952
- return ["printDirection", "borderColor", "isPaintBorder", "paintRowLine", "pageSize", "widthMm", "heightMm", "source", "topMarginMm", "bottomMarginMm", "leftMarginMm", "rightMarginMm", "headerYMm", "footerYMm", "showFirstPageHead", "showFirstPageFoot", "pageNumber", "isHaveBgImage", "commentWidthMm", "fontFormat", "fontSize", "fontColor", "backColor", "paraAlign", "charSpace", "lineHeight"];
46024
+ return ['drawLineUnderline', 'lineUnderlineColor', 'lineUnderlineStyle', 'printDirection', 'borderColor', 'isPaintBorder', 'paintRowLine', 'pageSize', 'widthMm', 'heightMm', 'source', 'topMarginMm', 'bottomMarginMm', 'leftMarginMm', 'rightMarginMm', 'headerYMm', 'footerYMm', 'showFirstPageHead', 'showFirstPageFoot', 'pageNumber', 'isHaveBgImage', 'commentWidthMm', 'fontFormat', 'fontSize', 'fontColor', 'backColor', 'paraAlign', 'charSpace', 'lineHeight'];
45953
46025
  }
45954
46026
  }]);
45955
46027
  return PageProperty;
@@ -46015,7 +46087,8 @@ var TableProperty = /*#__PURE__*/function () {
46015
46087
  //按顺序新增行
46016
46088
  function TableProperty(objectValues) {
46017
46089
  (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_classCallCheck_js__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z)(this, TableProperty);
46018
- //private _id!: string; //编号
46090
+ (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_4__/* ["default"] */ .Z)(this, "_id", void 0);
46091
+ //编号
46019
46092
  (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_4__/* ["default"] */ .Z)(this, "_customProperties", []);
46020
46093
  //自定义属性
46021
46094
  (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_4__/* ["default"] */ .Z)(this, "_canAdjustRowHeight", false);
@@ -46071,13 +46144,15 @@ var TableProperty = /*#__PURE__*/function () {
46071
46144
  assignvalue(this, valuesObj);
46072
46145
  }
46073
46146
  }
46074
- // get id(): string {
46075
- // return this._id;
46076
- // }
46077
- // set id(value: string) {
46078
- // this._id = value;
46079
- // }
46080
46147
  (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_3__/* ["default"] */ .Z)(TableProperty, [{
46148
+ key: "id",
46149
+ get: function get() {
46150
+ return this._id;
46151
+ },
46152
+ set: function set(value) {
46153
+ this._id = value;
46154
+ }
46155
+ }, {
46081
46156
  key: "customProperties",
46082
46157
  get: function get() {
46083
46158
  return this._customProperties;
@@ -46304,8 +46379,7 @@ var RowProperty = /*#__PURE__*/function () {
46304
46379
  function RowProperty(objectValues //, table: TableNode
46305
46380
  ) {
46306
46381
  (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_classCallCheck_js__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z)(this, RowProperty);
46307
- (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_4__/* ["default"] */ .Z)(this, "_id", "");
46308
- //编号
46382
+ // private _id = "";//编号
46309
46383
  (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_4__/* ["default"] */ .Z)(this, "_customProperties", []);
46310
46384
  //自定义属性
46311
46385
  //private _dataSource !: DataSource;//数据源
@@ -46350,14 +46424,6 @@ var RowProperty = /*#__PURE__*/function () {
46350
46424
  }
46351
46425
  }
46352
46426
  (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_3__/* ["default"] */ .Z)(RowProperty, [{
46353
- key: "id",
46354
- get: function get() {
46355
- return this._id;
46356
- },
46357
- set: function set(value) {
46358
- this._id = value;
46359
- }
46360
- }, {
46361
46427
  key: "customProperties",
46362
46428
  get: function get() {
46363
46429
  return this._customProperties;
@@ -46548,16 +46614,36 @@ var ColDownListProperty = /*#__PURE__*/function () {
46548
46614
  return ColDownListProperty;
46549
46615
  }();
46550
46616
  var DateTimeProperty = /*#__PURE__*/function () {
46551
- //是否自动填入当前日期时间
46552
46617
  function DateTimeProperty(objectValues) {
46553
46618
  (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_classCallCheck_js__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z)(this, DateTimeProperty);
46554
46619
  (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_4__/* ["default"] */ .Z)(this, "_inputStyle", "yyyy-MM-dd HH:mm:ss");
46555
46620
  //日期时间输入样式 编辑器属性是DateTime类型的情况
46556
46621
  (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_4__/* ["default"] */ .Z)(this, "_isAutoInputCurDate", false);
46557
- this._inputStyle = objectValues["inputStyle"] ? objectValues["inputStyle"] : objectValues["_inputStyle"];
46558
- this._isAutoInputCurDate = objectValues["isAutoInputCurDate"] === undefined ? objectValues["_isAutoInputCurDate"] === undefined ? false : objectValues["_isAutoInputCurDate"] : objectValues["isAutoInputCurDate"];
46622
+ //是否自动填入当前日期时间
46623
+ (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_4__/* ["default"] */ .Z)(this, "_isUpdateNextDays", false);
46624
+ (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_4__/* ["default"] */ .Z)(this, "_daysInterval", 0);
46625
+ this._inputStyle = objectValues["inputStyle"] || objectValues["_inputStyle"];
46626
+ this._isAutoInputCurDate = objectValues["isAutoInputCurDate"] || objectValues["_isAutoInputCurDate"] || false;
46627
+ this._isUpdateNextDays = objectValues["isUpdateNextDays"] || objectValues["_isUpdateNextDays"] || false;
46628
+ this._daysInterval = objectValues["daysInterval"] || objectValues["_daysInterval"] || 0;
46559
46629
  }
46560
46630
  (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_3__/* ["default"] */ .Z)(DateTimeProperty, [{
46631
+ key: "isUpdateNextDays",
46632
+ get: function get() {
46633
+ return this._isUpdateNextDays;
46634
+ },
46635
+ set: function set(value) {
46636
+ this._isUpdateNextDays = value;
46637
+ }
46638
+ }, {
46639
+ key: "daysInterval",
46640
+ get: function get() {
46641
+ return this._daysInterval;
46642
+ },
46643
+ set: function set(value) {
46644
+ this._daysInterval = value;
46645
+ }
46646
+ }, {
46561
46647
  key: "inputStyle",
46562
46648
  get: function get() {
46563
46649
  return this._inputStyle;
@@ -46638,7 +46724,6 @@ var ColProperty = /*#__PURE__*/function () {
46638
46724
  //新增行时是否使用默认值
46639
46725
  function ColProperty(objectValues) {
46640
46726
  (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_classCallCheck_js__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z)(this, ColProperty);
46641
- //private _id!: string;//编号
46642
46727
  (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_4__/* ["default"] */ .Z)(this, "_editorProperty", EditorProperty.None);
46643
46728
  //编辑器属性
46644
46729
  (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_4__/* ["default"] */ .Z)(this, "_align", VAlign.vatop);
@@ -46691,12 +46776,6 @@ var ColProperty = /*#__PURE__*/function () {
46691
46776
  }
46692
46777
  }
46693
46778
  }
46694
- // get id(): string {
46695
- // return this._id;
46696
- // }
46697
- // set id(value: string) {
46698
- // this._id = value;
46699
- // }
46700
46779
  (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_3__/* ["default"] */ .Z)(ColProperty, [{
46701
46780
  key: "editorProperty",
46702
46781
  get: function get() {
@@ -46815,42 +46894,12 @@ var DiagonalType;
46815
46894
  DiagonalType[DiagonalType["Left"] = 1] = "Left";
46816
46895
  DiagonalType[DiagonalType["Right"] = 2] = "Right";
46817
46896
  })(DiagonalType || (DiagonalType = {}));
46818
- // export class Formula { //计算公式
46819
- // private _formulaStr = "";
46820
- // private _oldValue = "";
46821
- // constructor(objectValues: any) {
46822
- // //this._formularType = objectValues["formularType"] ? objectValues["formularType"] : objectValues["_formularType"];
46823
- // this._formulaStr = objectValues["formulaStr"] ? objectValues["formulaStr"] : objectValues["_formulaStr"];
46824
- // }
46825
- // // get formularType(): FormularType {
46826
- // // return this._formularType;
46827
- // // }
46828
- // // set formularType(value: FormularType) {
46829
- // // this._formularType = value;
46830
- // // }
46831
- // get formulaStr(): string {
46832
- // return this._formulaStr;
46833
- // }
46834
- // set formulaStr(value: string) {
46835
- // this._formulaStr = value;
46836
- // }
46837
- // get oldValue(): string {
46838
- // return this._oldValue;
46839
- // }
46840
- // set oldValue(value: string) {
46841
- // this._oldValue = value;
46842
- // }
46843
- // }
46844
46897
  var CellProperty = /*#__PURE__*/function () {
46845
- function CellProperty(objectValues //, table: TableNode
46846
- ) {
46898
+ function CellProperty(objectValues) {
46847
46899
  (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_classCallCheck_js__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z)(this, CellProperty);
46848
- //private _id!: string;//编号
46849
46900
  //private _lightCellBorders = false;//突出显示单元格边框
46850
- //private _title = "";//标题
46851
46901
  (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_4__/* ["default"] */ .Z)(this, "_customProperties", []);
46852
46902
  //自定义属性
46853
- //private _dataSource!: DataSource;//数据源
46854
46903
  (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_4__/* ["default"] */ .Z)(this, "_align", VAlign.vatop);
46855
46904
  //垂直对齐方式
46856
46905
  (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_4__/* ["default"] */ .Z)(this, "_cellInnerMargin", [0, 0, 0.1, 0.1]);
@@ -46879,7 +46928,6 @@ var CellProperty = /*#__PURE__*/function () {
46879
46928
  (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_4__/* ["default"] */ .Z)(this, "_diagonalType", DiagonalType.None);
46880
46929
  (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_4__/* ["default"] */ .Z)(this, "_formula", "");
46881
46930
  (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_4__/* ["default"] */ .Z)(this, "_oldValue", "");
46882
- //this._dataSource = new DataSource();
46883
46931
  if (objectValues !== "") {
46884
46932
  var valuesObj = eval('(' + objectValues + ')');
46885
46933
  var assignvalue = function assignvalue(target, source) {
@@ -46916,29 +46964,8 @@ var CellProperty = /*#__PURE__*/function () {
46916
46964
  if (valuesObj["editorProperty"] === EditorProperty.DateTime) {
46917
46965
  this._dateTimeProperty = new DateTimeProperty(valuesObj["dateTimeProperty"]);
46918
46966
  }
46919
- // if (valuesObj["editorProperty"] === EditorProperty.Formula) {
46920
- // this._formula = new Formula(valuesObj["formula"]);
46921
- // }
46922
46967
  }
46923
46968
  }
46924
- // get id(): string {
46925
- // return this._id;
46926
- // }
46927
- // set id(value: string) {
46928
- // this._id = value;
46929
- // }
46930
- // get lightCellBorders(): boolean {
46931
- // return this._lightCellBorders;
46932
- // }
46933
- // set lightCellBorders(value: boolean) {
46934
- // this._lightCellBorders = value;
46935
- // }
46936
- // get title(): string {
46937
- // return this._title;
46938
- // }
46939
- // set title(value: string) {
46940
- // this._title = value;
46941
- // }
46942
46969
  (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_3__/* ["default"] */ .Z)(CellProperty, [{
46943
46970
  key: "customProperties",
46944
46971
  get: function get() {
@@ -46947,12 +46974,6 @@ var CellProperty = /*#__PURE__*/function () {
46947
46974
  set: function set(value) {
46948
46975
  this._customProperties = value;
46949
46976
  }
46950
- // get dataSource(): DataSource {
46951
- // return this._dataSource;
46952
- // }
46953
- // set dataSource(value: DataSource) {
46954
- // this._dataSource = value;
46955
- // }
46956
46977
  }, {
46957
46978
  key: "align",
46958
46979
  get: function get() {
@@ -50378,58 +50399,60 @@ var BaseNode = /*#__PURE__*/function () {
50378
50399
  /* harmony export */ D: function() { return /* binding */ CellNode; },
50379
50400
  /* harmony export */ v: function() { return /* binding */ CrossLineType; }
50380
50401
  /* harmony export */ });
50381
- /* harmony import */ var D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_typeof_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(8495);
50382
- /* harmony import */ var ant_design_vue_es_message_style__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(94310);
50383
- /* harmony import */ var ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_40__ = __webpack_require__(40735);
50384
- /* harmony import */ var D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(27222);
50385
- /* harmony import */ var D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_classCallCheck_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(70280);
50386
- /* harmony import */ var D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(66298);
50387
- /* harmony import */ var D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(75808);
50388
- /* harmony import */ var D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_inherits_js__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(11651);
50389
- /* harmony import */ var D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createSuper_js__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(19593);
50390
- /* harmony import */ var D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(78255);
50391
- /* harmony import */ var core_js_modules_es_array_push_js__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(57658);
50392
- /* harmony import */ var core_js_modules_es_array_push_js__WEBPACK_IMPORTED_MODULE_9___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_push_js__WEBPACK_IMPORTED_MODULE_9__);
50393
- /* harmony import */ var core_js_modules_es_number_constructor_js__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(9653);
50394
- /* harmony import */ var core_js_modules_es_number_constructor_js__WEBPACK_IMPORTED_MODULE_10___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_number_constructor_js__WEBPACK_IMPORTED_MODULE_10__);
50395
- /* harmony import */ var core_js_modules_es_object_to_string_js__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(41539);
50396
- /* harmony import */ var core_js_modules_es_object_to_string_js__WEBPACK_IMPORTED_MODULE_11___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_object_to_string_js__WEBPACK_IMPORTED_MODULE_11__);
50397
- /* harmony import */ var core_js_modules_es_regexp_to_string_js__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(39714);
50398
- /* harmony import */ var core_js_modules_es_regexp_to_string_js__WEBPACK_IMPORTED_MODULE_12___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_regexp_to_string_js__WEBPACK_IMPORTED_MODULE_12__);
50399
- /* harmony import */ var core_js_modules_es_object_keys_js__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(47941);
50400
- /* harmony import */ var core_js_modules_es_object_keys_js__WEBPACK_IMPORTED_MODULE_13___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_object_keys_js__WEBPACK_IMPORTED_MODULE_13__);
50401
- /* harmony import */ var core_js_modules_es_json_stringify_js__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(38862);
50402
- /* harmony import */ var core_js_modules_es_json_stringify_js__WEBPACK_IMPORTED_MODULE_14___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_json_stringify_js__WEBPACK_IMPORTED_MODULE_14__);
50403
- /* harmony import */ var core_js_modules_es_array_splice_js__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(40561);
50404
- /* harmony import */ var core_js_modules_es_array_splice_js__WEBPACK_IMPORTED_MODULE_15___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_splice_js__WEBPACK_IMPORTED_MODULE_15__);
50405
- /* harmony import */ var core_js_modules_es_array_concat_js__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(92222);
50406
- /* harmony import */ var core_js_modules_es_array_concat_js__WEBPACK_IMPORTED_MODULE_16___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_concat_js__WEBPACK_IMPORTED_MODULE_16__);
50407
- /* harmony import */ var core_js_modules_es_array_slice_js__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(47042);
50408
- /* harmony import */ var core_js_modules_es_array_slice_js__WEBPACK_IMPORTED_MODULE_17___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_slice_js__WEBPACK_IMPORTED_MODULE_17__);
50409
- /* harmony import */ var core_js_modules_web_dom_collections_for_each_js__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(54747);
50410
- /* harmony import */ var core_js_modules_web_dom_collections_for_each_js__WEBPACK_IMPORTED_MODULE_18___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_web_dom_collections_for_each_js__WEBPACK_IMPORTED_MODULE_18__);
50411
- /* harmony import */ var core_js_modules_es_function_name_js__WEBPACK_IMPORTED_MODULE_19__ = __webpack_require__(68309);
50412
- /* harmony import */ var core_js_modules_es_function_name_js__WEBPACK_IMPORTED_MODULE_19___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_function_name_js__WEBPACK_IMPORTED_MODULE_19__);
50413
- /* harmony import */ var _editor_draw_drawNode_DrawCell__WEBPACK_IMPORTED_MODULE_20__ = __webpack_require__(78040);
50414
- /* harmony import */ var _editor_events_NodeChangeEvent__WEBPACK_IMPORTED_MODULE_21__ = __webpack_require__(2613);
50415
- /* harmony import */ var _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_22__ = __webpack_require__(74089);
50416
- /* harmony import */ var _plugins_type__WEBPACK_IMPORTED_MODULE_23__ = __webpack_require__(41542);
50417
- /* harmony import */ var _DocTree__WEBPACK_IMPORTED_MODULE_24__ = __webpack_require__(32629);
50418
- /* harmony import */ var _DomRange__WEBPACK_IMPORTED_MODULE_25__ = __webpack_require__(94639);
50419
- /* harmony import */ var _NodePosition__WEBPACK_IMPORTED_MODULE_26__ = __webpack_require__(42921);
50420
- /* harmony import */ var _TableProperty__WEBPACK_IMPORTED_MODULE_27__ = __webpack_require__(79546);
50421
- /* harmony import */ var _BaseCombineNode__WEBPACK_IMPORTED_MODULE_28__ = __webpack_require__(4938);
50422
- /* harmony import */ var _BaseNode__WEBPACK_IMPORTED_MODULE_29__ = __webpack_require__(62358);
50423
- /* harmony import */ var _ControlNode__WEBPACK_IMPORTED_MODULE_30__ = __webpack_require__(91105);
50424
- /* harmony import */ var _DateTimeNode__WEBPACK_IMPORTED_MODULE_31__ = __webpack_require__(92501);
50425
- /* harmony import */ var _MarkNode__WEBPACK_IMPORTED_MODULE_32__ = __webpack_require__(57727);
50426
- /* harmony import */ var _ParagraphNode__WEBPACK_IMPORTED_MODULE_33__ = __webpack_require__(67945);
50427
- /* harmony import */ var _RectNode__WEBPACK_IMPORTED_MODULE_34__ = __webpack_require__(67800);
50428
- /* harmony import */ var _SignNode__WEBPACK_IMPORTED_MODULE_35__ = __webpack_require__(24701);
50429
- /* harmony import */ var _TableNode__WEBPACK_IMPORTED_MODULE_36__ = __webpack_require__(5010);
50430
- /* harmony import */ var _TextInputFieldNode__WEBPACK_IMPORTED_MODULE_37__ = __webpack_require__(65043);
50431
- /* harmony import */ var _TextNode__WEBPACK_IMPORTED_MODULE_38__ = __webpack_require__(27198);
50432
- /* harmony import */ var _QrcodeNode__WEBPACK_IMPORTED_MODULE_39__ = __webpack_require__(12659);
50402
+ /* harmony import */ var D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_objectSpread2_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(63442);
50403
+ /* harmony import */ var D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_typeof_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(8495);
50404
+ /* harmony import */ var ant_design_vue_es_message_style__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(94310);
50405
+ /* harmony import */ var ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_41__ = __webpack_require__(40735);
50406
+ /* harmony import */ var D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(27222);
50407
+ /* harmony import */ var D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_classCallCheck_js__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(70280);
50408
+ /* harmony import */ var D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(66298);
50409
+ /* harmony import */ var D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(75808);
50410
+ /* harmony import */ var D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_inherits_js__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(11651);
50411
+ /* harmony import */ var D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createSuper_js__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(19593);
50412
+ /* harmony import */ var D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(78255);
50413
+ /* harmony import */ var core_js_modules_es_array_push_js__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(57658);
50414
+ /* harmony import */ var core_js_modules_es_array_push_js__WEBPACK_IMPORTED_MODULE_10___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_push_js__WEBPACK_IMPORTED_MODULE_10__);
50415
+ /* harmony import */ var core_js_modules_es_number_constructor_js__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(9653);
50416
+ /* harmony import */ var core_js_modules_es_number_constructor_js__WEBPACK_IMPORTED_MODULE_11___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_number_constructor_js__WEBPACK_IMPORTED_MODULE_11__);
50417
+ /* harmony import */ var core_js_modules_es_object_to_string_js__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(41539);
50418
+ /* harmony import */ var core_js_modules_es_object_to_string_js__WEBPACK_IMPORTED_MODULE_12___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_object_to_string_js__WEBPACK_IMPORTED_MODULE_12__);
50419
+ /* harmony import */ var core_js_modules_es_regexp_to_string_js__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(39714);
50420
+ /* harmony import */ var core_js_modules_es_regexp_to_string_js__WEBPACK_IMPORTED_MODULE_13___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_regexp_to_string_js__WEBPACK_IMPORTED_MODULE_13__);
50421
+ /* harmony import */ var core_js_modules_es_object_keys_js__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(47941);
50422
+ /* harmony import */ var core_js_modules_es_object_keys_js__WEBPACK_IMPORTED_MODULE_14___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_object_keys_js__WEBPACK_IMPORTED_MODULE_14__);
50423
+ /* harmony import */ var core_js_modules_es_json_stringify_js__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(38862);
50424
+ /* harmony import */ var core_js_modules_es_json_stringify_js__WEBPACK_IMPORTED_MODULE_15___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_json_stringify_js__WEBPACK_IMPORTED_MODULE_15__);
50425
+ /* harmony import */ var core_js_modules_es_array_splice_js__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(40561);
50426
+ /* harmony import */ var core_js_modules_es_array_splice_js__WEBPACK_IMPORTED_MODULE_16___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_splice_js__WEBPACK_IMPORTED_MODULE_16__);
50427
+ /* harmony import */ var core_js_modules_es_array_concat_js__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(92222);
50428
+ /* harmony import */ var core_js_modules_es_array_concat_js__WEBPACK_IMPORTED_MODULE_17___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_concat_js__WEBPACK_IMPORTED_MODULE_17__);
50429
+ /* harmony import */ var core_js_modules_es_array_slice_js__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(47042);
50430
+ /* harmony import */ var core_js_modules_es_array_slice_js__WEBPACK_IMPORTED_MODULE_18___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_slice_js__WEBPACK_IMPORTED_MODULE_18__);
50431
+ /* harmony import */ var core_js_modules_web_dom_collections_for_each_js__WEBPACK_IMPORTED_MODULE_19__ = __webpack_require__(54747);
50432
+ /* harmony import */ var core_js_modules_web_dom_collections_for_each_js__WEBPACK_IMPORTED_MODULE_19___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_web_dom_collections_for_each_js__WEBPACK_IMPORTED_MODULE_19__);
50433
+ /* harmony import */ var core_js_modules_es_function_name_js__WEBPACK_IMPORTED_MODULE_20__ = __webpack_require__(68309);
50434
+ /* harmony import */ var core_js_modules_es_function_name_js__WEBPACK_IMPORTED_MODULE_20___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_function_name_js__WEBPACK_IMPORTED_MODULE_20__);
50435
+ /* harmony import */ var _editor_draw_drawNode_DrawCell__WEBPACK_IMPORTED_MODULE_21__ = __webpack_require__(78040);
50436
+ /* harmony import */ var _editor_events_NodeChangeEvent__WEBPACK_IMPORTED_MODULE_22__ = __webpack_require__(2613);
50437
+ /* harmony import */ var _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_23__ = __webpack_require__(74089);
50438
+ /* harmony import */ var _plugins_type__WEBPACK_IMPORTED_MODULE_24__ = __webpack_require__(41542);
50439
+ /* harmony import */ var _DocTree__WEBPACK_IMPORTED_MODULE_25__ = __webpack_require__(32629);
50440
+ /* harmony import */ var _DomRange__WEBPACK_IMPORTED_MODULE_26__ = __webpack_require__(94639);
50441
+ /* harmony import */ var _NodePosition__WEBPACK_IMPORTED_MODULE_27__ = __webpack_require__(42921);
50442
+ /* harmony import */ var _TableProperty__WEBPACK_IMPORTED_MODULE_28__ = __webpack_require__(79546);
50443
+ /* harmony import */ var _BaseCombineNode__WEBPACK_IMPORTED_MODULE_29__ = __webpack_require__(4938);
50444
+ /* harmony import */ var _BaseNode__WEBPACK_IMPORTED_MODULE_30__ = __webpack_require__(62358);
50445
+ /* harmony import */ var _ControlNode__WEBPACK_IMPORTED_MODULE_31__ = __webpack_require__(91105);
50446
+ /* harmony import */ var _DateTimeNode__WEBPACK_IMPORTED_MODULE_32__ = __webpack_require__(92501);
50447
+ /* harmony import */ var _MarkNode__WEBPACK_IMPORTED_MODULE_33__ = __webpack_require__(57727);
50448
+ /* harmony import */ var _ParagraphNode__WEBPACK_IMPORTED_MODULE_34__ = __webpack_require__(67945);
50449
+ /* harmony import */ var _RectNode__WEBPACK_IMPORTED_MODULE_35__ = __webpack_require__(67800);
50450
+ /* harmony import */ var _SignNode__WEBPACK_IMPORTED_MODULE_36__ = __webpack_require__(24701);
50451
+ /* harmony import */ var _TableNode__WEBPACK_IMPORTED_MODULE_37__ = __webpack_require__(5010);
50452
+ /* harmony import */ var _TextInputFieldNode__WEBPACK_IMPORTED_MODULE_38__ = __webpack_require__(65043);
50453
+ /* harmony import */ var _TextNode__WEBPACK_IMPORTED_MODULE_39__ = __webpack_require__(27198);
50454
+ /* harmony import */ var _QrcodeNode__WEBPACK_IMPORTED_MODULE_40__ = __webpack_require__(12659);
50455
+
50433
50456
 
50434
50457
 
50435
50458
 
@@ -50495,21 +50518,21 @@ var CrossLineType;
50495
50518
  // vabottom,
50496
50519
  // }
50497
50520
  var CellNode = /*#__PURE__*/function (_RectNode) {
50498
- (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_inherits_js__WEBPACK_IMPORTED_MODULE_6__/* ["default"] */ .Z)(CellNode, _RectNode);
50499
- var _super = (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createSuper_js__WEBPACK_IMPORTED_MODULE_7__/* ["default"] */ .Z)(CellNode);
50521
+ (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_inherits_js__WEBPACK_IMPORTED_MODULE_7__/* ["default"] */ .Z)(CellNode, _RectNode);
50522
+ var _super = (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createSuper_js__WEBPACK_IMPORTED_MODULE_8__/* ["default"] */ .Z)(CellNode);
50500
50523
  function CellNode(hoEditorFactoryID, rootNodes, pNode, row, copyCell, r, c, rowSpan, colSpan, cellProperty) {
50501
50524
  var _this;
50502
- (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_classCallCheck_js__WEBPACK_IMPORTED_MODULE_3__/* ["default"] */ .Z)(this, CellNode);
50503
- _this = _super.call(this, hoEditorFactoryID, rootNodes, pNode, _BaseNode__WEBPACK_IMPORTED_MODULE_29__/* .NodeType */ .Jq.ntCell);
50504
- (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_8__/* ["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), "_borderVisible", void 0);
50505
- (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_8__/* ["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), "_crossLineType", void 0);
50506
- (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_8__/* ["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), "_rowSpan", void 0);
50507
- (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_8__/* ["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), "_colSpan", void 0);
50508
- (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_8__/* ["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), "_table", void 0);
50509
- (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_8__/* ["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), "_row", void 0);
50510
- (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_8__/* ["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), "_drawCell", void 0);
50525
+ (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_classCallCheck_js__WEBPACK_IMPORTED_MODULE_4__/* ["default"] */ .Z)(this, CellNode);
50526
+ _this = _super.call(this, hoEditorFactoryID, rootNodes, pNode, _BaseNode__WEBPACK_IMPORTED_MODULE_30__/* .NodeType */ .Jq.ntCell);
50527
+ (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_9__/* ["default"] */ .Z)((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_6__/* ["default"] */ .Z)(_this), "_borderVisible", void 0);
50528
+ (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_9__/* ["default"] */ .Z)((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_6__/* ["default"] */ .Z)(_this), "_crossLineType", void 0);
50529
+ (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_9__/* ["default"] */ .Z)((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_6__/* ["default"] */ .Z)(_this), "_rowSpan", void 0);
50530
+ (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_9__/* ["default"] */ .Z)((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_6__/* ["default"] */ .Z)(_this), "_colSpan", void 0);
50531
+ (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_9__/* ["default"] */ .Z)((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_6__/* ["default"] */ .Z)(_this), "_table", void 0);
50532
+ (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_9__/* ["default"] */ .Z)((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_6__/* ["default"] */ .Z)(_this), "_row", void 0);
50533
+ (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_9__/* ["default"] */ .Z)((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_6__/* ["default"] */ .Z)(_this), "_drawCell", void 0);
50511
50534
  // private _valign: VAlign;
50512
- (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_8__/* ["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), "_cellProperty", void 0);
50535
+ (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_9__/* ["default"] */ .Z)((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_6__/* ["default"] */ .Z)(_this), "_cellProperty", void 0);
50513
50536
  _this._hoEditorFactoryID = hoEditorFactoryID;
50514
50537
  _this._borderVisible = [true, true, true, true];
50515
50538
  _this._crossLineType = CrossLineType.ctNone;
@@ -50528,7 +50551,7 @@ var CellNode = /*#__PURE__*/function (_RectNode) {
50528
50551
  * @param dTop
50529
50552
  * @param dline
50530
50553
  */
50531
- (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_4__/* ["default"] */ .Z)(CellNode, [{
50554
+ (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_5__/* ["default"] */ .Z)(CellNode, [{
50532
50555
  key: "drawCell",
50533
50556
  get:
50534
50557
  //单元格属性
@@ -50573,7 +50596,7 @@ var CellNode = /*#__PURE__*/function (_RectNode) {
50573
50596
  var bNeedUpdateHeight = true;
50574
50597
  var aHeight = 0;
50575
50598
  var _this$_table$getCellI = this._table.getCellInfos(this),
50576
- _this$_table$getCellI2 = (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z)(_this$_table$getCellI, 2),
50599
+ _this$_table$getCellI2 = (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_3__/* ["default"] */ .Z)(_this$_table$getCellI, 2),
50577
50600
  r = _this$_table$getCellI2[0],
50578
50601
  c = _this$_table$getCellI2[1];
50579
50602
  if (r >= 0) {
@@ -50606,7 +50629,7 @@ var CellNode = /*#__PURE__*/function (_RectNode) {
50606
50629
  this._colSpan = colSpan;
50607
50630
  var aWidth = 0;
50608
50631
  var _this$_table$getCellI3 = this._table.getCellInfos(this),
50609
- _this$_table$getCellI4 = (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z)(_this$_table$getCellI3, 2),
50632
+ _this$_table$getCellI4 = (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_3__/* ["default"] */ .Z)(_this$_table$getCellI3, 2),
50610
50633
  r = _this$_table$getCellI4[0],
50611
50634
  c = _this$_table$getCellI4[1];
50612
50635
  var bNeedUpdateWidth = true;
@@ -50677,7 +50700,7 @@ var CellNode = /*#__PURE__*/function (_RectNode) {
50677
50700
  }, {
50678
50701
  key: "initBlankDoc",
50679
50702
  value: function initBlankDoc() {
50680
- var aparagraph = new _ParagraphNode__WEBPACK_IMPORTED_MODULE_33__/* .ParagraphNode */ .C(this._hoEditorFactoryID, this.rootNodes, this, 0);
50703
+ var aparagraph = new _ParagraphNode__WEBPACK_IMPORTED_MODULE_34__/* .ParagraphNode */ .C(this._hoEditorFactoryID, this.rootNodes, this, 0);
50681
50704
  aparagraph.node2DrawNode();
50682
50705
  this._childNodes.push(aparagraph);
50683
50706
  this._drawCell.drawLines.push(this._childNodes[0].drawlines[0]);
@@ -50687,7 +50710,7 @@ var CellNode = /*#__PURE__*/function (_RectNode) {
50687
50710
  key: "placeDNodeAfterDTop",
50688
50711
  value: function placeDNodeAfterDTop(droots, dTop) {
50689
50712
  var paragraphNode = this.childNodes[0];
50690
- var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_22__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID);
50713
+ var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_23__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID);
50691
50714
  // const aline = paragraphNode.drawlines[0];
50692
50715
  hoEditorFactory.drawTree.drawDocInsert(paragraphNode, 0, paragraphNode, -1, hoEditorFactory.docTree.getNodeLastPath(this));
50693
50716
  if (this._drawCell.drawLines.length > 0) {
@@ -50725,7 +50748,7 @@ var CellNode = /*#__PURE__*/function (_RectNode) {
50725
50748
  value: function updateWidth(awidth) {
50726
50749
  this.drawCell.dWidth = awidth;
50727
50750
  // (this.childNodes[0] as ParagraphNode).drawlines[0].dWidth = awidth;
50728
- _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_22__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID).drawTree.clearDrawContainer(this.drawCell.drawLines);
50751
+ _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_23__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID).drawTree.clearDrawContainer(this.drawCell.drawLines);
50729
50752
  this._drawCell.drawLines.length = 0;
50730
50753
  this.childNodes[0].node2DrawNode();
50731
50754
  this.drawCell.drawLines.push(this.childNodes[0].drawlines[0]);
@@ -50741,12 +50764,12 @@ var CellNode = /*#__PURE__*/function (_RectNode) {
50741
50764
  }, {
50742
50765
  key: "redrawCell",
50743
50766
  value: function redrawCell(repaintInmediate, action) {
50744
- var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_22__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID);
50767
+ var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_23__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID);
50745
50768
  if (repaintInmediate) {
50746
- var dcChangeEvent = new _editor_events_NodeChangeEvent__WEBPACK_IMPORTED_MODULE_21__/* .NodeChangeEvent */ .G(this._hoEditorFactoryID, action, hoEditorFactory.docTree.getNodeFirstPath(this.childNodes[0]), hoEditorFactory.docTree.getNodeLastPath(this.childNodes[this.childNodes.length - 1]));
50747
- if (action === _DocTree__WEBPACK_IMPORTED_MODULE_24__/* .DocAction */ .gk.daDelete || action === _DocTree__WEBPACK_IMPORTED_MODULE_24__/* .DocAction */ .gk.daModifyStyle) {
50769
+ var dcChangeEvent = new _editor_events_NodeChangeEvent__WEBPACK_IMPORTED_MODULE_22__/* .NodeChangeEvent */ .G(this._hoEditorFactoryID, action, hoEditorFactory.docTree.getNodeFirstPath(this.childNodes[0]), hoEditorFactory.docTree.getNodeLastPath(this.childNodes[this.childNodes.length - 1]));
50770
+ if (action === _DocTree__WEBPACK_IMPORTED_MODULE_25__/* .DocAction */ .gk.daDelete || action === _DocTree__WEBPACK_IMPORTED_MODULE_25__/* .DocAction */ .gk.daModifyStyle) {
50748
50771
  dcChangeEvent.oldEndPath = hoEditorFactory.docTree.getNodeLastPath(this);
50749
- if (action === _DocTree__WEBPACK_IMPORTED_MODULE_24__/* .DocAction */ .gk.daDelete) {
50772
+ if (action === _DocTree__WEBPACK_IMPORTED_MODULE_25__/* .DocAction */ .gk.daDelete) {
50750
50773
  dcChangeEvent.oldDrawTreeLines = this._table.drawTable.getCellsDrawTreeLines([this]);
50751
50774
  } else {
50752
50775
  dcChangeEvent.oldDrawLines = this._table.drawTable.getCellsDrawLines([this]);
@@ -50797,7 +50820,7 @@ var CellNode = /*#__PURE__*/function (_RectNode) {
50797
50820
  aHeight += this._table.rowInfos[_i2].rowHeight;
50798
50821
  }
50799
50822
  aHeight += this._rowSpan;
50800
- this._drawCell = new _editor_draw_drawNode_DrawCell__WEBPACK_IMPORTED_MODULE_20__/* .DrawCell */ .y(this._hoEditorFactoryID, this, 0, aWidth, aHeight);
50823
+ this._drawCell = new _editor_draw_drawNode_DrawCell__WEBPACK_IMPORTED_MODULE_21__/* .DrawCell */ .y(this._hoEditorFactoryID, this, 0, aWidth, aHeight);
50801
50824
  this._drawNodes.push(this._drawCell);
50802
50825
  // this._drawCell.drawLines.push(
50803
50826
  // (this._childNodes[0] as ParagraphNode).drawlines[0]
@@ -50815,7 +50838,7 @@ var CellNode = /*#__PURE__*/function (_RectNode) {
50815
50838
  }, {
50816
50839
  key: "range",
50817
50840
  value: function range() {
50818
- var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_22__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID);
50841
+ var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_23__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID);
50819
50842
  var spath = hoEditorFactory.docTree.getNodeFirstPath(this);
50820
50843
  var epath = hoEditorFactory.docTree.getNodeLastPath(this);
50821
50844
  return {
@@ -50833,9 +50856,9 @@ var CellNode = /*#__PURE__*/function (_RectNode) {
50833
50856
  for (var i = 0; i < this.childNodes.length; i++) {
50834
50857
  var node = this.childNodes[i];
50835
50858
  var nodeJson = void 0;
50836
- if (node instanceof _TableNode__WEBPACK_IMPORTED_MODULE_36__/* .TableNode */ .Fh || node instanceof _TextInputFieldNode__WEBPACK_IMPORTED_MODULE_37__/* .TextInputFieldNode */ .re) {
50859
+ if (node instanceof _TableNode__WEBPACK_IMPORTED_MODULE_37__/* .TableNode */ .Fh || node instanceof _TextInputFieldNode__WEBPACK_IMPORTED_MODULE_38__/* .TextInputFieldNode */ .re) {
50837
50860
  nodeJson = node.node2Json(undefined, isCopy, type, clearSign);
50838
- } else if (node instanceof _SignNode__WEBPACK_IMPORTED_MODULE_35__/* .SignNode */ .N) {
50861
+ } else if (node instanceof _SignNode__WEBPACK_IMPORTED_MODULE_36__/* .SignNode */ .N) {
50839
50862
  if (clearSign) {
50840
50863
  if (node.isTemplate) {
50841
50864
  nodeJson = node.node2Json(undefined, isCopy, undefined, clearSign);
@@ -50844,11 +50867,11 @@ var CellNode = /*#__PURE__*/function (_RectNode) {
50844
50867
  nodeJson = node.node2Json(undefined, isCopy);
50845
50868
  }
50846
50869
  } else {
50847
- if (node instanceof _TextNode__WEBPACK_IMPORTED_MODULE_38__/* .TextNode */ .R) {
50870
+ if (node instanceof _TextNode__WEBPACK_IMPORTED_MODULE_39__/* .TextNode */ .R) {
50848
50871
  if (node.text !== "") {
50849
50872
  nodeJson = node.node2Json(undefined, isCopy);
50850
50873
  }
50851
- } else if (node instanceof _DateTimeNode__WEBPACK_IMPORTED_MODULE_31__/* .DateTimeNode */ .Z || node instanceof _QrcodeNode__WEBPACK_IMPORTED_MODULE_39__/* .QrcodeNode */ .d) {
50874
+ } else if (node instanceof _DateTimeNode__WEBPACK_IMPORTED_MODULE_32__/* .DateTimeNode */ .Z || node instanceof _QrcodeNode__WEBPACK_IMPORTED_MODULE_40__/* .QrcodeNode */ .d) {
50852
50875
  nodeJson = node.node2Json(undefined, isCopy, undefined, clearSign);
50853
50876
  } else {
50854
50877
  nodeJson = node.node2Json(undefined, isCopy);
@@ -50919,15 +50942,13 @@ var CellNode = /*#__PURE__*/function (_RectNode) {
50919
50942
  if (cellPropertyJson["gridLineDisplay"] === "true,true,true,true") {
50920
50943
  delete cellPropertyJson["gridLineDisplay"];
50921
50944
  }
50945
+ } else if (keysName[k] === "backColor") {
50946
+ if (cellPropertyJson["backColor"].toString().toLowerCase() === defaultCellPropJson["backColor"].toString().toLowerCase()) {
50947
+ delete cellPropertyJson["backColor"];
50948
+ }
50922
50949
  } else {
50923
- if (keysName[k] === "backColor") {
50924
- if (cellPropertyJson["backColor"].toString().toLowerCase() === defaultCellPropJson["backColor"].toString().toLowerCase()) {
50925
- delete cellPropertyJson["backColor"];
50926
- }
50927
- } else {
50928
- if (cellPropertyJson[keysName[k]] === defaultCellPropJson[keysName[k]]) {
50929
- delete cellPropertyJson[keysName[k]];
50930
- }
50950
+ if (cellPropertyJson[keysName[k]] === defaultCellPropJson[keysName[k]]) {
50951
+ delete cellPropertyJson[keysName[k]];
50931
50952
  }
50932
50953
  }
50933
50954
  }
@@ -50949,7 +50970,7 @@ var CellNode = /*#__PURE__*/function (_RectNode) {
50949
50970
  }
50950
50971
  var cellText = this.getCellText(clearSign);
50951
50972
  var retObj = {
50952
- nodeType: _BaseNode__WEBPACK_IMPORTED_MODULE_29__/* .NodeType */ .Jq[this.nodeType],
50973
+ nodeType: _BaseNode__WEBPACK_IMPORTED_MODULE_30__/* .NodeType */ .Jq[this.nodeType],
50953
50974
  //borderVisible: this.borderVisible.toString(),
50954
50975
  //crossLineType: CrossLineType[this.crossLineType],
50955
50976
  //rowSpan: this.rowSpan,
@@ -50958,7 +50979,7 @@ var CellNode = /*#__PURE__*/function (_RectNode) {
50958
50979
  rowNo: rowNo,
50959
50980
  colNo: colNo,
50960
50981
  //cellProperty: cellPropertyJson,
50961
- isModified: false,
50982
+ //isModified: false, // 未发现有实际用途 暂时隐藏
50962
50983
  text: cellText
50963
50984
  };
50964
50985
  if (this.borderVisible.toString() !== "true,true,true,true") {
@@ -51008,22 +51029,22 @@ var CellNode = /*#__PURE__*/function (_RectNode) {
51008
51029
  if (!bNormalized) {
51009
51030
  newRange = arange.normalize();
51010
51031
  }
51011
- var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_22__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID);
51032
+ var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_23__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID);
51012
51033
  var startPath = hoEditorFactory.docTree.getNodeFirstPath(this.childNodes[0]);
51013
51034
  var lastPath = hoEditorFactory.docTree.getNodeLastPath(this.childNodes[this.childNodes.length - 1]);
51014
- if (_NodePosition__WEBPACK_IMPORTED_MODULE_26__/* .NodePosition */ .F.pathCanCompare(newRange.startPath, startPath)) {
51015
- ret = _NodePosition__WEBPACK_IMPORTED_MODULE_26__/* .NodePosition */ .F.treePathCompare(startPath, newRange.startPath) >= 0 && _NodePosition__WEBPACK_IMPORTED_MODULE_26__/* .NodePosition */ .F.treePathCompare(lastPath, arange.endPath) <= 0;
51035
+ if (_NodePosition__WEBPACK_IMPORTED_MODULE_27__/* .NodePosition */ .F.pathCanCompare(newRange.startPath, startPath)) {
51036
+ ret = _NodePosition__WEBPACK_IMPORTED_MODULE_27__/* .NodePosition */ .F.treePathCompare(startPath, newRange.startPath) >= 0 && _NodePosition__WEBPACK_IMPORTED_MODULE_27__/* .NodePosition */ .F.treePathCompare(lastPath, arange.endPath) <= 0;
51016
51037
  }
51017
51038
  return ret;
51018
51039
  }
51019
51040
  }, {
51020
51041
  key: "getNodesForUpdate",
51021
51042
  value: function getNodesForUpdate() {
51022
- var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_22__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID);
51043
+ var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_23__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID);
51023
51044
  var ret = new Array();
51024
51045
  for (var i = 0; i < this._childNodes.length; i++) {
51025
- if (this._childNodes[i] instanceof _TableNode__WEBPACK_IMPORTED_MODULE_36__/* .TableNode */ .Fh) {
51026
- var domRange = new _DomRange__WEBPACK_IMPORTED_MODULE_25__/* .DomRange */ .a(this._hoEditorFactoryID, hoEditorFactory.docTree.getNodeFirstPath(this._childNodes[i]), hoEditorFactory.docTree.getNodeLastPath(this._childNodes[i]));
51046
+ if (this._childNodes[i] instanceof _TableNode__WEBPACK_IMPORTED_MODULE_37__/* .TableNode */ .Fh) {
51047
+ var domRange = new _DomRange__WEBPACK_IMPORTED_MODULE_26__/* .DomRange */ .a(this._hoEditorFactoryID, hoEditorFactory.docTree.getNodeFirstPath(this._childNodes[i]), hoEditorFactory.docTree.getNodeLastPath(this._childNodes[i]));
51027
51048
  ret = ret.concat(this._childNodes[i].getSelectNodesForUpdate(domRange, true));
51028
51049
  } else ret.push(this._childNodes[i]);
51029
51050
  }
@@ -51032,14 +51053,14 @@ var CellNode = /*#__PURE__*/function (_RectNode) {
51032
51053
  }, {
51033
51054
  key: "getSelectNodes",
51034
51055
  value: function getSelectNodes(bSplitTextInputNode) {
51035
- var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_22__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID);
51056
+ var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_23__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID);
51036
51057
  var ret = new Array();
51037
51058
  for (var i = 0; i < this._childNodes.length; i++) {
51038
51059
  var aNode = this._childNodes[i];
51039
- if (aNode instanceof _TableNode__WEBPACK_IMPORTED_MODULE_36__/* .TableNode */ .Fh) {
51040
- var domRange = new _DomRange__WEBPACK_IMPORTED_MODULE_25__/* .DomRange */ .a(this._hoEditorFactoryID, hoEditorFactory.docTree.getNodeFirstPath(aNode), hoEditorFactory.docTree.getNodeLastPath(aNode));
51060
+ if (aNode instanceof _TableNode__WEBPACK_IMPORTED_MODULE_37__/* .TableNode */ .Fh) {
51061
+ var domRange = new _DomRange__WEBPACK_IMPORTED_MODULE_26__/* .DomRange */ .a(this._hoEditorFactoryID, hoEditorFactory.docTree.getNodeFirstPath(aNode), hoEditorFactory.docTree.getNodeLastPath(aNode));
51041
51062
  ret = ret.concat(aNode.getSelectNodes(domRange, true, bSplitTextInputNode));
51042
- } else if (bSplitTextInputNode && aNode instanceof _TextInputFieldNode__WEBPACK_IMPORTED_MODULE_37__/* .TextInputFieldNode */ .re) {
51063
+ } else if (bSplitTextInputNode && aNode instanceof _TextInputFieldNode__WEBPACK_IMPORTED_MODULE_38__/* .TextInputFieldNode */ .re) {
51043
51064
  ret = ret.concat(aNode.getAllChildNodes());
51044
51065
  } else ret.push(this._childNodes[i]);
51045
51066
  }
@@ -51062,17 +51083,17 @@ var CellNode = /*#__PURE__*/function (_RectNode) {
51062
51083
  var loopChildNodes = function loopChildNodes(node) {
51063
51084
  var nodes = node.childNodes.slice(1);
51064
51085
  nodes.forEach(function (childNode) {
51065
- if (childNode instanceof _TextNode__WEBPACK_IMPORTED_MODULE_38__/* .TextNode */ .R) {
51086
+ if (childNode instanceof _TextNode__WEBPACK_IMPORTED_MODULE_39__/* .TextNode */ .R) {
51066
51087
  cellText += childNode.text;
51067
- } else if (childNode instanceof _ControlNode__WEBPACK_IMPORTED_MODULE_30__/* .ControlNode */ .w) {
51068
- if (childNode instanceof _DateTimeNode__WEBPACK_IMPORTED_MODULE_31__/* .DateTimeNode */ .Z && (isClearValue || childNode.text == childNode.name)) {
51088
+ } else if (childNode instanceof _ControlNode__WEBPACK_IMPORTED_MODULE_31__/* .ControlNode */ .w) {
51089
+ if (childNode instanceof _DateTimeNode__WEBPACK_IMPORTED_MODULE_32__/* .DateTimeNode */ .Z && (isClearValue || childNode.text == childNode.name)) {
51069
51090
  cellText += "";
51070
51091
  } else {
51071
51092
  cellText += childNode.text;
51072
51093
  }
51073
- } else if (childNode instanceof _BaseCombineNode__WEBPACK_IMPORTED_MODULE_28__/* .BaseCombineNode */ .V) {
51094
+ } else if (childNode instanceof _BaseCombineNode__WEBPACK_IMPORTED_MODULE_29__/* .BaseCombineNode */ .V) {
51074
51095
  loopChildNodes(childNode);
51075
- } else if (childNode instanceof _ParagraphNode__WEBPACK_IMPORTED_MODULE_33__/* .ParagraphNode */ .C) {
51096
+ } else if (childNode instanceof _ParagraphNode__WEBPACK_IMPORTED_MODULE_34__/* .ParagraphNode */ .C) {
51076
51097
  cellText += '\n';
51077
51098
  }
51078
51099
  });
@@ -51082,36 +51103,24 @@ var CellNode = /*#__PURE__*/function (_RectNode) {
51082
51103
  }
51083
51104
  }, {
51084
51105
  key: "setCellText",
51085
- value: function setCellText(value, isPaste) {
51106
+ value: function setCellText(value, isPaste, isUpdateNextDays) {
51086
51107
  var colIndex = this.row.indexOf(this);
51087
- var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_22__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID);
51108
+ var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_23__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID);
51088
51109
  var colProperty = this.table.colInfos[colIndex].colProperty;
51089
- if (colProperty.editorProperty === _TableProperty__WEBPACK_IMPORTED_MODULE_27__/* .EditorProperty */ .YS.Number) {
51090
- if (!(0,_plugins_type__WEBPACK_IMPORTED_MODULE_23__/* .isNumber */ .hj)(value)) {
51091
- ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_40__/* ["default"] */ .Z.warn("输入值非数值类型,请重输！");
51110
+ if (colProperty.editorProperty === _TableProperty__WEBPACK_IMPORTED_MODULE_28__/* .EditorProperty */ .YS.Number) {
51111
+ if (!(0,_plugins_type__WEBPACK_IMPORTED_MODULE_24__/* .isNumber */ .hj)(value)) {
51112
+ ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_41__/* ["default"] */ .Z.warn("输入值非数值类型,请重输！");
51092
51113
  return;
51093
51114
  }
51094
51115
  if (Number(value) > colProperty.numberProperty.maxNumVal) {
51095
- ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_40__/* ["default"] */ .Z.warn("输入值超出最大允许值,请重输！");
51116
+ ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_41__/* ["default"] */ .Z.warn("输入值超出最大允许值,请重输！");
51096
51117
  return;
51097
51118
  }
51098
51119
  if (Number(value) < colProperty.numberProperty.minNumVal) {
51099
- ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_40__/* ["default"] */ .Z.warn("输入值低于最小允许值,请重输！");
51120
+ ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_41__/* ["default"] */ .Z.warn("输入值低于最小允许值,请重输！");
51100
51121
  return;
51101
51122
  }
51102
51123
  }
51103
- // if (colProperty.editorProperty === EditorProperty.DateTime) {
51104
- // let time = value.replace(/['年'|'月'|'-']/g, "/").replace(/['时'|'分']/g, ":").replace(/['日'|'秒']/g, " ");
51105
- // if (!time.includes('/') && !time.includes('-') && !time.includes('年')) {
51106
- // time = '2021/07/07 ' + time;
51107
- // }
51108
- // if (isNaN(Date.parse(time))) {//非日期格式的字符串
51109
- // message.warn("输入值非日期时间格式,请重输！", "提示");
51110
- // return;
51111
- // }
51112
- // }
51113
- //const startPath = `${this.getNodePath()}/0`;
51114
- //const startPath = hoEditorFactory.docTree.curDomRange.startPath;
51115
51124
  var endPath = "";
51116
51125
  var startPath = "";
51117
51126
  if (isPaste) {
@@ -51120,7 +51129,7 @@ var CellNode = /*#__PURE__*/function (_RectNode) {
51120
51129
  } else {
51121
51130
  if (this.table.tableProperty.isAutoChangeLine) {
51122
51131
  var curDomRange = hoEditorFactory.docTree.curDomRange.normalize();
51123
- if (curDomRange.npEnd.node instanceof _ParagraphNode__WEBPACK_IMPORTED_MODULE_33__/* .ParagraphNode */ .C) {
51132
+ if (curDomRange.npEnd.node instanceof _ParagraphNode__WEBPACK_IMPORTED_MODULE_34__/* .ParagraphNode */ .C) {
51124
51133
  startPath = curDomRange.startPath;
51125
51134
  endPath = startPath;
51126
51135
  } else {
@@ -51132,9 +51141,14 @@ var CellNode = /*#__PURE__*/function (_RectNode) {
51132
51141
  endPath = hoEditorFactory.docTree.getNodeLastPath(this);
51133
51142
  }
51134
51143
  }
51135
- var aRange = new _DomRange__WEBPACK_IMPORTED_MODULE_25__/* .DomRange */ .a(this._hoEditorFactoryID, startPath, endPath);
51144
+ var aRange = new _DomRange__WEBPACK_IMPORTED_MODULE_26__/* .DomRange */ .a(this._hoEditorFactoryID, startPath, endPath);
51136
51145
  hoEditorFactory.docController.deleteRange(aRange, true);
51137
51146
  hoEditorFactory.docController.insertPlainTextAfterPath(startPath, value);
51147
+ if (!isUpdateNextDays && this.cellProperty.dateTimeProperty && this.cellProperty.dateTimeProperty.isUpdateNextDays) {
51148
+ var colNo = this._row.indexOf(this);
51149
+ var rowNo = this.table.rows.indexOf(this._row);
51150
+ hoEditorFactory.vueController.updateCellNextDays(rowNo, colNo, this.table.tableProperty.id, value);
51151
+ }
51138
51152
  }
51139
51153
  }, {
51140
51154
  key: "toString",
@@ -51155,14 +51169,14 @@ var CellNode = /*#__PURE__*/function (_RectNode) {
51155
51169
  if (colProperty && colProperty.downListProperty) {
51156
51170
  var isAllowDel = colProperty.downListProperty.isAllowDel;
51157
51171
  if (isAllowDel !== undefined && !isAllowDel) {
51158
- ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_40__/* ["default"] */ .Z.warn("不允许删除！");
51172
+ ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_41__/* ["default"] */ .Z.warn("不允许删除！");
51159
51173
  return false;
51160
51174
  }
51161
51175
  }
51162
51176
  if (cellProperty && cellProperty.downListProperty) {
51163
51177
  var _isAllowDel = cellProperty.downListProperty.isAllowDel;
51164
51178
  if (_isAllowDel !== undefined && !_isAllowDel) {
51165
- ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_40__/* ["default"] */ .Z.warn("不允许删除！");
51179
+ ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_41__/* ["default"] */ .Z.warn("不允许删除！");
51166
51180
  return false;
51167
51181
  }
51168
51182
  }
@@ -51171,30 +51185,30 @@ var CellNode = /*#__PURE__*/function (_RectNode) {
51171
51185
  }, {
51172
51186
  key: "needPaintLineGrid",
51173
51187
  value: function needPaintLineGrid() {
51174
- var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_22__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID);
51188
+ var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_23__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID);
51175
51189
  var _this$table$getCellIn = this.table.getCellInfos(this),
51176
- _this$table$getCellIn2 = (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z)(_this$table$getCellIn, 2),
51190
+ _this$table$getCellIn2 = (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_3__/* ["default"] */ .Z)(_this$table$getCellIn, 2),
51177
51191
  r = _this$table$getCellIn2[0],
51178
51192
  c = _this$table$getCellIn2[1];
51179
- return (hoEditorFactory.docTree.docProperty.type === _DocTree__WEBPACK_IMPORTED_MODULE_24__/* .EmrType */ .Fr.etForm || this.table.tableProperty.isAutoChangeLine) && !this.table.rowInfos[r].rowProperty.repeatAsTitleAtPageTop && this.cellProperty.align !== _TableProperty__WEBPACK_IMPORTED_MODULE_27__/* .VAlign */ .TR.vacenter;
51193
+ return (hoEditorFactory.docTree.docProperty.type === _DocTree__WEBPACK_IMPORTED_MODULE_25__/* .EmrType */ .Fr.etForm || this.table.tableProperty.isAutoChangeLine) && !this.table.rowInfos[r].rowProperty.repeatAsTitleAtPageTop && this.cellProperty.align !== _TableProperty__WEBPACK_IMPORTED_MODULE_28__/* .VAlign */ .TR.vacenter;
51180
51194
  }
51181
51195
  }], [{
51182
51196
  key: "json2Node",
51183
51197
  value: function json2Node(hoEditorFactoryID, json, rootNodes, tableNode, aRow, rowsMap, rows,
51184
51198
  //defaultCellProperty: any,
51185
51199
  isPaste, isClearSign) {
51186
- var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_22__/* .HOEditorFactorys */ .b.instance().getFactory(hoEditorFactoryID);
51200
+ var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_23__/* .HOEditorFactorys */ .b.instance().getFactory(hoEditorFactoryID);
51187
51201
  var rowNo = parseInt(json.rowNo);
51188
51202
  var colNo = parseInt(json.colNo);
51189
51203
  aRow = rowsMap.get(rowNo);
51190
- var cellNode = new CellNode(hoEditorFactoryID, rootNodes, tableNode, aRow, undefined, rowNo, colNo, 1, 1, new _TableProperty__WEBPACK_IMPORTED_MODULE_27__/* .CellProperty */ .$W(""));
51204
+ var cellNode = new CellNode(hoEditorFactoryID, rootNodes, tableNode, aRow, undefined, rowNo, colNo, 1, 1, new _TableProperty__WEBPACK_IMPORTED_MODULE_28__/* .CellProperty */ .$W(""));
51191
51205
  var cellProperty = json.cellProperty;
51192
51206
  // if (cellProperty === "") {
51193
51207
  // cellProperty = JSON.parse("{}");
51194
51208
  // }
51195
51209
  var assignvalue = function assignvalue(target, source) {
51196
51210
  Object.keys(source).forEach(function (value) {
51197
- if ((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_typeof_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z)(target[value]) == "object") {
51211
+ if ((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_typeof_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)(target[value]) == "object") {
51198
51212
  if (value === "customProperties") {
51199
51213
  target[value] = Array.isArray(source[value].customProperty) ? source[value].customProperty : Array(source[value].customProperty);
51200
51214
  } else {
@@ -51220,9 +51234,9 @@ var CellNode = /*#__PURE__*/function (_RectNode) {
51220
51234
  target[value] = Number(source[value]);
51221
51235
  } else {
51222
51236
  if (value === "dateTimeProperty") {
51223
- cellNode.cellProperty.dateTimeProperty = new _TableProperty__WEBPACK_IMPORTED_MODULE_27__/* .DateTimeProperty */ .Ks(source[value]);
51237
+ cellNode.cellProperty.dateTimeProperty = new _TableProperty__WEBPACK_IMPORTED_MODULE_28__/* .DateTimeProperty */ .Ks(source[value]);
51224
51238
  } else if (value === "downListProperty") {
51225
- cellNode.cellProperty.downListProperty = new _TableProperty__WEBPACK_IMPORTED_MODULE_27__/* .ColDownListProperty */ .cW(source[value]);
51239
+ cellNode.cellProperty.downListProperty = new _TableProperty__WEBPACK_IMPORTED_MODULE_28__/* .ColDownListProperty */ .cW(source[value]);
51226
51240
  } else {
51227
51241
  target[value] = source[value];
51228
51242
  }
@@ -51237,13 +51251,6 @@ var CellNode = /*#__PURE__*/function (_RectNode) {
51237
51251
  if (!aRow) {}
51238
51252
  aRow.splice(colNo, 1);
51239
51253
  aRow.splice(colNo, 0, cellNode);
51240
- //aRow.push(cellNode);
51241
- // const colSpan = json.colSpan;
51242
- // if (colSpan > 1) {
51243
- // for (let z = 0; z < colSpan - 1; z++) {
51244
- // aRow.push(undefined);
51245
- // }
51246
- // }
51247
51254
  cellNode.initBlankDoc();
51248
51255
  cellNode.rowSpan = json.rowSpan === undefined ? 1 : Number(json.rowSpan);
51249
51256
  cellNode.colSpan = json.colSpan === undefined ? 1 : Number(json.colSpan);
@@ -51259,7 +51266,7 @@ var CellNode = /*#__PURE__*/function (_RectNode) {
51259
51266
  for (var j = 1; j < item.length; j++) {
51260
51267
  var convertNode = hoEditorFactory.structureConvert.convertNode(item[j], rootNodes, cellNode, undefined, isPaste, isClearSign);
51261
51268
  if (convertNode) {
51262
- if (convertNode instanceof _TextNode__WEBPACK_IMPORTED_MODULE_38__/* .TextNode */ .R) {
51269
+ if (convertNode instanceof _TextNode__WEBPACK_IMPORTED_MODULE_39__/* .TextNode */ .R) {
51263
51270
  if (convertNode.text !== "" && convertNode.text !== '‌‌' && convertNode.text !== '‌‌‌‌' && convertNode.text !== '‌‌‌‌‌' && convertNode.text !== '‌‌‌' && convertNode.text !== '‌') {
51264
51271
  cellNode.addChild(convertNode);
51265
51272
  }
@@ -51268,7 +51275,7 @@ var CellNode = /*#__PURE__*/function (_RectNode) {
51268
51275
  }
51269
51276
  } else {
51270
51277
  if (isClearSign) {
51271
- if (convertNode instanceof _SignNode__WEBPACK_IMPORTED_MODULE_35__/* .SignNode */ .N) {
51278
+ if (convertNode instanceof _SignNode__WEBPACK_IMPORTED_MODULE_36__/* .SignNode */ .N) {
51272
51279
  if (convertNode.isTemplate && !(convertNode.number == 0 && convertNode.type == 0 && convertNode.name == "")) {
51273
51280
  cellNode.addChild(convertNode);
51274
51281
  }
@@ -51276,7 +51283,7 @@ var CellNode = /*#__PURE__*/function (_RectNode) {
51276
51283
  cellNode.addChild(convertNode);
51277
51284
  }
51278
51285
  } else {
51279
- if (convertNode instanceof _SignNode__WEBPACK_IMPORTED_MODULE_35__/* .SignNode */ .N) {
51286
+ if (convertNode instanceof _SignNode__WEBPACK_IMPORTED_MODULE_36__/* .SignNode */ .N) {
51280
51287
  if (!(convertNode.number == 0 && convertNode.type == 0 && convertNode.name == "")) {
51281
51288
  cellNode.addChild(convertNode);
51282
51289
  }
@@ -51286,27 +51293,15 @@ var CellNode = /*#__PURE__*/function (_RectNode) {
51286
51293
  }
51287
51294
  }
51288
51295
  }
51289
- if (convertNode instanceof _MarkNode__WEBPACK_IMPORTED_MODULE_32__/* .MarkNode */ .j) {
51296
+ if (convertNode instanceof _MarkNode__WEBPACK_IMPORTED_MODULE_33__/* .MarkNode */ .j) {
51290
51297
  hoEditorFactory.structureConvert._markNodes.push(convertNode);
51291
51298
  }
51292
51299
  }
51293
51300
  } else {
51294
51301
  cellNode.childNodes[0].paraNo = Number(item.styleIndex);
51295
51302
  cellNode.childNodes[0].styleIndex = Number(item.textStyleNo ? item.textStyleNo : 0);
51296
- // const convertNode = hoEditorFactory.structureConvert.convertNode(
51297
- // item,
51298
- // rootNodes,
51299
- // cellNode
51300
- // );
51301
- // if (convertNode) {
51302
- // cellNode!.addChild(convertNode);
51303
- // }
51304
- // if (convertNode instanceof MarkNode) {
51305
- // hoEditorFactory.structureConvert._markNodes.push(convertNode);
51306
- // }
51307
51303
  }
51308
51304
  };
51309
-
51310
51305
  if (isPaste) {
51311
51306
  if (json.childNodes.item) {
51312
51307
  getChildNodes(json.childNodes.item);
@@ -51317,8 +51312,8 @@ var CellNode = /*#__PURE__*/function (_RectNode) {
51317
51312
  }
51318
51313
  } else {
51319
51314
  var isModified = json.isModified;
51320
- var text = json.text;
51321
51315
  if (isModified) {
51316
+ var text = json.text;
51322
51317
  var paraNode;
51323
51318
  if (Array.isArray(json.childNodes.node)) {
51324
51319
  paraNode = json.childNodes.node[0];
@@ -51329,14 +51324,14 @@ var CellNode = /*#__PURE__*/function (_RectNode) {
51329
51324
  cellNode.childNodes[0].styleIndex = Number(paraNode.textStyleNo ? paraNode.textStyleNo : 0);
51330
51325
  if (text !== "") {
51331
51326
  var textArr = text.split("\n");
51332
- var firstTextNode = new _TextNode__WEBPACK_IMPORTED_MODULE_38__/* .TextNode */ .R(hoEditorFactoryID, rootNodes, cellNode, _BaseNode__WEBPACK_IMPORTED_MODULE_29__/* .NodeType */ .Jq.ntText, textArr[0], Number(paraNode.textStyleNo ? paraNode.textStyleNo : 0));
51327
+ var firstTextNode = new _TextNode__WEBPACK_IMPORTED_MODULE_39__/* .TextNode */ .R(hoEditorFactoryID, rootNodes, cellNode, _BaseNode__WEBPACK_IMPORTED_MODULE_30__/* .NodeType */ .Jq.ntText, textArr[0], Number(paraNode.textStyleNo ? paraNode.textStyleNo : 0));
51333
51328
  cellNode.addChild(firstTextNode);
51334
51329
  if (textArr.length > 1) {
51335
51330
  for (var i = 1; i < textArr.length; i++) {
51336
- var paragraNode = new _ParagraphNode__WEBPACK_IMPORTED_MODULE_33__/* .ParagraphNode */ .C(hoEditorFactoryID, rootNodes, cellNode, Number(paraNode.styleIndex));
51331
+ var paragraNode = new _ParagraphNode__WEBPACK_IMPORTED_MODULE_34__/* .ParagraphNode */ .C(hoEditorFactoryID, rootNodes, cellNode, Number(paraNode.styleIndex));
51337
51332
  cellNode.addChild(paragraNode);
51338
51333
  if (textArr[i] !== "") {
51339
- var textNode = new _TextNode__WEBPACK_IMPORTED_MODULE_38__/* .TextNode */ .R(hoEditorFactoryID, rootNodes, cellNode, _BaseNode__WEBPACK_IMPORTED_MODULE_29__/* .NodeType */ .Jq.ntText, textArr[i], Number(paraNode.textStyleNo ? paraNode.textStyleNo : 0));
51334
+ var textNode = new _TextNode__WEBPACK_IMPORTED_MODULE_39__/* .TextNode */ .R(hoEditorFactoryID, rootNodes, cellNode, _BaseNode__WEBPACK_IMPORTED_MODULE_30__/* .NodeType */ .Jq.ntText, textArr[i], Number(paraNode.textStyleNo ? paraNode.textStyleNo : 0));
51340
51335
  cellNode.addChild(textNode);
51341
51336
  }
51342
51337
  }
@@ -51348,11 +51343,28 @@ var CellNode = /*#__PURE__*/function (_RectNode) {
51348
51343
  }
51349
51344
  }
51350
51345
  }
51346
+ if (cellNode.cellProperty.dateTimeProperty && cellNode.cellProperty.dateTimeProperty.isUpdateNextDays) {
51347
+ var allTableList = hoEditorFactory.updateNextDaysRecordList.get("0") || [];
51348
+ var currentCell = {
51349
+ tableId: cellNode.table.tableProperty.id,
51350
+ rowNo: rowNo,
51351
+ colNo: colNo,
51352
+ text: cellNode.getCellText(),
51353
+ daysInterval: String(cellNode.cellProperty.dateTimeProperty.daysInterval)
51354
+ };
51355
+ allTableList.push(currentCell);
51356
+ if (currentCell.text) {
51357
+ hoEditorFactory.updateNextDaysRecordList.set("last", (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_objectSpread2_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z)({}, currentCell));
51358
+ } else {
51359
+ hoEditorFactory.updateNextDaysRecordList.set("update", true);
51360
+ }
51361
+ hoEditorFactory.updateNextDaysRecordList.set("0", allTableList);
51362
+ }
51351
51363
  return aRow;
51352
51364
  }
51353
51365
  }]);
51354
51366
  return CellNode;
51355
- }(_RectNode__WEBPACK_IMPORTED_MODULE_34__/* .RectNode */ .z);
51367
+ }(_RectNode__WEBPACK_IMPORTED_MODULE_35__/* .RectNode */ .z);
51356
51368
 
51357
51369
  /***/ }),
51358
51370
 
@@ -62500,6 +62512,8 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
62500
62512
  (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_8__/* ["default"] */ .Z)((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z)(_this), "_drawTable", void 0);
62501
62513
  (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_8__/* ["default"] */ .Z)((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z)(_this), "_paragraphNode", void 0);
62502
62514
  (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_8__/* ["default"] */ .Z)((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z)(_this), "_tableProperty", void 0);
62515
+ //表格属性
62516
+ (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_8__/* ["default"] */ .Z)((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z)(_this), "id", '');
62503
62517
  _this._rows = new Array();
62504
62518
  _this._rowCount = rowCount;
62505
62519
  _this._colCount = colCount;
@@ -62509,6 +62523,10 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
62509
62523
  _this._rowInfos = new Array();
62510
62524
  _this._colInfos = new Array();
62511
62525
  // this._paragraphNode = paragraphNode;
62526
+ if (!tableProperty.id) {
62527
+ var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_41__/* .HOEditorFactorys */ .b.instance().getFactory(_this._hoEditorFactoryID);
62528
+ tableProperty.id = hoEditorFactory.gernerateCode.generateID("TB");
62529
+ }
62512
62530
  _this._tableProperty = tableProperty;
62513
62531
  var colWidth = _this.calcColWidth();
62514
62532
  for (var i = 0; i < _this._colCount; i++) {
@@ -62544,9 +62562,7 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
62544
62562
  */
62545
62563
  (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_7__/* ["default"] */ .Z)(TableNode, [{
62546
62564
  key: "hoEditorFactoryID",
62547
- get:
62548
- //表格属性
62549
- function get() {
62565
+ get: function get() {
62550
62566
  return this._hoEditorFactoryID;
62551
62567
  }
62552
62568
  }, {
@@ -63743,7 +63759,6 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
63743
63759
  var defaultColPropJson = JSON.parse(JSON.stringify(defaultColProp));
63744
63760
  //处理列宽
63745
63761
  var colInfosArray = new Array();
63746
- //for (let i = pfrom.col; i <= this.colInfos.length - 1; i++) {
63747
63762
  for (var _i4 = pfrom.col; _i4 <= cols; _i4++) {
63748
63763
  var colInfo = this.colInfos[_i4];
63749
63764
  var _customProperties2 = {
@@ -63818,7 +63833,6 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
63818
63833
  //处理单元格
63819
63834
  var rowArrays = new Array();
63820
63835
  var undefines = new Array();
63821
- //let maxColNum=0;
63822
63836
  //for (let k = pfrom.row; k <= pto.row; k++) {
63823
63837
  for (var _k2 = pfrom.row; _k2 <= rows; _k2++) {
63824
63838
  var row = this.rows[_k2];
@@ -63860,11 +63874,8 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
63860
63874
  if (col) {
63861
63875
  var json = col.node2Json(r, isCopy, type, clearSign, defaultCellPropJson);
63862
63876
  undefineArr.base = JSON.parse(JSON.stringify(json));
63863
- // json.rowNo = k - pfrom.row;
63864
- // json.colNo = j - pfrom.col;
63865
63877
  json.rowNo = _k2 - pfrom.row;
63866
63878
  json.colNo = j - pfrom.col;
63867
- //rowArray.childNodes.item.push(json);
63868
63879
  if (isCopy) {
63869
63880
  rowArray.childNodes.item.push(json);
63870
63881
  } else {
@@ -63880,18 +63891,6 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
63880
63891
  }
63881
63892
  }
63882
63893
  }
63883
- //给undefined的节点，补上内容
63884
- // for (let i = 0; i < undefines.length; i++) {
63885
- // if (undefines[i].childNodes.length == 0)
63886
- // break;
63887
- // const nsource = undefines[i].base;
63888
- // //只保留段落节点和结束标记
63889
- // nsource.childNodes.item = [nsource.childNodes.item[0], nsource.childNodes.item[nsource.childNodes.length - 1]];
63890
- // for (let j = 0; j < undefines[i].childNodes.length; j++) {
63891
- // const uitem = undefines[i].childNodes[j];
63892
- // rowArrays[uitem.rowNo].childNodes.item.splice(uitem.colNo, 0, Object.assign(nsource, uitem));
63893
- // }
63894
- // }
63895
63894
  //更新合并单元格的合并值
63896
63895
  for (var _i5 = 0; _i5 < rowArrays.length; _i5++) {
63897
63896
  var _row2 = rowArrays[_i5].childNodes;
@@ -63904,9 +63903,6 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
63904
63903
  }
63905
63904
  }
63906
63905
  }
63907
- //const rowInfos = { defaultRowProperty: defaultRowProp, item: rowInfosArray };
63908
- //const colInfos = { defaultColProperty: defaultColProp, item: colInfosArray };
63909
- //const childNodes = { defaultCellProperty: defaultCellProp, item: rowArrays };
63910
63906
  var rowInfos = {
63911
63907
  item: rowInfosArray
63912
63908
  };
@@ -63921,24 +63917,6 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
63921
63917
  };
63922
63918
  var rowCount = rowInfos.item.length;
63923
63919
  var colCount = colInfos.item.length;
63924
- // const tableProperty = {
63925
- // canAddRow: this.tableProperty.canAddRow,
63926
- // canAddCol: this.tableProperty.canAddCol,
63927
- // canAdjustRowHeight: this.tableProperty.canAdjustRowHeight,
63928
- // canAdjustRowWidth: this.tableProperty.canAdjustRowWidth,
63929
- // canDeleteRow: this.tableProperty.canDeleteRow,
63930
- // canDelTable: this.tableProperty.canDelTable,
63931
- // continuePrintBorders: this.tableProperty.continuePrintBorders,
63932
- // customProperties,
63933
- // layoutFullLine: this.tableProperty.layoutFullLine,
63934
- // tightLineSpace: this.tableProperty.tightLineSpace,
63935
- // isAutoChangeLine: this.tableProperty.isAutoChangeLine,
63936
- // autoLineHeight: this.tableProperty.autoLineHeight,
63937
- // fixedOnePage: this.tableProperty.fixedOnePage,
63938
- // isUsePopEdit: this.tableProperty.isUsePopEdit,
63939
- // isSignLock: this.tableProperty.isSignLock,
63940
- // isLock: this.tableProperty.isLock,
63941
- // };
63942
63920
  var tableProperty = {};
63943
63921
  if (this.tableProperty.canAdjustRowHeight) {
63944
63922
  tableProperty.canAdjustRowHeight = this.tableProperty.canAdjustRowHeight;
@@ -63985,6 +63963,7 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
63985
63963
  if (this.tableProperty.customProperties.length > 0 && this.tableProperty.customProperties[0]) {
63986
63964
  tableProperty.customProperties = customProperties;
63987
63965
  }
63966
+ tableProperty.id = this.tableProperty.id;
63988
63967
  var retJson = {
63989
63968
  nodeType: _BaseNode__WEBPACK_IMPORTED_MODULE_31__/* .NodeType */ .Jq[this.nodeType],
63990
63969
  rowCount: rowCount,
@@ -64627,11 +64606,13 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
64627
64606
  }
64628
64607
  }], [{
64629
64608
  key: "json2Node",
64630
- value: function json2Node(hoEditorFactoryID, json, rootNodes, pNode, isPaste, isClearSign) {
64609
+ value: function json2Node(hoEditorFactoryID, json, rootNodes, pNode, isPaste, isClearSign, isNewPage) {
64631
64610
  // console.log("加载表格", json.rowCount, json.colCount)
64632
64611
  json = this.transType(json);
64633
64612
  var tableProperty = new _TableProperty__WEBPACK_IMPORTED_MODULE_35__/* .TableProperty */ .vE("");
64634
64613
  if (json.tableProperty) {
64614
+ var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_41__/* .HOEditorFactorys */ .b.instance().getFactory(hoEditorFactoryID);
64615
+ var tableId = hoEditorFactory.vueController.generateID("TB");
64635
64616
  var tp = json.tableProperty;
64636
64617
  tableProperty.canAdjustRowHeight = tp["canAdjustRowHeight"] === true || tp["canAdjustRowHeight"] == "true" ? true : false;
64637
64618
  tableProperty.canAdjustRowWidth = tp["canAdjustRowWidth"] === true || tp["canAdjustRowWidth"] === "true" ? true : false;
@@ -64648,6 +64629,7 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
64648
64629
  tableProperty.isLock = tp["isLock"] === true || tp["isLock"] === "true" ? true : false;
64649
64630
  tableProperty.addRowByOrder = tp["addRowByOrder"] === true || tp["addRowByOrder"] === "true" ? true : false;
64650
64631
  tableProperty.customProperties = json.tableProperty.customProperties ? Array.isArray(json.tableProperty.customProperties.customProperty) ? json.tableProperty.customProperties.customProperty : Array(json.tableProperty.customProperties.customProperty) : "";
64632
+ tableProperty.id = isNewPage ? tableId : json.tableProperty.id ? json.tableProperty.id : tableId;
64651
64633
  }
64652
64634
  var tableNode = new TableNode(hoEditorFactoryID, rootNodes, pNode ? pNode : null, Number(json.rowCount), Number(json.colCount), tableProperty);
64653
64635
  tableNode.rowCount = Number(json.rowCount);
@@ -70358,6 +70340,12 @@ var es_array_concat = __webpack_require__(92222);
70358
70340
  var es_array_splice = __webpack_require__(40561);
70359
70341
  // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.slice.js
70360
70342
  var es_array_slice = __webpack_require__(47042);
70343
+ // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.includes.js
70344
+ var es_array_includes = __webpack_require__(26699);
70345
+ // EXTERNAL MODULE: ./node_modules/core-js/modules/es.string.includes.js
70346
+ var es_string_includes = __webpack_require__(32023);
70347
+ // EXTERNAL MODULE: ./node_modules/core-js/modules/es.function.name.js
70348
+ var es_function_name = __webpack_require__(68309);
70361
70349
  // EXTERNAL MODULE: ./src/yuki-createjs/index.ts
70362
70350
  var yuki_createjs = __webpack_require__(38205);
70363
70351
  // EXTERNAL MODULE: ./src/editor/draw/drawNode/DrawContainer.ts
@@ -70450,6 +70438,8 @@ var TextInputFieldNode = __webpack_require__(65043);
70450
70438
  var DrawRadioAndCheckBox = __webpack_require__(88666);
70451
70439
  // EXTERNAL MODULE: ./src/editor/draw/drawNode/DrawRadioAndCheckBoxPrint.ts
70452
70440
  var DrawRadioAndCheckBoxPrint = __webpack_require__(91757);
70441
+ // EXTERNAL MODULE: ./src/editor/draw/drawNode/DrawPageCell.ts + 1 modules
70442
+ var DrawPageCell = __webpack_require__(59105);
70453
70443
  ;// CONCATENATED MODULE: ./src/editor/draw/DrawLine.ts
70454
70444
 
70455
70445
 
@@ -70472,6 +70462,10 @@ var DrawRadioAndCheckBoxPrint = __webpack_require__(91757);
70472
70462
 
70473
70463
 
70474
70464
 
70465
+
70466
+
70467
+
70468
+
70475
70469
 
70476
70470
 
70477
70471
 
@@ -70495,11 +70489,12 @@ var DrawLine = /*#__PURE__*/function (_DrawContainer) {
70495
70489
  (0,defineProperty/* default */.Z)((0,assertThisInitialized/* default */.Z)(_this), "_docHeight", void 0);
70496
70490
  (0,defineProperty/* default */.Z)((0,assertThisInitialized/* default */.Z)(_this), "_dBaseY", void 0);
70497
70491
  (0,defineProperty/* default */.Z)((0,assertThisInitialized/* default */.Z)(_this), "_maxFontHeight", void 0);
70492
+ (0,defineProperty/* default */.Z)((0,assertThisInitialized/* default */.Z)(_this), "_underlineShape", void 0);
70498
70493
  _this._paragraphNode = node;
70499
70494
  var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(node.hoEditorFactoryID);
70500
70495
  _this._dWidth = width;
70501
70496
  _this._actualWidth = 0;
70502
- _this._dHeight = hoEditorFactory.defaultLineHeight;
70497
+ // this._dHeight = hoEditorFactory.defaultLineHeight;
70503
70498
  var paraFontstyle = hoEditorFactory.docTree.styles[node.styleIndex];
70504
70499
  var size = paraFontstyle && paraFontstyle.size ? paraFontstyle.size : hoEditorFactory.docTree.defaultCombineStyle.size;
70505
70500
  _this._maxFontHeight = hoEditorFactory.getFontHeightByFontSize(size);
@@ -70690,9 +70685,7 @@ var DrawLine = /*#__PURE__*/function (_DrawContainer) {
70690
70685
  for (var i = 0; i < this._drawItems.length; i++) {
70691
70686
  var _dItem = this._drawItems[i];
70692
70687
  var dx = _dItem.x;
70693
- var dy = 0;
70694
70688
  var dWidth = _dItem.dWidth + this.charSpace;
70695
- var dBottom = this._dHeight;
70696
70689
  if (x >= dx && x <= dx + dWidth) {
70697
70690
  if (_dItem instanceof DrawTextNode/* DrawTextNode */.v) {
70698
70691
  if (_dItem.node instanceof TextNode/* TextNode */.R) {
@@ -70830,6 +70823,7 @@ var DrawLine = /*#__PURE__*/function (_DrawContainer) {
70830
70823
  this._charSpace = this._paragraphNode.combineParagraph.charSpace;
70831
70824
  this.dWidth = this._dWidth;
70832
70825
  this.dHeight = this._dHeight;
70826
+ this.createdUnderline();
70833
70827
  }
70834
70828
  }, {
70835
70829
  key: "updateLineStyle",
@@ -70908,6 +70902,9 @@ var DrawLine = /*#__PURE__*/function (_DrawContainer) {
70908
70902
  this._dHeight = aHeight + this._maxFontHeight * (this.paragraphNode.combineParagraph.lineSpace - 1);
70909
70903
  }
70910
70904
  this.dHeight = this._dHeight;
70905
+ if (this._underlineShape) {
70906
+ this._underlineShape.y = this.dHeight + 1;
70907
+ }
70911
70908
  var bottompos = dHeight + (this._dHeight - dHeight) / 2;
70912
70909
  for (var j = 0; j < this.drawItems.length; j++) {
70913
70910
  if (this.drawItems[j] instanceof DrawContainer/* DrawContainer */.H) {
@@ -70957,6 +70954,37 @@ var DrawLine = /*#__PURE__*/function (_DrawContainer) {
70957
70954
  get: function get() {
70958
70955
  return this._docHeight;
70959
70956
  }
70957
+ }, {
70958
+ key: "isInTable",
70959
+ value: function isInTable() {
70960
+ var _this$paragraphNode;
70961
+ if (this.parent instanceof DrawPageCell/* DrawPageCell */.k || ((_this$paragraphNode = this.paragraphNode) === null || _this$paragraphNode === void 0 ? void 0 : _this$paragraphNode.parentNode) instanceof CellNode/* CellNode */.D) {
70962
+ return true;
70963
+ }
70964
+ return false;
70965
+ }
70966
+ }, {
70967
+ key: "createdUnderline",
70968
+ value: function createdUnderline() {
70969
+ var _this$paragraphNode2;
70970
+ var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this._paragraphNode.hoEditorFactoryID);
70971
+ var isDraw = hoEditorFactory.pageProperty.drawLineUnderline && !this._underlineShape && this.rootPath.includes('main') && !(this.parent instanceof DrawPageCell/* DrawPageCell */.k) && !(((_this$paragraphNode2 = this.paragraphNode) === null || _this$paragraphNode2 === void 0 ? void 0 : _this$paragraphNode2.parentNode) instanceof CellNode/* CellNode */.D);
70972
+ // const isPrint = hoEditorFactory.drawTree.paintStatus == PaintState.psPreview || hoEditorFactory.drawTree.paintStatus == PaintState.psPrint;
70973
+ if (isDraw) {
70974
+ var shape = new createjs.Shape();
70975
+ shape.graphics.clear();
70976
+ var width = Math.max(this.actualWidth, this.dWidth);
70977
+ if (hoEditorFactory.pageProperty.lineUnderlineStyle === 0) {
70978
+ shape.graphics.beginFill(hoEditorFactory.pageProperty.lineUnderlineColor || '#000000').drawRect(0, 0, width, 1).endFill();
70979
+ } else {
70980
+ shape.graphics.beginStroke(hoEditorFactory.pageProperty.lineUnderlineColor || '#000000').setStrokeDash([2, 2]).moveTo(0, 0).lineTo(width, 1).endStroke();
70981
+ }
70982
+ shape.name = 'dline_underline';
70983
+ shape.y = this.dHeight;
70984
+ this._underlineShape = shape;
70985
+ this.addChild(this._underlineShape);
70986
+ }
70987
+ }
70960
70988
  }], [{
70961
70989
  key: "inSameLine",
70962
70990
  value: function inSameLine(dobj1, dobj2) {
@@ -84028,6 +84056,8 @@ var PageProperty = __webpack_require__(65847);
84028
84056
 
84029
84057
 
84030
84058
 
84059
+
84060
+
84031
84061
  var DrawPage = /*#__PURE__*/function () {
84032
84062
  function DrawPage(hoeditorfacotryID, index //,
84033
84063
  //doc: DocTree,
@@ -84396,21 +84426,11 @@ var DrawPage = /*#__PURE__*/function () {
84396
84426
  return (0,regeneratorRuntime/* default */.Z)().wrap(function _callee$(_context) {
84397
84427
  while (1) switch (_context.prev = _context.next) {
84398
84428
  case 0:
84399
- // const isHaveBgImage = HOEditorFactorys.instance().getFactory(this._hoEditorFactoryID).pageProperty.isHaveBgImage;
84400
- // if (!isHaveBgImage) {
84401
84429
  //TODO:如果没有设置背景或者背景为空时绘制白色背景
84402
84430
  if (!this._background) this._background = new createjs.Shape();
84403
84431
  hoEditorFactory = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this._hoEditorFactoryID);
84404
84432
  this._background.graphics.clear();
84405
- backColor = hoEditorFactory.drawTree.paintStatus === PaintState.psPreview ? '#FFFFFF' : '#FFFFFF'; // this._background.graphics
84406
- // .beginFill(backColor)
84407
- // .drawRect(
84408
- // 0,
84409
- // 0,
84410
- // hoEditorFactory.pageProperty.widthPixes,
84411
- // hoEditorFactory.pageProperty.heightPixes
84412
- // )
84413
- // .closePath();
84433
+ backColor = hoEditorFactory.drawTree.paintStatus === PaintState.psPreview ? '#FFFFFF' : '#FFFFFF';
84414
84434
  this._background.graphics.beginFill(backColor).drawRect(0, 0, hoEditorFactory.pageProperty.canvasParams.width, hoEditorFactory.pageProperty.canvasParams.height).closePath();
84415
84435
  if (this._domLevel && this._domLevel.stage) {
84416
84436
  this.drawDocContainer.addChildAt(this._background, 0);
@@ -84426,6 +84446,20 @@ var DrawPage = /*#__PURE__*/function () {
84426
84446
  }
84427
84447
  return paintBackGround;
84428
84448
  }()
84449
+ }, {
84450
+ key: "paintChild",
84451
+ value: function paintChild(paintStatus) {
84452
+ var dline = this.drawMainDoc.children[this.drawMainDoc.children.length - 1];
84453
+ if (dline instanceof DrawLine/* DrawLine */.a) {
84454
+ if (dline.children.length == 1 && dline.children[0].name == 'dline_underline') {
84455
+ if (paintStatus === PaintState.psPreview || paintStatus === PaintState.psPrint) {
84456
+ dline.children[0].alpha = 0;
84457
+ } else {
84458
+ dline.children[0].alpha = 1;
84459
+ }
84460
+ }
84461
+ }
84462
+ }
84429
84463
  }, {
84430
84464
  key: "removeBackGroud",
84431
84465
  value: function removeBackGroud() {
@@ -87224,13 +87258,9 @@ var DrawTree = /*#__PURE__*/function () {
87224
87258
  value: function getStagePosition(dPage, dPlace, x, y) {
87225
87259
  var hoeditfactory = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this._hoEditorFactoryID);
87226
87260
  if (dPage.drawDomLevel) {
87227
- // const dPlace = dPage.drawDomLevel.activeDrawRect;
87228
- // console.log("x:" + x + ";y:" + y);
87229
- var stage = dPage.drawDomLevel.stage;
87230
87261
  //转换为区域坐标
87231
87262
  var pt = dPlace.globalToLocal(x, y);
87232
87263
  var aPage = dPage;
87233
- // const dItems = dPlace.drawLines;
87234
87264
  //处理跨页空单元格
87235
87265
  if (dPlace instanceof DrawPageCell/* DrawPageCell */.k && dPlace.isEmpty()) {
87236
87266
  var aPrevPlace;
@@ -87261,11 +87291,6 @@ var DrawTree = /*#__PURE__*/function () {
87261
87291
  }
87262
87292
  }
87263
87293
  }
87264
- // if (dPlace instanceof DrawCell) {
87265
- // dItems = (dPlace as DrawCell).drawLxines;
87266
- // } else {
87267
- // dItems = dPlace.children;
87268
- // }
87269
87294
  var dLine = dPlace.getDlineByPos(dPlace.children, pt.x, pt.y);
87270
87295
  if (!dLine) {
87271
87296
  return null;
@@ -87275,8 +87300,6 @@ var DrawTree = /*#__PURE__*/function () {
87275
87300
  var aPlace = dLine.getDrawPageCellByPos(newPt.x, newPt.y);
87276
87301
  return this.getStagePosition(dPage, aPlace, x, y);
87277
87302
  }
87278
- var dNode;
87279
- var node;
87280
87303
  var linePt = dLine.globalToLocal(x, y);
87281
87304
  var index;
87282
87305
  if (pt.y > dLine.y + dLine.dHeight + dLine.paragraphNode.combineParagraph.lineSpace) {
@@ -95271,7 +95294,7 @@ var NodeConvert = /*#__PURE__*/function () {
95271
95294
  for (var i = 0; i < jsonArray.length; i++) {
95272
95295
  var nodeJson = jsonArray[i];
95273
95296
  if (nodeJson) {
95274
- var node = hoEditorFactory.structureConvert.convertNode(nodeJson, aRootNodes, rootPath ? null : parentNode, undefined, isNewPage ? false : true);
95297
+ var node = hoEditorFactory.structureConvert.convertNode(nodeJson, aRootNodes, rootPath ? null : parentNode, undefined, isNewPage ? false : true, undefined, isNewPage);
95275
95298
  if (!node) {
95276
95299
  return [];
95277
95300
  }
@@ -169857,10 +169880,10 @@ var map = {
169857
169880
  "./selectDialog/SelectDialog.vue": 73791,
169858
169881
  "./sign/Sign.vue": 67218,
169859
169882
  "./specialChars/HoSpecialChars.vue": 75058,
169860
- "./table/TableCellPoper.vue": 19363,
169883
+ "./table/TableCellPoper.vue": 21166,
169861
169884
  "./table/TableCellPoper1.vue": 44645,
169862
- "./table/TableCellProperty.vue": 90546,
169863
- "./table/TableColProperty.vue": 16154,
169885
+ "./table/TableCellProperty.vue": 14278,
169886
+ "./table/TableColProperty.vue": 3828,
169864
169887
  "./table/TableForm.vue": 79036,
169865
169888
  "./table/TableFormTree.vue": 84804,
169866
169889
  "./table/TableFormula.vue": 80199,
@@ -207305,8 +207328,8 @@ var es_string_match = __webpack_require__(4723);
207305
207328
  var es_number_constructor = __webpack_require__(9653);
207306
207329
  // EXTERNAL MODULE: ./node_modules/core-js/modules/es.json.stringify.js
207307
207330
  var es_json_stringify = __webpack_require__(38862);
207308
- ;// 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/HoDoc.vue?vue&type=template&id=3b58cf3f&
207309
- var HoDocvue_type_template_id_3b58cf3f_render = function render() {
207331
+ ;// 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/HoDoc.vue?vue&type=template&id=797833eb&
207332
+ var HoDocvue_type_template_id_797833eb_render = function render() {
207310
207333
  var _vm = this,
207311
207334
  _c = _vm._self._c;
207312
207335
  return _c('div', {
@@ -207507,7 +207530,7 @@ var HoDocvue_type_template_id_3b58cf3f_render = function render() {
207507
207530
  }
207508
207531
  }, [_vm._v("v " + _vm._s(_vm.version))])])])], 1);
207509
207532
  };
207510
- var HoDocvue_type_template_id_3b58cf3f_staticRenderFns = [];
207533
+ var HoDocvue_type_template_id_797833eb_staticRenderFns = [];
207511
207534
 
207512
207535
  // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.filter.js
207513
207536
  var es_array_filter = __webpack_require__(57327);
@@ -208361,14 +208384,17 @@ var DrawDomLevel = /*#__PURE__*/function () {
208361
208384
  }, {
208362
208385
  key: "bindStage",
208363
208386
  value: function bindStage(isPrint) {
208387
+ var hoeditorfactory = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this._hoEditorFactoryID);
208388
+ var dPage = hoeditorfactory.drawTree.drawPages[this._pageIndex];
208389
+ if (this._pageIndex == hoeditorfactory.drawTree.drawPages.length - 1) {
208390
+ dPage.paintChild(hoeditorfactory.drawTree.paintStatus);
208391
+ }
208364
208392
  if (!this._domStage) {
208365
- var hoeditorfactory = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this._hoEditorFactoryID);
208366
208393
  this._domCanvas.width = hoeditorfactory.pageProperty.canvasParams.width;
208367
208394
  this._domCanvas.height = hoeditorfactory.pageProperty.canvasParams.height;
208368
208395
  this._domStage = new createjs.Stage(this._domCanvas);
208369
208396
  this._domStage.scaleX = DrawConfig/* DrawConfig */.f.instance().scale;
208370
208397
  this._domStage.scaleY = DrawConfig/* DrawConfig */.f.instance().scale;
208371
- var dPage = hoeditorfactory.drawTree.drawPages[this._pageIndex];
208372
208398
  var keys = (0,esm_toConsumableArray/* default */.Z)(hoeditorfactory.drawPageTree.needUpdateMainDocInfo.keys()).sort(function (a, b) {
208373
208399
  if (a > b) {
208374
208400
  return 1;
@@ -208392,21 +208418,12 @@ var DrawDomLevel = /*#__PURE__*/function () {
208392
208418
  hoeditorfactory.subDocManger.repaintPageMarkNodes(dPage.drawHeader, SubDocManger/* HeaderFooterType */.pi.hftHead);
208393
208419
  hoeditorfactory.subDocManger.paintSubDoc(dPage.pageIndex, SubDocManger/* HeaderFooterType */.pi.hftFoot);
208394
208420
  hoeditorfactory.subDocManger.repaintPageMarkNodes(dPage.drawFooter, SubDocManger/* HeaderFooterType */.pi.hftFoot);
208395
- // dPage.drawDocContainer.addChild(dPage.drawHeader);
208396
208421
  dPage.drawHeader.x = hoeditorfactory.pageProperty.leftMarginPixes;
208397
- // dPage.drawHeader.y = hoeditorfactory.pageProperty.headerYPixes;
208398
- // // this._domStage.addChildAt(this._drawMainDoc, 0);
208399
208422
  dPage.drawMainDoc.x = hoeditorfactory.pageProperty.leftMarginPixes;
208400
- // dPage.drawMainDoc.y = this._mainDocTop; // HOEditorFactorys.instance().getFactory(this._hoEditorFactoryID).pageProperty.topMarginPixes +
208401
- // HOEditorFactorys.instance().getFactory(this._hoEditorFactoryID).pageProperty.headerYPixes;
208402
- // dPage.drawDocContainer.addChild(dPage.drawFooter);
208403
208423
  dPage.drawFooter.x = hoeditorfactory.pageProperty.leftMarginPixes;
208404
- // dPage.drawFooter.y =
208405
- // hoeditorfactory.pageProperty.heightPixes -
208406
- // hoeditorfactory.pageProperty.bottomMarginPixes;
208407
208424
  dPage.drawDocContainer.addChild(dPage.drawMainDoc);
208408
- } else {
208409
- if (isPrint) this._domStage.update();
208425
+ } else if (isPrint) {
208426
+ this._domStage.update();
208410
208427
  }
208411
208428
  }
208412
208429
  }, {
@@ -209101,7 +209118,7 @@ var PoperMark = __webpack_require__(20734);
209101
209118
 
209102
209119
 
209103
209120
  // EXTERNAL MODULE: ./src/components/controls/table/TableCellPoper.vue + 6 modules
209104
- var TableCellPoper = __webpack_require__(19363);
209121
+ var TableCellPoper = __webpack_require__(21166);
209105
209122
  // EXTERNAL MODULE: ./src/editor/dom/treeNode/DateTimeNode.ts
209106
209123
  var DateTimeNode = __webpack_require__(92501);
209107
209124
  // EXTERNAL MODULE: ./src/editor/dom/treeNode/DownListNode.ts
@@ -210498,7 +210515,7 @@ var TextNode = __webpack_require__(27198);
210498
210515
  // EXTERNAL MODULE: ./src/editor/dom/treeNode/ParagraphNode.ts
210499
210516
  var ParagraphNode = __webpack_require__(67945);
210500
210517
  ;// CONCATENATED MODULE: ./src/components/version.ts
210501
- /* harmony default export */ var version = ('3.1.161');
210518
+ /* harmony default export */ var version = ('3.1.163');
210502
210519
  // EXTERNAL MODULE: ./src/components/controls/poperTipText/PoperTipText.vue + 5 modules
210503
210520
  var PoperTipText = __webpack_require__(84531);
210504
210521
  ;// CONCATENATED MODULE: ./src/components/controls/poperTipText/index.ts
@@ -211544,10 +211561,10 @@ var defaultHeight = Math.floor(1122 * scaleXY) % 2 === 1 ? Math.floor(1122 * sca
211544
211561
  });
211545
211562
  ;// CONCATENATED MODULE: ./src/components/HoDoc.vue?vue&type=script&lang=js&
211546
211563
  /* harmony default export */ var components_HoDocvue_type_script_lang_js_ = (HoDocvue_type_script_lang_js_);
211547
- ;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-32.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-32.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-32.use[2]!./node_modules/less-loader/dist/cjs.js??clonedRuleSet-32.use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/HoDoc.vue?vue&type=style&index=0&id=3b58cf3f&prod&lang=less&
211564
+ ;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-32.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-32.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-32.use[2]!./node_modules/less-loader/dist/cjs.js??clonedRuleSet-32.use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/HoDoc.vue?vue&type=style&index=0&id=797833eb&prod&lang=less&
211548
211565
  // extracted by mini-css-extract-plugin
211549
211566
 
211550
- ;// CONCATENATED MODULE: ./src/components/HoDoc.vue?vue&type=style&index=0&id=3b58cf3f&prod&lang=less&
211567
+ ;// CONCATENATED MODULE: ./src/components/HoDoc.vue?vue&type=style&index=0&id=797833eb&prod&lang=less&
211551
211568
 
211552
211569
  ;// CONCATENATED MODULE: ./src/components/HoDoc.vue
211553
211570
 
@@ -211560,8 +211577,8 @@ var defaultHeight = Math.floor(1122 * scaleXY) % 2 === 1 ? Math.floor(1122 * sca
211560
211577
 
211561
211578
  var HoDoc_component = (0,componentNormalizer/* default */.Z)(
211562
211579
  components_HoDocvue_type_script_lang_js_,
211563
- HoDocvue_type_template_id_3b58cf3f_render,
211564
- HoDocvue_type_template_id_3b58cf3f_staticRenderFns,
211580
+ HoDocvue_type_template_id_797833eb_render,
211581
+ HoDocvue_type_template_id_797833eb_staticRenderFns,
211565
211582
  false,
211566
211583
  null,
211567
211584
  null,
@@ -215522,8 +215539,6 @@ var StructureConvert = /*#__PURE__*/function () {
215522
215539
  footerDocTree.push(_subDocTree);
215523
215540
  }
215524
215541
  }
215525
- var footerSubDocTree = new Array();
215526
- // console.timeEnd("return");
215527
215542
  return {
215528
215543
  docProperty: root.docProperty,
215529
215544
  pageSettings: root.pageSettings,
@@ -216021,6 +216036,9 @@ var StructureConvert = /*#__PURE__*/function () {
216021
216036
  pageProperty.paraAlign = pageSettings.paraAlign ? Number(pageSettings.paraAlign) : 3;
216022
216037
  pageProperty.charSpace = pageSettings.charSpace ? Number(pageSettings.charSpace) : 0;
216023
216038
  pageProperty.lineHeight = pageSettings.lineHeight ? Number(pageSettings.lineHeight) : 1.25;
216039
+ pageProperty.drawLineUnderline = pageSettings.drawLineUnderline === "true" ? true : false;
216040
+ pageProperty.lineUnderlineColor = pageSettings.lineUnderlineColor || '#000000';
216041
+ pageProperty.lineUnderlineStyle = pageSettings.lineUnderlineStyle == 1 ? 1 : 0;
216024
216042
  // hoEditorFactory.pageProperty = pageProperty;
216025
216043
  }
216026
216044
 
@@ -216363,7 +216381,7 @@ var StructureConvert = /*#__PURE__*/function () {
216363
216381
  }
216364
216382
  }, {
216365
216383
  key: "convertNode",
216366
- value: function convertNode(temp, rootNodes, parentNode, nodes, isPaste, isClearSign) {
216384
+ value: function convertNode(temp, rootNodes, parentNode, nodes, isPaste, isClearSign, isNewPage) {
216367
216385
  if (temp === "") {
216368
216386
  return undefined;
216369
216387
  }
@@ -216373,7 +216391,7 @@ var StructureConvert = /*#__PURE__*/function () {
216373
216391
  message/* default */.Z.warn("不允许将表格粘贴到文本域");
216374
216392
  return undefined;
216375
216393
  }
216376
- var node = TableNode/* TableNode */.Fh.json2Node(this._hoEditorFactoryID, temp, rootNodes, parentNode, isPaste, isClearSign);
216394
+ var node = TableNode/* TableNode */.Fh.json2Node(this._hoEditorFactoryID, temp, rootNodes, parentNode, isPaste, isClearSign, isNewPage);
216377
216395
  return node;
216378
216396
  } else if (temp.nodeType == BaseNode/* NodeType */.Jq.ntParagraph) {
216379
216397
  return ParagraphNode/* ParagraphNode */.C.json2Node(this._hoEditorFactoryID, temp, rootNodes, parentNode);
@@ -218410,6 +218428,7 @@ var ExpressionCalculator = __webpack_require__(71115);
218410
218428
 
218411
218429
 
218412
218430
 
218431
+
218413
218432
 
218414
218433
 
218415
218434
  var VueController = /*#__PURE__*/function () {
@@ -220932,12 +220951,14 @@ var VueController = /*#__PURE__*/function () {
220932
220951
  var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this._hoEditorFactoryID);
220933
220952
  var scaleXY = DrawConfig/* DrawConfig */.f.instance().scale;
220934
220953
  var drawPage = hoEditorFactory.drawTree.drawPages[pageIndex];
220935
- for (var j = 0; j < drawPage.selectContainer.children.length; j++) {
220936
- var child = drawPage.selectContainer.children[j];
220937
- if (child.name && child.name.includes("mask")) {
220938
- var bounds = child.getBounds();
220939
- if (stageY > bounds.y * scaleXY && stageY < bounds.y * scaleXY + bounds.height * scaleXY) {
220940
- return false;
220954
+ if (drawPage) {
220955
+ for (var j = 0; j < drawPage.selectContainer.children.length; j++) {
220956
+ var child = drawPage.selectContainer.children[j];
220957
+ if (child.name && child.name.includes("mask")) {
220958
+ var bounds = child.getBounds();
220959
+ if (stageY > bounds.y * scaleXY && stageY < bounds.y * scaleXY + bounds.height * scaleXY) {
220960
+ return false;
220961
+ }
220941
220962
  }
220942
220963
  }
220943
220964
  }
@@ -222163,6 +222184,48 @@ var VueController = /*#__PURE__*/function () {
222163
222184
  }
222164
222185
  hoEditorFactory.docTree.curDomRange.setSamePath(nodePath);
222165
222186
  hoEditorFactory.docController.parseNodeData(nodes);
222187
+ var lastNextDays = hoEditorFactory.updateNextDaysRecordList.get("last");
222188
+ // const isUpdate = hoEditorFactory.updateNextDaysRecordList.get("update");
222189
+ if (lastNextDays) {
222190
+ this.updateCellNextDays(lastNextDays.rowNo, lastNextDays.colNo, lastNextDays.tableId, '', true);
222191
+ }
222192
+ }
222193
+ }
222194
+ /**
222195
+ * 更新单元格属性设置过日期属性且设置间隔回填单元格
222196
+ */
222197
+ }, {
222198
+ key: "updateCellNextDays",
222199
+ value: function updateCellNextDays(rowNo, colNo, tableId, date, isAddNewPage) {
222200
+ var _tableNodeMap$get;
222201
+ var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this._hoEditorFactoryID);
222202
+ var tableNodeMap = hoEditorFactory.vueController.getTableNodeList();
222203
+ var allTableList = hoEditorFactory.updateNextDaysRecordList.get("0") || [];
222204
+ var currIndex = -1;
222205
+ var updateCount = 1;
222206
+ var currentCellNode = (_tableNodeMap$get = tableNodeMap.get(tableId)) === null || _tableNodeMap$get === void 0 ? void 0 : _tableNodeMap$get.rows[rowNo][colNo];
222207
+ var currentText = (currentCellNode === null || currentCellNode === void 0 ? void 0 : currentCellNode.getCellText()) || '';
222208
+ if (currentCellNode && (currentText.replace(/ /g, '') == '' || isAddNewPage && currentText.replace(/ /g, '') != '')) {
222209
+ var currentStyle = currentCellNode.cellProperty.dateTimeProperty.inputStyle.replace(/dd/g, 'DD').replace(/yyyy/g, 'YYYY');
222210
+ // 单元格文本获取最新的内容
222211
+ allTableList.map(function (v, index) {
222212
+ if (v.rowNo == rowNo && v.colNo == colNo && v.tableId == tableId) {
222213
+ currIndex = index;
222214
+ } else if (currIndex != -1 && index > currIndex) {
222215
+ var _tableNodeMap$get2;
222216
+ var cellNode = (_tableNodeMap$get2 = tableNodeMap.get(v.tableId)) === null || _tableNodeMap$get2 === void 0 ? void 0 : _tableNodeMap$get2.rows[v.rowNo][v.colNo];
222217
+ if (cellNode) {
222218
+ var cellText = cellNode.getCellText();
222219
+ if (cellText.replace(/ /g, '') == '') {
222220
+ var cellStyle = cellNode.cellProperty.dateTimeProperty.inputStyle.replace(/dd/g, 'DD').replace(/yyyy/g, 'YYYY');
222221
+ var nextDays = moment_default()(date || currentText, currentStyle, 'zh-cn').add(Number(v.daysInterval) * updateCount, 'days').format(cellStyle);
222222
+ updateCount++;
222223
+ cellNode.setCellText(nextDays, false, true);
222224
+ hoEditorFactory.updateNextDaysRecordList.set("last", (0,objectSpread2/* default */.Z)({}, v));
222225
+ }
222226
+ }
222227
+ }
222228
+ });
222166
222229
  }
222167
222230
  }
222168
222231
  /**
@@ -227511,6 +227574,19 @@ var VueController = /*#__PURE__*/function () {
227511
227574
  behavior: "auto"
227512
227575
  });
227513
227576
  }
227577
+ }, {
227578
+ key: "getTableNodeList",
227579
+ value: function getTableNodeList() {
227580
+ var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this._hoEditorFactoryID);
227581
+ var mainNodes = hoEditorFactory.docTree.mainNodes;
227582
+ var tableMap = new Map();
227583
+ mainNodes.map(function (node) {
227584
+ if (node instanceof TableNode/* TableNode */.Fh) {
227585
+ tableMap.set(node.tableProperty.id, node);
227586
+ }
227587
+ });
227588
+ return tableMap;
227589
+ }
227514
227590
  }]);
227515
227591
  return VueController;
227516
227592
  }();
@@ -239645,7 +239721,7 @@ var localforage_default = /*#__PURE__*/__webpack_require__.n(localforage);
239645
239721
  var HoLocalStorage = /*#__PURE__*/function () {
239646
239722
  // 增加页面刷新时缓存未保存的病历数据
239647
239723
  function HoLocalStorage(hoEditorFactoryID) {
239648
- var _window;
239724
+ var _this$getChromeWebvie;
239649
239725
  (0,esm_classCallCheck/* default */.Z)(this, HoLocalStorage);
239650
239726
  (0,esm_defineProperty/* default */.Z)(this, "_hoEditorFactoryID", void 0);
239651
239727
  (0,esm_defineProperty/* default */.Z)(this, "_key", void 0);
@@ -239689,7 +239765,7 @@ var HoLocalStorage = /*#__PURE__*/function () {
239689
239765
  // name: "_ho_web",
239690
239766
  // storeName: this._storeName,
239691
239767
  // });
239692
- (_window = window) === null || _window === void 0 || (_window = _window.chrome) === null || _window === void 0 || (_window = _window.webview) === null || _window === void 0 ? void 0 : _window.addEventListener('message', function (e) {
239768
+ (_this$getChromeWebvie = this.getChromeWebview()) === null || _this$getChromeWebvie === void 0 ? void 0 : _this$getChromeWebvie.addEventListener('message', function (e) {
239693
239769
  if (e && e.data) {
239694
239770
  var res = JSON.parse(e.data);
239695
239771
  // console.log('res-----', res);
@@ -239713,10 +239789,25 @@ var HoLocalStorage = /*#__PURE__*/function () {
239713
239789
  }
239714
239790
  });
239715
239791
  }
239716
- // set ho_web(value: any) {
239717
- // this._ho_web = value;
239718
- // }
239719
239792
  (0,esm_createClass/* default */.Z)(HoLocalStorage, [{
239793
+ key: "getChromeWebview",
239794
+ value: function getChromeWebview() {
239795
+ var _chromes;
239796
+ var chromes;
239797
+ try {
239798
+ if (window.top) {
239799
+ chromes = window.top.chrome;
239800
+ }
239801
+ } catch (error) {
239802
+ console.error(error);
239803
+ chromes = undefined;
239804
+ }
239805
+ return (_chromes = chromes) === null || _chromes === void 0 ? void 0 : _chromes.webview;
239806
+ }
239807
+ // set ho_web(value: any) {
239808
+ // this._ho_web = value;
239809
+ // }
239810
+ }, {
239720
239811
  key: "initHoWebSql",
239721
239812
  value: function initHoWebSql() {
239722
239813
  localforage_default().config({
@@ -239748,7 +239839,7 @@ var HoLocalStorage = /*#__PURE__*/function () {
239748
239839
  }, {
239749
239840
  key: "getLocalXmlList",
239750
239841
  value: function getLocalXmlList(callBack) {
239751
- var _window2;
239842
+ var _this$getChromeWebvie2;
239752
239843
  this.callBack = callBack;
239753
239844
  var hoEditfactory = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this._hoEditorFactoryID);
239754
239845
  var data = {
@@ -239761,7 +239852,7 @@ var HoLocalStorage = /*#__PURE__*/function () {
239761
239852
  }
239762
239853
  }
239763
239854
  };
239764
- (_window2 = window) === null || _window2 === void 0 || (_window2 = _window2.chrome) === null || _window2 === void 0 || (_window2 = _window2.webview) === null || _window2 === void 0 ? void 0 : _window2.postMessage(data);
239855
+ (_this$getChromeWebvie2 = this.getChromeWebview()) === null || _this$getChromeWebvie2 === void 0 ? void 0 : _this$getChromeWebvie2.postMessage(data);
239765
239856
  }
239766
239857
  // 获取key的数据 => { data, keyInfo }
239767
239858
  }, {
@@ -239775,7 +239866,7 @@ var HoLocalStorage = /*#__PURE__*/function () {
239775
239866
  }, {
239776
239867
  key: "loadLocalXml",
239777
239868
  value: function loadLocalXml(item, callBack) {
239778
- var _window3;
239869
+ var _this$getChromeWebvie3;
239779
239870
  this.callBackForLoad = callBack;
239780
239871
  var data = {
239781
239872
  exec: 'emr',
@@ -239787,7 +239878,7 @@ var HoLocalStorage = /*#__PURE__*/function () {
239787
239878
  }
239788
239879
  }
239789
239880
  };
239790
- (_window3 = window) === null || _window3 === void 0 || (_window3 = _window3.chrome) === null || _window3 === void 0 || (_window3 = _window3.webview) === null || _window3 === void 0 ? void 0 : _window3.postMessage(data);
239881
+ (_this$getChromeWebvie3 = this.getChromeWebview()) === null || _this$getChromeWebvie3 === void 0 ? void 0 : _this$getChromeWebvie3.postMessage(data);
239791
239882
  }
239792
239883
  }, {
239793
239884
  key: "removeLocalStorage",
@@ -239818,18 +239909,18 @@ var HoLocalStorage = /*#__PURE__*/function () {
239818
239909
  }, {
239819
239910
  key: "autoSaveLocalStorage",
239820
239911
  value: function autoSaveLocalStorage() {
239821
- var _window4,
239822
- _this4 = this;
239912
+ var _this4 = this;
239823
239913
  if (this._lastSaveTime && new Date().getTime() - this._lastSaveTime <= this._intervalsTime) {
239824
239914
  return;
239825
239915
  }
239826
- var HoBrowser = (_window4 = window) === null || _window4 === void 0 || (_window4 = _window4.chrome) === null || _window4 === void 0 ? void 0 : _window4.webview;
239916
+ var HoBrowser = this.getChromeWebview();
239827
239917
  var saveTime = (0,plugins_util/* dateFormat */.vc)(new Date());
239828
239918
  var hoEditfactory = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this._hoEditorFactoryID);
239829
239919
  this._key = hoEditfactory.userInfo.id + hoEditfactory.docTree.docProperty.patientID + hoEditfactory.docTree.docProperty.title;
239830
239920
  if (HoBrowser) {
239831
239921
  this._lastSaveTime = new Date(saveTime).getTime();
239832
239922
  if (hoEditfactory && hoEditfactory.vueController.isModifyDoc()) {
239923
+ var _this$getChromeWebvie4;
239833
239924
  var data = {
239834
239925
  exec: 'emr',
239835
239926
  data: {
@@ -239842,7 +239933,7 @@ var HoLocalStorage = /*#__PURE__*/function () {
239842
239933
  }
239843
239934
  };
239844
239935
  // console.log('SaveEmrData', data);
239845
- window.chrome.webview.postMessage(data);
239936
+ (_this$getChromeWebvie4 = this.getChromeWebview()) === null || _this$getChromeWebvie4 === void 0 ? void 0 : _this$getChromeWebvie4.postMessage(data);
239846
239937
  }
239847
239938
  } else if (this._networkConnectionStatus) {
239848
239939
  // 网络连接正常情况下正常缓存
@@ -240153,28 +240244,28 @@ var HOEditorFactory = /*#__PURE__*/function () {
240153
240244
  (0,esm_defineProperty/* default */.Z)(this, "_fontSizeMap", new Map());
240154
240245
  (0,esm_defineProperty/* default */.Z)(this, "_notAllowEditInReview", false);
240155
240246
  //审阅模式下不允许修改(质控医生站的病历只可进行批注不可修改)
240156
- (0,esm_defineProperty/* default */.Z)(this, "_printSilently", false);
240247
+ (0,esm_defineProperty/* default */.Z)(this, "_canvasListNode", void 0);
240248
+ (0,esm_defineProperty/* default */.Z)(this, "printSilently", false);
240157
240249
  // 封装浏览器静默打印
240158
- (0,esm_defineProperty/* default */.Z)(this, "_limitCharNumber", 0);
240250
+ (0,esm_defineProperty/* default */.Z)(this, "limitCharNumber", 0);
240159
240251
  // 限制复制病历文本的字符数
240160
- (0,esm_defineProperty/* default */.Z)(this, "_reviewJson", {});
240252
+ (0,esm_defineProperty/* default */.Z)(this, "reviewJson", {});
240161
240253
  // 审阅列表菜单权限
240162
- (0,esm_defineProperty/* default */.Z)(this, "_canvasListNode", void 0);
240163
- (0,esm_defineProperty/* default */.Z)(this, "_numLetterOnOneLine", true);
240254
+ (0,esm_defineProperty/* default */.Z)(this, "numLetterOnOneLine", true);
240164
240255
  //连续的数字或字母是否在一行显示
240165
- (0,esm_defineProperty/* default */.Z)(this, "_reviewParams", {
240256
+ (0,esm_defineProperty/* default */.Z)(this, "reviewParams", {
240166
240257
  old: false // 是否使用完善后的批注界面
240167
240258
  });
240168
240259
  // 审阅参数设置
240169
- (0,esm_defineProperty/* default */.Z)(this, "_commentParams", void 0);
240260
+ (0,esm_defineProperty/* default */.Z)(this, "commentParams", void 0);
240170
240261
  // 批注相关动态变更
240171
- (0,esm_defineProperty/* default */.Z)(this, "_isDrawMustMarker", true);
240262
+ (0,esm_defineProperty/* default */.Z)(this, "isDrawMustMarker", true);
240172
240263
  //是否绘制必填标记
240173
- (0,esm_defineProperty/* default */.Z)(this, "_isControlCaret", false);
240264
+ (0,esm_defineProperty/* default */.Z)(this, "isControlCaret", false);
240174
240265
  //鼠标点击空元素控制光标在中间位置
240175
- (0,esm_defineProperty/* default */.Z)(this, "_allowUncheckRadio", false);
240266
+ (0,esm_defineProperty/* default */.Z)(this, "allowUncheckRadio", false);
240176
240267
  //允许直接取消勾选单选控件(默认不允许)
240177
- (0,esm_defineProperty/* default */.Z)(this, "_insHtmlWithColor", true);
240268
+ (0,esm_defineProperty/* default */.Z)(this, "insHtmlWithColor", true);
240178
240269
  //插入检查检验文本带颜色(默认带颜色)
240179
240270
  (0,esm_defineProperty/* default */.Z)(this, "convertSignImage", false);
240180
240271
  // 处理签名图片，减小其分辨率大小，提高打印时图片处理速度
@@ -240183,12 +240274,14 @@ var HOEditorFactory = /*#__PURE__*/function () {
240183
240274
  (0,esm_defineProperty/* default */.Z)(this, "innerIdentifierList", []);
240184
240275
  // 内部标识符列表
240185
240276
  (0,esm_defineProperty/* default */.Z)(this, "isDrawEmptyNode", true);
240277
+ // 元素内容为空时是否绘制(文本域元素和关联文本域的标签元素)
240278
+ (0,esm_defineProperty/* default */.Z)(this, "updateNextDaysRecordList", new Map());
240186
240279
  this._hoEditorFactoryId = id;
240187
240280
  }
240188
240281
  (0,esm_createClass/* default */.Z)(HOEditorFactory, [{
240189
240282
  key: "hoLocalStorage",
240190
240283
  get:
240191
- // 元素内容为空时是否绘制(文本域元素和关联文本域的标签元素)
240284
+ // 记录一下单元格双击属性为日期的更新列表
240192
240285
  /**
240193
240286
  * Getter hoLocalStorage
240194
240287
  * @return {HoLocalStorage}
@@ -240709,56 +240802,6 @@ var HOEditorFactory = /*#__PURE__*/function () {
240709
240802
  this._notAllowEditInReview = value;
240710
240803
  }
240711
240804
  }
240712
- }, {
240713
- key: "limitCharNumber",
240714
- get: function get() {
240715
- return this._limitCharNumber;
240716
- },
240717
- set: function set(value) {
240718
- if (this._limitCharNumber !== value) {
240719
- this._limitCharNumber = value;
240720
- }
240721
- }
240722
- }, {
240723
- key: "numLetterOnOneLine",
240724
- get: function get() {
240725
- return this._numLetterOnOneLine;
240726
- },
240727
- set: function set(value) {
240728
- if (this._numLetterOnOneLine !== value) {
240729
- this._numLetterOnOneLine = value;
240730
- }
240731
- }
240732
- }, {
240733
- key: "reviewJson",
240734
- get: function get() {
240735
- return this._reviewJson;
240736
- },
240737
- set: function set(value) {
240738
- if (this._reviewJson !== value) {
240739
- this._reviewJson = value;
240740
- }
240741
- }
240742
- }, {
240743
- key: "reviewParams",
240744
- get: function get() {
240745
- return this._reviewParams;
240746
- },
240747
- set: function set(value) {
240748
- if (this._reviewParams !== value) {
240749
- this._reviewParams = value;
240750
- }
240751
- }
240752
- }, {
240753
- key: "commentParams",
240754
- get: function get() {
240755
- return this._commentParams;
240756
- },
240757
- set: function set(value) {
240758
- if (this._commentParams !== value) {
240759
- this._commentParams = value;
240760
- }
240761
- }
240762
240805
  }, {
240763
240806
  key: "isHideComments",
240764
240807
  get: function get() {
@@ -240958,36 +241001,6 @@ var HOEditorFactory = /*#__PURE__*/function () {
240958
241001
  this._isEnabledGlobalColor = value;
240959
241002
  }
240960
241003
  }
240961
- }, {
240962
- key: "isDrawMustMarker",
240963
- get: function get() {
240964
- return this._isDrawMustMarker;
240965
- },
240966
- set: function set(value) {
240967
- if (this._isDrawMustMarker !== value) {
240968
- this._isDrawMustMarker = value;
240969
- }
240970
- }
240971
- }, {
240972
- key: "allowUncheckRadio",
240973
- get: function get() {
240974
- return this._allowUncheckRadio;
240975
- },
240976
- set: function set(value) {
240977
- if (this._allowUncheckRadio !== value) {
240978
- this._allowUncheckRadio = value;
240979
- }
240980
- }
240981
- }, {
240982
- key: "insHtmlWithColor",
240983
- get: function get() {
240984
- return this._insHtmlWithColor;
240985
- },
240986
- set: function set(value) {
240987
- if (this._insHtmlWithColor !== value) {
240988
- this._insHtmlWithColor = value;
240989
- }
240990
- }
240991
241004
  }, {
240992
241005
  key: "isSameColorWithEmptyVlaue",
240993
241006
  get: function get() {
@@ -241029,16 +241042,6 @@ var HOEditorFactory = /*#__PURE__*/function () {
241029
241042
  this._defaultIsAllowDelete = value;
241030
241043
  }
241031
241044
  }
241032
- }, {
241033
- key: "printSilently",
241034
- get: function get() {
241035
- return this._printSilently;
241036
- },
241037
- set: function set(value) {
241038
- if (this._printSilently !== value) {
241039
- this._printSilently = value;
241040
- }
241041
- }
241042
241045
  }, {
241043
241046
  key: "canvasListNode",
241044
241047
  get: function get() {
@@ -241049,16 +241052,6 @@ var HOEditorFactory = /*#__PURE__*/function () {
241049
241052
  this._canvasListNode = value;
241050
241053
  }
241051
241054
  }
241052
- }, {
241053
- key: "isControlCaret",
241054
- get: function get() {
241055
- return this._isControlCaret;
241056
- },
241057
- set: function set(value) {
241058
- if (this._isControlCaret !== value) {
241059
- this._isControlCaret = value;
241060
- }
241061
- }
241062
241055
  }, {
241063
241056
  key: "clear",
241064
241057
  value: function clear() {
@@ -242890,6 +242883,11 @@ var HoColorPickers = __webpack_require__(98181);
242890
242883
 
242891
242884
 
242892
242885
 
242886
+
242887
+
242888
+
242889
+
242890
+
242893
242891
 
242894
242892
  /* harmony default export */ var ToolFamilyvue_type_script_lang_js_ = (external_commonjs_vue_commonjs2_vue_root_Vue_default().extend({
242895
242893
  name: 'ToolFamily',
@@ -242999,6 +242997,12 @@ var HoColorPickers = __webpack_require__(98181);
242999
242997
  */
243000
242998
  fontFamilyClick: function fontFamilyClick(fontItem) {
243001
242999
  // const font = JSON.stringify(fontItem);
243000
+ var selectText = this.vueController.getSelectText();
243001
+ var matchText = selectText.match(/[\u4e00-\u9fa5]+/g);
243002
+ if (fontItem.ch !== '宋体' && matchText) {
243003
+ message/* default */.Z.error("\u4E0D\u80FD\u5C06\u4E2D\u6587\u5B57\u7B26\u3010".concat(matchText.join("，"), "\u3011\u8BBE\u7F6E\u4E3A\u82F1\u6587\u5B57\u4F53").concat(fontItem.ch));
243004
+ return false;
243005
+ }
243002
243006
  this.font = fontItem;
243003
243007
  this.fontFamilyVisible = false;
243004
243008
  this.vueController.fontFormat(fontItem.ch);
@@ -243736,8 +243740,8 @@ var UpdateDocument_component = (0,componentNormalizer/* default */.Z)(
243736
243740
  )
243737
243741
 
243738
243742
  /* harmony default export */ var UpdateDocument = (UpdateDocument_component.exports);
243739
- ;// 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/PageSetting.vue?vue&type=template&id=4294664e&
243740
- var PageSettingvue_type_template_id_4294664e_render = function render() {
243743
+ ;// 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/PageSetting.vue?vue&type=template&id=077d9a5e&
243744
+ var PageSettingvue_type_template_id_077d9a5e_render = function render() {
243741
243745
  var _vm = this,
243742
243746
  _c = _vm._self._c;
243743
243747
  return _c('div', {
@@ -243783,7 +243787,11 @@ var PageSettingvue_type_template_id_4294664e_render = function render() {
243783
243787
  staticStyle: {
243784
243788
  "margin": "0 10px 10px 10px"
243785
243789
  }
243786
- }, [_c('legend', [_vm._v("页边距    毫米")]), _c('ul', {
243790
+ }, [_c('legend', {
243791
+ staticStyle: {
243792
+ "width": "81px"
243793
+ }
243794
+ }, [_vm._v("页边距    毫米")]), _c('ul', {
243787
243795
  staticClass: "page-spacing"
243788
243796
  }, [_c('li', {
243789
243797
  staticClass: "page-spacing-item",
@@ -243815,7 +243823,7 @@ var PageSettingvue_type_template_id_4294664e_render = function render() {
243815
243823
  staticClass: "page-spacing-form"
243816
243824
  }, [_c('span', {
243817
243825
  staticClass: "labels"
243818
- }, [_vm._v("左(L)")]), _c('a-input-number', {
243826
+ }, [_vm._v("下(B)")]), _c('a-input-number', {
243819
243827
  staticStyle: {
243820
243828
  "text-align": "left"
243821
243829
  },
@@ -243826,22 +243834,17 @@ var PageSettingvue_type_template_id_4294664e_render = function render() {
243826
243834
  "min": 0
243827
243835
  },
243828
243836
  model: {
243829
- value: _vm.property.leftMarginMm,
243837
+ value: _vm.property.bottomMarginMm,
243830
243838
  callback: function callback($$v) {
243831
- _vm.$set(_vm.property, "leftMarginMm", $$v);
243839
+ _vm.$set(_vm.property, "bottomMarginMm", $$v);
243832
243840
  },
243833
- expression: "property.leftMarginMm"
243834
- }
243835
- })], 1)]), _c('li', {
243836
- staticClass: "page-spacing-item",
243837
- staticStyle: {
243838
- "justify-content": "space-between"
243841
+ expression: "property.bottomMarginMm"
243839
243842
  }
243840
- }, [_c('div', {
243843
+ })], 1), _c('div', {
243841
243844
  staticClass: "page-spacing-form"
243842
243845
  }, [_c('span', {
243843
243846
  staticClass: "labels"
243844
- }, [_vm._v("下(B)")]), _c('a-input-number', {
243847
+ }, [_vm._v("左(L)")]), _c('a-input-number', {
243845
243848
  staticStyle: {
243846
243849
  "text-align": "left"
243847
243850
  },
@@ -243852,11 +243855,11 @@ var PageSettingvue_type_template_id_4294664e_render = function render() {
243852
243855
  "min": 0
243853
243856
  },
243854
243857
  model: {
243855
- value: _vm.property.bottomMarginMm,
243858
+ value: _vm.property.leftMarginMm,
243856
243859
  callback: function callback($$v) {
243857
- _vm.$set(_vm.property, "bottomMarginMm", $$v);
243860
+ _vm.$set(_vm.property, "leftMarginMm", $$v);
243858
243861
  },
243859
- expression: "property.bottomMarginMm"
243862
+ expression: "property.leftMarginMm"
243860
243863
  }
243861
243864
  })], 1), _c('div', {
243862
243865
  staticClass: "page-spacing-form"
@@ -243883,7 +243886,11 @@ var PageSettingvue_type_template_id_4294664e_render = function render() {
243883
243886
  staticClass: "print-settings"
243884
243887
  }, [_c('fieldset', {
243885
243888
  staticClass: "fieldset print-direction-item"
243886
- }, [_c('legend', [_vm._v("打印方向")]), _c('div', {
243889
+ }, [_c('legend', {
243890
+ staticStyle: {
243891
+ "width": "50px"
243892
+ }
243893
+ }, [_vm._v("打印方向")]), _c('div', {
243887
243894
  class: _vm.property.printDirection === 0 ? 'print-direction is-actived' : 'print-direction',
243888
243895
  on: {
243889
243896
  "click": function click($event) {
@@ -243933,7 +243940,8 @@ var PageSettingvue_type_template_id_4294664e_render = function render() {
243933
243940
  staticClass: "control-item",
243934
243941
  staticStyle: {
243935
243942
  "padding": "0",
243936
- "margin-left": "10px"
243943
+ "margin-left": "10px",
243944
+ "justify-content": "space-between"
243937
243945
  }
243938
243946
  }, [_c('fieldset', {
243939
243947
  staticClass: "fieldset",
@@ -243942,7 +243950,11 @@ var PageSettingvue_type_template_id_4294664e_render = function render() {
243942
243950
  "padding": "0 10px",
243943
243951
  "margin": "0"
243944
243952
  }
243945
- }, [_c('legend', [_vm._v("纸张    毫米")]), _c('ul', {
243953
+ }, [_c('legend', {
243954
+ staticStyle: {
243955
+ "width": "64px"
243956
+ }
243957
+ }, [_vm._v("纸张    毫米")]), _c('ul', {
243946
243958
  staticClass: "control-list"
243947
243959
  }, [_c('li', {
243948
243960
  staticClass: "control-item"
@@ -244036,7 +244048,11 @@ var PageSettingvue_type_template_id_4294664e_render = function render() {
244036
244048
  "width": "250px",
244037
244049
  "padding": "0 10px 10px"
244038
244050
  }
244039
- }, [_c('legend', [_vm._v("边框")]), _c('div', {
244051
+ }, [_c('legend', {
244052
+ staticStyle: {
244053
+ "width": "28px"
244054
+ }
244055
+ }, [_vm._v("边框")]), _c('div', {
244040
244056
  staticClass: "control-item"
244041
244057
  }, [_c('a-checkbox', {
244042
244058
  model: {
@@ -244065,11 +244081,55 @@ var PageSettingvue_type_template_id_4294664e_render = function render() {
244065
244081
  attrs: {
244066
244082
  "labelWidth": "64px",
244067
244083
  "defaultStyle": _vm.property.paintRowLine,
244068
- "placeholder": "绘制行线"
244084
+ "placeholder": "边框样式"
244069
244085
  },
244070
244086
  on: {
244071
244087
  "change": _vm.printStyleChange
244072
244088
  }
244089
+ })], 1), _c('fieldset', {
244090
+ staticClass: "fieldset",
244091
+ staticStyle: {
244092
+ "width": "250px",
244093
+ "padding": "0 10px 10px"
244094
+ }
244095
+ }, [_c('legend', {
244096
+ staticStyle: {
244097
+ "width": "28px"
244098
+ }
244099
+ }, [_vm._v("行线")]), _c('div', {
244100
+ staticClass: "control-item"
244101
+ }, [_c('a-checkbox', {
244102
+ model: {
244103
+ value: _vm.property.drawLineUnderline,
244104
+ callback: function callback($$v) {
244105
+ _vm.$set(_vm.property, "drawLineUnderline", $$v);
244106
+ },
244107
+ expression: "property.drawLineUnderline"
244108
+ }
244109
+ }, [_vm._v("绘制行线")])], 1), _c('div', {
244110
+ staticClass: "control-item"
244111
+ }, [_c('span', {
244112
+ staticClass: "label",
244113
+ staticStyle: {
244114
+ "width": "64px"
244115
+ }
244116
+ }, [_vm._v("线条颜色")]), _c('ho-color-picker', {
244117
+ model: {
244118
+ value: _vm.property.lineUnderlineColor,
244119
+ callback: function callback($$v) {
244120
+ _vm.$set(_vm.property, "lineUnderlineColor", $$v);
244121
+ },
244122
+ expression: "property.lineUnderlineColor"
244123
+ }
244124
+ })], 1), _c('PrintLineStyle', {
244125
+ attrs: {
244126
+ "labelWidth": "64px",
244127
+ "defaultStyle": _vm.property.lineUnderlineStyle,
244128
+ "placeholder": "线条样式"
244129
+ },
244130
+ on: {
244131
+ "change": _vm.underlineStyleChange
244132
+ }
244073
244133
  })], 1)])])])]), _c('a-tab-pane', {
244074
244134
  key: "second",
244075
244135
  attrs: {
@@ -244080,7 +244140,11 @@ var PageSettingvue_type_template_id_4294664e_render = function render() {
244080
244140
  staticStyle: {
244081
244141
  "padding": "0 10px 10px"
244082
244142
  }
244083
- }, [_c('legend', [_vm._v("页眉    毫米")]), _c('div', {
244143
+ }, [_c('legend', {
244144
+ staticStyle: {
244145
+ "width": "72px"
244146
+ }
244147
+ }, [_vm._v("页眉    毫米")]), _c('div', {
244084
244148
  staticClass: "control-item"
244085
244149
  }, [_vm._v("距页边界：")]), _c('div', {
244086
244150
  staticClass: "control-item"
@@ -244126,7 +244190,11 @@ var PageSettingvue_type_template_id_4294664e_render = function render() {
244126
244190
  staticStyle: {
244127
244191
  "padding": "0 10px 10px"
244128
244192
  }
244129
- }, [_c('legend', [_vm._v("页脚    毫米")]), _c('div', {
244193
+ }, [_c('legend', {
244194
+ staticStyle: {
244195
+ "width": "72px"
244196
+ }
244197
+ }, [_vm._v("页脚    毫米")]), _c('div', {
244130
244198
  staticClass: "control-item"
244131
244199
  }, [_vm._v("距页边界：")]), _c('div', {
244132
244200
  staticClass: "control-item"
@@ -244172,7 +244240,11 @@ var PageSettingvue_type_template_id_4294664e_render = function render() {
244172
244240
  staticStyle: {
244173
244241
  "padding": "0 10px 10px"
244174
244242
  }
244175
- }, [_c('legend', [_vm._v("页数")]), _c('div', {
244243
+ }, [_c('legend', {
244244
+ staticStyle: {
244245
+ "width": "28px"
244246
+ }
244247
+ }, [_vm._v("页数")]), _c('div', {
244176
244248
  staticClass: "control-item"
244177
244249
  }, [_c('span', {
244178
244250
  staticClass: "label",
@@ -244213,7 +244285,7 @@ var PageSettingvue_type_template_id_4294664e_render = function render() {
244213
244285
  }
244214
244286
  }, [_vm._v("取消")])], 1)])]);
244215
244287
  };
244216
- var PageSettingvue_type_template_id_4294664e_staticRenderFns = [];
244288
+ var PageSettingvue_type_template_id_077d9a5e_staticRenderFns = [];
244217
244289
 
244218
244290
  // EXTERNAL MODULE: ./src/components/mixins/appendToBody.ts
244219
244291
  var appendToBody = __webpack_require__(95677);
@@ -244254,7 +244326,7 @@ var HoColorPicker = __webpack_require__(10306);
244254
244326
  alignList: ['left', 'both', 'right', 'both'],
244255
244327
  lineHeightList: [1.25, 1.5, 2, 2.5, 3],
244256
244328
  fontSpacingList: [0, 1, 2, 3],
244257
- paperStyle: [['自定义', [210, 297]], ['A3', [297, 420]], ['A4', [210, 297]], ['A5', [148, 210]], ['A6', [105, 148]], ['B4', [250, 353]], ['B5', [176, 250]], ['B6', [125, 176]], ['16K', [195, 270]], ['16K', [185, 265]]],
244329
+ paperStyle: [['自定义', [210, 297]], ['A3', [297, 420]], ['A4', [210, 297]], ['A5', [148, 210]], ['A6', [105, 148]], ['B4', [250, 353]], ['B5', [176, 250]], ['B6', [125, 176]], ['16K', [195, 270]], ['16K-1', [185, 265]]],
244258
244330
  property: {
244259
244331
  pageSize: 'A4',
244260
244332
  source: '0',
@@ -244272,8 +244344,7 @@ var HoColorPicker = __webpack_require__(10306);
244272
244344
  pageNumber: 1,
244273
244345
  borderColor: '#FFFFFF',
244274
244346
  paintRowLine: 0,
244275
- isPaintBorder: false
244276
-
244347
+ isPaintBorder: false,
244277
244348
  // fontFormat: "微软雅黑",
244278
244349
  // fontSize: 14,
244279
244350
  // fontColor: "#000000",
@@ -244282,8 +244353,11 @@ var HoColorPicker = __webpack_require__(10306);
244282
244353
  // paraAlign: 3,
244283
244354
  // charSpace: 1,
244284
244355
  // lineHeight: 1.25,
244285
- },
244286
244356
 
244357
+ drawLineUnderline: false,
244358
+ lineUnderlineColor: '#000000',
244359
+ lineUnderlineStyle: 0
244360
+ },
244287
244361
  textActiveName: 'first',
244288
244362
  backFile: null,
244289
244363
  backImgUrl: '',
@@ -244337,6 +244411,9 @@ var HoColorPicker = __webpack_require__(10306);
244337
244411
  printStyleChange: function printStyleChange(style) {
244338
244412
  this.property.paintRowLine = style;
244339
244413
  },
244414
+ underlineStyleChange: function underlineStyleChange(style) {
244415
+ this.property.lineUnderlineStyle = style;
244416
+ },
244340
244417
  handleClose: function handleClose() {
244341
244418
  this.$emit('closePageSetting', false);
244342
244419
  },
@@ -244351,7 +244428,7 @@ var HoColorPicker = __webpack_require__(10306);
244351
244428
  params.fontColor = 'transparent';
244352
244429
  }
244353
244430
  this.vueController.setPageProperty(JSON.stringify((0,objectSpread2/* default */.Z)({}, params)));
244354
- this.vueController.fullRedraw();
244431
+ this.vueController.rebuildAll();
244355
244432
  this.handleClose();
244356
244433
  },
244357
244434
  toolModalDown: function toolModalDown(e) {
@@ -244361,10 +244438,10 @@ var HoColorPicker = __webpack_require__(10306);
244361
244438
  });
244362
244439
  ;// CONCATENATED MODULE: ./src/components/toolbar/PageSetting.vue?vue&type=script&lang=js&
244363
244440
  /* harmony default export */ var toolbar_PageSettingvue_type_script_lang_js_ = (PageSettingvue_type_script_lang_js_);
244364
- ;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-32.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-32.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-32.use[2]!./node_modules/less-loader/dist/cjs.js??clonedRuleSet-32.use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/toolbar/PageSetting.vue?vue&type=style&index=0&id=4294664e&prod&lang=less&
244441
+ ;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-32.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-32.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-32.use[2]!./node_modules/less-loader/dist/cjs.js??clonedRuleSet-32.use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/toolbar/PageSetting.vue?vue&type=style&index=0&id=077d9a5e&prod&lang=less&
244365
244442
  // extracted by mini-css-extract-plugin
244366
244443
 
244367
- ;// CONCATENATED MODULE: ./src/components/toolbar/PageSetting.vue?vue&type=style&index=0&id=4294664e&prod&lang=less&
244444
+ ;// CONCATENATED MODULE: ./src/components/toolbar/PageSetting.vue?vue&type=style&index=0&id=077d9a5e&prod&lang=less&
244368
244445
 
244369
244446
  ;// CONCATENATED MODULE: ./src/components/toolbar/PageSetting.vue
244370
244447
 
@@ -244377,8 +244454,8 @@ var HoColorPicker = __webpack_require__(10306);
244377
244454
 
244378
244455
  var PageSetting_component = (0,componentNormalizer/* default */.Z)(
244379
244456
  toolbar_PageSettingvue_type_script_lang_js_,
244380
- PageSettingvue_type_template_id_4294664e_render,
244381
- PageSettingvue_type_template_id_4294664e_staticRenderFns,
244457
+ PageSettingvue_type_template_id_077d9a5e_render,
244458
+ PageSettingvue_type_template_id_077d9a5e_staticRenderFns,
244382
244459
  false,
244383
244460
  null,
244384
244461
  null,