hoeditor-web 3.1.63 → 3.1.65-1

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.
@@ -5183,7 +5183,7 @@ var component = (0,componentNormalizer/* default */.Z)(
5183
5183
 
5184
5184
  /***/ }),
5185
5185
 
5186
- /***/ 6675:
5186
+ /***/ 15759:
5187
5187
  /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
5188
5188
 
5189
5189
  "use strict";
@@ -5205,7 +5205,7 @@ var es_string_includes = __webpack_require__(32023);
5205
5205
  var es_regexp_exec = __webpack_require__(74916);
5206
5206
  // EXTERNAL MODULE: ./node_modules/core-js/modules/es.string.replace.js
5207
5207
  var es_string_replace = __webpack_require__(15306);
5208
- ;// 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/dateDialog/DateDialog.vue?vue&type=template&id=0353b7dc&
5208
+ ;// 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/dateDialog/DateDialog.vue?vue&type=template&id=51a11de7&
5209
5209
 
5210
5210
 
5211
5211
 
@@ -5250,7 +5250,13 @@ var render = function render() {
5250
5250
  staticClass: "control-item"
5251
5251
  }, [_c('span', {
5252
5252
  staticClass: "label"
5253
- }, [_vm._v("编号")]), _c('span', {
5253
+ }, [_vm._v("日期编号(唯一值)")]), _c('span', {
5254
+ staticClass: "readonly-value"
5255
+ }, [_vm._v(_vm._s(_vm.dataId))])]), _c('li', {
5256
+ staticClass: "control-item"
5257
+ }, [_c('span', {
5258
+ staticClass: "label"
5259
+ }, [_vm._v("日期ID")]), _c('span', {
5254
5260
  staticClass: "readonly-value"
5255
5261
  }, [_vm._v(_vm._s(_vm.id))])]), _c('li', {
5256
5262
  staticClass: "control-item"
@@ -5474,7 +5480,7 @@ var render = function render() {
5474
5480
  };
5475
5481
  var staticRenderFns = [];
5476
5482
 
5477
- ;// CONCATENATED MODULE: ./src/components/controls/dateDialog/DateDialog.vue?vue&type=template&id=0353b7dc&
5483
+ ;// CONCATENATED MODULE: ./src/components/controls/dateDialog/DateDialog.vue?vue&type=template&id=51a11de7&
5478
5484
 
5479
5485
  // EXTERNAL MODULE: ./node_modules/@babel/runtime/helpers/esm/objectSpread2.js
5480
5486
  var objectSpread2 = __webpack_require__(63442);
@@ -5532,6 +5538,7 @@ var zh_cn = __webpack_require__(83839);
5532
5538
  // 自定义属性
5533
5539
  customPropertyValue: new Object(),
5534
5540
  id: '',
5541
+ dataId: '',
5535
5542
  name: '',
5536
5543
  text: null,
5537
5544
  title: '日期时间',
@@ -5580,6 +5587,7 @@ var zh_cn = __webpack_require__(83839);
5580
5587
  this.innerIdentifier = updateNode.innerIdentifier;
5581
5588
  this.dataMetaIdentifier = updateNode.dataMetaIdentifier;
5582
5589
  this.identifierFormat = updateNode.identifierFormat;
5590
+ this.dataId = updateNode.dataId;
5583
5591
  this.readType = updateNode.readType === 1 ? true : false;
5584
5592
  if ((0,type/* isObject */.Kn)(updateNode.customProperty)) {
5585
5593
  this.customPropertys = updateNode.customProperty;
@@ -5681,10 +5689,10 @@ var zh_cn = __webpack_require__(83839);
5681
5689
  });
5682
5690
  ;// CONCATENATED MODULE: ./src/components/controls/dateDialog/DateDialog.vue?vue&type=script&lang=js&
5683
5691
  /* harmony default export */ var dateDialog_DateDialogvue_type_script_lang_js_ = (DateDialogvue_type_script_lang_js_);
5684
- ;// 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/dateDialog/DateDialog.vue?vue&type=style&index=0&id=0353b7dc&prod&lang=less&
5692
+ ;// 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/dateDialog/DateDialog.vue?vue&type=style&index=0&id=51a11de7&prod&lang=less&
5685
5693
  // extracted by mini-css-extract-plugin
5686
5694
 
5687
- ;// CONCATENATED MODULE: ./src/components/controls/dateDialog/DateDialog.vue?vue&type=style&index=0&id=0353b7dc&prod&lang=less&
5695
+ ;// CONCATENATED MODULE: ./src/components/controls/dateDialog/DateDialog.vue?vue&type=style&index=0&id=51a11de7&prod&lang=less&
5688
5696
 
5689
5697
  // EXTERNAL MODULE: ./node_modules/@vue/vue-loader-v15/lib/runtime/componentNormalizer.js
5690
5698
  var componentNormalizer = __webpack_require__(70713);
@@ -15837,7 +15845,7 @@ var component = (0,componentNormalizer/* default */.Z)(
15837
15845
 
15838
15846
  /***/ }),
15839
15847
 
15840
- /***/ 921:
15848
+ /***/ 24193:
15841
15849
  /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
15842
15850
 
15843
15851
  "use strict";
@@ -15851,7 +15859,10 @@ __webpack_require__.d(__webpack_exports__, {
15851
15859
 
15852
15860
  // EXTERNAL MODULE: ./node_modules/core-js/modules/es.function.name.js
15853
15861
  var es_function_name = __webpack_require__(68309);
15854
- ;// 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/sign/Sign.vue?vue&type=template&id=657c2f70&
15862
+ // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.concat.js
15863
+ var es_array_concat = __webpack_require__(92222);
15864
+ ;// 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/sign/Sign.vue?vue&type=template&id=034775ac&
15865
+
15855
15866
 
15856
15867
  var render = function render() {
15857
15868
  var _vm = this,
@@ -15950,7 +15961,7 @@ var render = function render() {
15950
15961
  },
15951
15962
  expression: "connectChar"
15952
15963
  }
15953
- })], 1) : _vm._e(), _vm.signType >= 4 ? [_c('li', {
15964
+ })], 1) : _vm.signType >= 4 ? [_c('li', {
15954
15965
  staticClass: "control-item"
15955
15966
  }, [_c('span', {
15956
15967
  staticClass: "label"
@@ -16070,7 +16081,7 @@ var render = function render() {
16070
16081
  attrs: {
16071
16082
  "value": "1"
16072
16083
  }
16073
- }, [_vm._v("右")])], 1)], 1) : _vm._e()] : _vm._e(), _vm.signType >= 9 ? [_c('li', {
16084
+ }, [_vm._v("右")])], 1)], 1) : _vm._e()] : _vm.signType >= 9 ? [_c('li', {
16074
16085
  staticClass: "control-item"
16075
16086
  }, [_c('span', {
16076
16087
  staticClass: "label"
@@ -16210,7 +16221,34 @@ var render = function render() {
16210
16221
  attrs: {
16211
16222
  "type": "info-circle"
16212
16223
  }
16213
- })], 2)], 1)] : _vm._e()], 2), _vm.signType >= 9 ? _c('div', {
16224
+ })], 2)], 1)] : _vm.signType == 0 || _vm.signType == 1 ? [_c('li', {
16225
+ staticClass: "control-item"
16226
+ }, [_c('span', {
16227
+ staticClass: "label"
16228
+ }, [_vm._v("关联日期元素")]), _c('a-select', {
16229
+ attrs: {
16230
+ "showSearch": "",
16231
+ "allowClear": "",
16232
+ "getPopupContainer": function getPopupContainer(triggerNode) {
16233
+ return triggerNode.parentNode;
16234
+ },
16235
+ "placeholder": "请选择关联日期时间元素"
16236
+ },
16237
+ model: {
16238
+ value: _vm.associatedElement,
16239
+ callback: function callback($$v) {
16240
+ _vm.associatedElement = $$v;
16241
+ },
16242
+ expression: "associatedElement"
16243
+ }
16244
+ }, _vm._l(_vm.dateTimeList, function (dateTime) {
16245
+ return _c('a-select-option', {
16246
+ key: dateTime.dataId,
16247
+ attrs: {
16248
+ "value": dateTime.dataId
16249
+ }
16250
+ }, [_vm._v(_vm._s("".concat(dateTime.name, "(").concat(dateTime.dataId, ")")))]);
16251
+ }), 1)], 1)] : _vm._e()], 2), _vm.signType >= 9 ? _c('div', {
16214
16252
  staticClass: "section-right"
16215
16253
  }, [_c('div', {
16216
16254
  staticClass: "custom-format-tool-box"
@@ -16312,7 +16350,7 @@ var render = function render() {
16312
16350
  };
16313
16351
  var staticRenderFns = [];
16314
16352
 
16315
- ;// CONCATENATED MODULE: ./src/components/controls/sign/Sign.vue?vue&type=template&id=657c2f70&
16353
+ ;// CONCATENATED MODULE: ./src/components/controls/sign/Sign.vue?vue&type=template&id=034775ac&
16316
16354
 
16317
16355
  // EXTERNAL MODULE: ./node_modules/@babel/runtime/helpers/esm/objectSpread2.js
16318
16356
  var objectSpread2 = __webpack_require__(63442);
@@ -16320,6 +16358,16 @@ var objectSpread2 = __webpack_require__(63442);
16320
16358
  var style = __webpack_require__(94310);
16321
16359
  // EXTERNAL MODULE: ./node_modules/ant-design-vue/es/message/index.js + 3 modules
16322
16360
  var message = __webpack_require__(40735);
16361
+ // EXTERNAL MODULE: ./node_modules/@babel/runtime/helpers/esm/toConsumableArray.js + 3 modules
16362
+ var toConsumableArray = __webpack_require__(61748);
16363
+ // EXTERNAL MODULE: ./node_modules/core-js/modules/es.object.to-string.js
16364
+ var es_object_to_string = __webpack_require__(41539);
16365
+ // EXTERNAL MODULE: ./node_modules/core-js/modules/web.dom-collections.for-each.js
16366
+ var web_dom_collections_for_each = __webpack_require__(54747);
16367
+ // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.includes.js
16368
+ var es_array_includes = __webpack_require__(26699);
16369
+ // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.push.js
16370
+ var es_array_push = __webpack_require__(57658);
16323
16371
  // EXTERNAL MODULE: ./node_modules/core-js/modules/es.regexp.exec.js
16324
16372
  var es_regexp_exec = __webpack_require__(74916);
16325
16373
  // EXTERNAL MODULE: ./node_modules/core-js/modules/es.string.replace.js
@@ -16328,18 +16376,8 @@ var es_string_replace = __webpack_require__(15306);
16328
16376
  var es_json_stringify = __webpack_require__(38862);
16329
16377
  // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.filter.js
16330
16378
  var es_array_filter = __webpack_require__(57327);
16331
- // EXTERNAL MODULE: ./node_modules/core-js/modules/es.object.to-string.js
16332
- var es_object_to_string = __webpack_require__(41539);
16333
- // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.includes.js
16334
- var es_array_includes = __webpack_require__(26699);
16335
16379
  // EXTERNAL MODULE: ./node_modules/core-js/modules/es.string.includes.js
16336
16380
  var es_string_includes = __webpack_require__(32023);
16337
- // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.concat.js
16338
- var es_array_concat = __webpack_require__(92222);
16339
- // EXTERNAL MODULE: ./node_modules/core-js/modules/web.dom-collections.for-each.js
16340
- var web_dom_collections_for_each = __webpack_require__(54747);
16341
- // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.push.js
16342
- var es_array_push = __webpack_require__(57658);
16343
16381
  // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.slice.js
16344
16382
  var es_array_slice = __webpack_require__(47042);
16345
16383
  // EXTERNAL MODULE: ./src/HOEditorFactorys.ts
@@ -16364,6 +16402,7 @@ var SignNode = __webpack_require__(24701);
16364
16402
 
16365
16403
 
16366
16404
 
16405
+
16367
16406
  /* harmony default export */ var Signvue_type_script_lang_js_ = ({
16368
16407
  name: 'Sign',
16369
16408
  props: {
@@ -16395,10 +16434,23 @@ var SignNode = __webpack_require__(24701);
16395
16434
  animationClassNames: 'control-modal-contents sign-modal animation-in',
16396
16435
  isDisplayTitle: false,
16397
16436
  isDisplayTime: false,
16398
- timePosition: '0'
16437
+ timePosition: '0',
16438
+ dateTimeList: [],
16439
+ associatedElement: ''
16399
16440
  };
16400
16441
  },
16401
16442
  mounted: function mounted() {
16443
+ var _this = this;
16444
+ var signs = this.vueController.getAllSignNodeList();
16445
+ var signList = [].concat((0,toConsumableArray/* default */.Z)(signs.sign), (0,toConsumableArray/* default */.Z)(signs.patientSign));
16446
+ var associatedElementList = [];
16447
+ signList.forEach(function (v) {
16448
+ if (v.associatedElement && !associatedElementList.includes(v.associatedElement)) {
16449
+ associatedElementList.push(v.associatedElement);
16450
+ }
16451
+ });
16452
+ var list = this.vueController.getAllElements();
16453
+ this.dateTimeList = [];
16402
16454
  if (this.controlStatus === 'update') {
16403
16455
  var node = this.getCurrentSelectNode();
16404
16456
  if (node) {
@@ -16430,7 +16482,21 @@ var SignNode = __webpack_require__(24701);
16430
16482
  this.isDisplayTitle = ((_node$otherProperties = node.otherProperties) === null || _node$otherProperties === void 0 ? void 0 : _node$otherProperties.isDisplayTitle) === 'true' | ((_node$otherProperties2 = node.otherProperties) === null || _node$otherProperties2 === void 0 ? void 0 : _node$otherProperties2.isDisplayTitle) === true ? true : false;
16431
16483
  this.isDisplayTime = ((_node$otherProperties3 = node.otherProperties) === null || _node$otherProperties3 === void 0 ? void 0 : _node$otherProperties3.isDisplayTime) === 'true' | ((_node$otherProperties4 = node.otherProperties) === null || _node$otherProperties4 === void 0 ? void 0 : _node$otherProperties4.isDisplayTime) === true ? true : false;
16432
16484
  this.timePosition = ((_node$otherProperties5 = node.otherProperties) === null || _node$otherProperties5 === void 0 ? void 0 : _node$otherProperties5.timePosition) == '1' ? '1' : '0';
16485
+ this.associatedElement = node.associatedElement ? node.associatedElement : '';
16486
+ list.forEach(function (v) {
16487
+ if (v.nodeType == 8 && (!associatedElementList.includes(v.dataId) || node.associatedElement == v.dataId)) {
16488
+ // 只取日期元素
16489
+ _this.dateTimeList.push(v);
16490
+ }
16491
+ });
16433
16492
  }
16493
+ } else {
16494
+ list.forEach(function (v) {
16495
+ if (v.nodeType == 8 && !associatedElementList.includes(v.dataId)) {
16496
+ // 只取日期元素
16497
+ _this.dateTimeList.push(v);
16498
+ }
16499
+ });
16434
16500
  }
16435
16501
  },
16436
16502
  methods: {
@@ -16501,18 +16567,18 @@ var SignNode = __webpack_require__(24701);
16501
16567
  if (this.controlStatus === 'add') {
16502
16568
  if (this.signType === 9) {
16503
16569
  // 自定义多人签名
16504
- this.vueController.insertEmptySignNode(this.name ? this.name : '自定义医生签名', 1, this.signFormat, this.signTimeFormat, customProperty, this.connectMode, this.isFront, this.allowEditSignTime, 0, '', {});
16570
+ this.vueController.insertEmptySignNode(this.name ? this.name : '自定义医生签名', 1, this.signFormat, this.signTimeFormat, customProperty, this.connectMode, this.isFront, this.allowEditSignTime, 0, '', {}, this.associatedElement);
16505
16571
  } else if (this.signType === 2) {
16506
16572
  // 自定义多人签名
16507
- this.vueController.insertEmptySignNode(this.name ? this.name : '自定义多人签名(默认带出职称)', 0, '', '', customProperty, '', undefined, undefined, this.signType, this.connectChar, {});
16573
+ this.vueController.insertEmptySignNode(this.name ? this.name : '自定义多人签名(默认带出职称)', 0, '', '', customProperty, '', undefined, undefined, this.signType, this.connectChar, {}, this.associatedElement);
16508
16574
  } else if (this.signType === 3) {
16509
16575
  // 自定义多人签名
16510
- this.vueController.insertEmptySignNode(this.name ? this.name : '自定义多人签名(默认带出职称和日期)', 0, '', '', customProperty, '', undefined, undefined, this.signType, this.connectChar, {});
16576
+ this.vueController.insertEmptySignNode(this.name ? this.name : '自定义多人签名(默认带出职称和日期)', 0, '', '', customProperty, '', undefined, undefined, this.signType, this.connectChar, {}, this.associatedElement);
16511
16577
  } else if (this.signType === 4) {
16512
16578
  // 自定义多人签名
16513
16579
  this.vueController.insertEmptySignNode(this.name ? this.name : '自定义多人签名(职称,连接符可选)', 0, '', this.signTimeFormat, customProperty, this.connectMode, undefined, undefined, this.signType, this.connectChar, (0,objectSpread2/* default */.Z)({
16514
16580
  isDisplayTitle: this.isDisplayTitle
16515
- }, otherProperty));
16581
+ }, otherProperty), this.associatedElement);
16516
16582
  } else {
16517
16583
  var name = this.name ? this.name : this.signType == 1 ? '患者签名' : '医生签名';
16518
16584
  this.vueController.insertEmptySignNode(name, 0, '', '', customProperty, '', undefined, undefined, this.signType, '', {});
@@ -16525,7 +16591,7 @@ var SignNode = __webpack_require__(24701);
16525
16591
  var otherProperties = (0,objectSpread2/* default */.Z)((0,objectSpread2/* default */.Z)({}, node.otherProperties), {}, {
16526
16592
  isDisplayTitle: this.isDisplayTitle
16527
16593
  }, otherProperty);
16528
- this.vueController.updateEmptySignNode(node, _name, attribute, this.connectChar, signType, this.signFormat, this.signor, '', this.signTimeFormat, this.connectMode, otherProperties, this.isFront);
16594
+ this.vueController.updateEmptySignNode(node, _name, attribute, this.connectChar, signType, this.signFormat, this.signor, '', this.signTimeFormat, this.connectMode, otherProperties, this.isFront, this.associatedElement);
16529
16595
  }
16530
16596
  this.handleClose();
16531
16597
  },
@@ -16537,10 +16603,10 @@ var SignNode = __webpack_require__(24701);
16537
16603
  });
16538
16604
  ;// CONCATENATED MODULE: ./src/components/controls/sign/Sign.vue?vue&type=script&lang=js&
16539
16605
  /* harmony default export */ var sign_Signvue_type_script_lang_js_ = (Signvue_type_script_lang_js_);
16540
- ;// 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/sign/Sign.vue?vue&type=style&index=0&id=657c2f70&prod&lang=less&
16606
+ ;// 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/sign/Sign.vue?vue&type=style&index=0&id=034775ac&prod&lang=less&
16541
16607
  // extracted by mini-css-extract-plugin
16542
16608
 
16543
- ;// CONCATENATED MODULE: ./src/components/controls/sign/Sign.vue?vue&type=style&index=0&id=657c2f70&prod&lang=less&
16609
+ ;// CONCATENATED MODULE: ./src/components/controls/sign/Sign.vue?vue&type=style&index=0&id=034775ac&prod&lang=less&
16544
16610
 
16545
16611
  // EXTERNAL MODULE: ./node_modules/@vue/vue-loader-v15/lib/runtime/componentNormalizer.js
16546
16612
  var componentNormalizer = __webpack_require__(70713);
@@ -44886,7 +44952,7 @@ var DocController = /*#__PURE__*/function () {
44886
44952
  sPath = hoEditorFactory.docTree.getNodeLastPath(node);
44887
44953
  }
44888
44954
  }
44889
- var newSignNode = new _treeNode_SignNode__WEBPACK_IMPORTED_MODULE_85__/* .SignNode */ .N(this._hoEditorFactoryID, node.rootNodes, node.parentNode, _treeNode_BaseNode__WEBPACK_IMPORTED_MODULE_26__/* .NodeType */ .Jq.ntSign, 2, type, name, node.signType, node.signFormat, signor, signTime, node.signTimeFormat, imgSrc, imgWidth, imgHeight, customProperty, false, node.styleIndex, node.connectMode, type == 1 && node.signType == 1 ? true : node.isFront, node.allowEditSignTime, fingerPrintSrc, fingerPosition, node.attribute, node.connectChar, otherProperties ? otherProperties : node.otherProperties);
44955
+ var newSignNode = new _treeNode_SignNode__WEBPACK_IMPORTED_MODULE_85__/* .SignNode */ .N(this._hoEditorFactoryID, node.rootNodes, node.parentNode, _treeNode_BaseNode__WEBPACK_IMPORTED_MODULE_26__/* .NodeType */ .Jq.ntSign, 2, type, name, node.signType, node.signFormat, signor, signTime, node.signTimeFormat, imgSrc, imgWidth, imgHeight, customProperty, false, node.styleIndex, node.connectMode, type == 1 && node.signType == 1 ? true : node.isFront, node.allowEditSignTime, fingerPrintSrc, fingerPosition, node.attribute, node.connectChar, otherProperties ? otherProperties : node.otherProperties, '', node.associatedElement);
44890
44956
  //插入该表达式节点
44891
44957
  hoEditorFactory.undoService.begin();
44892
44958
  hoEditorFactory.undoService.add(new _undoRedo_NodeInsertUndoUnit__WEBPACK_IMPORTED_MODULE_27__/* .NodeInsertUndoUnit */ .R(this._hoEditorFactoryID, sPath, newSignNode));
@@ -44906,7 +44972,7 @@ var DocController = /*#__PURE__*/function () {
44906
44972
  var path1 = sign1.getNodePath();
44907
44973
  var path2 = node.getNodePath();
44908
44974
  var result = _NodePosition__WEBPACK_IMPORTED_MODULE_84__/* .NodePosition */ .F.treePathCompare(path1, path2);
44909
- if (result < 0) {
44975
+ if (result <= 0) {
44910
44976
  hoEditorFactory.structureConvert._superiorSign[0] = node;
44911
44977
  hoEditorFactory.vueController.hiddenMask(false);
44912
44978
  }
@@ -67604,7 +67670,7 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
67604
67670
  /*
67605
67671
  * @Author: your name
67606
67672
  * @Date: 2020-11-03 15:17:54
67607
- * @LastEditTime: 2024-01-17 11:31:50
67673
+ * @LastEditTime: 2024-01-29 11:40:48
67608
67674
  * @LastEditors: liyanan 2441631434@qq.com
67609
67675
  * @Description: In User Settings Edit
67610
67676
  * @FilePath: \hoeditor-web\src\editor\dom\treeNode\TextInputFieldNode.ts
@@ -68897,11 +68963,13 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
68897
68963
  hoEditorFactory.docTree.curDomRange.setSamePath(startPath);
68898
68964
  }
68899
68965
  if (!(text === '')) {
68900
- _context2.next = 25;
68966
+ _context2.next = 26;
68901
68967
  break;
68902
68968
  }
68903
68969
  this._canModifyContent = oldValue;
68904
- hoEditorFactory.docController.deleteRange(aRange, true, 'update');
68970
+ _context2.next = 21;
68971
+ return hoEditorFactory.docController.deleteRange(aRange, true, 'update');
68972
+ case 21:
68905
68973
  // this._childNodes.splice(1, this._childNodes.length - 2);
68906
68974
  // const markNode = new MarkNode(this._hoEditorFactoryID, this.rootNodes, this, NodeType.ntText, this.labelText, hoEditorFactory.docTree.curStyleIndex, MarkNodeType.mtContent);
68907
68975
  // this._childNodes.splice(1, 0, markNode);
@@ -68916,10 +68984,10 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
68916
68984
  hoEditorFactory.drawTree.editor.input.focus();
68917
68985
  hoEditorFactory.drawTree.moveCaretToPath(startPath);
68918
68986
  return _context2.abrupt("return");
68919
- case 25:
68920
- _context2.next = 27;
68987
+ case 26:
68988
+ _context2.next = 28;
68921
68989
  return hoEditorFactory.docController.insertPlainTextAfterPath(startPath, text, oldValue);
68922
- case 27:
68990
+ case 28:
68923
68991
  case "end":
68924
68992
  return _context2.stop();
68925
68993
  }
@@ -88398,7 +88466,7 @@ var DrawTree = /*#__PURE__*/function () {
88398
88466
  var prevPara = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this._hoEditorFactoryID).docTree.getSameRectPrevParanode(paraNode);
88399
88467
  var dTop = 0;
88400
88468
  // const pNode = paraNode.parentNode;
88401
- if (!prevPara) {
88469
+ if (!prevPara || prevPara.customProperty && prevPara.customProperty.hidden == "true") {
88402
88470
  // if (pNode) {
88403
88471
  // if (
88404
88472
  // pNode instanceof CellNode &&
@@ -90615,7 +90683,7 @@ var NodeDeleteUndoUnit = /*#__PURE__*/function (_UndoInfo) {
90615
90683
  key: "doRedo",
90616
90684
  value: function () {
90617
90685
  var _doRedo = (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_asyncToGenerator_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)( /*#__PURE__*/(0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_regeneratorRuntime_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z)().mark(function _callee2() {
90618
- var strPath, hoeditorFactory, np, siblings, currNode, parentPath, getSlibs, index, pre, startPath, changeEvent, result, toPath;
90686
+ var strPath, hoeditorFactory, np, siblings, currNode, parentPath, getSlibs, index, pre, prevSibNode, prePara, paraEndPath, startPath, changeEvent, result, toPath;
90619
90687
  return (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_regeneratorRuntime_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z)().wrap(function _callee2$(_context2) {
90620
90688
  while (1) switch (_context2.prev = _context2.next) {
90621
90689
  case 0:
@@ -90681,6 +90749,34 @@ var NodeDeleteUndoUnit = /*#__PURE__*/function (_UndoInfo) {
90681
90749
  case 16:
90682
90750
  index = siblings.indexOf(currNode);
90683
90751
  pre = index == 0 ? null : siblings[index - 1];
90752
+ prevSibNode = currNode.prevSibling();
90753
+ if (!prevSibNode) {
90754
+ _context2.next = 30;
90755
+ break;
90756
+ }
90757
+ prePara = hoeditorFactory.docTree.getNodeParaNode(prevSibNode);
90758
+ if (!(prePara.customProperty && prePara.customProperty.hidden == "true")) {
90759
+ _context2.next = 30;
90760
+ break;
90761
+ }
90762
+ case 22:
90763
+ prePara = hoeditorFactory.docTree.getSameRectPrevParanode(prePara);
90764
+ if (!(prePara && prePara.customProperty && prePara.customProperty.hidden == "true")) {
90765
+ _context2.next = 26;
90766
+ break;
90767
+ }
90768
+ _context2.next = 29;
90769
+ break;
90770
+ case 26:
90771
+ paraEndPath = prePara.getParagraphLastNodePath();
90772
+ pre = hoeditorFactory.docTree.findNodePositionByPath(paraEndPath).node;
90773
+ return _context2.abrupt("break", 30);
90774
+ case 29:
90775
+ if (prePara) {
90776
+ _context2.next = 22;
90777
+ break;
90778
+ }
90779
+ case 30:
90684
90780
  startPath = pre ? hoeditorFactory.docTree.getNodeLastPath(pre) : currNode.rootPath + '/0';
90685
90781
  changeEvent = new _events_NodeChangeEvent__WEBPACK_IMPORTED_MODULE_14__/* .NodeChangeEvent */ .G(this._hoEditorFactoryID, _editor_dom_DocTree__WEBPACK_IMPORTED_MODULE_13__/* .DocAction */ .gk.daUndoInsert, startPath, "");
90686
90782
  changeEvent.oldEndPath = hoeditorFactory.docTree.getNodeLastPath(currNode);
@@ -90689,7 +90785,7 @@ var NodeDeleteUndoUnit = /*#__PURE__*/function (_UndoInfo) {
90689
90785
  result = hoeditorFactory.docTree.deleteNode(currNode, this._operType);
90690
90786
  toPath = changeEvent.beforeChangePath;
90691
90787
  if (!result) {
90692
- _context2.next = 31;
90788
+ _context2.next = 43;
90693
90789
  break;
90694
90790
  }
90695
90791
  //const next = index == siblings.length ? null : siblings[index];
@@ -90697,26 +90793,26 @@ var NodeDeleteUndoUnit = /*#__PURE__*/function (_UndoInfo) {
90697
90793
  // ? hoeditorFactory.docTree.getNodeLastPath(next)
90698
90794
  // : changeEvent.beforeChangePath;
90699
90795
  changeEvent.afterChangePath = toPath;
90700
- _context2.next = 28;
90796
+ _context2.next = 40;
90701
90797
  return hoeditorFactory.docTree.change(changeEvent);
90702
- case 28:
90798
+ case 40:
90703
90799
  toPath = changeEvent.beforeChangePath;
90704
- _context2.next = 32;
90800
+ _context2.next = 44;
90705
90801
  break;
90706
- case 31:
90802
+ case 43:
90707
90803
  toPath = this.strBeforePath;
90708
- case 32:
90804
+ case 44:
90709
90805
  hoeditorFactory.docTree.curDomRange.setSamePath(toPath);
90710
90806
  hoeditorFactory.drawTree.moveCaretToPath(toPath);
90711
90807
  this.strBeforePath = pre ? hoeditorFactory.docTree.getNodeLastPath(pre) : parentPath;
90712
- _context2.next = 37;
90808
+ _context2.next = 49;
90713
90809
  return this.ParentRepaint();
90714
- case 37:
90810
+ case 49:
90715
90811
  if (currNode instanceof _dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_19__/* .SignNode */ .N && (hoeditorFactory.drawTree.paintStatus == _draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_20__/* .PaintState */ .Dh.psEdit || hoeditorFactory.drawTree.paintStatus == _draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_20__/* .PaintState */ .Dh.psReview)) {
90716
90812
  hoeditorFactory.undoService.stack.splice(hoeditorFactory.undoService.stack.length - 1, 1);
90717
90813
  hoeditorFactory.undoService._position--;
90718
90814
  }
90719
- case 38:
90815
+ case 50:
90720
90816
  case "end":
90721
90817
  return _context2.stop();
90722
90818
  }
@@ -91671,22 +91767,22 @@ var NodeStyleUndoUnit = /*#__PURE__*/function () {
91671
91767
  /* harmony import */ var _dom_treeNode_TextNode__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(27198);
91672
91768
  /* harmony import */ var _events_NodeChangeEvent__WEBPACK_IMPORTED_MODULE_19__ = __webpack_require__(2613);
91673
91769
  /* harmony import */ var _dom_DomRange__WEBPACK_IMPORTED_MODULE_20__ = __webpack_require__(94639);
91674
- /* harmony import */ var _TextNodeSplitUndoUnit__WEBPACK_IMPORTED_MODULE_21__ = __webpack_require__(59057);
91675
- /* harmony import */ var _events_SelectionChangeEvent__WEBPACK_IMPORTED_MODULE_22__ = __webpack_require__(931);
91676
- /* harmony import */ var _UndoService__WEBPACK_IMPORTED_MODULE_23__ = __webpack_require__(19229);
91677
- /* harmony import */ var _dom_treeNode_TextInputFieldNode__WEBPACK_IMPORTED_MODULE_24__ = __webpack_require__(90161);
91678
- /* harmony import */ var _dom_treeNode_MarkNode__WEBPACK_IMPORTED_MODULE_25__ = __webpack_require__(57727);
91679
- /* harmony import */ var _events_Exception__WEBPACK_IMPORTED_MODULE_26__ = __webpack_require__(8277);
91680
- /* harmony import */ var _dom_treeNode_ParagraphNode__WEBPACK_IMPORTED_MODULE_27__ = __webpack_require__(67945);
91681
- /* harmony import */ var _dom_treeNode_CellNode__WEBPACK_IMPORTED_MODULE_28__ = __webpack_require__(68598);
91682
- /* harmony import */ var _draw_SelectRange__WEBPACK_IMPORTED_MODULE_29__ = __webpack_require__(53901);
91683
- /* harmony import */ var _dom_treeNode_TableNode__WEBPACK_IMPORTED_MODULE_30__ = __webpack_require__(5010);
91684
- /* harmony import */ var _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_31__ = __webpack_require__(74089);
91685
- /* harmony import */ var _dom_treeNode_ControlNode__WEBPACK_IMPORTED_MODULE_32__ = __webpack_require__(91105);
91686
- /* harmony import */ var _dom_treeNode_RadioAndCheckBoxNode__WEBPACK_IMPORTED_MODULE_33__ = __webpack_require__(99152);
91687
- /* harmony import */ var _dom_treeNode_DateTimeNode__WEBPACK_IMPORTED_MODULE_34__ = __webpack_require__(92501);
91688
- /* harmony import */ var _dom_treeNode_DownListNode__WEBPACK_IMPORTED_MODULE_35__ = __webpack_require__(45712);
91689
- /* harmony import */ var _NodeInsertUndoUnit__WEBPACK_IMPORTED_MODULE_36__ = __webpack_require__(64465);
91770
+ /* harmony import */ var _dom_treeNode_BaseNode__WEBPACK_IMPORTED_MODULE_21__ = __webpack_require__(62358);
91771
+ /* harmony import */ var _TextNodeSplitUndoUnit__WEBPACK_IMPORTED_MODULE_22__ = __webpack_require__(59057);
91772
+ /* harmony import */ var _events_SelectionChangeEvent__WEBPACK_IMPORTED_MODULE_23__ = __webpack_require__(931);
91773
+ /* harmony import */ var _UndoService__WEBPACK_IMPORTED_MODULE_24__ = __webpack_require__(19229);
91774
+ /* harmony import */ var _dom_treeNode_TextInputFieldNode__WEBPACK_IMPORTED_MODULE_25__ = __webpack_require__(90161);
91775
+ /* harmony import */ var _dom_treeNode_MarkNode__WEBPACK_IMPORTED_MODULE_26__ = __webpack_require__(57727);
91776
+ /* harmony import */ var _events_Exception__WEBPACK_IMPORTED_MODULE_27__ = __webpack_require__(8277);
91777
+ /* harmony import */ var _dom_treeNode_ParagraphNode__WEBPACK_IMPORTED_MODULE_28__ = __webpack_require__(67945);
91778
+ /* harmony import */ var _dom_treeNode_CellNode__WEBPACK_IMPORTED_MODULE_29__ = __webpack_require__(68598);
91779
+ /* harmony import */ var _draw_SelectRange__WEBPACK_IMPORTED_MODULE_30__ = __webpack_require__(53901);
91780
+ /* harmony import */ var _dom_treeNode_TableNode__WEBPACK_IMPORTED_MODULE_31__ = __webpack_require__(5010);
91781
+ /* harmony import */ var _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_32__ = __webpack_require__(74089);
91782
+ /* harmony import */ var _dom_treeNode_ControlNode__WEBPACK_IMPORTED_MODULE_33__ = __webpack_require__(91105);
91783
+ /* harmony import */ var _dom_treeNode_RadioAndCheckBoxNode__WEBPACK_IMPORTED_MODULE_34__ = __webpack_require__(99152);
91784
+ /* harmony import */ var _dom_treeNode_DateTimeNode__WEBPACK_IMPORTED_MODULE_35__ = __webpack_require__(92501);
91785
+ /* harmony import */ var _dom_treeNode_DownListNode__WEBPACK_IMPORTED_MODULE_36__ = __webpack_require__(45712);
91690
91786
  /* harmony import */ var _dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_37__ = __webpack_require__(24701);
91691
91787
  /* harmony import */ var _dom_NodePosition__WEBPACK_IMPORTED_MODULE_38__ = __webpack_require__(42921);
91692
91788
  /* harmony import */ var _dom_treeNode_TableFormula__WEBPACK_IMPORTED_MODULE_39__ = __webpack_require__(90832);
@@ -91767,7 +91863,7 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
91767
91863
  this._startPath = startPath;
91768
91864
  this._endPath = endPath;
91769
91865
  this._isForceDelete = isForceDelete;
91770
- this._undo = new _UndoService__WEBPACK_IMPORTED_MODULE_23__/* .UndoService */ .O(this._hoEditorFactoryID); //hoEditorFactory.undoService;
91866
+ this._undo = new _UndoService__WEBPACK_IMPORTED_MODULE_24__/* .UndoService */ .O(this._hoEditorFactoryID); //hoEditorFactory.undoService;
91771
91867
  this._undoNodes = new Map();
91772
91868
  var aDomRange = new _dom_DomRange__WEBPACK_IMPORTED_MODULE_20__/* .DomRange */ .a(hoEditorFactoryID, startPath, endPath).normalize();
91773
91869
  var _aDomRange$inSameTabl = aDomRange.inSameTable(),
@@ -91776,7 +91872,7 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
91776
91872
  aTable = _aDomRange$inSameTabl2[1];
91777
91873
  this._bSameTable = bSametable;
91778
91874
  this._opTime = new Date();
91779
- this._affectText = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_31__/* .HOEditorFactorys */ .b.instance().getFactory(hoEditorFactoryID).vueController.getRangeText(aDomRange);
91875
+ this._affectText = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_32__/* .HOEditorFactorys */ .b.instance().getFactory(hoEditorFactoryID).vueController.getRangeText(aDomRange);
91780
91876
  }
91781
91877
  (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_5__/* ["default"] */ .Z)(NodesDeleteUndoUnit, [{
91782
91878
  key: "undo",
@@ -91795,10 +91891,10 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
91795
91891
  arr = Array.from(this._undoNodes).reverse();
91796
91892
  i = 0;
91797
91893
  prevIsTable = false;
91798
- hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_31__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID);
91894
+ hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_32__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID);
91799
91895
  while (i < arr.length) {
91800
91896
  value = arr[i];
91801
- if (value[1] instanceof _dom_treeNode_CellNode__WEBPACK_IMPORTED_MODULE_28__/* .CellNode */ .D) {
91897
+ if (value[1] instanceof _dom_treeNode_CellNode__WEBPACK_IMPORTED_MODULE_29__/* .CellNode */ .D) {
91802
91898
  // (value[1] as CellNode).redrawCell(true, DocAction.daInsert);
91803
91899
  } else {
91804
91900
  if (prevIsTable) {
@@ -91806,12 +91902,12 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
91806
91902
  } else {
91807
91903
  hoEditorFactory.docTree.insertNodeAfterPath(value[0], value[1]);
91808
91904
  }
91809
- if (value[1] instanceof _dom_treeNode_TableNode__WEBPACK_IMPORTED_MODULE_30__/* .TableNode */ .Fh) {
91905
+ if (value[1] instanceof _dom_treeNode_TableNode__WEBPACK_IMPORTED_MODULE_31__/* .TableNode */ .Fh) {
91810
91906
  prevIsTable = true;
91811
91907
  // value[1].clearDrawNodes();
91812
91908
  // value[1].drawTable.drawPageTables.length = 0;
91813
91909
  np = hoEditorFactory.docTree.findNodePositionByPath(value[0]);
91814
- if (np && np.node && np.node instanceof _dom_treeNode_ParagraphNode__WEBPACK_IMPORTED_MODULE_27__/* .ParagraphNode */ .C) value[1].drawTable.paragraphNode = np.node;
91910
+ if (np && np.node && np.node instanceof _dom_treeNode_ParagraphNode__WEBPACK_IMPORTED_MODULE_28__/* .ParagraphNode */ .C) value[1].drawTable.paragraphNode = np.node;
91815
91911
  } else {
91816
91912
  prevIsTable = false;
91817
91913
  }
@@ -91850,7 +91946,7 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
91850
91946
  //选中范围变化事件
91851
91947
  newRange = new _dom_DomRange__WEBPACK_IMPORTED_MODULE_20__/* .DomRange */ .a(this._hoEditorFactoryID, this._startPath, this._endPath).normalize();
91852
91948
  hoEditorFactory.docTree.curDomRange = newRange;
91853
- cgEvent = new _events_SelectionChangeEvent__WEBPACK_IMPORTED_MODULE_22__/* .SelectionChangeEvent */ .r(hoEditorFactory.docTree.curDomRange, newRange);
91949
+ cgEvent = new _events_SelectionChangeEvent__WEBPACK_IMPORTED_MODULE_23__/* .SelectionChangeEvent */ .r(hoEditorFactory.docTree.curDomRange, newRange);
91854
91950
  hoEditorFactory.docTree.selectChange(cgEvent);
91855
91951
  //光标定位
91856
91952
  hoEditorFactory.drawTree.moveCaretToPath(newRange.endPath);
@@ -91877,7 +91973,7 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
91877
91973
  }, {
91878
91974
  key: "MoveCaret",
91879
91975
  value: function MoveCaret(path) {
91880
- _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_31__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID).drawTree.moveCaretToPath(path);
91976
+ _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_32__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID).drawTree.moveCaretToPath(path);
91881
91977
  }
91882
91978
  /**
91883
91979
  * @description 返回前面一个node的开始结束选中范围 文本节点时候返回文本中单个文字的选中范围
@@ -91887,20 +91983,20 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
91887
91983
  key: "getPrevNodeDomRange",
91888
91984
  value: function getPrevNodeDomRange(Anode) {
91889
91985
  var spath;
91890
- var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_31__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID);
91986
+ var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_32__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID);
91891
91987
  var prev = Anode.prevSibling();
91892
91988
  if (!prev) {
91893
- throw _events_Exception__WEBPACK_IMPORTED_MODULE_26__/* .Exception */ .P.NodeNotFound();
91989
+ throw _events_Exception__WEBPACK_IMPORTED_MODULE_27__/* .Exception */ .P.NodeNotFound();
91894
91990
  }
91895
91991
  var epath = hoEditorFactory.docTree.getNodeLastPath(prev);
91896
91992
  if (prev instanceof _dom_treeNode_TextNode__WEBPACK_IMPORTED_MODULE_18__/* .TextNode */ .R) {
91897
91993
  spath = prev.prevPath(epath);
91898
- } else if (prev instanceof _dom_treeNode_ParagraphNode__WEBPACK_IMPORTED_MODULE_27__/* .ParagraphNode */ .C) {
91994
+ } else if (prev instanceof _dom_treeNode_ParagraphNode__WEBPACK_IMPORTED_MODULE_28__/* .ParagraphNode */ .C) {
91899
91995
  spath = epath;
91900
91996
  } else {
91901
91997
  var prev1 = prev.previousLeaf();
91902
91998
  if (!prev1) {
91903
- throw _events_Exception__WEBPACK_IMPORTED_MODULE_26__/* .Exception */ .P.NodeNotFound();
91999
+ throw _events_Exception__WEBPACK_IMPORTED_MODULE_27__/* .Exception */ .P.NodeNotFound();
91904
92000
  }
91905
92001
  spath = hoEditorFactory.docTree.getNodeLastPath(prev1);
91906
92002
  }
@@ -91923,14 +92019,14 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
91923
92019
  return 0;
91924
92020
  }
91925
92021
  var newDomRange = new _dom_DomRange__WEBPACK_IMPORTED_MODULE_20__/* .DomRange */ .a(this._hoEditorFactoryID, this._tmp.start, this._tmp.end);
91926
- if (!newDomRange.npStart.node) throw _events_Exception__WEBPACK_IMPORTED_MODULE_26__/* .Exception */ .P.NodeNotFound();
91927
- if (!newDomRange.npEnd.node) throw _events_Exception__WEBPACK_IMPORTED_MODULE_26__/* .Exception */ .P.NodeNotFound();
92022
+ if (!newDomRange.npStart.node) throw _events_Exception__WEBPACK_IMPORTED_MODULE_27__/* .Exception */ .P.NodeNotFound();
92023
+ if (!newDomRange.npEnd.node) throw _events_Exception__WEBPACK_IMPORTED_MODULE_27__/* .Exception */ .P.NodeNotFound();
91928
92024
  var aStart = newDomRange.npStart.node;
91929
92025
  if (currRange.startMainNode) {
91930
92026
  aStart = currRange.startMainNode;
91931
92027
  }
91932
92028
  var nodes = _dom_DomRange__WEBPACK_IMPORTED_MODULE_20__/* .DomRange */ .a.getSelectDomNodesForDelete(this._hoEditorFactoryID, this._tmp.start, this._tmp.end);
91933
- var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_31__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID);
92029
+ var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_32__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID);
91934
92030
  // this.DeleteBaseCombineNodeContent(
91935
92031
  // newDomRange,
91936
92032
  // newDomRange.npEnd.node,
@@ -92058,15 +92154,15 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
92058
92154
  *
92059
92155
  * @param Anode
92060
92156
  */
92061
- var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_31__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID);
92157
+ var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_32__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID);
92062
92158
  var forMarkNode = function forMarkNode(Anode) {
92063
- if (Anode.parentNode instanceof _dom_treeNode_TextInputFieldNode__WEBPACK_IMPORTED_MODULE_24__/* .TextInputFieldNode */ .re) {
92159
+ if (Anode.parentNode instanceof _dom_treeNode_TextInputFieldNode__WEBPACK_IMPORTED_MODULE_25__/* .TextInputFieldNode */ .re) {
92064
92160
  var pTINode = Anode.parentNode;
92065
92161
  if (pTINode.isEmpty() || !pTINode.canModifyContent) {
92066
92162
  //为空 或者 不允许编辑
92067
92163
  var tmp = pTINode.previousLeaf();
92068
92164
  if (!tmp) {
92069
- throw _events_Exception__WEBPACK_IMPORTED_MODULE_26__/* .Exception */ .P.NodeNotFound();
92165
+ throw _events_Exception__WEBPACK_IMPORTED_MODULE_27__/* .Exception */ .P.NodeNotFound();
92070
92166
  }
92071
92167
  info[0] = 0;
92072
92168
  info[1] = new _dom_DomRange__WEBPACK_IMPORTED_MODULE_20__/* .DomRange */ .a(_this._hoEditorFactoryID, hoEditorFactory.docTree.getNodeLastPath(tmp), hoEditorFactory.docTree.getNodeLastPath(pTINode));
@@ -92092,20 +92188,20 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
92092
92188
  }
92093
92189
  };
92094
92190
  if (!(s && e)) {
92095
- throw _events_Exception__WEBPACK_IMPORTED_MODULE_26__/* .Exception */ .P.NodeNotFound();
92191
+ throw _events_Exception__WEBPACK_IMPORTED_MODULE_27__/* .Exception */ .P.NodeNotFound();
92096
92192
  }
92097
92193
  this._tmp.start = Arange.startPath;
92098
92194
  this._tmp.end = Arange.endPath;
92099
92195
  var spnode = s.parentNode;
92100
92196
  var epnode = e.parentNode;
92101
92197
  var pnode = epnode;
92102
- if (spnode instanceof _dom_treeNode_TextInputFieldNode__WEBPACK_IMPORTED_MODULE_24__/* .TextInputFieldNode */ .re && epnode instanceof _dom_treeNode_TextInputFieldNode__WEBPACK_IMPORTED_MODULE_24__/* .TextInputFieldNode */ .re && spnode != epnode) {
92198
+ if (spnode instanceof _dom_treeNode_TextInputFieldNode__WEBPACK_IMPORTED_MODULE_25__/* .TextInputFieldNode */ .re && epnode instanceof _dom_treeNode_TextInputFieldNode__WEBPACK_IMPORTED_MODULE_25__/* .TextInputFieldNode */ .re && spnode != epnode) {
92103
92199
  var result = _dom_NodePosition__WEBPACK_IMPORTED_MODULE_38__/* .NodePosition */ .F.nodePositionCompare(spnode.StartMarkNode, epnode.StartMarkNode);
92104
92200
  if (result < 0) {
92105
92201
  pnode = spnode;
92106
92202
  }
92107
92203
  }
92108
- if (this._isForceDelete && pnode instanceof _dom_treeNode_TextInputFieldNode__WEBPACK_IMPORTED_MODULE_24__/* .TextInputFieldNode */ .re && pnode.inputFieldType === 1 && (_pnode$downListProper = pnode.downListProperty.listItems) !== null && _pnode$downListProper !== void 0 && _pnode$downListProper.includes("<元素>")) {
92204
+ if (this._isForceDelete && pnode instanceof _dom_treeNode_TextInputFieldNode__WEBPACK_IMPORTED_MODULE_25__/* .TextInputFieldNode */ .re && pnode.inputFieldType === 1 && (_pnode$downListProper = pnode.downListProperty.listItems) !== null && _pnode$downListProper !== void 0 && _pnode$downListProper.includes("<元素>")) {
92109
92205
  this._tmp.start = pnode.StartMarkNode.getNodePath();
92110
92206
  this._tmp.end = hoEditorFactory.docTree.getNodeLastPath(pnode.EndMarkNode.previousLeaf());
92111
92207
  return true;
@@ -92113,12 +92209,12 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
92113
92209
  if (s === e) {
92114
92210
  if (s instanceof _dom_treeNode_TextNode__WEBPACK_IMPORTED_MODULE_18__/* .TextNode */ .R) {
92115
92211
  // HOEditorFactorys.instance().getFactory(this._hoEditorFactoryID).docTree.curDomRange = Arange;
92116
- var tmp = new _TextNodeSplitUndoUnit__WEBPACK_IMPORTED_MODULE_21__/* .TextNodeSplitUndoUnit */ .W(this._hoEditorFactoryID, Arange.startPath, s, Arange);
92212
+ var tmp = new _TextNodeSplitUndoUnit__WEBPACK_IMPORTED_MODULE_22__/* .TextNodeSplitUndoUnit */ .W(this._hoEditorFactoryID, Arange.startPath, s, Arange);
92117
92213
  this._undo.begin();
92118
92214
  this._undo.add(tmp);
92119
92215
  this._undo.commit();
92120
92216
  this._tmp.end = hoEditorFactory.docTree.getNodeLastPath(tmp.theNode);
92121
- } else if (s instanceof _dom_treeNode_MarkNode__WEBPACK_IMPORTED_MODULE_25__/* .MarkNode */ .j) {
92217
+ } else if (s instanceof _dom_treeNode_MarkNode__WEBPACK_IMPORTED_MODULE_26__/* .MarkNode */ .j) {
92122
92218
  forMarkNode(s);
92123
92219
  if (info[0] == 0 && info[1]) {
92124
92220
  this._tmp.start = info[1].startPath;
@@ -92134,17 +92230,17 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
92134
92230
  } else {
92135
92231
  var _tmp3 = null;
92136
92232
  if (e instanceof _dom_treeNode_TextNode__WEBPACK_IMPORTED_MODULE_18__/* .TextNode */ .R && Arange.npEnd.childIndex >= 0 && Arange.npEnd.childIndex < e.getLength() - 1) {
92137
- _tmp3 = new _TextNodeSplitUndoUnit__WEBPACK_IMPORTED_MODULE_21__/* .TextNodeSplitUndoUnit */ .W(this._hoEditorFactoryID, Arange.endPath, e, Arange);
92233
+ _tmp3 = new _TextNodeSplitUndoUnit__WEBPACK_IMPORTED_MODULE_22__/* .TextNodeSplitUndoUnit */ .W(this._hoEditorFactoryID, Arange.endPath, e, Arange);
92138
92234
  this._undo.begin();
92139
92235
  this._undo.add(_tmp3);
92140
92236
  this._undo.commit();
92141
92237
  }
92142
92238
  if (s instanceof _dom_treeNode_TextNode__WEBPACK_IMPORTED_MODULE_18__/* .TextNode */ .R && Arange.npStart.childIndex >= 0 && Arange.npStart.childIndex < s.getLength() - 1) {
92143
92239
  this._undo.begin();
92144
- this._undo.add(new _TextNodeSplitUndoUnit__WEBPACK_IMPORTED_MODULE_21__/* .TextNodeSplitUndoUnit */ .W(this._hoEditorFactoryID, Arange.startPath, s, Arange));
92240
+ this._undo.add(new _TextNodeSplitUndoUnit__WEBPACK_IMPORTED_MODULE_22__/* .TextNodeSplitUndoUnit */ .W(this._hoEditorFactoryID, Arange.startPath, s, Arange));
92145
92241
  this._undo.commit();
92146
92242
  }
92147
- if (e instanceof _dom_treeNode_MarkNode__WEBPACK_IMPORTED_MODULE_25__/* .MarkNode */ .j) {
92243
+ if (e instanceof _dom_treeNode_MarkNode__WEBPACK_IMPORTED_MODULE_26__/* .MarkNode */ .j) {
92148
92244
  forMarkNode(e);
92149
92245
  if (info[0] == 0 && info[1]) {
92150
92246
  this._tmp.end = info[1].endPath;
@@ -92165,17 +92261,21 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
92165
92261
  }, {
92166
92262
  key: "ParentRepaint",
92167
92263
  value: function ParentRepaint(Anode) {
92168
- if (Anode && Anode instanceof _dom_treeNode_TextInputFieldNode__WEBPACK_IMPORTED_MODULE_24__/* .TextInputFieldNode */ .re) {
92169
- var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_31__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID);
92264
+ if (Anode && Anode instanceof _dom_treeNode_TextInputFieldNode__WEBPACK_IMPORTED_MODULE_25__/* .TextInputFieldNode */ .re) {
92265
+ //const hoEditorFactory = HOEditorFactorys.instance().getFactory(this._hoEditorFactoryID);
92170
92266
  if (Anode.childNodes.length === 2) {
92171
- var contentMarkNode = Anode.childNodes2[1];
92172
- contentMarkNode.styleIndex = Anode.childNodes[0].styleIndex;
92173
- var insertPath = hoEditorFactory.docTree.getNodeLastPath(Anode.childNodes[0]);
92174
- hoEditorFactory.undoService.begin();
92175
- hoEditorFactory.undoService.add(new _NodeInsertUndoUnit__WEBPACK_IMPORTED_MODULE_36__/* .NodeInsertUndoUnit */ .R(this._hoEditorFactoryID, insertPath, contentMarkNode));
92176
- hoEditorFactory.undoService.commit();
92267
+ var contentMark = Anode.childNodes2[1];
92268
+ var styleIndex = Anode.childNodes[0].styleIndex;
92269
+ var contentMarkNode = new _dom_treeNode_MarkNode__WEBPACK_IMPORTED_MODULE_26__/* .MarkNode */ .j(this._hoEditorFactoryID, Anode.childNodes[0].rootNodes, Anode, _dom_treeNode_BaseNode__WEBPACK_IMPORTED_MODULE_21__/* .NodeType */ .Jq.ntMark, contentMark.text, styleIndex, _dom_treeNode_MarkNode__WEBPACK_IMPORTED_MODULE_26__/* .MarkNodeType */ .q.mtContent);
92270
+ //const insertPath = hoEditorFactory.docTree.getNodeLastPath(Anode.childNodes[0]);
92271
+ // hoEditorFactory.undoService.begin();
92272
+ // hoEditorFactory.undoService.add(
92273
+ // new NodeInsertUndoUnit(this._hoEditorFactoryID, insertPath, contentMarkNode)
92274
+ // );
92275
+ // hoEditorFactory.undoService.commit();
92276
+ Anode.childNodes.splice(1, 0, contentMarkNode);
92177
92277
  }
92178
- Anode.update();
92278
+ Anode.update(0);
92179
92279
  }
92180
92280
  }
92181
92281
  }, {
@@ -92195,7 +92295,7 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
92195
92295
  case 0:
92196
92296
  this.initParam();
92197
92297
  currRange = new _dom_DomRange__WEBPACK_IMPORTED_MODULE_20__/* .DomRange */ .a(this._hoEditorFactoryID, this._startPath, this._endPath).normalize();
92198
- hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_31__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID);
92298
+ hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_32__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID);
92199
92299
  hoEditorFactory.docTree.curDomRange = currRange;
92200
92300
  if (!(hoEditorFactory.drawTree.paintStatus === _draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_41__/* .PaintState */ .Dh.psReview)) {
92201
92301
  _context2.next = 11;
@@ -92229,7 +92329,7 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
92229
92329
  break;
92230
92330
  }
92231
92331
  lastNode = nodes[nodes.length - 1];
92232
- if (!(lastNode instanceof _dom_treeNode_MarkNode__WEBPACK_IMPORTED_MODULE_25__/* .MarkNode */ .j && lastNode.MarkNodeType === 0)) {
92332
+ if (!(lastNode instanceof _dom_treeNode_MarkNode__WEBPACK_IMPORTED_MODULE_26__/* .MarkNode */ .j && lastNode.MarkNodeType === 0)) {
92233
92333
  _context2.next = 22;
92234
92334
  break;
92235
92335
  }
@@ -92243,18 +92343,18 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
92243
92343
  hoEditorFactory.docTree.curDomRange.endPath = ePath;
92244
92344
  nodes.splice(nodes.length - 1, 1);
92245
92345
  case 22:
92246
- if (!(nodes.length === 1 && nodes[0] instanceof _dom_treeNode_MarkNode__WEBPACK_IMPORTED_MODULE_25__/* .MarkNode */ .j && nodes[0].MarkNodeType === 2)) {
92346
+ if (!(nodes.length === 1 && nodes[0] instanceof _dom_treeNode_MarkNode__WEBPACK_IMPORTED_MODULE_26__/* .MarkNode */ .j && nodes[0].MarkNodeType === 2)) {
92247
92347
  _context2.next = 24;
92248
92348
  break;
92249
92349
  }
92250
92350
  return _context2.abrupt("return");
92251
92351
  case 24:
92252
- if (nodes.length === 2 && nodes[0] instanceof _dom_treeNode_MarkNode__WEBPACK_IMPORTED_MODULE_25__/* .MarkNode */ .j && nodes[0].MarkNodeType === 0) {
92352
+ if (nodes.length === 2 && nodes[0] instanceof _dom_treeNode_MarkNode__WEBPACK_IMPORTED_MODULE_26__/* .MarkNode */ .j && nodes[0].MarkNodeType === 0) {
92253
92353
  sPath = nodes[0].getNodePath();
92254
92354
  hoEditorFactory.docTree.curDomRange.startPath = sPath;
92255
92355
  nodes.splice(0, 1);
92256
92356
  }
92257
- if (!(nodes.length === 2 && nodes[1] instanceof _dom_treeNode_MarkNode__WEBPACK_IMPORTED_MODULE_25__/* .MarkNode */ .j && nodes[1].MarkNodeType === 2 && !nodes[1].parentNode.canModifyContent)) {
92357
+ if (!(nodes.length === 2 && nodes[1] instanceof _dom_treeNode_MarkNode__WEBPACK_IMPORTED_MODULE_26__/* .MarkNode */ .j && nodes[1].MarkNodeType === 2 && !nodes[1].parentNode.canModifyContent)) {
92258
92358
  _context2.next = 30;
92259
92359
  break;
92260
92360
  }
@@ -92274,7 +92374,7 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
92274
92374
  // this._isError = true;
92275
92375
  // return;
92276
92376
  // }
92277
- if (!(node instanceof _dom_treeNode_ControlNode__WEBPACK_IMPORTED_MODULE_32__/* .ControlNode */ .w && !(node instanceof _dom_treeNode_RareCharNode__WEBPACK_IMPORTED_MODULE_40__/* .RareCharNode */ .Q) || node instanceof _dom_treeNode_TextInputFieldNode__WEBPACK_IMPORTED_MODULE_24__/* .TextInputFieldNode */ .re)) {
92377
+ if (!(node instanceof _dom_treeNode_ControlNode__WEBPACK_IMPORTED_MODULE_33__/* .ControlNode */ .w && !(node instanceof _dom_treeNode_RareCharNode__WEBPACK_IMPORTED_MODULE_40__/* .RareCharNode */ .Q) || node instanceof _dom_treeNode_TextInputFieldNode__WEBPACK_IMPORTED_MODULE_25__/* .TextInputFieldNode */ .re)) {
92278
92378
  _context2.next = 44;
92279
92379
  break;
92280
92380
  }
@@ -92283,16 +92383,16 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
92283
92383
  break;
92284
92384
  }
92285
92385
  tip = "";
92286
- if (node instanceof _dom_treeNode_RadioAndCheckBoxNode__WEBPACK_IMPORTED_MODULE_33__/* .RadioAndCheckBoxNode */ .Yh && node.controlStyle === "RadioBox") {
92386
+ if (node instanceof _dom_treeNode_RadioAndCheckBoxNode__WEBPACK_IMPORTED_MODULE_34__/* .RadioAndCheckBoxNode */ .Yh && node.controlStyle === "RadioBox") {
92287
92387
  tip = "单选框";
92288
92388
  }
92289
- if (node instanceof _dom_treeNode_RadioAndCheckBoxNode__WEBPACK_IMPORTED_MODULE_33__/* .RadioAndCheckBoxNode */ .Yh && node.controlStyle === "CheckBox") {
92389
+ if (node instanceof _dom_treeNode_RadioAndCheckBoxNode__WEBPACK_IMPORTED_MODULE_34__/* .RadioAndCheckBoxNode */ .Yh && node.controlStyle === "CheckBox") {
92290
92390
  tip = "复选框";
92291
92391
  }
92292
- if (node instanceof _dom_treeNode_DateTimeNode__WEBPACK_IMPORTED_MODULE_34__/* .DateTimeNode */ .Z) {
92392
+ if (node instanceof _dom_treeNode_DateTimeNode__WEBPACK_IMPORTED_MODULE_35__/* .DateTimeNode */ .Z) {
92293
92393
  tip = "日期时间";
92294
92394
  }
92295
- if (node instanceof _dom_treeNode_DownListNode__WEBPACK_IMPORTED_MODULE_35__/* .DownListNode */ .yF) {
92395
+ if (node instanceof _dom_treeNode_DownListNode__WEBPACK_IMPORTED_MODULE_36__/* .DownListNode */ .yF) {
92296
92396
  tip = "下拉列表";
92297
92397
  }
92298
92398
  ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_42__/* ["default"] */ .Z.destroy();
@@ -92300,7 +92400,7 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
92300
92400
  this._isError = true;
92301
92401
  return _context2.abrupt("return");
92302
92402
  case 44:
92303
- if (!(node instanceof _dom_treeNode_MarkNode__WEBPACK_IMPORTED_MODULE_25__/* .MarkNode */ .j && node.MarkNodeType === 0)) {
92403
+ if (!(node instanceof _dom_treeNode_MarkNode__WEBPACK_IMPORTED_MODULE_26__/* .MarkNode */ .j && node.MarkNodeType === 0)) {
92304
92404
  _context2.next = 49;
92305
92405
  break;
92306
92406
  }
@@ -92318,7 +92418,7 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
92318
92418
  this._isError = true;
92319
92419
  return _context2.abrupt("return");
92320
92420
  case 54:
92321
- if (!(node instanceof _dom_treeNode_TableNode__WEBPACK_IMPORTED_MODULE_30__/* .TableNode */ .Fh)) {
92421
+ if (!(node instanceof _dom_treeNode_TableNode__WEBPACK_IMPORTED_MODULE_31__/* .TableNode */ .Fh)) {
92322
92422
  _context2.next = 59;
92323
92423
  break;
92324
92424
  }
@@ -92340,12 +92440,12 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
92340
92440
  _context2.next = 31;
92341
92441
  break;
92342
92442
  case 67:
92343
- if (nodes.length === 1 && nodes[0] instanceof _dom_treeNode_TextInputFieldNode__WEBPACK_IMPORTED_MODULE_24__/* .TextInputFieldNode */ .re && !nodes[0].isAllowDelete && nodes[0].childNodes[1] instanceof _dom_treeNode_MarkNode__WEBPACK_IMPORTED_MODULE_25__/* .MarkNode */ .j) {
92443
+ if (nodes.length === 1 && nodes[0] instanceof _dom_treeNode_TextInputFieldNode__WEBPACK_IMPORTED_MODULE_25__/* .TextInputFieldNode */ .re && !nodes[0].isAllowDelete && nodes[0].childNodes[1] instanceof _dom_treeNode_MarkNode__WEBPACK_IMPORTED_MODULE_26__/* .MarkNode */ .j) {
92344
92444
  hoEditorFactory.docTree.curDomRange.setSamePath(this._endPath);
92345
92445
  }
92346
92446
  case 68:
92347
92447
  pnode = (_currRange$npEnd$node = currRange.npEnd.node) === null || _currRange$npEnd$node === void 0 ? void 0 : _currRange$npEnd$node.parentNode;
92348
- if (!(pnode && pnode instanceof _dom_treeNode_TextInputFieldNode__WEBPACK_IMPORTED_MODULE_24__/* .TextInputFieldNode */ .re && currRange.npEnd.path != hoEditorFactory.docTree.getNodeLastPath(pnode))) {
92448
+ if (!(pnode && pnode instanceof _dom_treeNode_TextInputFieldNode__WEBPACK_IMPORTED_MODULE_25__/* .TextInputFieldNode */ .re && currRange.npEnd.path != hoEditorFactory.docTree.getNodeLastPath(pnode))) {
92349
92449
  _context2.next = 74;
92350
92450
  break;
92351
92451
  }
@@ -92369,7 +92469,7 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
92369
92469
  _context2.next = 77;
92370
92470
  break;
92371
92471
  }
92372
- throw _events_Exception__WEBPACK_IMPORTED_MODULE_26__/* .Exception */ .P.NodeNotFound();
92472
+ throw _events_Exception__WEBPACK_IMPORTED_MODULE_27__/* .Exception */ .P.NodeNotFound();
92373
92473
  case 77:
92374
92474
  // const [startPath, endPath] = DomRange.skipStartEndTablePath(
92375
92475
  // this._hoEditorFactory,
@@ -92379,7 +92479,7 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
92379
92479
  startPath = currRange.startPath;
92380
92480
  endPath = currRange.endPath;
92381
92481
  changeEvent.oldEndPath = endPath;
92382
- changeEvent.oldDrawTreeLines = new _draw_SelectRange__WEBPACK_IMPORTED_MODULE_29__/* .SelectRange */ .E(this._hoEditorFactoryID).getRangeDrawTreeLines(startPath, endPath);
92482
+ changeEvent.oldDrawTreeLines = new _draw_SelectRange__WEBPACK_IMPORTED_MODULE_30__/* .SelectRange */ .E(this._hoEditorFactoryID).getRangeDrawTreeLines(startPath, endPath);
92383
92483
  res = this.deleteRange(currRange.endPath, currRange.startPath);
92384
92484
  if (!(res == 1)) {
92385
92485
  _context2.next = 89;
@@ -92390,7 +92490,7 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
92390
92490
  _context2.next = 87;
92391
92491
  return hoEditorFactory.docTree.change(changeEvent);
92392
92492
  case 87:
92393
- cgEvent = new _events_SelectionChangeEvent__WEBPACK_IMPORTED_MODULE_22__/* .SelectionChangeEvent */ .r(hoEditorFactory.docTree.curDomRange, new _dom_DomRange__WEBPACK_IMPORTED_MODULE_20__/* .DomRange */ .a(this._hoEditorFactoryID, this._tmp.start, this._tmp.start));
92493
+ cgEvent = new _events_SelectionChangeEvent__WEBPACK_IMPORTED_MODULE_23__/* .SelectionChangeEvent */ .r(hoEditorFactory.docTree.curDomRange, new _dom_DomRange__WEBPACK_IMPORTED_MODULE_20__/* .DomRange */ .a(this._hoEditorFactoryID, this._tmp.start, this._tmp.start));
92394
92494
  hoEditorFactory.docTree.selectChange(cgEvent);
92395
92495
  case 89:
92396
92496
  hoEditorFactory.docTree.curDomRange.setSamePath(this._tmp.start);
@@ -96385,6 +96485,11 @@ var UnitConvert = /*#__PURE__*/function () {
96385
96485
  value: function fontPt2Pix(value) {
96386
96486
  return Math.round(this.dpiX / 72 * value);
96387
96487
  }
96488
+ }, {
96489
+ key: "pxToPt",
96490
+ value: function pxToPt(value) {
96491
+ return Math.round(value * 72 / this.dpiX);
96492
+ }
96388
96493
  }, {
96389
96494
  key: "replaceAll",
96390
96495
  value: function replaceAll(str, s1, s2) {
@@ -179113,7 +179218,7 @@ var map = {
179113
179218
  "./commentDialog/CommentDialog.vue": 61720,
179114
179219
  "./customAttributes/CustomAttributes.vue": 75819,
179115
179220
  "./dataSource/DataSource.vue": 84051,
179116
- "./dateDialog/DateDialog.vue": 6675,
179221
+ "./dateDialog/DateDialog.vue": 15759,
179117
179222
  "./delimiter/Delimiter.vue": 93230,
179118
179223
  "./expressionForm/ExpressionForm.vue": 77541,
179119
179224
  "./findReplace/FindReplace.vue": 98064,
@@ -179132,7 +179237,7 @@ var map = {
179132
179237
  "./qrCode/QrCode.vue": 59805,
179133
179238
  "./radioCheckBox/RadioCheckbox.vue": 16616,
179134
179239
  "./selectDialog/SelectDialog.vue": 32497,
179135
- "./sign/Sign.vue": 921,
179240
+ "./sign/Sign.vue": 24193,
179136
179241
  "./table/TableCellPoper.vue": 97628,
179137
179242
  "./table/TableCellPoper1.vue": 44645,
179138
179243
  "./table/TableCellProperty.vue": 63689,
@@ -217374,9 +217479,9 @@ var DrawSelectLevel = /*#__PURE__*/function () {
217374
217479
  }
217375
217480
  hoeditorfactory.drawTree.selectRange.spStart = startPos;
217376
217481
  hoeditorfactory.drawTree.selectRange.spEnd = startPos;
217377
- if (aevent.nativeEvent.button === 0) {
217378
- hoeditorfactory.docTree.curDomRange.setSamePath(startPos.path);
217379
- }
217482
+ // if (aevent.nativeEvent.button === 0) {
217483
+ hoeditorfactory.docTree.curDomRange.setSamePath(startPos.path);
217484
+ // }
217380
217485
  hoeditorfactory.drawTree.moveCaretToPath(startPos.path);
217381
217486
  if (aevent.nativeEvent.button === 0) {
217382
217487
  //鼠标点到文本域内容结尾时触发
@@ -219757,7 +219862,7 @@ var TextNode = __webpack_require__(27198);
219757
219862
  // EXTERNAL MODULE: ./src/editor/dom/treeNode/ParagraphNode.ts
219758
219863
  var ParagraphNode = __webpack_require__(67945);
219759
219864
  ;// CONCATENATED MODULE: ./src/components/version.ts
219760
- /* harmony default export */ var version = ('3.1.63');
219865
+ /* harmony default export */ var version = ('3.1.65-1');
219761
219866
  // EXTERNAL MODULE: ./src/components/controls/poperTipText/PoperTipText.vue + 5 modules
219762
219867
  var PoperTipText = __webpack_require__(50987);
219763
219868
  ;// CONCATENATED MODULE: ./src/components/controls/poperTipText/index.ts
@@ -226806,8 +226911,6 @@ var es_array_flat = __webpack_require__(84944);
226806
226911
  var es_array_unscopables_flat = __webpack_require__(33792);
226807
226912
  // EXTERNAL MODULE: ./src/editor/events/NodeChangingEvent.ts
226808
226913
  var NodeChangingEvent = __webpack_require__(10574);
226809
- // EXTERNAL MODULE: ./src/plugins/pretty-data.js
226810
- var pretty_data = __webpack_require__(49049);
226811
226914
  // EXTERNAL MODULE: ./src/editor/draw/SelectRange.ts
226812
226915
  var SelectRange = __webpack_require__(53901);
226813
226916
  // EXTERNAL MODULE: ./src/plugins/type.ts
@@ -227093,7 +227196,7 @@ var hoCreateHistory = {
227093
227196
 
227094
227197
 
227095
227198
 
227096
-
227199
+ // import pd from '@/plugins/pretty-data';
227097
227200
 
227098
227201
 
227099
227202
 
@@ -228831,11 +228934,11 @@ var VueController = /*#__PURE__*/function () {
228831
228934
  }
228832
228935
 
228833
228936
  if (type === 'json') {
228937
+ var pd = __webpack_require__(49049);
228834
228938
  ret = hoEditorFactory.structureConvert.doc2Xml('json', true, true);
228835
-
228836
228939
  // ret = JSON.stringify(ret);
228837
228940
 
228838
- ret = pretty_data.pd.json(ret);
228941
+ ret = pd.pd.json(ret);
228839
228942
  }
228840
228943
  return ret;
228841
228944
  }
@@ -228978,7 +229081,6 @@ var VueController = /*#__PURE__*/function () {
228978
229081
  var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this._hoEditorFactoryID);
228979
229082
  var data = hoEditorFactory.testDataSet.getTestJsonData();
228980
229083
  var retJson = hoEditorFactory.structureConvert.getRowsJsonData(data);
228981
- //retJson = pd.json(retJson);
228982
229084
  return retJson;
228983
229085
  }
228984
229086
  // /**
@@ -231302,7 +231404,7 @@ var VueController = /*#__PURE__*/function () {
231302
231404
  //const nextNode = node.nextLeaf();
231303
231405
  //if ((node.imgSrc !== '' || node.fingerPrintSrc !== '') && node.isTemplate && !(preNode instanceof SignNode) && !(nextNode instanceof SignNode)) {
231304
231406
  if ((node.imgSrc !== '' || node.fingerPrintSrc !== '') && node.isTemplate) {
231305
- var signNode = new SignNode/* SignNode */.N(this._hoEditorFactoryID, node.rootNodes, node.parentNode, BaseNode/* NodeType */.Jq.ntSign, 0, 0, node.name === '' ? '签名' : node.name, node.signType, node.signFormat, '', '', node.signTimeFormat, '', 0, 0, {}, true, node.styleIndex, node.connectMode, node.isFront, node.allowEditSignTime, '', undefined, node.attribute, node.connectChar, node.otherProperties);
231407
+ var signNode = new SignNode/* SignNode */.N(this._hoEditorFactoryID, node.rootNodes, node.parentNode, BaseNode/* NodeType */.Jq.ntSign, 0, 0, node.name === '' ? '签名' : node.name, node.signType, node.signFormat, '', '', node.signTimeFormat, '', 0, 0, {}, true, node.styleIndex, node.connectMode, node.isFront, node.allowEditSignTime, '', undefined, node.attribute, node.connectChar, node.otherProperties, '', node.associatedElement);
231306
231408
  hoEditorFactory.undoService.begin();
231307
231409
  hoEditorFactory.undoService.add(new NodeDeleteUndoUnit/* NodeDeleteUndoUnit */.w(this._hoEditorFactoryID, node, ePath));
231308
231410
  hoEditorFactory.undoService.add(new NodeInsertUndoUnit/* NodeInsertUndoUnit */.R(this._hoEditorFactoryID, sPath, signNode));
@@ -231322,7 +231424,20 @@ var VueController = /*#__PURE__*/function () {
231322
231424
  var superiorSign = hoEditorFactory.structureConvert._superiorSign;
231323
231425
  if (superiorSign.length > 0 && node === superiorSign[0]) {
231324
231426
  this.hiddenMask(true);
231325
- superiorSign[0] = signNode;
231427
+ var prenode = signNode.previousLeaf();
231428
+ do {
231429
+ if (prenode) {
231430
+ if (prenode instanceof SignNode/* SignNode */.N && prenode.imgSrc != "") {
231431
+ superiorSign[0] = prenode;
231432
+ this.hiddenMask(false);
231433
+ return;
231434
+ }
231435
+ prenode = prenode.previousLeaf();
231436
+ }
231437
+ } while (prenode);
231438
+ if (!prenode) {
231439
+ superiorSign.length = 0;
231440
+ }
231326
231441
  }
231327
231442
  return;
231328
231443
  } else {
@@ -232639,6 +232754,60 @@ var VueController = /*#__PURE__*/function () {
232639
232754
  var caret = hoEditorFactory.drawTree.caret;
232640
232755
  return [caret.pageIndex + 1, caret.stageX * 0.75, caret.stageY * 0.75 + 40];
232641
232756
  }
232757
+ /**
232758
+ * @param type bottom:页左下角坐标点(0,0) top:页左上角坐标点(0,0)
232759
+ */
232760
+ }, {
232761
+ key: "getPosition3",
232762
+ value: function getPosition3(type) {
232763
+ var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this._hoEditorFactoryID);
232764
+ var curDomRange = hoEditorFactory.docTree.curDomRange.normalize();
232765
+ var node = curDomRange.npEnd.node;
232766
+ var caret = hoEditorFactory.drawTree.caret;
232767
+ var y = hoEditorFactory.pageProperty.heightPixes - caret.stageY;
232768
+ // if(type == 'top') {
232769
+ // y = caret.stageY
232770
+ // }
232771
+ var result = {
232772
+ page: caret.pageIndex + 1,
232773
+ pxX: caret.stageX,
232774
+ pxY: y,
232775
+ mmX: hoEditorFactory.unitConvert.pxConversionMm(caret.stageX, true),
232776
+ mmY: hoEditorFactory.unitConvert.pxConversionMm(y, true),
232777
+ ptX: hoEditorFactory.unitConvert.pxToPt(caret.stageX),
232778
+ ptY: hoEditorFactory.unitConvert.pxToPt(y),
232779
+ ptTop: 0,
232780
+ ptRight: 0,
232781
+ ptBottom: 0,
232782
+ ptLeft: 0
232783
+ };
232784
+ if (node instanceof SignNode/* SignNode */.N && node !== null && node !== void 0 && node.drawNodes[0]) {
232785
+ var drawNode = node === null || node === void 0 ? void 0 : node.drawNodes[0];
232786
+ result = (0,objectSpread2/* default */.Z)((0,objectSpread2/* default */.Z)({}, result), {}, {
232787
+ ptRight: hoEditorFactory.unitConvert.pxToPt(caret.stageX + drawNode.dWidth),
232788
+ ptLeft: result.ptX
232789
+ });
232790
+ if (node.number == 0) {
232791
+ // if(type == 'top') {
232792
+ // result.ptTop = result.ptY;
232793
+ // result.ptBottom = hoEditorFactory.unitConvert.pxToPt(y + drawNode.dHeight);
232794
+ // } else {
232795
+ result.ptTop = result.ptY;
232796
+ result.ptBottom = hoEditorFactory.unitConvert.pxToPt(y - drawNode.dHeight);
232797
+ // }
232798
+ } else {
232799
+ // if(type == 'top') {
232800
+ // result.ptTop = hoEditorFactory.unitConvert.pxToPt(y + drawNode.dHeight);
232801
+ // result.ptBottom = hoEditorFactory.unitConvert.pxToPt(y + drawNode.dHeight * 2);
232802
+ // } else {
232803
+ result.ptTop = hoEditorFactory.unitConvert.pxToPt(y - drawNode.dHeight);
232804
+ result.ptBottom = hoEditorFactory.unitConvert.pxToPt(y - drawNode.dHeight * 2);
232805
+ // }
232806
+ }
232807
+ }
232808
+
232809
+ return result;
232810
+ }
232642
232811
  /**
232643
232812
  * 获取光标位置
232644
232813
  * returns [pageIndex, x, y]
@@ -232795,7 +232964,9 @@ var VueController = /*#__PURE__*/function () {
232795
232964
  if (newNode instanceof SignNode/* SignNode */.N) {
232796
232965
  Promise.all([hoEditorFactory.docController.updateSignNode(newNode, 3, '患者签名', '', '', imgSrc, 0, 0, customPropertys, fingerPrintSrc, fingerPosition)]).then(function () {
232797
232966
  setTimeout(function () {
232798
- callback && callback();
232967
+ callback && callback({
232968
+ associatedElement: newNode.associatedElement
232969
+ });
232799
232970
  }, 0);
232800
232971
  });
232801
232972
  }
@@ -232803,7 +232974,9 @@ var VueController = /*#__PURE__*/function () {
232803
232974
  } else {
232804
232975
  Promise.all([hoEditorFactory.docController.updateSignNode(node, 3, '患者签名', '', '', imgSrc, 0, 0, customPropertys, fingerPrintSrc, fingerPosition)]).then(function () {
232805
232976
  setTimeout(function () {
232806
- callback && callback();
232977
+ callback && callback({
232978
+ associatedElement: node.associatedElement
232979
+ });
232807
232980
  }, 0);
232808
232981
  });
232809
232982
  }
@@ -232817,7 +232990,9 @@ var VueController = /*#__PURE__*/function () {
232817
232990
  if (hoEditorFactory.docTree.changing(changingEvent)) {
232818
232991
  Promise.all([hoEditorFactory.docController.insertSignNode(curDomRange, 1, '患者签名', node.signor, node.signTime, node.signTimeFormat, imgSrc, node.imgWidth, node.imgHeight, customPropertys, fingerPrintSrc, fingerPosition)]).then(function () {
232819
232992
  setTimeout(function () {
232820
- callback && callback();
232993
+ callback && callback({
232994
+ associatedElement: node.associatedElement
232995
+ });
232821
232996
  }, 0);
232822
232997
  });
232823
232998
  }
@@ -233309,6 +233484,17 @@ var VueController = /*#__PURE__*/function () {
233309
233484
  }
233310
233485
  return text ? text : '';
233311
233486
  }
233487
+ /**
233488
+ * 查询光标所在位置之前的文本内容
233489
+ */
233490
+ }, {
233491
+ key: "getCaretTextNode",
233492
+ value: function getCaretTextNode() {
233493
+ var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this._hoEditorFactoryID);
233494
+ var curDomRange = hoEditorFactory.docTree.curDomRange.normalize();
233495
+ var node = curDomRange.npEnd.node;
233496
+ return node !== null && node !== void 0 && node.name ? node.name : '';
233497
+ }
233312
233498
  /**
233313
233499
  * 初始化文档
233314
233500
  */
@@ -233750,6 +233936,8 @@ var VueController = /*#__PURE__*/function () {
233750
233936
  number: node.number,
233751
233937
  isVerify: node.otherProperties && node.otherProperties.isVerify ? true : false,
233752
233938
  customProperty: node.customProperty,
233939
+ associatedElement: node.associatedElement,
233940
+ dataId: node.dataId,
233753
233941
  node: {}
233754
233942
  };
233755
233943
  if (showNode) {
@@ -243334,8 +243522,8 @@ var HoDocs_component = (0,componentNormalizer/* default */.Z)(
243334
243522
  )
243335
243523
 
243336
243524
  /* harmony default export */ var HoDocs = (HoDocs_component.exports);
243337
- ;// 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=26f26696&
243338
- var ToolBarvue_type_template_id_26f26696_render = function render() {
243525
+ ;// 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=2bbec870&
243526
+ var ToolBarvue_type_template_id_2bbec870_render = function render() {
243339
243527
  var _vm = this,
243340
243528
  _c = _vm._self._c;
243341
243529
  return _c('div', {
@@ -243568,7 +243756,7 @@ var ToolBarvue_type_template_id_26f26696_render = function render() {
243568
243756
  }, [_vm._v(_vm._s(item.title))]);
243569
243757
  }), 1)], 1) : _vm._e()], 1);
243570
243758
  };
243571
- var ToolBarvue_type_template_id_26f26696_staticRenderFns = [];
243759
+ var ToolBarvue_type_template_id_2bbec870_staticRenderFns = [];
243572
243760
 
243573
243761
  ;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/toolbar/insert/HoMedicalExpression.vue?vue&type=template&id=4699ffee&
243574
243762
  var HoMedicalExpressionvue_type_template_id_4699ffee_render = function render() {
@@ -248797,13 +248985,22 @@ var ToolTable_component = (0,componentNormalizer/* default */.Z)(
248797
248985
  * 下载文件
248798
248986
  */
248799
248987
  downloadFile: function downloadFile(file, fileName, fileType) {
248988
+ var name = fileName;
248989
+ var type = fileType;
248990
+ if (fileType == 'plain') {
248991
+ type = '.txt';
248992
+ name += type;
248993
+ } else if (fileType == 'json') {
248994
+ type = '.json';
248995
+ name += type;
248996
+ }
248800
248997
  var url = window.URL.createObjectURL(new Blob([file], {
248801
248998
  type: "text/".concat(fileType)
248802
248999
  }));
248803
249000
  var link = document.createElement('a');
248804
249001
  link.style.display = 'none';
248805
249002
  link.href = url;
248806
- link.setAttribute('download', fileName);
249003
+ link.setAttribute('download', name);
248807
249004
  document.body.appendChild(link);
248808
249005
  link.click();
248809
249006
  this.$nextTick(function () {
@@ -248814,10 +249011,10 @@ var ToolTable_component = (0,componentNormalizer/* default */.Z)(
248814
249011
  });
248815
249012
  ;// CONCATENATED MODULE: ./src/components/toolbar/ToolBar.vue?vue&type=script&lang=js&
248816
249013
  /* harmony default export */ var toolbar_ToolBarvue_type_script_lang_js_ = (ToolBarvue_type_script_lang_js_);
248817
- ;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-32.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-32.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-32.use[2]!./node_modules/less-loader/dist/cjs.js??clonedRuleSet-32.use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/toolbar/ToolBar.vue?vue&type=style&index=0&id=26f26696&prod&lang=less&
249014
+ ;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-32.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-32.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-32.use[2]!./node_modules/less-loader/dist/cjs.js??clonedRuleSet-32.use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/toolbar/ToolBar.vue?vue&type=style&index=0&id=2bbec870&prod&lang=less&
248818
249015
  // extracted by mini-css-extract-plugin
248819
249016
 
248820
- ;// CONCATENATED MODULE: ./src/components/toolbar/ToolBar.vue?vue&type=style&index=0&id=26f26696&prod&lang=less&
249017
+ ;// CONCATENATED MODULE: ./src/components/toolbar/ToolBar.vue?vue&type=style&index=0&id=2bbec870&prod&lang=less&
248821
249018
 
248822
249019
  ;// CONCATENATED MODULE: ./src/components/toolbar/ToolBar.vue
248823
249020
 
@@ -248830,8 +249027,8 @@ var ToolTable_component = (0,componentNormalizer/* default */.Z)(
248830
249027
 
248831
249028
  var ToolBar_component = (0,componentNormalizer/* default */.Z)(
248832
249029
  toolbar_ToolBarvue_type_script_lang_js_,
248833
- ToolBarvue_type_template_id_26f26696_render,
248834
- ToolBarvue_type_template_id_26f26696_staticRenderFns,
249030
+ ToolBarvue_type_template_id_2bbec870_render,
249031
+ ToolBarvue_type_template_id_2bbec870_staticRenderFns,
248835
249032
  false,
248836
249033
  null,
248837
249034
  null,