hoeditor-web 3.0.36 → 3.0.38

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.
@@ -3324,7 +3324,7 @@ function _extends(){return _extends=Object.assign?Object.assign.bind():function(
3324
3324
 
3325
3325
  /***/ }),
3326
3326
 
3327
- /***/ 21184:
3327
+ /***/ 21920:
3328
3328
  /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
3329
3329
 
3330
3330
  "use strict";
@@ -3336,7 +3336,7 @@ __webpack_require__.d(__webpack_exports__, {
3336
3336
  "default": function() { return /* binding */ ControlModal; }
3337
3337
  });
3338
3338
 
3339
- ;// 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/ControlModal.vue?vue&type=template&id=b9b90c34&
3339
+ ;// 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/ControlModal.vue?vue&type=template&id=c3d1bac8&
3340
3340
  var render = function render() {
3341
3341
  var _vm = this,
3342
3342
  _c = _vm._self._c;
@@ -3416,21 +3416,6 @@ var HOEditorFactorys = __webpack_require__(74089);
3416
3416
  }
3417
3417
  },
3418
3418
  props: {
3419
- // controlPropertyd: {
3420
- // required: true,
3421
- // },
3422
- // isDataSource: {
3423
- // required: true,
3424
- // },
3425
- // isCustoms: {
3426
- // required: true,
3427
- // },
3428
- // isTableProperty: {
3429
- // required: true,
3430
- // },
3431
- // isListStyle: {
3432
- // required: true,
3433
- // },
3434
3419
  hoEditorFactoryId: {
3435
3420
  required: true
3436
3421
  },
@@ -8892,7 +8877,7 @@ var component = (0,componentNormalizer/* default */.Z)(
8892
8877
 
8893
8878
  /***/ }),
8894
8879
 
8895
- /***/ 85936:
8880
+ /***/ 80206:
8896
8881
  /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
8897
8882
 
8898
8883
  "use strict";
@@ -8912,7 +8897,7 @@ var es_string_includes = __webpack_require__(32023);
8912
8897
  var es_regexp_exec = __webpack_require__(74916);
8913
8898
  // EXTERNAL MODULE: ./node_modules/core-js/modules/es.string.replace.js
8914
8899
  var es_string_replace = __webpack_require__(15306);
8915
- ;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/poperSelect/PoperSelect.vue?vue&type=template&id=09a357ac&
8900
+ ;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/poperSelect/PoperSelect.vue?vue&type=template&id=7a572170&
8916
8901
 
8917
8902
 
8918
8903
 
@@ -9294,7 +9279,7 @@ var render = function render() {
9294
9279
  };
9295
9280
  var staticRenderFns = [];
9296
9281
 
9297
- ;// CONCATENATED MODULE: ./src/components/controls/poperSelect/PoperSelect.vue?vue&type=template&id=09a357ac&
9282
+ ;// CONCATENATED MODULE: ./src/components/controls/poperSelect/PoperSelect.vue?vue&type=template&id=7a572170&
9298
9283
 
9299
9284
  // EXTERNAL MODULE: ./node_modules/@babel/runtime/helpers/esm/toConsumableArray.js + 3 modules
9300
9285
  var toConsumableArray = __webpack_require__(61748);
@@ -9310,8 +9295,6 @@ var web_dom_collections_for_each = __webpack_require__(54747);
9310
9295
  var es_array_filter = __webpack_require__(57327);
9311
9296
  // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.push.js
9312
9297
  var es_array_push = __webpack_require__(57658);
9313
- // EXTERNAL MODULE: ./node_modules/core-js/modules/es.number.constructor.js
9314
- var es_number_constructor = __webpack_require__(9653);
9315
9298
  // EXTERNAL MODULE: ./node_modules/core-js/modules/es.json.stringify.js
9316
9299
  var es_json_stringify = __webpack_require__(38862);
9317
9300
  // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.concat.js
@@ -9324,6 +9307,8 @@ var es_array_map = __webpack_require__(21249);
9324
9307
  var es_object_keys = __webpack_require__(47941);
9325
9308
  // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.join.js
9326
9309
  var es_array_join = __webpack_require__(69600);
9310
+ // EXTERNAL MODULE: ./node_modules/core-js/modules/es.number.constructor.js
9311
+ var es_number_constructor = __webpack_require__(9653);
9327
9312
  // EXTERNAL MODULE: ./src/plugins/util.ts
9328
9313
  var util = __webpack_require__(62783);
9329
9314
  // EXTERNAL MODULE: ./src/editor/dom/treeNode/DateTimeNode.ts
@@ -11387,7 +11372,8 @@ var type = __webpack_require__(41542);
11387
11372
  if (this.dateTimeStyle.includes('yyyy') || this.dateTimeStyle.includes('MM') || this.dateTimeStyle.includes('dd')) {
11388
11373
  return {
11389
11374
  width: '100px',
11390
- height: '10px'
11375
+ height: '0',
11376
+ border: '0'
11391
11377
  };
11392
11378
  } else {
11393
11379
  return {
@@ -11505,8 +11491,8 @@ var type = __webpack_require__(41542);
11505
11491
  calendarInstanceChange: function calendarInstanceChange(event) {
11506
11492
  var style = this.dateTimeStyle.replace(/dd/g, 'DD').replace(/yyyy/g, 'YYYY');
11507
11493
  var format = this.dateTimeStyle.replace(/[^a-zA-Z]/g, '').replace(/dd/g, 'DD').replace(/yyyy/g, 'YYYY');
11508
- var dateStyle = format.replace(/hh|mm|ss/, '');
11509
- var timeStyle = format.replace(/YYYY|MM|DD/, '');
11494
+ var dateStyle = format.replace(/HH|hh|mm|ss/g, '');
11495
+ var timeStyle = format.replace(/yyyy|YYYY|MM|DD/g, '');
11510
11496
  var defaultValue = event.target.value;
11511
11497
  if (event.target.value.replace(/[^0-9]/g, '').length !== defaultValue.length) {
11512
11498
  console.warn("value: ".concat(defaultValue));
@@ -11514,23 +11500,22 @@ var type = __webpack_require__(41542);
11514
11500
  }
11515
11501
  if (dateStyle && timeStyle) {
11516
11502
  if (defaultValue.length >= dateStyle.length && defaultValue.length < format.length) {
11517
- var _value = moment_default()(Number(defaultValue), dateStyle).format(style.split(" ")[0]);
11518
- if (_value != 'Invalid date') {
11519
- this.date = _value;
11503
+ var value = moment_default()(String(defaultValue), dateStyle).format(style.split(" ")[0]);
11504
+ if (value != 'Invalid date') {
11505
+ this.date = value;
11520
11506
  }
11521
11507
  } else if (defaultValue.length >= format.length) {
11522
- var _value2 = moment_default()(Number(defaultValue), format).format(style);
11523
- if (_value2 != 'Invalid date') {
11524
- this.date = _value2.split(" ")[0];
11525
- this.time = _value2.split(" ")[1];
11508
+ var _value = moment_default()(String(defaultValue), format).format(style);
11509
+ if (_value != 'Invalid date') {
11510
+ this.date = _value.split(" ")[0];
11511
+ this.time = _value.split(" ")[1];
11526
11512
  }
11527
11513
  }
11528
11514
  } else if (dateStyle && !timeStyle) {
11529
- consoel.log('dateStyle ==> ', value, dateStyle);
11530
11515
  if (defaultValue.length >= dateStyle.length) {
11531
- var _value3 = moment_default()(Number(defaultValue), dateStyle).format(style);
11532
- if (_value3 != 'Invalid date') {
11533
- this.date = _value3;
11516
+ var _value2 = moment_default()(String(defaultValue), dateStyle).format(style);
11517
+ if (_value2 != 'Invalid date') {
11518
+ this.date = _value2;
11534
11519
  }
11535
11520
  }
11536
11521
  } else if (timeStyle && !dateStyle) {}
@@ -11958,10 +11943,10 @@ var type = __webpack_require__(41542);
11958
11943
  });
11959
11944
  ;// CONCATENATED MODULE: ./src/components/controls/poperSelect/PoperSelect.vue?vue&type=script&lang=js&
11960
11945
  /* harmony default export */ var poperSelect_PoperSelectvue_type_script_lang_js_ = (PoperSelectvue_type_script_lang_js_);
11961
- ;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/poperSelect/PoperSelect.vue?vue&type=style&index=0&id=09a357ac&prod&lang=scss&
11946
+ ;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/poperSelect/PoperSelect.vue?vue&type=style&index=0&id=7a572170&prod&lang=scss&
11962
11947
  // extracted by mini-css-extract-plugin
11963
11948
 
11964
- ;// CONCATENATED MODULE: ./src/components/controls/poperSelect/PoperSelect.vue?vue&type=style&index=0&id=09a357ac&prod&lang=scss&
11949
+ ;// CONCATENATED MODULE: ./src/components/controls/poperSelect/PoperSelect.vue?vue&type=style&index=0&id=7a572170&prod&lang=scss&
11965
11950
 
11966
11951
  // EXTERNAL MODULE: ./node_modules/@vue/vue-loader-v15/lib/runtime/componentNormalizer.js
11967
11952
  var componentNormalizer = __webpack_require__(70713);
@@ -18563,7 +18548,7 @@ var component = (0,componentNormalizer/* default */.Z)(
18563
18548
 
18564
18549
  /***/ }),
18565
18550
 
18566
- /***/ 74559:
18551
+ /***/ 2064:
18567
18552
  /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
18568
18553
 
18569
18554
  "use strict";
@@ -18575,7 +18560,7 @@ __webpack_require__.d(__webpack_exports__, {
18575
18560
  "default": function() { return /* binding */ table_TableFormula; }
18576
18561
  });
18577
18562
 
18578
- ;// 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/TableFormula.vue?vue&type=template&id=3db836cb&
18563
+ ;// 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/TableFormula.vue?vue&type=template&id=58b786b2&
18579
18564
  var render = function render() {
18580
18565
  var _vm = this,
18581
18566
  _c = _vm._self._c;
@@ -18781,6 +18766,24 @@ var render = function render() {
18781
18766
  }
18782
18767
  })], 1), _c('div', {
18783
18768
  staticClass: "ho-table-features-list"
18769
+ }, [_c('p', {
18770
+ staticStyle: {
18771
+ "width": "220px"
18772
+ }
18773
+ }, [_vm._v("附加单元格编号")]), _c('a-input', {
18774
+ attrs: {
18775
+ "autocomplete": "off",
18776
+ "placeholder": "多个单元格编号用,隔开"
18777
+ },
18778
+ model: {
18779
+ value: _vm.ftScoreMappingCell,
18780
+ callback: function callback($$v) {
18781
+ _vm.ftScoreMappingCell = $$v;
18782
+ },
18783
+ expression: "ftScoreMappingCell"
18784
+ }
18785
+ })], 1), _c('div', {
18786
+ staticClass: "ho-table-features-list"
18784
18787
  }, [_c('p', {
18785
18788
  staticStyle: {
18786
18789
  "width": "152px"
@@ -18920,20 +18923,20 @@ var toConsumableArray = __webpack_require__(61748);
18920
18923
  var objectSpread2 = __webpack_require__(63442);
18921
18924
  // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.includes.js
18922
18925
  var es_array_includes = __webpack_require__(26699);
18923
- // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.map.js
18924
- var es_array_map = __webpack_require__(21249);
18925
- // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.concat.js
18926
- var es_array_concat = __webpack_require__(92222);
18926
+ // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.join.js
18927
+ var es_array_join = __webpack_require__(69600);
18927
18928
  // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.filter.js
18928
18929
  var es_array_filter = __webpack_require__(57327);
18929
18930
  // EXTERNAL MODULE: ./node_modules/core-js/modules/es.object.to-string.js
18930
18931
  var es_object_to_string = __webpack_require__(41539);
18932
+ // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.map.js
18933
+ var es_array_map = __webpack_require__(21249);
18934
+ // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.concat.js
18935
+ var es_array_concat = __webpack_require__(92222);
18931
18936
  // EXTERNAL MODULE: ./node_modules/core-js/modules/es.regexp.exec.js
18932
18937
  var es_regexp_exec = __webpack_require__(74916);
18933
18938
  // EXTERNAL MODULE: ./node_modules/core-js/modules/es.string.replace.js
18934
18939
  var es_string_replace = __webpack_require__(15306);
18935
- // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.join.js
18936
- var es_array_join = __webpack_require__(69600);
18937
18940
  // EXTERNAL MODULE: ./node_modules/core-js/modules/es.json.stringify.js
18938
18941
  var es_json_stringify = __webpack_require__(38862);
18939
18942
  // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.push.js
@@ -18986,6 +18989,7 @@ var TableFormula = __webpack_require__(90832);
18986
18989
  expectedDate: '',
18987
18990
  isHideZero: true,
18988
18991
  isOnceClick: false,
18992
+ ftScoreMappingCell: '',
18989
18993
  ftScoreMapping: {
18990
18994
  cell: '',
18991
18995
  items: [{
@@ -19057,6 +19061,13 @@ var TableFormula = __webpack_require__(90832);
19057
19061
  if (node.formulaStr) {
19058
19062
  try {
19059
19063
  var ftScoreMapping = JSON.parse(node.formulaStr);
19064
+ var cell = ftScoreMapping.cell.split(",");
19065
+ if (cell.length > 1) {
19066
+ ftScoreMapping.cell = cell[0];
19067
+ this.ftScoreMappingCell = cell.filter(function (v, index) {
19068
+ return index > 0;
19069
+ }).join(",");
19070
+ }
19060
19071
  ftScoreMapping.items = ftScoreMapping.items.map(function (v) {
19061
19072
  v.range = v.range.split('-');
19062
19073
  return v;
@@ -19097,8 +19108,12 @@ var TableFormula = __webpack_require__(90832);
19097
19108
  // this.vueController.insertTableFormula(`${this.expectedDate}`.toLocaleLowerCase(), this.isHideZero, FormularType.ftPregnantDays)
19098
19109
  } else if (this.formula === 'ftScoreMapping') {
19099
19110
  var item = (0,toConsumableArray/* default */.Z)(this.ftScoreMapping.items);
19111
+ var cell = this.ftScoreMapping.cell;
19112
+ if (this.ftScoreMappingCell) {
19113
+ cell += ',' + this.ftScoreMappingCell;
19114
+ }
19100
19115
  var ftScoreMapping = {
19101
- cell: this.ftScoreMapping.cell,
19116
+ cell: cell,
19102
19117
  items: item.map(function (v) {
19103
19118
  if (v.text.replace(/\s*/g, '') === '') {
19104
19119
  return '';
@@ -19137,10 +19152,10 @@ var TableFormula = __webpack_require__(90832);
19137
19152
  });
19138
19153
  ;// CONCATENATED MODULE: ./src/components/controls/table/TableFormula.vue?vue&type=script&lang=js&
19139
19154
  /* harmony default export */ var table_TableFormulavue_type_script_lang_js_ = (TableFormulavue_type_script_lang_js_);
19140
- ;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/table/TableFormula.vue?vue&type=style&index=0&id=3db836cb&prod&lang=scss&
19155
+ ;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/table/TableFormula.vue?vue&type=style&index=0&id=58b786b2&prod&lang=scss&
19141
19156
  // extracted by mini-css-extract-plugin
19142
19157
 
19143
- ;// CONCATENATED MODULE: ./src/components/controls/table/TableFormula.vue?vue&type=style&index=0&id=3db836cb&prod&lang=scss&
19158
+ ;// CONCATENATED MODULE: ./src/components/controls/table/TableFormula.vue?vue&type=style&index=0&id=58b786b2&prod&lang=scss&
19144
19159
 
19145
19160
  // EXTERNAL MODULE: ./node_modules/@vue/vue-loader-v15/lib/runtime/componentNormalizer.js
19146
19161
  var componentNormalizer = __webpack_require__(70713);
@@ -35754,7 +35769,7 @@ var Print = /*#__PURE__*/function () {
35754
35769
  _context3.next = 5;
35755
35770
  break;
35756
35771
  }
35757
- message/* default.warn */.Z.warn('病程记录文件有删除或者内容减少,导致上一次记录的打印位置错误无法使用,请用重打进行打印或者删除所有打印记录后续打');
35772
+ message/* default.warn */.Z.warn('病程记录已打印文件有删除、内容减少或者新起一页打印参数变更,导致已记录的打印位置错误无法使用,请用重打进行打印或者删除所有打印记录后续打');
35758
35773
  reslove && reslove(null);
35759
35774
  return _context3.abrupt("return");
35760
35775
  case 5:
@@ -59728,56 +59743,81 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
59728
59743
  value: function getScoreMapping() {
59729
59744
  var strRet = " ";
59730
59745
  var formularJson = JSON.parse(this.formulaStr);
59731
- var cellNo = formularJson.cell;
59746
+ var cellNos = formularJson.cell;
59732
59747
  var items = formularJson.items;
59733
59748
  var table = this.getParentCell().table;
59734
- var _this$getRowColByCell21 = this.getRowColByCellAdress(cellNo),
59735
- _this$getRowColByCell22 = (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)(_this$getRowColByCell21, 2),
59736
- row = _this$getRowColByCell22[0],
59737
- col = _this$getRowColByCell22[1];
59738
- if (row >= 0 && col >= 0) {
59739
- if (!table.rows[row]) return " ";
59740
- var cell = table.rows[row][col];
59741
- if (cell) {
59742
- var tableFormular = cell.childNodes[0];
59743
- var loopNodes = function loopNodes(nodes) {
59744
- for (var k = 1; k < nodes.length; k++) {
59745
- var node = nodes[k];
59746
- if (node instanceof TableFormula) {
59747
- tableFormular = node;
59748
- break;
59749
+ var cellNoArr = cellNos.split(",");
59750
+ var score = 0;
59751
+ for (var i = 0; i < cellNoArr.length; i++) {
59752
+ var _this$getRowColByCell21 = this.getRowColByCellAdress(cellNoArr[i]),
59753
+ _this$getRowColByCell22 = (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)(_this$getRowColByCell21, 2),
59754
+ row = _this$getRowColByCell22[0],
59755
+ col = _this$getRowColByCell22[1];
59756
+ if (row >= 0 && col >= 0) {
59757
+ if (!table.rows[row]) continue;
59758
+ var cell = table.rows[row][col];
59759
+ if (cell) {
59760
+ if (i == 0) {
59761
+ var _ret = function () {
59762
+ var tableFormular = cell.childNodes[0];
59763
+ var loopNodes = function loopNodes(nodes) {
59764
+ for (var k = 1; k < nodes.length; k++) {
59765
+ var node = nodes[k];
59766
+ if (node instanceof TableFormula) {
59767
+ tableFormular = node;
59768
+ break;
59769
+ }
59770
+ if (node instanceof _BaseCombineNode__WEBPACK_IMPORTED_MODULE_31__/* .BaseCombineNode */ .V) {
59771
+ loopNodes(node.childNodes);
59772
+ }
59773
+ }
59774
+ };
59775
+ loopNodes(cell.childNodes);
59776
+ var scoreText = "";
59777
+ if (!(tableFormular instanceof TableFormula)) {
59778
+ scoreText = cell.getCellText();
59779
+ } else {
59780
+ scoreText = tableFormular.text;
59781
+ }
59782
+ if (cellNoArr.length == 1 && (scoreText == "" || scoreText == " ")) {
59783
+ return {
59784
+ v: strRet
59785
+ };
59786
+ }
59787
+ if (scoreText == "" || scoreText == " ") return "continue";
59788
+ score = Number(scoreText);
59789
+ }();
59790
+ if (_ret === "continue") continue;
59791
+ if ((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_typeof_js__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z)(_ret) === "object") return _ret.v;
59792
+ } else {
59793
+ var _this$getCellNumber9 = this.getCellNumber(cell.table, row, col),
59794
+ _this$getCellNumber10 = (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)(_this$getCellNumber9, 2),
59795
+ result = _this$getCellNumber10[0],
59796
+ value = _this$getCellNumber10[1];
59797
+ if (value == "") {
59798
+ continue;
59749
59799
  }
59750
- if (node instanceof _BaseCombineNode__WEBPACK_IMPORTED_MODULE_31__/* .BaseCombineNode */ .V) {
59751
- loopNodes(node.childNodes);
59800
+ if (result) {
59801
+ score += Number(value);
59752
59802
  }
59753
59803
  }
59754
- };
59755
- loopNodes(cell.childNodes);
59756
- var scoreText = "";
59757
- if (!(tableFormular instanceof TableFormula)) {
59758
- scoreText = cell.getCellText();
59759
59804
  } else {
59760
- scoreText = tableFormular.text;
59805
+ continue;
59761
59806
  }
59762
- if (scoreText == "" || scoreText == " ") {
59807
+ } else {
59808
+ continue;
59809
+ }
59810
+ }
59811
+ if (items.length > 0) {
59812
+ for (var _i = 0; _i < items.length; _i++) {
59813
+ var item = items[_i];
59814
+ var range = item.range.split('-');
59815
+ var from = Number(range[0]);
59816
+ var to = Number(range[1]);
59817
+ if (score >= from && score <= to) {
59818
+ strRet = item.text;
59763
59819
  return strRet;
59764
59820
  }
59765
- // if (tableFormular.hideZero && (scoreText == "0" || scoreText == "0.00")) {
59766
- // return strRet;
59767
- // }
59768
- var score = Number(scoreText);
59769
- if (items.length > 0) {
59770
- for (var i = 0; i < items.length; i++) {
59771
- var item = items[i];
59772
- var range = item.range.split('-');
59773
- var from = Number(range[0]);
59774
- var to = Number(range[1]);
59775
- if (score >= from && score <= to) {
59776
- strRet = item.text;
59777
- return strRet;
59778
- }
59779
- }
59780
- }
59781
59821
  }
59782
59822
  }
59783
59823
  return strRet;
@@ -59798,10 +59838,10 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
59798
59838
  if (!table.rows[row]) return strRet;
59799
59839
  var wCell = table.rows[row][col];
59800
59840
  if (wCell) {
59801
- var _this$getCellNumber9 = this.getCellNumber(table, row, col),
59802
- _this$getCellNumber10 = (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)(_this$getCellNumber9, 2),
59803
- wRet = _this$getCellNumber10[0],
59804
- weight = _this$getCellNumber10[1];
59841
+ var _this$getCellNumber11 = this.getCellNumber(table, row, col),
59842
+ _this$getCellNumber12 = (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)(_this$getCellNumber11, 2),
59843
+ wRet = _this$getCellNumber12[0],
59844
+ weight = _this$getCellNumber12[1];
59805
59845
  if (weight == "") return strRet;
59806
59846
  var weightNum = Number(weight);
59807
59847
  if (wRet) {
@@ -62790,7 +62830,7 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
62790
62830
  /*
62791
62831
  * @Author: your name
62792
62832
  * @Date: 2020-11-03 15:17:54
62793
- * @LastEditTime: 2023-03-21 11:27:21
62833
+ * @LastEditTime: 2023-03-22 15:28:47
62794
62834
  * @LastEditors: liyanan 2441631434@qq.com
62795
62835
  * @Description: In User Settings Edit
62796
62836
  * @FilePath: \hoeditor-web\src\editor\dom\treeNode\TextInputFieldNode.ts
@@ -65002,8 +65042,13 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
65002
65042
  }
65003
65043
  } else {
65004
65044
  if (textArr[0] != "") {
65005
- var textNode1 = new _TextNode__WEBPACK_IMPORTED_MODULE_55__/* .TextNode */ .R(hoEditorFactoryID, rootNodes, temp, _BaseNode__WEBPACK_IMPORTED_MODULE_40__/* .NodeType.ntText */ .Jq.ntText, textArr[0], styleIndex);
65006
- temp.childNodes.splice(temp.childNodes.length - 1, 0, textNode1);
65045
+ if (temp.innerIdentifier == "name" && temp.text.length > (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_toConsumableArray_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)(temp.text).length) {
65046
+ var rareCharNode = new _RareCharNode__WEBPACK_IMPORTED_MODULE_57__/* .RareCharNode */ .Q(temp.hoEditorFactoryID, rootNodes, temp, _BaseNode__WEBPACK_IMPORTED_MODULE_40__/* .NodeType.ntRareChar */ .Jq.ntRareChar, textArr[0], styleIndex);
65047
+ temp.childNodes.splice(temp.childNodes.length - 1, 0, rareCharNode);
65048
+ } else {
65049
+ var textNode1 = new _TextNode__WEBPACK_IMPORTED_MODULE_55__/* .TextNode */ .R(hoEditorFactoryID, rootNodes, temp, _BaseNode__WEBPACK_IMPORTED_MODULE_40__/* .NodeType.ntText */ .Jq.ntText, textArr[0], styleIndex);
65050
+ temp.childNodes.splice(temp.childNodes.length - 1, 0, textNode1);
65051
+ }
65007
65052
  }
65008
65053
  }
65009
65054
  if (textArr.length > 1) {
@@ -69941,8 +69986,8 @@ var DrawPageMainDoc = /*#__PURE__*/function (_DrawArea) {
69941
69986
  /*
69942
69987
  * @Author: your name
69943
69988
  * @Date: 2020-11-11 18:32:02
69944
- * @LastEditTime: 2021-09-28 10:05:52
69945
- * @LastEditors: Please set LastEditors
69989
+ * @LastEditTime: 2023-03-21 18:16:31
69990
+ * @LastEditors: liyanan 2441631434@qq.com
69946
69991
  * @Description: In User Settings Edit
69947
69992
  * @FilePath: \hoeditor-web\src\editor\draw\drawNode\DrawBarcodeNode.ts
69948
69993
  */
@@ -69973,6 +70018,7 @@ var DrawBarcodeNode = /*#__PURE__*/function (_DrawCombineNode) {
69973
70018
  (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_1__/* ["default"] */ .Z)(_this), "_scaleY", void 0);
69974
70019
  (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_1__/* ["default"] */ .Z)(_this), "_imageY", void 0);
69975
70020
  (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_1__/* ["default"] */ .Z)(_this), "_drawResize", void 0);
70021
+ (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_1__/* ["default"] */ .Z)(_this), "_bitMap", void 0);
69976
70022
  _this._textContent = textContent;
69977
70023
  //this._barCodeStyle = barCodeStyle;
69978
70024
  //this._textAlign = textAlign;
@@ -70023,12 +70069,25 @@ var DrawBarcodeNode = /*#__PURE__*/function (_DrawCombineNode) {
70023
70069
  this.clear();
70024
70070
  var image = new Image();
70025
70071
  image.src = this.imagePath;
70026
- var bitmap = new createjs.Bitmap(image);
70027
- bitmap.y = this._imageY;
70028
- bitmap.x = 0;
70029
- bitmap.name = this.node.id;
70030
- bitmap.setTransform(0, this._imageY, this._scaleX, this._scaleY);
70031
- this.addChild(bitmap);
70072
+ this._bitMap = new createjs.Bitmap(image);
70073
+ this._bitMap.y = this._imageY;
70074
+ this._bitMap.x = 0;
70075
+ this._bitMap.name = this.node.id;
70076
+ this._bitMap.setTransform(0, this._imageY, this._scaleX, this._scaleY);
70077
+ this.addChild(this._bitMap);
70078
+ }
70079
+ }, {
70080
+ key: "clone",
70081
+ value: function clone() {
70082
+ var aConTainer = new createjs.Container();
70083
+ var bitMap = this._bitMap.clone();
70084
+ bitMap.name = this.node.id;
70085
+ if (this._cloneProps) {
70086
+ this._cloneProps(aConTainer);
70087
+ }
70088
+ aConTainer.removeAllChildren();
70089
+ aConTainer.addChild(bitMap);
70090
+ return aConTainer;
70032
70091
  }
70033
70092
  }]);
70034
70093
  return DrawBarcodeNode;
@@ -195485,7 +195544,7 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
195485
195544
  /***/ (function(module, __unused_webpack_exports, __webpack_require__) {
195486
195545
 
195487
195546
  var map = {
195488
- "./ControlModal.vue": 21184,
195547
+ "./ControlModal.vue": 21920,
195489
195548
  "./barCode/BarCodes.vue": 20329,
195490
195549
  "./colorPicker/HoColorPicker.vue": 91351,
195491
195550
  "./colorPicker/HoColorPickers.vue": 84214,
@@ -195503,7 +195562,7 @@ var map = {
195503
195562
  "./pageInfoes/PageInfoes.vue": 17481,
195504
195563
  "./paragraph/ParagraphDialog.vue": 54949,
195505
195564
  "./poperSelect/PoperMark.vue": 71472,
195506
- "./poperSelect/PoperSelect.vue": 85936,
195565
+ "./poperSelect/PoperSelect.vue": 80206,
195507
195566
  "./poperTipText/PoperTipText.vue": 15845,
195508
195567
  "./popers/Poper.vue": 57937,
195509
195568
  "./popers/Title.vue": 89987,
@@ -195517,7 +195576,7 @@ var map = {
195517
195576
  "./table/TableColProperty.vue": 2116,
195518
195577
  "./table/TableForm.vue": 19064,
195519
195578
  "./table/TableFormTree.vue": 39703,
195520
- "./table/TableFormula.vue": 74559,
195579
+ "./table/TableFormula.vue": 2064,
195521
195580
  "./table/TableProperty.vue": 47130,
195522
195581
  "./table/TableRowProperty.vue": 5218,
195523
195582
  "./textDialog/TextDialog.vue": 94535,
@@ -231748,8 +231807,8 @@ var es_string_match = __webpack_require__(4723);
231748
231807
  var es_number_constructor = __webpack_require__(9653);
231749
231808
  // EXTERNAL MODULE: ./node_modules/core-js/modules/es.json.stringify.js
231750
231809
  var es_json_stringify = __webpack_require__(38862);
231751
- ;// 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=4072b7f7&
231752
- var HoDocvue_type_template_id_4072b7f7_render = function render() {
231810
+ ;// 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=1e74a76d&
231811
+ var HoDocvue_type_template_id_1e74a76d_render = function render() {
231753
231812
  var _vm = this,
231754
231813
  _c = _vm._self._c;
231755
231814
  return _c('div', {
@@ -231895,7 +231954,7 @@ var HoDocvue_type_template_id_4072b7f7_render = function render() {
231895
231954
  }
231896
231955
  }, [_vm._v("v " + _vm._s(_vm.version))])])])], 1);
231897
231956
  };
231898
- var HoDocvue_type_template_id_4072b7f7_staticRenderFns = [];
231957
+ var HoDocvue_type_template_id_1e74a76d_staticRenderFns = [];
231899
231958
 
231900
231959
  // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.filter.js
231901
231960
  var es_array_filter = __webpack_require__(57327);
@@ -233408,7 +233467,7 @@ var DrawPage = __webpack_require__(72722);
233408
233467
  // EXTERNAL MODULE: ./src/plugins/util.ts
233409
233468
  var plugins_util = __webpack_require__(62783);
233410
233469
  // EXTERNAL MODULE: ./src/components/controls/poperSelect/PoperSelect.vue + 9 modules
233411
- var PoperSelect = __webpack_require__(85936);
233470
+ var PoperSelect = __webpack_require__(80206);
233412
233471
  // EXTERNAL MODULE: ./src/components/controls/poperSelect/PoperMark.vue + 5 modules
233413
233472
  var PoperMark = __webpack_require__(71472);
233414
233473
  ;// CONCATENATED MODULE: ./src/components/controls/poperSelect/index.ts
@@ -235107,7 +235166,7 @@ var ParagraphNode = __webpack_require__(67945);
235107
235166
  // EXTERNAL MODULE: ./src/editor/dom/treeNode/MarkNode.ts
235108
235167
  var MarkNode = __webpack_require__(57727);
235109
235168
  ;// CONCATENATED MODULE: ./src/components/version.ts
235110
- /* harmony default export */ var version = ('3.0.36');
235169
+ /* harmony default export */ var version = ('3.0.38');
235111
235170
  // EXTERNAL MODULE: ./src/components/controls/poperTipText/PoperTipText.vue + 5 modules
235112
235171
  var PoperTipText = __webpack_require__(15845);
235113
235172
  ;// CONCATENATED MODULE: ./src/components/controls/poperTipText/index.ts
@@ -235464,7 +235523,7 @@ var defaultHeight = Math.floor(1122 * DrawConfig/* DrawConfig.instance */.f.inst
235464
235523
  if (hoEditorFactory.drawTree.paintStatus == 1) {
235465
235524
  if (node.nodeType == 18) {
235466
235525
  // 跳转元素
235467
- this.$emit("leftclick", {
235526
+ this.$emit('leftclick', {
235468
235527
  name: node.name,
235469
235528
  linkId: node.fileId,
235470
235529
  nodeType: node.nodeType,
@@ -235502,7 +235561,8 @@ var defaultHeight = Math.floor(1122 * DrawConfig/* DrawConfig.instance */.f.inst
235502
235561
  if (this.poperType) return false;
235503
235562
  if (type !== 'dblclick') return false;
235504
235563
  var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this.hoEditorProvider.activeDocId);
235505
- if (hoEditorFactory.drawTree.paintStatus === 5) {
235564
+ var paintStatus = hoEditorFactory.drawTree.paintStatus;
235565
+ if (paintStatus === 5 || paintStatus == 2) {
235506
235566
  return false;
235507
235567
  }
235508
235568
  this.domRange = {
@@ -235510,7 +235570,7 @@ var defaultHeight = Math.floor(1122 * DrawConfig/* DrawConfig.instance */.f.inst
235510
235570
  endPath: hoEditorFactory.docTree.curDomRange.normalize().endPath
235511
235571
  };
235512
235572
  if (node instanceof SignNode/* SignNode */.N) {
235513
- if (hoEditorFactory.drawTree.paintStatus === 0 && !node.imgSrc && !node.fingerPrintSrc) {
235573
+ if (paintStatus === 0 && !node.imgSrc && !node.fingerPrintSrc) {
235514
235574
  this.hoEditorProvider.setControlProperty('sign', 'update', '');
235515
235575
  return;
235516
235576
  }
@@ -235519,16 +235579,30 @@ var defaultHeight = Math.floor(1122 * DrawConfig/* DrawConfig.instance */.f.inst
235519
235579
  if (node.fingerPrintSrc || node.imgSrc && !node.fingerPrintSrc && node.customProperty && !node.customProperty.created_date) return false;
235520
235580
  this.$emit('dblNodeClick', {
235521
235581
  node: this.getCurrentSelectNode,
235522
- type: 'sign'
235582
+ type: 'sign',
235583
+ paintStatus: paintStatus
235523
235584
  });
235524
235585
  this.poperType = '';
235525
235586
  return false;
235526
235587
  }
235527
- if (hoEditorFactory.drawTree.paintStatus === 4) {
235588
+ if (paintStatus === 4) {
235589
+ if ((node instanceof TextNode/* TextNode */.R || node instanceof MarkNode/* MarkNode */.j) && node.parentNode instanceof TextInputFieldNode/* TextInputFieldNode */.re) {
235590
+ var parentNode = node.parentNode;
235591
+ if (Number(parentNode.inputFieldType) === 0 && !parentNode.canModifyContent) {
235592
+ this.$emit('dblNodeClick', {
235593
+ node: this.getCurrentSelectNode,
235594
+ type: 'modify_node',
235595
+ paintStatus: paintStatus
235596
+ });
235597
+ this.hoEditorProvider.setUpdateNodeValue(this.getCurrentSelectNode());
235598
+ return false;
235599
+ }
235600
+ return false;
235601
+ }
235528
235602
  return false;
235529
235603
  }
235530
235604
  if (node instanceof DateTimeNode/* DateTimeNode */.Z) {
235531
- if (hoEditorFactory.drawTree.paintStatus === 0) {
235605
+ if (paintStatus === 0) {
235532
235606
  this.hoEditorProvider.setControlProperty('date', 'update', '');
235533
235607
  return;
235534
235608
  }
@@ -235538,7 +235612,7 @@ var defaultHeight = Math.floor(1122 * DrawConfig/* DrawConfig.instance */.f.inst
235538
235612
  this.computedPoperPosition(node, pageIndex);
235539
235613
  this.poperType = 'datePoper';
235540
235614
  } else if (node instanceof DownListNode/* DownListNode */.yF) {
235541
- if (hoEditorFactory.drawTree.paintStatus === 0) {
235615
+ if (paintStatus === 0) {
235542
235616
  this.hoEditorProvider.setControlProperty('select', 'update', '');
235543
235617
  return;
235544
235618
  }
@@ -235558,40 +235632,43 @@ var defaultHeight = Math.floor(1122 * DrawConfig/* DrawConfig.instance */.f.inst
235558
235632
  this.$emit('dblNodeClick', {
235559
235633
  node: this.getCurrentSelectNode,
235560
235634
  type: 'downlist',
235561
- callback: callback
235635
+ callback: callback,
235636
+ paintStatus: paintStatus
235562
235637
  });
235563
235638
  } else {
235564
235639
  callback(undefined);
235565
235640
  }
235566
235641
  } else if ((node instanceof TextNode/* TextNode */.R || node instanceof MarkNode/* MarkNode */.j) && node.parentNode instanceof TextInputFieldNode/* TextInputFieldNode */.re) {
235567
235642
  // 文本域
235568
- var parentNode = node.parentNode;
235569
- if (Number(parentNode.inputFieldType) === 0) {
235570
- if (parentNode.canModifyContent) {
235643
+ var _parentNode = node.parentNode;
235644
+ if (Number(_parentNode.inputFieldType) === 0) {
235645
+ if (_parentNode.canModifyContent) {
235571
235646
  this.$emit('dblNodeClick', {
235572
235647
  node: this.getCurrentSelectNode,
235573
- type: 'text'
235648
+ type: 'text',
235649
+ paintStatus: paintStatus
235574
235650
  });
235575
235651
  } else {
235576
235652
  this.$emit('dblNodeClick', {
235577
235653
  node: this.getCurrentSelectNode,
235578
- type: 'modify_node'
235654
+ type: 'modify_node',
235655
+ paintStatus: paintStatus
235579
235656
  });
235580
235657
  }
235581
235658
  this.hoEditorProvider.setUpdateNodeValue(this.getCurrentSelectNode());
235582
235659
  return false;
235583
235660
  }
235584
- if (parentNode.readOnlyStatus === 0 && parentNode.text.replace(/\s*/g, '') !== '') {
235661
+ if (_parentNode.readOnlyStatus === 0 && _parentNode.text.replace(/\s*/g, '') !== '') {
235585
235662
  return false;
235586
235663
  }
235587
- if (Number(parentNode.inputFieldType) === 2) {
235588
- if (hoEditorFactory.drawTree.paintStatus === 0) {
235664
+ if (Number(_parentNode.inputFieldType) === 2) {
235665
+ if (paintStatus === 0) {
235589
235666
  this.hoEditorProvider.setControlProperty('date', 'update', '');
235590
235667
  return;
235591
235668
  }
235592
235669
  this.poperType = 'datePoper';
235593
- } else if (Number(parentNode.inputFieldType) === 1) {
235594
- if (hoEditorFactory.drawTree.paintStatus === 0) {
235670
+ } else if (Number(_parentNode.inputFieldType) === 1) {
235671
+ if (paintStatus === 0) {
235595
235672
  this.hoEditorProvider.setControlProperty('text', 'update', '');
235596
235673
  return;
235597
235674
  }
@@ -235600,29 +235677,31 @@ var defaultHeight = Math.floor(1122 * DrawConfig/* DrawConfig.instance */.f.inst
235600
235677
  if (Array.isArray(list) && list.length > 0) {
235601
235678
  _this5.poperSelectList = list;
235602
235679
  } else {
235603
- _this5.poperSelectList = JSON.parse(parentNode.downListProperty.listItems);
235680
+ _this5.poperSelectList = JSON.parse(_parentNode.downListProperty.listItems);
235604
235681
  }
235605
235682
  _this5.poperType = 'selectPoper';
235606
235683
  };
235607
- if (parentNode.customProperty && parentNode.customProperty.hasThirdData == true) {
235684
+ if (_parentNode.customProperty && _parentNode.customProperty.hasThirdData == true) {
235608
235685
  this.$emit('dblNodeClick', {
235609
235686
  node: this.getCurrentSelectNode,
235610
235687
  type: 'textlist',
235611
- callback: _callback
235688
+ callback: _callback,
235689
+ paintStatus: paintStatus
235612
235690
  });
235613
235691
  } else {
235614
235692
  _callback(undefined);
235615
235693
  }
235616
235694
  }
235617
235695
  } else if (node.parentNode instanceof CellNode/* CellNode */.D && node.nodeType !== BaseNode/* NodeType.ntMedicalExpression */.Jq.ntMedicalExpression && node.nodeType !== BaseNode/* NodeType.ntImage */.Jq.ntImage) {
235618
- this.handleCellNode(node, node.parentNode, pageIndex);
235696
+ this.handleCellNode(node, node.parentNode, pageIndex, paintStatus);
235619
235697
  } else if (node instanceof CellNode/* CellNode */.D) {
235620
235698
  this.handleForm('update');
235621
235699
  } else if (node instanceof ImageNode/* ImageNode */.H) {
235622
235700
  this.poperType = '';
235623
235701
  this.$emit('dblNodeClick', {
235624
235702
  node: this.getCurrentSelectNode,
235625
- type: 'edit-image'
235703
+ type: 'edit-image',
235704
+ paintStatus: paintStatus
235626
235705
  });
235627
235706
  } else {
235628
235707
  this.hoEditorProvider.setDblclickNodeValue(node, 'dblclick');
@@ -235650,7 +235729,7 @@ var defaultHeight = Math.floor(1122 * DrawConfig/* DrawConfig.instance */.f.inst
235650
235729
  * 2. 单元格日期设置显示当前日期时间时
235651
235730
  * 3. 单元格下拉列表项只有一项时
235652
235731
  */
235653
- handleCellNode: function handleCellNode(node, cellNode, pageIndex) {
235732
+ handleCellNode: function handleCellNode(node, cellNode, pageIndex, paintStatus) {
235654
235733
  var colProperty = cellNode.table.colInfos[cellNode.row.indexOf(cellNode)].colProperty;
235655
235734
  var cellProperty = cellNode.cellProperty;
235656
235735
  var isCreatePoper = true;
@@ -235675,7 +235754,8 @@ var defaultHeight = Math.floor(1122 * DrawConfig/* DrawConfig.instance */.f.inst
235675
235754
  type: 'table-sign'
235676
235755
  };
235677
235756
  },
235678
- type: 'table-sign'
235757
+ type: 'table-sign',
235758
+ paintStatus: paintStatus
235679
235759
  });
235680
235760
  isCreatePoper = false;
235681
235761
  this.poperType = '';
@@ -235793,10 +235873,10 @@ var defaultHeight = Math.floor(1122 * DrawConfig/* DrawConfig.instance */.f.inst
235793
235873
  });
235794
235874
  ;// CONCATENATED MODULE: ./src/components/HoDoc.vue?vue&type=script&lang=js&
235795
235875
  /* harmony default export */ var components_HoDocvue_type_script_lang_js_ = (HoDocvue_type_script_lang_js_);
235796
- ;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/HoDoc.vue?vue&type=style&index=0&id=4072b7f7&prod&lang=scss&
235876
+ ;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/HoDoc.vue?vue&type=style&index=0&id=1e74a76d&prod&lang=scss&
235797
235877
  // extracted by mini-css-extract-plugin
235798
235878
 
235799
- ;// CONCATENATED MODULE: ./src/components/HoDoc.vue?vue&type=style&index=0&id=4072b7f7&prod&lang=scss&
235879
+ ;// CONCATENATED MODULE: ./src/components/HoDoc.vue?vue&type=style&index=0&id=1e74a76d&prod&lang=scss&
235800
235880
 
235801
235881
  ;// CONCATENATED MODULE: ./src/components/HoDoc.vue
235802
235882
 
@@ -235809,8 +235889,8 @@ var defaultHeight = Math.floor(1122 * DrawConfig/* DrawConfig.instance */.f.inst
235809
235889
 
235810
235890
  var HoDoc_component = (0,componentNormalizer/* default */.Z)(
235811
235891
  components_HoDocvue_type_script_lang_js_,
235812
- HoDocvue_type_template_id_4072b7f7_render,
235813
- HoDocvue_type_template_id_4072b7f7_staticRenderFns,
235892
+ HoDocvue_type_template_id_1e74a76d_render,
235893
+ HoDocvue_type_template_id_1e74a76d_staticRenderFns,
235814
235894
  false,
235815
235895
  null,
235816
235896
  null,
@@ -241883,6 +241963,9 @@ var TOHTMLConverter = /*#__PURE__*/function () {
241883
241963
  this.convert.set(BaseNode/* NodeType */.Jq[BaseNode/* NodeType.ntLabel */.Jq.ntLabel], function (val) {
241884
241964
  return _this.TransText(val);
241885
241965
  });
241966
+ // this.convert.set(NodeType[NodeType.ntControl], (val: Record<string, any>) => {
241967
+ // return this.TransText(val);
241968
+ // });
241886
241969
  }
241887
241970
  (0,esm_createClass/* default */.Z)(TOHTMLConverter, [{
241888
241971
  key: "nextnode",
@@ -242002,6 +242085,9 @@ var TOHTMLConverter = /*#__PURE__*/function () {
242002
242085
  if (jnode.nodeType == BaseNode/* NodeType */.Jq[BaseNode/* NodeType.ntSpecialChar */.Jq.ntSpecialChar]) {
242003
242086
  str += jnode.text;
242004
242087
  }
242088
+ if (jnode.nodeType == BaseNode/* NodeType */.Jq[BaseNode/* NodeType.ntControl */.Jq.ntControl]) {
242089
+ str += jnode.text;
242090
+ }
242005
242091
  return "<span style=\"".concat(style, "\">").concat(str, "</span>");
242006
242092
  }
242007
242093
  }, {
@@ -242258,6 +242344,8 @@ var commonParamList = new Map();
242258
242344
  commonParamList.set(key, true);
242259
242345
  });
242260
242346
 
242347
+ // EXTERNAL MODULE: ./src/components/common/comment/index.ts + 6 modules
242348
+ var comment = __webpack_require__(32980);
242261
242349
  ;// CONCATENATED MODULE: ./src/editor/VueController.ts
242262
242350
 
242263
242351
 
@@ -242350,6 +242438,7 @@ var commonParamList = new Map();
242350
242438
 
242351
242439
 
242352
242440
 
242441
+
242353
242442
 
242354
242443
 
242355
242444
  var VueController = /*#__PURE__*/function () {
@@ -244340,6 +244429,10 @@ var VueController = /*#__PURE__*/function () {
244340
244429
  commentWidthMm: commentWidthMm
244341
244430
  }));
244342
244431
  }
244432
+ if (status !== 4) {
244433
+ // 非审阅状态销毁选中批注创建的组件
244434
+ comment/* $Comment.close */.D.close();
244435
+ }
244343
244436
  if (hoEditorFactory.structureConvert._superiorSign.length > 0) {
244344
244437
  if (status === 1 || status === 4) {
244345
244438
  this.hiddenMask(false);
@@ -255023,7 +255116,7 @@ var HoFooter_component = (0,componentNormalizer/* default */.Z)(
255023
255116
 
255024
255117
  /* harmony default export */ var HoFooter = (HoFooter_component.exports);
255025
255118
  // EXTERNAL MODULE: ./src/components/controls/ControlModal.vue + 3 modules
255026
- var ControlModal = __webpack_require__(21184);
255119
+ var ControlModal = __webpack_require__(21920);
255027
255120
  // EXTERNAL MODULE: ./src/components/controls/findReplace/FindReplace.vue + 5 modules
255028
255121
  var FindReplace = __webpack_require__(25918);
255029
255122
  ;// CONCATENATED MODULE: ./src/components/controls/findReplace/index.ts
@@ -255070,8 +255163,6 @@ var getFormula = function getFormula(tableFormular) {
255070
255163
  };
255071
255164
  // EXTERNAL MODULE: ./src/components/common/commondata/index.ts
255072
255165
  var commondata = __webpack_require__(76285);
255073
- // EXTERNAL MODULE: ./src/components/common/comment/index.ts + 6 modules
255074
- var comment = __webpack_require__(32980);
255075
255166
  ;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/HoDocs.vue?vue&type=script&lang=js&
255076
255167
 
255077
255168
 
@@ -255987,8 +256078,8 @@ var HoDocs_component = (0,componentNormalizer/* default */.Z)(
255987
256078
  )
255988
256079
 
255989
256080
  /* harmony default export */ var HoDocs = (HoDocs_component.exports);
255990
- ;// 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/ToolBar.vue?vue&type=template&id=3957338e&
255991
- var ToolBarvue_type_template_id_3957338e_render = function render() {
256081
+ ;// 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/ToolBar.vue?vue&type=template&id=7f1a29a4&
256082
+ var ToolBarvue_type_template_id_7f1a29a4_render = function render() {
255992
256083
  var _vm = this,
255993
256084
  _c = _vm._self._c;
255994
256085
  return _c('div', {
@@ -256221,7 +256312,7 @@ var ToolBarvue_type_template_id_3957338e_render = function render() {
256221
256312
  }, [_vm._v(_vm._s(item.title))]);
256222
256313
  }), 1)], 1) : _vm._e()], 1);
256223
256314
  };
256224
- var ToolBarvue_type_template_id_3957338e_staticRenderFns = [];
256315
+ var ToolBarvue_type_template_id_7f1a29a4_staticRenderFns = [];
256225
256316
 
256226
256317
  // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.map.js
256227
256318
  var es_array_map = __webpack_require__(21249);
@@ -261155,7 +261246,7 @@ var ToolTable_component = (0,componentNormalizer/* default */.Z)(
261155
261246
  this.tabKey = Object.keys(this.defaultSelect)[0] || ''; // 处理页签不存在的情况 默认取存在页签中的一个;
261156
261247
  }
261157
261248
 
261158
- if (this.defaultToolBarParams[this.tabKey]) {
261249
+ if (this.defaultToolBarParams[this.tabKey] != undefined) {
261159
261250
  this.vueController.setEditorStatus(this.defaultToolBarParams[this.tabKey]);
261160
261251
  }
261161
261252
  }
@@ -261404,10 +261495,10 @@ var ToolTable_component = (0,componentNormalizer/* default */.Z)(
261404
261495
  });
261405
261496
  ;// CONCATENATED MODULE: ./src/components/toolbar/ToolBar.vue?vue&type=script&lang=js&
261406
261497
  /* harmony default export */ var toolbar_ToolBarvue_type_script_lang_js_ = (ToolBarvue_type_script_lang_js_);
261407
- ;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/toolbar/ToolBar.vue?vue&type=style&index=0&id=3957338e&prod&lang=scss&
261498
+ ;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/toolbar/ToolBar.vue?vue&type=style&index=0&id=7f1a29a4&prod&lang=scss&
261408
261499
  // extracted by mini-css-extract-plugin
261409
261500
 
261410
- ;// CONCATENATED MODULE: ./src/components/toolbar/ToolBar.vue?vue&type=style&index=0&id=3957338e&prod&lang=scss&
261501
+ ;// CONCATENATED MODULE: ./src/components/toolbar/ToolBar.vue?vue&type=style&index=0&id=7f1a29a4&prod&lang=scss&
261411
261502
 
261412
261503
  ;// CONCATENATED MODULE: ./src/components/toolbar/ToolBar.vue
261413
261504
 
@@ -261420,8 +261511,8 @@ var ToolTable_component = (0,componentNormalizer/* default */.Z)(
261420
261511
 
261421
261512
  var ToolBar_component = (0,componentNormalizer/* default */.Z)(
261422
261513
  toolbar_ToolBarvue_type_script_lang_js_,
261423
- ToolBarvue_type_template_id_3957338e_render,
261424
- ToolBarvue_type_template_id_3957338e_staticRenderFns,
261514
+ ToolBarvue_type_template_id_7f1a29a4_render,
261515
+ ToolBarvue_type_template_id_7f1a29a4_staticRenderFns,
261425
261516
  false,
261426
261517
  null,
261427
261518
  null,