hoeditor-web 3.1.128 → 3.1.130

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.
@@ -12982,7 +12982,7 @@ var component = (0,componentNormalizer/* default */.Z)(
12982
12982
 
12983
12983
  /***/ }),
12984
12984
 
12985
- /***/ 50987:
12985
+ /***/ 84531:
12986
12986
  /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
12987
12987
 
12988
12988
  "use strict";
@@ -12994,7 +12994,7 @@ __webpack_require__.d(__webpack_exports__, {
12994
12994
  "default": function() { return /* binding */ PoperTipText; }
12995
12995
  });
12996
12996
 
12997
- ;// 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/poperTipText/PoperTipText.vue?vue&type=template&id=fa5dc044&
12997
+ ;// 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/poperTipText/PoperTipText.vue?vue&type=template&id=404c662a&
12998
12998
  var render = function render() {
12999
12999
  var _vm = this,
13000
13000
  _c = _vm._self._c;
@@ -13166,10 +13166,10 @@ var popper = __webpack_require__(95551);
13166
13166
  });
13167
13167
  ;// CONCATENATED MODULE: ./src/components/controls/poperTipText/PoperTipText.vue?vue&type=script&lang=js&
13168
13168
  /* harmony default export */ var poperTipText_PoperTipTextvue_type_script_lang_js_ = (PoperTipTextvue_type_script_lang_js_);
13169
- ;// 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/poperTipText/PoperTipText.vue?vue&type=style&index=0&id=fa5dc044&prod&lang=less&
13169
+ ;// 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/poperTipText/PoperTipText.vue?vue&type=style&index=0&id=404c662a&prod&lang=less&
13170
13170
  // extracted by mini-css-extract-plugin
13171
13171
 
13172
- ;// CONCATENATED MODULE: ./src/components/controls/poperTipText/PoperTipText.vue?vue&type=style&index=0&id=fa5dc044&prod&lang=less&
13172
+ ;// CONCATENATED MODULE: ./src/components/controls/poperTipText/PoperTipText.vue?vue&type=style&index=0&id=404c662a&prod&lang=less&
13173
13173
 
13174
13174
  // EXTERNAL MODULE: ./node_modules/@vue/vue-loader-v15/lib/runtime/componentNormalizer.js
13175
13175
  var componentNormalizer = __webpack_require__(70713);
@@ -19741,7 +19741,7 @@ var component = (0,componentNormalizer/* default */.Z)(
19741
19741
 
19742
19742
  /***/ }),
19743
19743
 
19744
- /***/ 15417:
19744
+ /***/ 16154:
19745
19745
  /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
19746
19746
 
19747
19747
  "use strict";
@@ -19761,7 +19761,7 @@ var es_array_includes = __webpack_require__(26699);
19761
19761
  var es_string_includes = __webpack_require__(32023);
19762
19762
  // EXTERNAL MODULE: ./node_modules/core-js/modules/es.number.constructor.js
19763
19763
  var es_number_constructor = __webpack_require__(9653);
19764
- ;// 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=1879e46a&
19764
+ ;// 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&
19765
19765
 
19766
19766
 
19767
19767
 
@@ -19847,6 +19847,20 @@ var render = function render() {
19847
19847
  }
19848
19848
  }, [_vm._v("签名完成后锁定列")])], 1)]), _c('li', {
19849
19849
  staticClass: "control-item"
19850
+ }, [_c('div', {
19851
+ staticStyle: {
19852
+ "padding-right": "20px"
19853
+ }
19854
+ }, [_c('a-checkbox', {
19855
+ model: {
19856
+ value: _vm.addWithDefaultValue,
19857
+ callback: function callback($$v) {
19858
+ _vm.addWithDefaultValue = $$v;
19859
+ },
19860
+ expression: "addWithDefaultValue"
19861
+ }
19862
+ }, [_vm._v("新增时自动带出第一行默认值")])], 1)]), _c('li', {
19863
+ staticClass: "control-item"
19850
19864
  }, [_c('span', {
19851
19865
  staticClass: "label"
19852
19866
  }, [_vm._v("编辑器属性")]), _c('a-select', {
@@ -19897,13 +19911,7 @@ var render = function render() {
19897
19911
  attrs: {
19898
19912
  "value": 6
19899
19913
  }
19900
- }, [_vm._v("序号")])], 1)], 1), _c('li', {
19901
- directives: [{
19902
- name: "show",
19903
- rawName: "v-show",
19904
- value: _vm.editorProperty === 4,
19905
- expression: "editorProperty === 4"
19906
- }],
19914
+ }, [_vm._v("序号")])], 1)], 1), _vm.editorProperty === 4 ? _c('li', {
19907
19915
  staticClass: "control-item"
19908
19916
  }, [_c('div', {
19909
19917
  staticClass: "control-item"
@@ -19920,13 +19928,7 @@ var render = function render() {
19920
19928
  },
19921
19929
  expression: "name"
19922
19930
  }
19923
- })], 1)]), _c('li', {
19924
- directives: [{
19925
- name: "show",
19926
- rawName: "v-show",
19927
- value: _vm.editorProperty === 1,
19928
- expression: "editorProperty === 1"
19929
- }],
19931
+ })], 1)]) : _vm.editorProperty === 1 ? [_c('li', {
19930
19932
  staticClass: "control-item"
19931
19933
  }, [_c('div', {
19932
19934
  staticClass: "control-item"
@@ -19968,12 +19970,6 @@ var render = function render() {
19968
19970
  "value": "-"
19969
19971
  }
19970
19972
  }, [_vm._v("-")])], 1)], 1)]), _c('li', {
19971
- directives: [{
19972
- name: "show",
19973
- rawName: "v-show",
19974
- value: _vm.editorProperty === 1,
19975
- expression: "editorProperty === 1"
19976
- }],
19977
19973
  staticClass: "control-item"
19978
19974
  }, [_c('a-checkbox', {
19979
19975
  model: {
@@ -20000,12 +19996,6 @@ var render = function render() {
20000
19996
  expression: "canModifyContent"
20001
19997
  }
20002
19998
  }, [_vm._v("用户可以直接编辑修改内容")])], 1), _c('li', {
20003
- directives: [{
20004
- name: "show",
20005
- rawName: "v-show",
20006
- value: _vm.editorProperty === 1,
20007
- expression: "editorProperty === 1"
20008
- }],
20009
19999
  staticClass: "control-item"
20010
20000
  }, [_c('a-table', {
20011
20001
  staticStyle: {
@@ -20126,13 +20116,7 @@ var render = function render() {
20126
20116
  }, [_vm._v("删除")]) : _vm._e()];
20127
20117
  }
20128
20118
  }])
20129
- })], 1)], 1), _c('li', {
20130
- directives: [{
20131
- name: "show",
20132
- rawName: "v-show",
20133
- value: _vm.editorProperty === 2,
20134
- expression: "editorProperty === 2"
20135
- }],
20119
+ })], 1)], 1)] : _vm.editorProperty === 2 ? [_c('li', {
20136
20120
  staticClass: "control-item"
20137
20121
  }, [_c('div', {
20138
20122
  staticClass: "control-item"
@@ -20161,12 +20145,6 @@ var render = function render() {
20161
20145
  }
20162
20146
  }, [_vm._v(_vm._s(item))]);
20163
20147
  }), 1)], 1)]), _c('div', {
20164
- directives: [{
20165
- name: "show",
20166
- rawName: "v-show",
20167
- value: _vm.editorProperty === 2,
20168
- expression: "editorProperty === 2"
20169
- }],
20170
20148
  staticClass: "control-item"
20171
20149
  }, [_c('a-checkbox', {
20172
20150
  model: {
@@ -20176,13 +20154,7 @@ var render = function render() {
20176
20154
  },
20177
20155
  expression: "isAutoInputCurDate"
20178
20156
  }
20179
- }, [_vm._v("新增行自动填入当前日期时间")])], 1), _c('li', {
20180
- directives: [{
20181
- name: "show",
20182
- rawName: "v-show",
20183
- value: _vm.editorProperty === 3,
20184
- expression: "editorProperty === 3"
20185
- }],
20157
+ }, [_vm._v("新增行自动填入当前日期时间")])], 1)] : _vm.editorProperty === 3 ? _c('li', {
20186
20158
  staticClass: "control-item"
20187
20159
  }, [_c('div', {
20188
20160
  staticClass: "control-item"
@@ -20219,7 +20191,7 @@ var render = function render() {
20219
20191
  },
20220
20192
  expression: "maxNumVal"
20221
20193
  }
20222
- })], 1)])])]), _c('footer', {
20194
+ })], 1)]) : _vm._e()], 2)]), _c('footer', {
20223
20195
  staticClass: "ho-modal-footer"
20224
20196
  }, [_c('a-button', {
20225
20197
  attrs: {
@@ -20239,7 +20211,7 @@ var render = function render() {
20239
20211
  };
20240
20212
  var staticRenderFns = [];
20241
20213
 
20242
- ;// CONCATENATED MODULE: ./src/components/controls/table/TableColProperty.vue?vue&type=template&id=1879e46a&
20214
+ ;// CONCATENATED MODULE: ./src/components/controls/table/TableColProperty.vue?vue&type=template&id=0e76e24b&
20243
20215
 
20244
20216
  // EXTERNAL MODULE: ./node_modules/@babel/runtime/helpers/esm/toConsumableArray.js + 3 modules
20245
20217
  var toConsumableArray = __webpack_require__(61748);
@@ -20321,6 +20293,7 @@ var getCellNode = __webpack_require__(5986);
20321
20293
  isAutoInputCurDate: false,
20322
20294
  allowMultiSelected: false,
20323
20295
  splitCharacter: ',',
20296
+ addWithDefaultValue: false,
20324
20297
  errorArr: [],
20325
20298
  errorIndex: [],
20326
20299
  focusIndexs: -1,
@@ -20383,6 +20356,7 @@ var getCellNode = __webpack_require__(5986);
20383
20356
  this.width = colProperty.width ? colProperty.width : 0;
20384
20357
  this.isSpecifyWidth = colProperty.isSpecifyWidth ? true : false;
20385
20358
  this.isSignLock = colProperty.isSignLock ? true : false;
20359
+ this.addWithDefaultValue = colProperty.addWithDefaultValue ? true : false;
20386
20360
  if (colProperty.downListProperty) {
20387
20361
  var listKeyId = this.getKeyId(0);
20388
20362
  var list = [{
@@ -20529,7 +20503,8 @@ var getCellNode = __webpack_require__(5986);
20529
20503
  width: this.width,
20530
20504
  isSpecifyWidth: this.isSpecifyWidth,
20531
20505
  customProperties: this.customProperties,
20532
- isSignLock: this.isSignLock
20506
+ isSignLock: this.isSignLock,
20507
+ addWithDefaultValue: this.addWithDefaultValue
20533
20508
  };
20534
20509
  Object.keys(params).forEach(function (key) {
20535
20510
  if (JSON.stringify(_this2[key]) !== JSON.stringify(_this2.defaultColProperty[key])) {
@@ -20539,7 +20514,7 @@ var getCellNode = __webpack_require__(5986);
20539
20514
  var cellNode = this.getCellNodes();
20540
20515
  var currentCols = cellNode.row.indexOf(cellNode);
20541
20516
  var colInfoes = cellNode.table.colInfos[currentCols];
20542
- this.vueController.colProperty(JSON.stringify(param), colInfoes);
20517
+ this.vueController.colProperty(param, colInfoes);
20543
20518
  this.$nextTick(function () {
20544
20519
  return _this2.handleClose();
20545
20520
  });
@@ -20551,10 +20526,10 @@ var getCellNode = __webpack_require__(5986);
20551
20526
  });
20552
20527
  ;// CONCATENATED MODULE: ./src/components/controls/table/TableColProperty.vue?vue&type=script&lang=js&
20553
20528
  /* harmony default export */ var table_TableColPropertyvue_type_script_lang_js_ = (TableColPropertyvue_type_script_lang_js_);
20554
- ;// 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=1879e46a&prod&lang=less&
20529
+ ;// 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&
20555
20530
  // extracted by mini-css-extract-plugin
20556
20531
 
20557
- ;// CONCATENATED MODULE: ./src/components/controls/table/TableColProperty.vue?vue&type=style&index=0&id=1879e46a&prod&lang=less&
20532
+ ;// CONCATENATED MODULE: ./src/components/controls/table/TableColProperty.vue?vue&type=style&index=0&id=0e76e24b&prod&lang=less&
20558
20533
 
20559
20534
  // EXTERNAL MODULE: ./node_modules/@vue/vue-loader-v15/lib/runtime/componentNormalizer.js
20560
20535
  var componentNormalizer = __webpack_require__(70713);
@@ -39276,10 +39251,6 @@ var DocController = /*#__PURE__*/function () {
39276
39251
  var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_84__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID);
39277
39252
  var np = hoEditorFactory.docTree.findNodePositionByPath(arange.startPath);
39278
39253
  if (np && np.node) {
39279
- // const index = np.childIndex;
39280
- // if(index===-1){
39281
- // }else{
39282
- // }
39283
39254
  var cell = hoEditorFactory.docTree.getParentRectNode(np.node);
39284
39255
  if (cell && cell instanceof _treeNode_CellNode__WEBPACK_IMPORTED_MODULE_64__/* .CellNode */ .D) {
39285
39256
  if (hoEditorFactory.drawTree.paintStatus == _draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_98__/* .PaintState */ .Dh.psDesign || cell.table.tableProperty.canAddRow) {
@@ -39368,8 +39339,7 @@ var DocController = /*#__PURE__*/function () {
39368
39339
  var text = (0,_plugins_util__WEBPACK_IMPORTED_MODULE_99__/* .dateFormat */ .vc)(date, colProperty.dateTimeProperty.inputStyle);
39369
39340
  newTextNode(text, k);
39370
39341
  mark = true;
39371
- }
39372
- if (colProperty.editorProperty === _TableProperty__WEBPACK_IMPORTED_MODULE_65__/* .EditorProperty */ .YS.OrderNumber) {
39342
+ } else if (colProperty.editorProperty === _TableProperty__WEBPACK_IMPORTED_MODULE_65__/* .EditorProperty */ .YS.OrderNumber) {
39373
39343
  var acell = cell.table.rows[index + 2][k];
39374
39344
  if (acell) {
39375
39345
  var ctext = acell.getCellText();
@@ -39380,6 +39350,15 @@ var DocController = /*#__PURE__*/function () {
39380
39350
  mark = true;
39381
39351
  }
39382
39352
  }
39353
+ } else if (colProperty.addWithDefaultValue) {
39354
+ var _acell = cell.table.rows[index + 2][k];
39355
+ if (_acell) {
39356
+ var _ctext = _acell.getCellText();
39357
+ if (_ctext) {
39358
+ newTextNode(_ctext, k);
39359
+ mark = true;
39360
+ }
39361
+ }
39383
39362
  }
39384
39363
  }
39385
39364
  if (mark) {
@@ -39413,23 +39392,6 @@ var DocController = /*#__PURE__*/function () {
39413
39392
  hoEditorFactory.docTree.selectChange(cgEvent);
39414
39393
  hoEditorFactory.docTree.curDomRange = newRange;
39415
39394
  }
39416
- //hoEditorFactory.drawTree.moveCaretToPath(sPath);
39417
- // (cell as CellNode).table.insertRows(r, count, r);
39418
- // const endPath = (cell as CellNode).table.getNodePath();
39419
- // const [
39420
- // dcell,
39421
- // dRoots,
39422
- // ] = hoEditorFactory.drawTree.getDrawRootsByPath(endPath);
39423
- // const startDline = dRoots.indexOf((cell as CellNode).table.drawTable);
39424
- // if (startDline >= 0) {
39425
- // hoEditorFactory.redrawManger.addRedrawRange(
39426
- // null,
39427
- // dRoots,
39428
- // startDline,
39429
- // dRoots.length - 1,
39430
- // endPath
39431
- // );
39432
- // }
39433
39395
  } else {
39434
39396
  ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_101__/* ["default"] */ .Z.warn('表格已设置不允许新增行');
39435
39397
  return;
@@ -40648,7 +40610,7 @@ var DocController = /*#__PURE__*/function () {
40648
40610
  */
40649
40611
  }, {
40650
40612
  key: "deleteComment",
40651
- value: function deleteComment(type, commentID) {
40613
+ value: function deleteComment(type, commentID, forceDelete) {
40652
40614
  var _this7 = this;
40653
40615
  var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_84__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID);
40654
40616
  var delStyleComment = function delStyleComment(commentID) {
@@ -40674,7 +40636,7 @@ var DocController = /*#__PURE__*/function () {
40674
40636
  };
40675
40637
  if (type === 0) {
40676
40638
  hoEditorFactory.drawTree.commentsMap.forEach(function (value) {
40677
- if (value.userID == hoEditorFactory.userInfo.id) {
40639
+ if (value.userID == hoEditorFactory.userInfo.id || forceDelete) {
40678
40640
  del(value);
40679
40641
  }
40680
40642
  });
@@ -46325,9 +46287,8 @@ var EditorProperty;
46325
46287
  EditorProperty[EditorProperty["Formula"] = 7] = "Formula";
46326
46288
  })(EditorProperty || (EditorProperty = {})); //编辑器属性 {无,下拉列表,日期,数值,签名,输入域,次数,计算公式}
46327
46289
  var ColProperty = /*#__PURE__*/function () {
46328
- //是否锁定
46329
- function ColProperty(objectValues //, table: TableNode
46330
- ) {
46290
+ //新增行时是否使用默认值
46291
+ function ColProperty(objectValues) {
46331
46292
  (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_classCallCheck_js__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z)(this, ColProperty);
46332
46293
  //private _id!: string;//编号
46333
46294
  (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);
@@ -46348,8 +46309,10 @@ var ColProperty = /*#__PURE__*/function () {
46348
46309
  (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_4__/* ["default"] */ .Z)(this, "_isSignLock", false);
46349
46310
  //签名后是否锁定
46350
46311
  (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_4__/* ["default"] */ .Z)(this, "_isLock", false);
46351
- if (objectValues !== "") {
46352
- var valuesObj = eval('(' + objectValues + ')');
46312
+ //是否锁定
46313
+ (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_4__/* ["default"] */ .Z)(this, "addWithDefaultValue", false);
46314
+ if (typeof objectValues != 'string') {
46315
+ // const valuesObj = eval('(' + objectValues + ')');
46353
46316
  var assignvalue = function assignvalue(target, source) {
46354
46317
  Object.keys(source).forEach(function (value) {
46355
46318
  if (value !== "downListProperty" && value !== "dateTimeProperty" && value !== "numberProperty" && value !== "signProperty") {
@@ -46365,18 +46328,18 @@ var ColProperty = /*#__PURE__*/function () {
46365
46328
  }
46366
46329
  });
46367
46330
  };
46368
- assignvalue(this, valuesObj);
46369
- if (valuesObj["editorProperty"] === EditorProperty.DownList) {
46370
- this._downListProperty = new ColDownListProperty(valuesObj["downListProperty"]);
46331
+ assignvalue(this, objectValues);
46332
+ if (objectValues["editorProperty"] === EditorProperty.DownList) {
46333
+ this._downListProperty = new ColDownListProperty(objectValues["downListProperty"]);
46371
46334
  }
46372
- if (valuesObj["editorProperty"] === EditorProperty.DateTime) {
46373
- this._dateTimeProperty = new DateTimeProperty(valuesObj["dateTimeProperty"]);
46335
+ if (objectValues["editorProperty"] === EditorProperty.DateTime) {
46336
+ this._dateTimeProperty = new DateTimeProperty(objectValues["dateTimeProperty"]);
46374
46337
  }
46375
- if (valuesObj["editorProperty"] === EditorProperty.Number) {
46376
- this._numberProperty = new NumberProperty(valuesObj["numberProperty"]);
46338
+ if (objectValues["editorProperty"] === EditorProperty.Number) {
46339
+ this._numberProperty = new NumberProperty(objectValues["numberProperty"]);
46377
46340
  }
46378
- if (valuesObj["editorProperty"] === EditorProperty.Sign) {
46379
- this._signProperty = new SignProperty(valuesObj["signProperty"]);
46341
+ if (objectValues["editorProperty"] === EditorProperty.Sign) {
46342
+ this._signProperty = new SignProperty(objectValues["signProperty"]);
46380
46343
  }
46381
46344
  }
46382
46345
  }
@@ -60429,7 +60392,7 @@ var SpecialCharsNode = /*#__PURE__*/function (_ControlNode) {
60429
60392
  /* harmony export */ a: function() { return /* binding */ FormularType; }
60430
60393
  /* harmony export */ });
60431
60394
  /* harmony import */ var ant_design_vue_es_message_style__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(94310);
60432
- /* harmony import */ var ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_40__ = __webpack_require__(40735);
60395
+ /* harmony import */ var ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_41__ = __webpack_require__(40735);
60433
60396
  /* harmony import */ var D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(27222);
60434
60397
  /* harmony import */ var D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_typeof_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(8495);
60435
60398
  /* 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);
@@ -60489,6 +60452,8 @@ var SpecialCharsNode = /*#__PURE__*/function (_ControlNode) {
60489
60452
  /* harmony import */ var _CellNode__WEBPACK_IMPORTED_MODULE_37__ = __webpack_require__(68598);
60490
60453
  /* harmony import */ var _ControlNode__WEBPACK_IMPORTED_MODULE_38__ = __webpack_require__(91105);
60491
60454
  /* harmony import */ var _RadioAndCheckBoxNode__WEBPACK_IMPORTED_MODULE_39__ = __webpack_require__(99152);
60455
+ /* harmony import */ var _TextInputFieldNode__WEBPACK_IMPORTED_MODULE_40__ = __webpack_require__(65043);
60456
+
60492
60457
 
60493
60458
 
60494
60459
 
@@ -60896,6 +60861,22 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
60896
60861
  strValue = itemObject.text;
60897
60862
  }
60898
60863
  }
60864
+ //针对单元格childNodes节点下嵌套的下拉选择处理
60865
+ } else if (cell.childNodes && cell.childNodes.length > 1) {
60866
+ var textInputFieldNode = cell.childNodes[1];
60867
+ if (textInputFieldNode instanceof _TextInputFieldNode__WEBPACK_IMPORTED_MODULE_40__/* .TextInputFieldNode */ .re) {
60868
+ var tempListItems = textInputFieldNode.downListProperty.listItems;
60869
+ var midListItems = JSON.parse(tempListItems);
60870
+ var tempItemObject = midListItems.find(function (item) {
60871
+ return item.text === strValue;
60872
+ });
60873
+ if (tempItemObject) {
60874
+ strValue = tempItemObject.value;
60875
+ if (strValue === '') {
60876
+ strValue = tempItemObject.text;
60877
+ }
60878
+ }
60879
+ }
60899
60880
  }
60900
60881
  strValue = hoEditorFactory.unitConvert.replaceAll(strValue, ' ', '');
60901
60882
  strValue = hoEditorFactory.unitConvert.replaceAll(strValue, '\b', '');
@@ -61033,7 +61014,7 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
61033
61014
  var table = this.getParentCell().table;
61034
61015
  var arrStr = this.formulaStr.split(",");
61035
61016
  if (arrStr.length < 2) {
61036
- ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_40__/* ["default"] */ .Z.warn("体重和身高对应的单元格编号传入有误:" + this.formulaStr);
61017
+ ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_41__/* ["default"] */ .Z.warn("体重和身高对应的单元格编号传入有误:" + this.formulaStr);
61037
61018
  }
61038
61019
  var _this$getRowColByCell7 = this.getRowColByCellAdress(arrStr[0]),
61039
61020
  _this$getRowColByCell8 = (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)(_this$getRowColByCell7, 2),
@@ -61079,7 +61060,7 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
61079
61060
  var table = this.getParentCell().table;
61080
61061
  var arrStr = this.formulaStr.split(",");
61081
61062
  if (arrStr.length < 2) {
61082
- ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_40__/* ["default"] */ .Z.warn("单元格编号传入有误:" + this.formulaStr);
61063
+ ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_41__/* ["default"] */ .Z.warn("单元格编号传入有误:" + this.formulaStr);
61083
61064
  }
61084
61065
  var _this$getRowColByCell11 = this.getRowColByCellAdress(arrStr[0]),
61085
61066
  _this$getRowColByCell12 = (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)(_this$getRowColByCell11, 2),
@@ -61430,7 +61411,7 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
61430
61411
  var strRet = " ";
61431
61412
  var table = this.getParentCell().table;
61432
61413
  if (this.formulaStr == "") {
61433
- ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_40__/* ["default"] */ .Z.warn("体重的单元格编号传入有误:" + this.formulaStr);
61414
+ ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_41__/* ["default"] */ .Z.warn("体重的单元格编号传入有误:" + this.formulaStr);
61434
61415
  }
61435
61416
  var _this$getRowColByCell21 = this.getRowColByCellAdress(this.formulaStr),
61436
61417
  _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),
@@ -61466,7 +61447,7 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
61466
61447
  var table = this.getParentCell().table;
61467
61448
  var arrStr = this.formulaStr.split(",");
61468
61449
  if (arrStr.length < 2) {
61469
- ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_40__/* ["default"] */ .Z.warn("入院时间和出院时间对应的单元格编号传入有误:" + this.formulaStr);
61450
+ ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_41__/* ["default"] */ .Z.warn("入院时间和出院时间对应的单元格编号传入有误:" + this.formulaStr);
61470
61451
  return strRet;
61471
61452
  }
61472
61453
  var _this$getRowColByCell23 = this.getRowColByCellAdress(arrStr[0]),
@@ -61510,7 +61491,7 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
61510
61491
  var table = this.getParentCell().table;
61511
61492
  var arrStr = this.formulaStr.split(",");
61512
61493
  if (arrStr.length < 2) {
61513
- ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_40__/* ["default"] */ .Z.warn("开始时间和结束时间对应的单元格编号传入有误:" + this.formulaStr);
61494
+ ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_41__/* ["default"] */ .Z.warn("开始时间和结束时间对应的单元格编号传入有误:" + this.formulaStr);
61514
61495
  return strRet;
61515
61496
  }
61516
61497
  var _this$getRowColByCell27 = this.getRowColByCellAdress(arrStr[0]),
@@ -61603,7 +61584,7 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
61603
61584
  var strRet = " ";
61604
61585
  var table = this.getParentCell().table;
61605
61586
  if (this.formulaStr == "") {
61606
- ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_40__/* ["default"] */ .Z.warn("身高的单元格编号传入有误:" + this.formulaStr);
61587
+ ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_41__/* ["default"] */ .Z.warn("身高的单元格编号传入有误:" + this.formulaStr);
61607
61588
  }
61608
61589
  var cellNo = "";
61609
61590
  var isRange = false;
@@ -63450,7 +63431,8 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
63450
63431
  signProperty: "",
63451
63432
  customProperties: "",
63452
63433
  isSignLock: false,
63453
- isLock: false
63434
+ isLock: false,
63435
+ addWithDefaultValue: false
63454
63436
  };
63455
63437
  var defaultColPropJson = JSON.parse(JSON.stringify(defaultColProp));
63456
63438
  //处理列宽
@@ -63473,6 +63455,7 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
63473
63455
  //customProperties: colInfo.colProperty.customProperties
63474
63456
  isSignLock: colInfo.colProperty.isSignLock,
63475
63457
  isLock: colInfo.colProperty.isLock,
63458
+ addWithDefaultValue: colInfo.colProperty.addWithDefaultValue,
63476
63459
  customProperties: _customProperties2
63477
63460
  };
63478
63461
  var colPropertyJson = JSON.parse(JSON.stringify(colProperty));
@@ -64473,6 +64456,9 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
64473
64456
  if (colProperty.signProperty) {
64474
64457
  tableNode.colInfos[_i6].colProperty.signProperty = new _TableProperty__WEBPACK_IMPORTED_MODULE_35__/* .SignProperty */ .q5(colProperty.signProperty);
64475
64458
  }
64459
+ if (colProperty.addWithDefaultValue) {
64460
+ tableNode.colInfos[_i6].colProperty.addWithDefaultValue = colProperty.addWithDefaultValue;
64461
+ }
64476
64462
  if (colProperty.customProperties) {
64477
64463
  tableNode.colInfos[_i6].colProperty.customProperties = Array.isArray(colProperty.customProperties.customProperty) ? colProperty.customProperties.customProperty : Array(colProperty.customProperties.customProperty);
64478
64464
  }
@@ -74108,10 +74094,11 @@ var DrawCombineNode = /*#__PURE__*/function (_DrawContainer) {
74108
74094
  value: function bindEvent() {
74109
74095
  var _this2 = this;
74110
74096
  var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_10__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID);
74111
- if (hoEditorFactory.drawTree.paintStatus === _drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_11__/* .PaintState */ .Dh.psPreview || hoEditorFactory.drawTree.paintStatus === _drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_11__/* .PaintState */ .Dh.psPrint) {
74097
+ var paintStatus = hoEditorFactory.drawTree.paintStatus;
74098
+ if (paintStatus === _drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_11__/* .PaintState */ .Dh.psPreview || paintStatus === _drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_11__/* .PaintState */ .Dh.psPrint) {
74112
74099
  if (this._event) this._event.alpha = 0;
74113
74100
  } else {
74114
- if (hoEditorFactory.drawTree.paintStatus === _drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_11__/* .PaintState */ .Dh.psReview || !hoEditorFactory.isHideComments) {
74101
+ if (paintStatus === _drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_11__/* .PaintState */ .Dh.psReview || paintStatus === _drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_11__/* .PaintState */ .Dh.psTrace || !hoEditorFactory.isHideComments) {
74115
74102
  this.on('added', function (e1) {
74116
74103
  if (!_this2._event) {
74117
74104
  var r = _this2.getBounds();
@@ -86763,7 +86750,11 @@ var DrawTree = /*#__PURE__*/function () {
86763
86750
  selectStart = dLine.paragraphNode.getNodePath();
86764
86751
  } else {
86765
86752
  //取上一行的最后一个绘制点
86766
-
86753
+ // console.log("line", lineIndex);
86754
+ // console.log(
86755
+ // "length",
86756
+ // dLine.paragraphNode.drawlines[lineIndex - 1].drawItems.length
86757
+ // );
86767
86758
  var dNode = dLine.paragraphNode.drawlines[lineIndex - 1].drawItems[dLine.paragraphNode.drawlines[lineIndex - 1].drawItems.length - 1];
86768
86759
  if ((0,IDrawInfos/* instanceOfIDrawInfos */.r)(dNode)) {
86769
86760
  var node = dNode.node;
@@ -169639,7 +169630,7 @@ var map = {
169639
169630
  "./paragraph/ParagraphDialog.vue": 58874,
169640
169631
  "./poperSelect/PoperMark.vue": 20734,
169641
169632
  "./poperSelect/PoperSelect.vue": 31973,
169642
- "./poperTipText/PoperTipText.vue": 50987,
169633
+ "./poperTipText/PoperTipText.vue": 84531,
169643
169634
  "./popers/Poper.vue": 57937,
169644
169635
  "./popers/Title.vue": 31276,
169645
169636
  "./printstyle/PrintLineStyle.vue": 51484,
@@ -169651,7 +169642,7 @@ var map = {
169651
169642
  "./table/TableCellPoper.vue": 97628,
169652
169643
  "./table/TableCellPoper1.vue": 44645,
169653
169644
  "./table/TableCellProperty.vue": 90546,
169654
- "./table/TableColProperty.vue": 15417,
169645
+ "./table/TableColProperty.vue": 16154,
169655
169646
  "./table/TableForm.vue": 79036,
169656
169647
  "./table/TableFormTree.vue": 84804,
169657
169648
  "./table/TableFormula.vue": 80199,
@@ -207095,8 +207086,8 @@ var es_string_match = __webpack_require__(4723);
207095
207086
  var es_number_constructor = __webpack_require__(9653);
207096
207087
  // EXTERNAL MODULE: ./node_modules/core-js/modules/es.json.stringify.js
207097
207088
  var es_json_stringify = __webpack_require__(38862);
207098
- ;// 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=fe8a53a0&
207099
- var HoDocvue_type_template_id_fe8a53a0_render = function render() {
207089
+ ;// 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=2dfaf4c7&
207090
+ var HoDocvue_type_template_id_2dfaf4c7_render = function render() {
207100
207091
  var _vm = this,
207101
207092
  _c = _vm._self._c;
207102
207093
  return _c('div', {
@@ -207297,7 +207288,7 @@ var HoDocvue_type_template_id_fe8a53a0_render = function render() {
207297
207288
  }
207298
207289
  }, [_vm._v("v " + _vm._s(_vm.version))])])])], 1);
207299
207290
  };
207300
- var HoDocvue_type_template_id_fe8a53a0_staticRenderFns = [];
207291
+ var HoDocvue_type_template_id_2dfaf4c7_staticRenderFns = [];
207301
207292
 
207302
207293
  // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.filter.js
207303
207294
  var es_array_filter = __webpack_require__(57327);
@@ -210288,9 +210279,9 @@ var TextNode = __webpack_require__(27198);
210288
210279
  // EXTERNAL MODULE: ./src/editor/dom/treeNode/ParagraphNode.ts
210289
210280
  var ParagraphNode = __webpack_require__(67945);
210290
210281
  ;// CONCATENATED MODULE: ./src/components/version.ts
210291
- /* harmony default export */ var version = ('3.1.128');
210282
+ /* harmony default export */ var version = ('3.1.130');
210292
210283
  // EXTERNAL MODULE: ./src/components/controls/poperTipText/PoperTipText.vue + 5 modules
210293
- var PoperTipText = __webpack_require__(50987);
210284
+ var PoperTipText = __webpack_require__(84531);
210294
210285
  ;// CONCATENATED MODULE: ./src/components/controls/poperTipText/index.ts
210295
210286
 
210296
210287
  /* harmony default export */ var poperTipText = (PoperTipText["default"]);
@@ -211061,11 +211052,15 @@ var defaultHeight = Math.floor(1122 * scaleXY) % 2 === 1 ? Math.floor(1122 * sca
211061
211052
  }
211062
211053
  },
211063
211054
  createAddNextCellButton: function createAddNextCellButton(node, pageIndex) {
211055
+ var _node$parentNode;
211064
211056
  var cell = null;
211065
211057
  if (node instanceof CellNode/* CellNode */.D) {
211066
211058
  cell = node;
211067
211059
  } else if (node.parentNode instanceof CellNode/* CellNode */.D) {
211068
211060
  cell = node.parentNode;
211061
+ } else if (((_node$parentNode = node.parentNode) === null || _node$parentNode === void 0 ? void 0 : _node$parentNode.parentNode) instanceof CellNode/* CellNode */.D) {
211062
+ var _node$parentNode2;
211063
+ cell = (_node$parentNode2 = node.parentNode) === null || _node$parentNode2 === void 0 ? void 0 : _node$parentNode2.parentNode;
211069
211064
  }
211070
211065
  if (cell && cell.table.tableProperty.addRowByOrder) {
211071
211066
  var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this.hoEditorProvider.activeDocId);
@@ -211315,10 +211310,10 @@ var defaultHeight = Math.floor(1122 * scaleXY) % 2 === 1 ? Math.floor(1122 * sca
211315
211310
  });
211316
211311
  ;// CONCATENATED MODULE: ./src/components/HoDoc.vue?vue&type=script&lang=js&
211317
211312
  /* harmony default export */ var components_HoDocvue_type_script_lang_js_ = (HoDocvue_type_script_lang_js_);
211318
- ;// 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=fe8a53a0&prod&lang=less&
211313
+ ;// 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=2dfaf4c7&prod&lang=less&
211319
211314
  // extracted by mini-css-extract-plugin
211320
211315
 
211321
- ;// CONCATENATED MODULE: ./src/components/HoDoc.vue?vue&type=style&index=0&id=fe8a53a0&prod&lang=less&
211316
+ ;// CONCATENATED MODULE: ./src/components/HoDoc.vue?vue&type=style&index=0&id=2dfaf4c7&prod&lang=less&
211322
211317
 
211323
211318
  ;// CONCATENATED MODULE: ./src/components/HoDoc.vue
211324
211319
 
@@ -211331,8 +211326,8 @@ var defaultHeight = Math.floor(1122 * scaleXY) % 2 === 1 ? Math.floor(1122 * sca
211331
211326
 
211332
211327
  var HoDoc_component = (0,componentNormalizer/* default */.Z)(
211333
211328
  components_HoDocvue_type_script_lang_js_,
211334
- HoDocvue_type_template_id_fe8a53a0_render,
211335
- HoDocvue_type_template_id_fe8a53a0_staticRenderFns,
211329
+ HoDocvue_type_template_id_2dfaf4c7_render,
211330
+ HoDocvue_type_template_id_2dfaf4c7_staticRenderFns,
211336
211331
  false,
211337
211332
  null,
211338
211333
  null,
@@ -212694,7 +212689,13 @@ var NodeMouseMoveEvent = /*#__PURE__*/function () {
212694
212689
  (0,esm_defineProperty/* default */.Z)(this, "_id", void 0);
212695
212690
  (0,esm_defineProperty/* default */.Z)(this, "_deleterIndex", void 0);
212696
212691
  (0,esm_defineProperty/* default */.Z)(this, "_creatorIndex", void 0);
212692
+ (0,esm_defineProperty/* default */.Z)(this, "_modifierIndex", void 0);
212697
212693
  (0,esm_defineProperty/* default */.Z)(this, "_isUseTipText", void 0);
212694
+ (0,esm_defineProperty/* default */.Z)(this, "historyText", {
212695
+ 0: '创建',
212696
+ 1: '删除',
212697
+ 2: '修改'
212698
+ });
212698
212699
  this._pageIndex = 0;
212699
212700
  this._moveType = DmouseEventType.detOut;
212700
212701
  this._hoEditorFactoryID = hoEditorFactoryID;
@@ -212731,6 +212732,11 @@ var NodeMouseMoveEvent = /*#__PURE__*/function () {
212731
212732
  get: function get() {
212732
212733
  return this._deleterIndex;
212733
212734
  }
212735
+ }, {
212736
+ key: "modifierIndex",
212737
+ get: function get() {
212738
+ return this._modifierIndex;
212739
+ }
212734
212740
  }, {
212735
212741
  key: "poperTipPos",
212736
212742
  get: function get() {
@@ -212760,79 +212766,95 @@ var NodeMouseMoveEvent = /*#__PURE__*/function () {
212760
212766
  value: function setNode(node, moveType) {
212761
212767
  this._creatorIndex = -1;
212762
212768
  this._deleterIndex = -1;
212769
+ this._modifierIndex = -1;
212763
212770
  this._tipText = [];
212764
212771
  this._id = [];
212765
- // if(moveType === DmouseEventType.detOut) {
212766
- // return;
212767
- // }
212768
212772
  var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this._hoEditorFactoryID);
212769
- if (node instanceof TextNode/* TextNode */.R) {
212770
- if (hoEditorFactory.drawTree.paintStatus === DrawTree/* PaintState */.Dh.psReview || !hoEditorFactory.isHideComments) {
212771
- this._creatorIndex = hoEditorFactory.docTree.styles[node.styleIndex].creatorIndex;
212772
- this._deleterIndex = hoEditorFactory.docTree.styles[node.styleIndex].deleterIndex;
212773
- if (this._creatorIndex !== undefined && this._creatorIndex >= 0) {
212774
- var userHistories = hoEditorFactory.docTree.userHistories[this._creatorIndex];
212775
- this._moveType = moveType;
212776
- this._tipText.push("".concat(userHistories.editDate, " ").concat(userHistories.name, "\u521B\u5EFA"));
212777
- this._id.push(userHistories.id);
212778
- this.computedPosition(node.drawNodes[0]);
212779
- }
212780
- if (this._deleterIndex !== undefined && this._deleterIndex >= 0) {
212781
- var _userHistories = hoEditorFactory.docTree.userHistories[this._deleterIndex];
212782
- this._moveType = moveType;
212783
- this._tipText.push("".concat(_userHistories.editDate, " ").concat(_userHistories.name, "\u5220\u9664"));
212784
- this._id.push(_userHistories.id);
212785
- this.computedPosition(node.drawNodes[0]);
212773
+ var paintStatus = hoEditorFactory.drawTree.paintStatus;
212774
+ if (paintStatus === DrawTree/* PaintState */.Dh.psTrace) {
212775
+ var styleIndex = node === null || node === void 0 ? void 0 : node.styleIndex;
212776
+ if (!styleIndex) return;
212777
+ var style = hoEditorFactory.docTree.styles[styleIndex];
212778
+ this._creatorIndex = style.creatorIndex;
212779
+ this._deleterIndex = style.deleterIndex;
212780
+ this._modifierIndex = style.modifierIndex;
212781
+ var historyStyleIndex = this._creatorIndex || this.deleterIndex || this.modifierIndex;
212782
+ if (historyStyleIndex !== undefined && historyStyleIndex >= 0) {
212783
+ var userHistories = hoEditorFactory.docTree.userHistories[historyStyleIndex];
212784
+ this._moveType = moveType;
212785
+ this._tipText.push("".concat(userHistories.editDate, " ").concat(userHistories.name).concat(this.historyText[userHistories.historyEditType]));
212786
+ this._id.push(userHistories.id);
212787
+ this.computedPosition(node.drawNodes[0]);
212788
+ }
212789
+ } else {
212790
+ if (node instanceof TextNode/* TextNode */.R) {
212791
+ if (paintStatus === DrawTree/* PaintState */.Dh.psReview || !hoEditorFactory.isHideComments) {
212792
+ this._creatorIndex = hoEditorFactory.docTree.styles[node.styleIndex].creatorIndex;
212793
+ this._deleterIndex = hoEditorFactory.docTree.styles[node.styleIndex].deleterIndex;
212794
+ if (this._creatorIndex !== undefined && this._creatorIndex >= 0) {
212795
+ var _userHistories = hoEditorFactory.docTree.userHistories[this._creatorIndex];
212796
+ this._moveType = moveType;
212797
+ this._tipText.push("".concat(_userHistories.editDate, " ").concat(_userHistories.name, "\u521B\u5EFA"));
212798
+ this._id.push(_userHistories.id);
212799
+ this.computedPosition(node.drawNodes[0]);
212800
+ }
212801
+ if (this._deleterIndex !== undefined && this._deleterIndex >= 0) {
212802
+ var _userHistories2 = hoEditorFactory.docTree.userHistories[this._deleterIndex];
212803
+ this._moveType = moveType;
212804
+ this._tipText.push("".concat(_userHistories2.editDate, " ").concat(_userHistories2.name, "\u5220\u9664"));
212805
+ this._id.push(_userHistories2.id);
212806
+ this.computedPosition(node.drawNodes[0]);
212807
+ }
212808
+ } else {
212809
+ if (this._isUseTipText && this._deleterIndex !== 0 && node.parentNode && node.parentNode instanceof TextInputFieldNode/* TextInputFieldNode */.re && node.parentNode.tipText !== node.parentNode.name && (paintStatus === 0 || paintStatus === 1)) {
212810
+ this._moveType = moveType;
212811
+ if (node.parentNode.tipText) {
212812
+ var text = JSON.stringify(node.parentNode.tipText);
212813
+ text = text.slice(1, text.length - 1);
212814
+ var arr = text.split('\\n').filter(function (v) {
212815
+ return v;
212816
+ });
212817
+ this._tipText = arr;
212818
+ } else {
212819
+ this._tipText.push('');
212820
+ }
212821
+ this._id.push(node.parentNode.id);
212822
+ this.computedPosition(node.drawNodes[0]);
212823
+ }
212786
212824
  }
212787
- } else {
212788
- if (this._isUseTipText && this._deleterIndex !== 0 && node.parentNode && node.parentNode instanceof TextInputFieldNode/* TextInputFieldNode */.re && node.parentNode.tipText !== node.parentNode.name && (hoEditorFactory.drawTree.paintStatus === 0 || hoEditorFactory.drawTree.paintStatus === 1)) {
212825
+ } else if (node instanceof MarkNode/* MarkNode */.j) {
212826
+ if (this._isUseTipText && this._deleterIndex !== 0 && node.parentNode && node.parentNode instanceof TextInputFieldNode/* TextInputFieldNode */.re && node.parentNode.tipText !== node.parentNode.name && (paintStatus === 0 || paintStatus === 1)) {
212789
212827
  this._moveType = moveType;
212790
212828
  if (node.parentNode.tipText) {
212791
- var text = JSON.stringify(node.parentNode.tipText);
212792
- text = text.slice(1, text.length - 1);
212793
- var arr = text.split('\\n').filter(function (v) {
212829
+ var _text = JSON.stringify(node.parentNode.tipText);
212830
+ _text = _text.slice(1, _text.length - 1);
212831
+ var _arr = _text.split('\\n').filter(function (v) {
212794
212832
  return v;
212795
212833
  });
212796
- this._tipText = arr;
212834
+ this._tipText = _arr;
212797
212835
  } else {
212798
212836
  this._tipText.push('');
212799
212837
  }
212800
212838
  this._id.push(node.parentNode.id);
212801
212839
  this.computedPosition(node.drawNodes[0]);
212802
212840
  }
212803
- }
212804
- } else if (node instanceof MarkNode/* MarkNode */.j) {
212805
- if (this._isUseTipText && this._deleterIndex !== 0 && node.parentNode && node.parentNode instanceof TextInputFieldNode/* TextInputFieldNode */.re && node.parentNode.tipText !== node.parentNode.name && (hoEditorFactory.drawTree.paintStatus === 0 || hoEditorFactory.drawTree.paintStatus === 1)) {
212806
- this._moveType = moveType;
212807
- if (node.parentNode.tipText) {
212808
- var _text = JSON.stringify(node.parentNode.tipText);
212809
- _text = _text.slice(1, _text.length - 1);
212810
- var _arr = _text.split('\\n').filter(function (v) {
212811
- return v;
212812
- });
212813
- this._tipText = _arr;
212814
- } else {
212815
- this._tipText.push('');
212816
- }
212817
- this._id.push(node.parentNode.id);
212818
- this.computedPosition(node.drawNodes[0]);
212819
- }
212820
- } else {
212821
- if (this._isUseTipText && (hoEditorFactory.drawTree.paintStatus === 0 || hoEditorFactory.drawTree.paintStatus === 1 || hoEditorFactory.drawTree.paintStatus === 4)) {
212822
- if (node instanceof TextInputFieldNode/* TextInputFieldNode */.re && node.name !== node.tipText) {
212823
- this._moveType = moveType;
212824
- if (node.tipText) {
212825
- var _text2 = JSON.stringify(node.tipText);
212826
- _text2 = _text2.slice(1, _text2.length - 1);
212827
- var _arr2 = _text2.split('\\n').filter(function (v) {
212828
- return v;
212829
- });
212830
- this._tipText = _arr2;
212831
- } else {
212832
- this._tipText.push('');
212841
+ } else {
212842
+ if (this._isUseTipText && (paintStatus === 0 || paintStatus === 1 || paintStatus === 4)) {
212843
+ if (node instanceof TextInputFieldNode/* TextInputFieldNode */.re && node.name !== node.tipText) {
212844
+ this._moveType = moveType;
212845
+ if (node.tipText) {
212846
+ var _text2 = JSON.stringify(node.tipText);
212847
+ _text2 = _text2.slice(1, _text2.length - 1);
212848
+ var _arr2 = _text2.split('\\n').filter(function (v) {
212849
+ return v;
212850
+ });
212851
+ this._tipText = _arr2;
212852
+ } else {
212853
+ this._tipText.push('');
212854
+ }
212855
+ this._id.push(node.id);
212856
+ this.computedPosition(node.drawNodes[0]);
212833
212857
  }
212834
- this._id.push(node.id);
212835
- this.computedPosition(node.drawNodes[0]);
212836
212858
  }
212837
212859
  }
212838
212860
  }
@@ -220189,14 +220211,14 @@ var VueController = /*#__PURE__*/function () {
220189
220211
  */
220190
220212
  }, {
220191
220213
  key: "deleteComment",
220192
- value: function deleteComment(type, commentID) {
220214
+ value: function deleteComment(type, commentID, forceDelete) {
220193
220215
  var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this._hoEditorFactoryID);
220194
220216
  var _curDomRange = hoEditorFactory.docTree.curDomRange; //获取当前选中区域
220195
220217
  var startPath = _curDomRange.normalize().startPath;
220196
220218
  var endPath = _curDomRange.normalize().endPath;
220197
220219
  var changingEvent = new NodeChangingEvent/* NodeChangingEvent */.Q(DocTree/* DocAction */.gk.daDelete, startPath, endPath, NodeChangingEvent/* OperType */.y.deleteComment);
220198
220220
  if (hoEditorFactory.docTree.changing(changingEvent)) {
220199
- hoEditorFactory.docController.deleteComment(type, commentID);
220221
+ hoEditorFactory.docController.deleteComment(type, commentID, forceDelete);
220200
220222
  }
220201
220223
  comment/* hoCreateComment */.$.close();
220202
220224
  }
@@ -239007,12 +239029,10 @@ var TableController = /*#__PURE__*/function () {
239007
239029
  * @params `signProperty 签名 默认值 undefined`
239008
239030
  * @signPropertyParam ` name -string 签名名称`
239009
239031
  */
239010
- }, {
239011
- key: "colProperty",
239012
- value: function colProperty(objectValues, colInfo) {
239013
- var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this._hoEditorFactoryID);
239014
- hoEditorFactory.vueController.colProperty(objectValues, colInfo);
239015
- }
239032
+ // public colProperty(objectValues: string, colInfo: ColInfos) {
239033
+ // const hoEditorFactory = HOEditorFactorys.instance().getFactory(this._hoEditorFactoryID);
239034
+ // hoEditorFactory.vueController.colProperty(objectValues, colInfo);
239035
+ // }
239016
239036
  /**
239017
239037
  * 设置单元格属性
239018
239038
  * @params `id string 编号`
@@ -239672,8 +239692,6 @@ var HOEditorFactory = /*#__PURE__*/function () {
239672
239692
  // 是否启用绘制优化 默认不启用
239673
239693
  (0,esm_defineProperty/* default */.Z)(this, "_defaultIsAllowDelete", false);
239674
239694
  // 元素是否默认可以被删除
239675
- (0,esm_defineProperty/* default */.Z)(this, "_continuousView", void 0);
239676
- // 预览
239677
239695
  (0,esm_defineProperty/* default */.Z)(this, "_loadImageCount", 0);
239678
239696
  // 待加载的图片数量
239679
239697
  (0,esm_defineProperty/* default */.Z)(this, "_loadImageCallback", null);
@@ -239739,7 +239757,7 @@ var HOEditorFactory = /*#__PURE__*/function () {
239739
239757
  (0,esm_defineProperty/* default */.Z)(this, "_lockContent", false);
239740
239758
  //是否锁定病历内容(未签名)
239741
239759
  (0,esm_defineProperty/* default */.Z)(this, "_notAllowCrossPatiPaste", false);
239742
- //不允许跨病人粘贴
239760
+ //不允许跨病人复制粘贴
239743
239761
  (0,esm_defineProperty/* default */.Z)(this, "_forbidPaste", false);
239744
239762
  //禁止复制粘贴
239745
239763
  (0,esm_defineProperty/* default */.Z)(this, "_fontSizeMap", new Map());
@@ -240359,16 +240377,6 @@ var HOEditorFactory = /*#__PURE__*/function () {
240359
240377
  this._isHideComments = value;
240360
240378
  }
240361
240379
  }
240362
- }, {
240363
- key: "continuousView",
240364
- get: function get() {
240365
- return this._continuousView;
240366
- },
240367
- set: function set(value) {
240368
- if (this._continuousView !== value) {
240369
- this._continuousView = value;
240370
- }
240371
- }
240372
240380
  }, {
240373
240381
  key: "openXmled",
240374
240382
  get: function get() {