hoeditor-web 2.0.87 → 2.0.90

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.
@@ -10798,7 +10798,7 @@ var component = (0,componentNormalizer/* default */.Z)(
10798
10798
 
10799
10799
  /***/ }),
10800
10800
 
10801
- /***/ 99083:
10801
+ /***/ 16981:
10802
10802
  /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
10803
10803
 
10804
10804
  "use strict";
@@ -10810,8 +10810,8 @@ __webpack_require__.d(__webpack_exports__, {
10810
10810
  "default": function() { return /* binding */ TableCellPoper; }
10811
10811
  });
10812
10812
 
10813
- ;// CONCATENATED MODULE: ./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/table/TableCellPoper.vue?vue&type=template&id=29a19e91&scoped=true&
10814
- var render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"cell-poper-selected-modal animation-in",style:(_vm.posStyle)},[_c('div',{staticStyle:{"height":"0","overflow":"hidden"}},[_c('svg',{attrs:{"viewBox":"0 0 1303 1024","version":"1.1","xmlns":"http://www.w3.org/2000/svg","width":"16","height":"16"}},[_c('defs',[_c('g',{attrs:{"id":"selected"}},[_c('path',{attrs:{"d":"M498.688 1024c-26.996364 0-52.782545-11.636364-71.214545-32.395636L29.323636 536.017455a124.276364 124.276364 0 0 1 0-160.302546 89.181091 89.181091 0 0 1 132.747637-11.915636l11.264 11.915636L497.105455 749.288727 1133.102545 34.443636a88.994909 88.994909 0 0 1 129.489455-11.915636l11.357091 11.915636c39.098182 45.521455 39.098182 114.874182 0 160.395637l-705.629091 796.765091c-17.966545 20.48-43.194182 32.209455-69.632 32.395636","fill":"#2175FF"}})])])])]),(_vm.isCanSearch)?_c('el-input',{attrs:{"placeholder":"可搜索","size":"mini"},on:{"input":_vm.searchList},model:{value:(_vm.input),callback:function ($$v) {_vm.input=$$v},expression:"input"}}):_vm._e(),(_vm.editorProperty === 1)?_c('div',{staticClass:"select-poper"},[_c('ul',{staticClass:"list"},[_vm._l((_vm.currentList),function(item,index){return _c('li',{key:item.id,class:item.default ? 'selected' : '',on:{"click":function($event){return _vm.selectItems(item, index)}}},[_c('span',[_vm._v(_vm._s(item.text.split("<元素>")[0]))]),_c('svg',{attrs:{"viewBox":"0 0 1303 1024","version":"1.1","xmlns":"http://www.w3.org/2000/svg","width":"16","height":"16"}},[_c('use',{attrs:{"xlink:href":"#selected"}})])])}),(_vm.currentList.length === 0)?_c('li',{staticStyle:{"text-align":"center"}},[_vm._v("无选项")]):_vm._e()],2),(_vm.isAllowMultiSelect)?_c('footer',{style:({ bottom: _vm.isAllowMultiSelect ? '-34px' : '0px' })},[_c('el-button',{staticStyle:{"padding":"5px 13px"},attrs:{"size":"mini"},on:{"click":_vm.sureSelect}},[_vm._v("确定")]),_c('el-button',{staticStyle:{"padding":"5px 13px"},attrs:{"size":"mini"},on:{"click":function($event){_vm.selected = []}}},[_vm._v("清空")]),_c('el-button',{staticStyle:{"padding":"5px 13px"},attrs:{"size":"mini"},on:{"click":_vm.handleClose}},[_vm._v("取消")])],1):_vm._e(),(_vm.currentList.length === 0)?_c('footer',{staticStyle:{"bottom":"-43px","padding":"10px","text-align":"center"}},[_c('el-button',{staticStyle:{"padding":"5px 13px"},attrs:{"size":"mini"},on:{"click":_vm.handleClose}},[_vm._v("关闭")])],1):_vm._e()]):_vm._e(),(_vm.editorProperty === 2)?_c('div',{staticClass:"date-poper"},[(_vm.inputStyle.includes('dd'))?_c('DatePanel',{attrs:{"value":_vm.date},on:{"getValue":_vm.getTime}}):_vm._e(),(_vm.inputStyle.includes('MM') && !_vm.inputStyle.includes('dd'))?_c('DatePanel',{attrs:{"dateType":"month","value":_vm.date},on:{"getValue":_vm.getTime}}):_vm._e(),(_vm.inputStyle.includes('yyyy') && !_vm.inputStyle.includes('MM'))?_c('DatePanel',{attrs:{"dateType":"year","value":_vm.date},on:{"getValue":_vm.getTime}}):_vm._e(),(_vm.inputStyle.includes('HH'))?_c('div',{staticClass:"timepicker",staticStyle:{"padding":"8px 0"}},[_c('el-time-picker',{staticStyle:{"width":"200px"},attrs:{"type":"time","format":_vm.timeStyle,"value-format":_vm.timeStyle,"size":"mini"},model:{value:(_vm.time),callback:function ($$v) {_vm.time=$$v},expression:"time"}})],1):_vm._e(),_c('footer',[_c('el-button',{staticStyle:{"padding":"5px 13px"},attrs:{"size":"mini"},on:{"click":_vm.sureDate}},[_vm._v("确定")]),_c('el-button',{staticStyle:{"padding":"5px 13px"},attrs:{"size":"mini"},on:{"click":_vm.currentDateTime}},[_vm._v(_vm._s(_vm.inputStyle.indexOf('HH') !== -1 ? '此刻' : '今天'))]),_c('el-button',{staticStyle:{"padding":"5px 13px"},attrs:{"size":"mini"},on:{"click":function($event){return _vm.handleClose('cancel')}}},[_vm._v("取消")])],1)],1):_vm._e()],1)}
10813
+ ;// CONCATENATED MODULE: ./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/table/TableCellPoper.vue?vue&type=template&id=56a2ba09&scoped=true&
10814
+ var render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"cell-poper-selected-modal animation-in",style:(_vm.posStyle)},[_c('div',{staticStyle:{"height":"0","overflow":"hidden"}},[_c('svg',{attrs:{"viewBox":"0 0 1303 1024","version":"1.1","xmlns":"http://www.w3.org/2000/svg","width":"16","height":"16"}},[_c('defs',[_c('g',{attrs:{"id":"selected"}},[_c('path',{attrs:{"d":"M498.688 1024c-26.996364 0-52.782545-11.636364-71.214545-32.395636L29.323636 536.017455a124.276364 124.276364 0 0 1 0-160.302546 89.181091 89.181091 0 0 1 132.747637-11.915636l11.264 11.915636L497.105455 749.288727 1133.102545 34.443636a88.994909 88.994909 0 0 1 129.489455-11.915636l11.357091 11.915636c39.098182 45.521455 39.098182 114.874182 0 160.395637l-705.629091 796.765091c-17.966545 20.48-43.194182 32.209455-69.632 32.395636","fill":"#2175FF"}})])])])]),(_vm.isCanSearch)?_c('el-input',{attrs:{"placeholder":"可搜索","size":"mini"},on:{"input":_vm.searchList},model:{value:(_vm.input),callback:function ($$v) {_vm.input=$$v},expression:"input"}}):_vm._e(),(_vm.editorProperty === 1)?_c('div',{staticClass:"select-poper"},[_c('ul',{staticClass:"list"},[_vm._l((_vm.currentList),function(item,index){return _c('li',{key:item.id,class:item.default ? 'selected' : '',on:{"click":function($event){return _vm.selectItems(item, index)}}},[_c('span',[_vm._v(_vm._s(item.text.split("<元素>")[0]))]),_c('svg',{attrs:{"viewBox":"0 0 1303 1024","version":"1.1","xmlns":"http://www.w3.org/2000/svg","width":"16","height":"16"}},[_c('use',{attrs:{"xlink:href":"#selected"}})])])}),(_vm.currentList.length === 0)?_c('li',{staticStyle:{"text-align":"center"}},[_vm._v("无选项")]):_vm._e()],2),(_vm.isAllowMultiSelect)?_c('footer',{style:({ bottom: _vm.isAllowMultiSelect ? '-34px' : '0px' })},[_c('el-button',{staticStyle:{"padding":"5px 13px"},attrs:{"size":"mini"},on:{"click":_vm.sureSelect}},[_vm._v("确定")]),_c('el-button',{staticStyle:{"padding":"5px 13px"},attrs:{"size":"mini"},on:{"click":function($event){_vm.selected = []}}},[_vm._v("清空")]),_c('el-button',{staticStyle:{"padding":"5px 13px"},attrs:{"size":"mini"},on:{"click":_vm.handleClose}},[_vm._v("取消")])],1):_vm._e(),(_vm.currentList.length === 0)?_c('footer',{staticStyle:{"bottom":"-43px","padding":"10px","text-align":"center"}},[_c('el-button',{staticStyle:{"padding":"5px 13px"},attrs:{"size":"mini"},on:{"click":_vm.handleClose}},[_vm._v("关闭")])],1):_vm._e(),(_vm.poperList.length > 0)?_c('footer',{staticStyle:{"bottom":"-43px","padding":"10px","text-align":"center"}},[_c('el-button',{staticStyle:{"padding":"5px 13px"},attrs:{"size":"mini"},on:{"click":_vm.handleClose}},[_vm._v("关闭")])],1):_vm._e()]):_vm._e(),(_vm.editorProperty === 2)?_c('div',{staticClass:"date-poper"},[(_vm.inputStyle.includes('dd'))?_c('DatePanel',{attrs:{"value":_vm.date},on:{"getValue":_vm.getTime}}):_vm._e(),(_vm.inputStyle.includes('MM') && !_vm.inputStyle.includes('dd'))?_c('DatePanel',{attrs:{"dateType":"month","value":_vm.date},on:{"getValue":_vm.getTime}}):_vm._e(),(_vm.inputStyle.includes('yyyy') && !_vm.inputStyle.includes('MM'))?_c('DatePanel',{attrs:{"dateType":"year","value":_vm.date},on:{"getValue":_vm.getTime}}):_vm._e(),(_vm.inputStyle.includes('HH'))?_c('div',{staticClass:"timepicker",staticStyle:{"padding":"8px 0"}},[_c('el-time-picker',{staticStyle:{"width":"200px"},attrs:{"type":"time","format":_vm.timeStyle,"value-format":_vm.timeStyle,"size":"mini"},model:{value:(_vm.time),callback:function ($$v) {_vm.time=$$v},expression:"time"}})],1):_vm._e(),_c('footer',[_c('el-button',{staticStyle:{"padding":"5px 13px"},attrs:{"size":"mini"},on:{"click":_vm.sureDate}},[_vm._v("确定")]),_c('el-button',{staticStyle:{"padding":"5px 13px"},attrs:{"size":"mini"},on:{"click":_vm.currentDateTime}},[_vm._v(_vm._s(_vm.inputStyle.indexOf('HH') !== -1 ? '此刻' : '今天'))]),_c('el-button',{staticStyle:{"padding":"5px 13px"},attrs:{"size":"mini"},on:{"click":function($event){return _vm.handleClose('cancel')}}},[_vm._v("取消")])],1)],1):_vm._e()],1)}
10815
10815
  var staticRenderFns = []
10816
10816
 
10817
10817
 
@@ -10916,6 +10916,8 @@ var HOEditorFactorys = __webpack_require__(41005);
10916
10916
  //
10917
10917
  //
10918
10918
  //
10919
+ //
10920
+ //
10919
10921
 
10920
10922
 
10921
10923
 
@@ -11275,10 +11277,10 @@ var HOEditorFactorys = __webpack_require__(41005);
11275
11277
  });
11276
11278
  ;// CONCATENATED MODULE: ./src/components/controls/table/TableCellPoper.vue?vue&type=script&lang=js&
11277
11279
  /* harmony default export */ var table_TableCellPopervue_type_script_lang_js_ = (TableCellPopervue_type_script_lang_js_);
11278
- ;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-22[0].rules[0].use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22[0].rules[0].use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22[0].rules[0].use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22[0].rules[0].use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/table/TableCellPoper.vue?vue&type=style&index=0&id=29a19e91&lang=scss&scoped=true&
11280
+ ;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-22[0].rules[0].use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22[0].rules[0].use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22[0].rules[0].use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22[0].rules[0].use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/table/TableCellPoper.vue?vue&type=style&index=0&id=56a2ba09&lang=scss&scoped=true&
11279
11281
  // extracted by mini-css-extract-plugin
11280
11282
 
11281
- ;// CONCATENATED MODULE: ./src/components/controls/table/TableCellPoper.vue?vue&type=style&index=0&id=29a19e91&lang=scss&scoped=true&
11283
+ ;// CONCATENATED MODULE: ./src/components/controls/table/TableCellPoper.vue?vue&type=style&index=0&id=56a2ba09&lang=scss&scoped=true&
11282
11284
 
11283
11285
  // EXTERNAL MODULE: ./node_modules/@vue/vue-loader-v15/lib/runtime/componentNormalizer.js
11284
11286
  var componentNormalizer = __webpack_require__(1001);
@@ -11297,7 +11299,7 @@ var component = (0,componentNormalizer/* default */.Z)(
11297
11299
  staticRenderFns,
11298
11300
  false,
11299
11301
  null,
11300
- "29a19e91",
11302
+ "56a2ba09",
11301
11303
  null
11302
11304
 
11303
11305
  )
@@ -47751,7 +47753,7 @@ var SpecialCharsNode = /*#__PURE__*/function (_ControlNode) {
47751
47753
  /* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(37174);
47752
47754
  /* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_typeof_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(58913);
47753
47755
  /* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_classCallCheck_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(35671);
47754
- /* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_34__ = __webpack_require__(22342);
47756
+ /* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_35__ = __webpack_require__(22342);
47755
47757
  /* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_get_js__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(61670);
47756
47758
  /* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_getPrototypeOf_js__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(24084);
47757
47759
  /* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_inherits_js__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(99640);
@@ -47770,18 +47772,18 @@ var SpecialCharsNode = /*#__PURE__*/function (_ControlNode) {
47770
47772
  /* harmony import */ var core_js_modules_es_regexp_exec_js__WEBPACK_IMPORTED_MODULE_13___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_regexp_exec_js__WEBPACK_IMPORTED_MODULE_13__);
47771
47773
  /* harmony import */ var core_js_modules_es_string_split_js__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(23123);
47772
47774
  /* harmony import */ var core_js_modules_es_string_split_js__WEBPACK_IMPORTED_MODULE_14___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_string_split_js__WEBPACK_IMPORTED_MODULE_14__);
47773
- /* harmony import */ var core_js_modules_es_string_replace_js__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(15306);
47774
- /* harmony import */ var core_js_modules_es_string_replace_js__WEBPACK_IMPORTED_MODULE_15___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_string_replace_js__WEBPACK_IMPORTED_MODULE_15__);
47775
- /* harmony import */ var core_js_modules_es_string_replace_all_js__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(68757);
47776
- /* harmony import */ var core_js_modules_es_string_replace_all_js__WEBPACK_IMPORTED_MODULE_16___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_string_replace_all_js__WEBPACK_IMPORTED_MODULE_16__);
47777
- /* harmony import */ var core_js_modules_es_regexp_constructor_js__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(24603);
47778
- /* harmony import */ var core_js_modules_es_regexp_constructor_js__WEBPACK_IMPORTED_MODULE_17___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_regexp_constructor_js__WEBPACK_IMPORTED_MODULE_17__);
47779
- /* harmony import */ var core_js_modules_es_regexp_dot_all_js__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(28450);
47780
- /* harmony import */ var core_js_modules_es_regexp_dot_all_js__WEBPACK_IMPORTED_MODULE_18___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_regexp_dot_all_js__WEBPACK_IMPORTED_MODULE_18__);
47781
- /* harmony import */ var core_js_modules_es_regexp_sticky_js__WEBPACK_IMPORTED_MODULE_19__ = __webpack_require__(88386);
47782
- /* harmony import */ var core_js_modules_es_regexp_sticky_js__WEBPACK_IMPORTED_MODULE_19___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_regexp_sticky_js__WEBPACK_IMPORTED_MODULE_19__);
47783
- /* harmony import */ var core_js_modules_es_regexp_to_string_js__WEBPACK_IMPORTED_MODULE_20__ = __webpack_require__(39714);
47784
- /* harmony import */ var core_js_modules_es_regexp_to_string_js__WEBPACK_IMPORTED_MODULE_20___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_regexp_to_string_js__WEBPACK_IMPORTED_MODULE_20__);
47775
+ /* harmony import */ var core_js_modules_es_regexp_to_string_js__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(39714);
47776
+ /* harmony import */ var core_js_modules_es_regexp_to_string_js__WEBPACK_IMPORTED_MODULE_15___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_regexp_to_string_js__WEBPACK_IMPORTED_MODULE_15__);
47777
+ /* harmony import */ var core_js_modules_es_string_replace_js__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(15306);
47778
+ /* harmony import */ var core_js_modules_es_string_replace_js__WEBPACK_IMPORTED_MODULE_16___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_string_replace_js__WEBPACK_IMPORTED_MODULE_16__);
47779
+ /* harmony import */ var core_js_modules_es_string_replace_all_js__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(68757);
47780
+ /* harmony import */ var core_js_modules_es_string_replace_all_js__WEBPACK_IMPORTED_MODULE_17___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_string_replace_all_js__WEBPACK_IMPORTED_MODULE_17__);
47781
+ /* harmony import */ var core_js_modules_es_regexp_constructor_js__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(24603);
47782
+ /* harmony import */ var core_js_modules_es_regexp_constructor_js__WEBPACK_IMPORTED_MODULE_18___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_regexp_constructor_js__WEBPACK_IMPORTED_MODULE_18__);
47783
+ /* harmony import */ var core_js_modules_es_regexp_dot_all_js__WEBPACK_IMPORTED_MODULE_19__ = __webpack_require__(28450);
47784
+ /* harmony import */ var core_js_modules_es_regexp_dot_all_js__WEBPACK_IMPORTED_MODULE_19___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_regexp_dot_all_js__WEBPACK_IMPORTED_MODULE_19__);
47785
+ /* harmony import */ var core_js_modules_es_regexp_sticky_js__WEBPACK_IMPORTED_MODULE_20__ = __webpack_require__(88386);
47786
+ /* harmony import */ var core_js_modules_es_regexp_sticky_js__WEBPACK_IMPORTED_MODULE_20___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_regexp_sticky_js__WEBPACK_IMPORTED_MODULE_20__);
47785
47787
  /* harmony import */ var core_js_modules_es_array_splice_js__WEBPACK_IMPORTED_MODULE_21__ = __webpack_require__(40561);
47786
47788
  /* harmony import */ var core_js_modules_es_array_splice_js__WEBPACK_IMPORTED_MODULE_21___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_splice_js__WEBPACK_IMPORTED_MODULE_21__);
47787
47789
  /* harmony import */ var core_js_modules_es_string_match_all_js__WEBPACK_IMPORTED_MODULE_22__ = __webpack_require__(76373);
@@ -47798,9 +47800,11 @@ var SpecialCharsNode = /*#__PURE__*/function (_ControlNode) {
47798
47800
  /* harmony import */ var _editor_utils_ExpressionCalculator__WEBPACK_IMPORTED_MODULE_28__ = __webpack_require__(28284);
47799
47801
  /* harmony import */ var _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_29__ = __webpack_require__(41005);
47800
47802
  /* harmony import */ var _plugins_util__WEBPACK_IMPORTED_MODULE_30__ = __webpack_require__(33913);
47801
- /* harmony import */ var _BaseNode__WEBPACK_IMPORTED_MODULE_31__ = __webpack_require__(50369);
47802
- /* harmony import */ var _CellNode__WEBPACK_IMPORTED_MODULE_32__ = __webpack_require__(15798);
47803
- /* harmony import */ var _ControlNode__WEBPACK_IMPORTED_MODULE_33__ = __webpack_require__(8395);
47803
+ /* harmony import */ var _BaseCombineNode__WEBPACK_IMPORTED_MODULE_31__ = __webpack_require__(8);
47804
+ /* harmony import */ var _BaseNode__WEBPACK_IMPORTED_MODULE_32__ = __webpack_require__(50369);
47805
+ /* harmony import */ var _CellNode__WEBPACK_IMPORTED_MODULE_33__ = __webpack_require__(15798);
47806
+ /* harmony import */ var _ControlNode__WEBPACK_IMPORTED_MODULE_34__ = __webpack_require__(8395);
47807
+
47804
47808
 
47805
47809
 
47806
47810
 
@@ -47897,7 +47901,7 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
47897
47901
  return _this;
47898
47902
  }
47899
47903
 
47900
- (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_34__/* ["default"] */ .Z)(TableFormula, [{
47904
+ (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_35__/* ["default"] */ .Z)(TableFormula, [{
47901
47905
  key: "setCustomProperty",
47902
47906
  value: function setCustomProperty(customProperty) {
47903
47907
  var assignvalue = function assignvalue(target, source) {
@@ -48012,9 +48016,9 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
48012
48016
  }, {
48013
48017
  key: "node2DrawNodeRange",
48014
48018
  value: function node2DrawNodeRange(startIndex, endIndex) {
48015
- this.refreshDrawStyle();
48016
- var text = this._hideZero && (this._text == "0" || this._text === "0.00") ? " " : this._text;
48017
- var dNode = new _editor_draw_drawNode_DrawTableFormular__WEBPACK_IMPORTED_MODULE_27__/* .DrawTableFormular */ .A(this._rootPath, this, text);
48019
+ this.refreshDrawStyle(); //const text = this._hideZero && (this._text == "0" || this._text === "0.00") ? " " : this._text;
48020
+
48021
+ var dNode = new _editor_draw_drawNode_DrawTableFormular__WEBPACK_IMPORTED_MODULE_27__/* .DrawTableFormular */ .A(this._rootPath, this, this._text);
48018
48022
 
48019
48023
  this._drawNodes.push(dNode);
48020
48024
  }
@@ -48057,7 +48061,7 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
48057
48061
  key: "node2Json",
48058
48062
  value: function node2Json(range, isCopy) {
48059
48063
  var retObj = {
48060
- nodeType: _BaseNode__WEBPACK_IMPORTED_MODULE_31__/* .NodeType */ .Jq[this.nodeType],
48064
+ nodeType: _BaseNode__WEBPACK_IMPORTED_MODULE_32__/* .NodeType */ .Jq[this.nodeType],
48061
48065
  text: this._formulaStr,
48062
48066
  styleIndex: this.styleIndex,
48063
48067
  hideZero: this._hideZero,
@@ -48079,7 +48083,7 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
48079
48083
  var pNode = this.parentNode;
48080
48084
 
48081
48085
  while (pNode) {
48082
- if (pNode instanceof _CellNode__WEBPACK_IMPORTED_MODULE_32__/* .CellNode */ .D) {
48086
+ if (pNode instanceof _CellNode__WEBPACK_IMPORTED_MODULE_33__/* .CellNode */ .D) {
48083
48087
  return pNode;
48084
48088
  }
48085
48089
 
@@ -48095,7 +48099,7 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
48095
48099
 
48096
48100
  var table = this.getParentCell().table;
48097
48101
  var totalOk = false;
48098
- var total = 0.0;
48102
+ var total = " ";
48099
48103
 
48100
48104
  if (arr.length == 2) {
48101
48105
  var _this$getRowColByCell = this.getRowColByCellAdress(arr[0]),
@@ -48115,6 +48119,7 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
48115
48119
  for (var r = istartRow; r <= iEndRow; r++) {
48116
48120
  for (var c = istartCol; c <= iEndCol; c++) {
48117
48121
  if (bCalc) {
48122
+ if (!table.rows[r]) return "?";
48118
48123
  var cell = table.rows[r][c];
48119
48124
  if (!cell) continue;
48120
48125
 
@@ -48125,7 +48130,10 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
48125
48130
 
48126
48131
  if (cell.cellProperty.downListProperty) {
48127
48132
  if (bret) {
48128
- total += value;
48133
+ //total+=value;
48134
+ if (value !== "") {
48135
+ total = ((total == " " ? 0.00 : Number(total)) + Number(value)).toString();
48136
+ }
48129
48137
  } else {
48130
48138
  var cellText = cell.getCellText();
48131
48139
  var downListProperty = cell.cellProperty.downListProperty;
@@ -48143,7 +48151,8 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
48143
48151
  var val = Number(listItem.value);
48144
48152
 
48145
48153
  if (!isNaN(val)) {
48146
- total += val;
48154
+ //total += val;
48155
+ total = ((total == " " ? 0.00 : Number(total)) + val).toString();
48147
48156
  } else {
48148
48157
  totalOk = false;
48149
48158
  break;
@@ -48163,8 +48172,11 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
48163
48172
  break;
48164
48173
  }
48165
48174
 
48166
- ;
48167
- total += value;
48175
+ ; //total += value;
48176
+
48177
+ if (value !== "") {
48178
+ total = ((total == " " ? 0.00 : Number(total)) + Number(value)).toString();
48179
+ }
48168
48180
  }
48169
48181
  } else {
48170
48182
  this._cellRange.push([r, c]);
@@ -48188,7 +48200,7 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
48188
48200
  }, {
48189
48201
  key: "getCellNumber",
48190
48202
  value: function getCellNumber(tb, irow, icol) {
48191
- var ret = 0;
48203
+ var ret = "";
48192
48204
  var bret = false;
48193
48205
  var cell = tb.rows[irow][icol];
48194
48206
 
@@ -48215,7 +48227,7 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
48215
48227
 
48216
48228
  if (!isNaN(ivalue)) {
48217
48229
  bret = true;
48218
- ret = ivalue;
48230
+ ret = strValue;
48219
48231
  }
48220
48232
  }
48221
48233
 
@@ -48245,7 +48257,7 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
48245
48257
  }, {
48246
48258
  key: "clacFormula",
48247
48259
  value: function clacFormula(bCalc) {
48248
- var strRet = '?';
48260
+ var strRet = ' ';
48249
48261
 
48250
48262
  var strFormula = this._formulaStr.toLowerCase();
48251
48263
 
@@ -48297,7 +48309,8 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
48297
48309
  avalue = _this$getCellNumber4[1];
48298
48310
 
48299
48311
  if (isNumber) {
48300
- value[i] = avalue.toString();
48312
+ //value[i] = avalue.toString();
48313
+ value[i] = avalue;
48301
48314
  } else {
48302
48315
  totalOk = false;
48303
48316
  break;
@@ -48314,7 +48327,7 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
48314
48327
  }
48315
48328
 
48316
48329
  if (!bCalc) {
48317
- return '0';
48330
+ return ' ';
48318
48331
  }
48319
48332
 
48320
48333
  if (totalOk) {
@@ -48322,20 +48335,25 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
48322
48335
  var isRet = true;
48323
48336
 
48324
48337
  for (var m = 0; m < value.length; m++) {
48325
- if (value[m] !== "0") {
48338
+ // if (value[m] !== "0") {
48339
+ // isRet = false;
48340
+ // }
48341
+ if (value[m] !== "") {
48326
48342
  isRet = false;
48343
+ break;
48327
48344
  }
48328
48345
  }
48329
48346
 
48330
48347
  if (isRet) {
48331
- return '0';
48348
+ return " ";
48332
48349
  }
48333
48350
 
48334
48351
  for (var k = arr.length - 1; k >= 0; k--) {
48335
48352
  strFormula = hoEditorFactory.unitConvert.replaceAll(strFormula, arr[k], value[k]); //strFormula.replaceAll(arr[k], value[k]);
48336
48353
  }
48337
48354
 
48338
- strRet = '' + (0,_editor_utils_ExpressionCalculator__WEBPACK_IMPORTED_MODULE_28__/* .expressionCalculator */ .C)(strFormula);
48355
+ var result = (0,_editor_utils_ExpressionCalculator__WEBPACK_IMPORTED_MODULE_28__/* .expressionCalculator */ .C)(strFormula);
48356
+ strRet = result.toString() == "NaN" ? " " : result.toString();
48339
48357
  }
48340
48358
 
48341
48359
  return strRet;
@@ -48343,7 +48361,7 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
48343
48361
  }, {
48344
48362
  key: "clacBMI",
48345
48363
  value: function clacBMI() {
48346
- var strRet = "0";
48364
+ var strRet = " ";
48347
48365
  var table = this.getParentCell().table;
48348
48366
  var arrStr = this.formulaStr.split(",");
48349
48367
 
@@ -48362,6 +48380,8 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
48362
48380
  heightCol = _this$getRowColByCell10[1];
48363
48381
 
48364
48382
  if (weightRow >= 0 && weightCol >= 0 && heightRow >= 0 && heightCol >= 0) {
48383
+ if (!table.rows[weightRow]) return strRet;
48384
+ if (!table.rows[heightRow]) return strRet;
48365
48385
  var wCell = table.rows[weightRow][weightCol];
48366
48386
  var hCell = table.rows[heightRow][heightCol];
48367
48387
 
@@ -48369,14 +48389,17 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
48369
48389
  var _this$getCellNumber5 = this.getCellNumber(table, weightRow, weightCol),
48370
48390
  _this$getCellNumber6 = (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)(_this$getCellNumber5, 2),
48371
48391
  wRet = _this$getCellNumber6[0],
48372
- weightNum = _this$getCellNumber6[1];
48392
+ weight = _this$getCellNumber6[1];
48373
48393
 
48374
48394
  var _this$getCellNumber7 = this.getCellNumber(table, heightRow, heightCol),
48375
48395
  _this$getCellNumber8 = (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)(_this$getCellNumber7, 2),
48376
48396
  hRet = _this$getCellNumber8[0],
48377
- heightNum = _this$getCellNumber8[1];
48397
+ height = _this$getCellNumber8[1];
48378
48398
 
48379
- if (hRet && heightNum === 0) return strRet;
48399
+ if (height == "0" || height == "") return strRet;
48400
+ if (weight == "") return strRet;
48401
+ var weightNum = Number(weight);
48402
+ var heightNum = Number(height);
48380
48403
 
48381
48404
  if (wRet && hRet) {
48382
48405
  if (heightNum > 3) {
@@ -48424,6 +48447,8 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
48424
48447
  }
48425
48448
 
48426
48449
  if (sRow >= 0 && sCol >= 0 && eRow >= 0 && eCol >= 0) {
48450
+ if (!table.rows[sRow]) return "0";
48451
+ if (!table.rows[eRow]) return "0";
48427
48452
  var sCell = table.rows[sRow][sCol];
48428
48453
  var eCell = table.rows[eRow][eCol];
48429
48454
 
@@ -48482,6 +48507,7 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
48482
48507
 
48483
48508
  if (arrStr.length === 3) {
48484
48509
  if (aRow >= 0 && aCol >= 0) {
48510
+ if (!table.rows[aRow]) return "0";
48485
48511
  var aCell = table.rows[aRow][aCol];
48486
48512
 
48487
48513
  if (aCell) {
@@ -48592,6 +48618,7 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
48592
48618
  col = _this$getRowColByCell18[1];
48593
48619
 
48594
48620
  if (row >= 0 && col >= 0) {
48621
+ if (!table.rows[row]) return "0";
48595
48622
  var cell = table.rows[row][col];
48596
48623
 
48597
48624
  if (cell) {
@@ -48636,6 +48663,7 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
48636
48663
  col = _this$getRowColByCell20[1];
48637
48664
 
48638
48665
  if (row >= 0 && col >= 0) {
48666
+ if (!table.rows[row]) return "0";
48639
48667
  var cell = table.rows[row][col];
48640
48668
 
48641
48669
  if (cell) {
@@ -48669,7 +48697,7 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
48669
48697
  }, {
48670
48698
  key: "getScoreMapping",
48671
48699
  value: function getScoreMapping() {
48672
- var strRet = "0";
48700
+ var strRet = " ";
48673
48701
  var formularJson = JSON.parse(this.formulaStr);
48674
48702
  var cellNo = formularJson.cell;
48675
48703
  var items = formularJson.items;
@@ -48681,20 +48709,38 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
48681
48709
  col = _this$getRowColByCell22[1];
48682
48710
 
48683
48711
  if (row >= 0 && col >= 0) {
48712
+ if (!table.rows[row]) return " ";
48684
48713
  var cell = table.rows[row][col];
48685
48714
 
48686
- if (cell && cell.childNodes[1] instanceof TableFormula) {
48687
- var tableFormular = cell.childNodes[1]; //const scoreText = cell.getCellText();
48715
+ if (cell) {
48716
+ var tableFormular = cell.childNodes[0];
48717
+
48718
+ var loopNodes = function loopNodes(nodes) {
48719
+ for (var k = 0; k < nodes.length; k++) {
48720
+ var node = nodes[k];
48721
+
48722
+ if (node instanceof TableFormula) {
48723
+ tableFormular = node;
48724
+ break;
48725
+ }
48726
+
48727
+ if (node instanceof _BaseCombineNode__WEBPACK_IMPORTED_MODULE_31__/* .BaseCombineNode */ .V) {
48728
+ loopNodes(node.childNodes);
48729
+ }
48730
+ }
48731
+ };
48732
+
48733
+ loopNodes(cell.childNodes);
48734
+ if (!(tableFormular instanceof TableFormula)) return " "; //const scoreText = cell.getCellText();
48688
48735
 
48689
48736
  var scoreText = tableFormular.text;
48690
48737
 
48691
48738
  if (scoreText == "" || scoreText == " ") {
48692
48739
  return strRet;
48693
- }
48740
+ } // if (tableFormular.hideZero && (scoreText == "0" || scoreText == "0.00")) {
48741
+ // return strRet;
48742
+ // }
48694
48743
 
48695
- if (tableFormular.hideZero && (scoreText == "0" || scoreText == "0.00")) {
48696
- return strRet;
48697
- }
48698
48744
 
48699
48745
  var score = Number(scoreText);
48700
48746
 
@@ -48817,13 +48863,13 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
48817
48863
  formularType = json.text.indexOf(':') > 0 ? FormularType.ftSum : FormularType.ftFormular;
48818
48864
  }
48819
48865
 
48820
- var ret = new TableFormula(hoEditorFactoryID, rootNodes, pNode ? pNode : null, _BaseNode__WEBPACK_IMPORTED_MODULE_31__/* .NodeType.ntTableFormula */ .Jq.ntTableFormula, json.text, styleIndex, hideZero, formularType, json.customProperty);
48866
+ var ret = new TableFormula(hoEditorFactoryID, rootNodes, pNode ? pNode : null, _BaseNode__WEBPACK_IMPORTED_MODULE_32__/* .NodeType.ntTableFormula */ .Jq.ntTableFormula, json.text, styleIndex, hideZero, formularType, json.customProperty);
48821
48867
  return ret;
48822
48868
  }
48823
48869
  }]);
48824
48870
 
48825
48871
  return TableFormula;
48826
- }(_ControlNode__WEBPACK_IMPORTED_MODULE_33__/* .ControlNode */ .w);
48872
+ }(_ControlNode__WEBPACK_IMPORTED_MODULE_34__/* .ControlNode */ .w);
48827
48873
 
48828
48874
  /***/ }),
48829
48875
 
@@ -49257,6 +49303,8 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
49257
49303
  }
49258
49304
  }
49259
49305
 
49306
+ _this.countChildNodes();
49307
+
49260
49308
  _this.node2DrawNode();
49261
49309
 
49262
49310
  _this.updateWidth();
@@ -49353,11 +49401,11 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
49353
49401
  }, {
49354
49402
  key: "childNodes",
49355
49403
  get: function get() {
49356
- var arr = this._rows.flat();
49404
+ if (!this._childNodes) {
49405
+ this.countChildNodes();
49406
+ }
49357
49407
 
49358
- return arr.filter(function (element) {
49359
- return element !== undefined;
49360
- });
49408
+ return this._childNodes;
49361
49409
  }
49362
49410
  }, {
49363
49411
  key: "borderWidth",
@@ -49367,6 +49415,15 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
49367
49415
  set: function set(borderWidth) {
49368
49416
  this._borderWidth = borderWidth;
49369
49417
  }
49418
+ }, {
49419
+ key: "countChildNodes",
49420
+ value: function countChildNodes() {
49421
+ var arr = this._rows.flat();
49422
+
49423
+ this._childNodes = arr.filter(function (element) {
49424
+ return element !== undefined;
49425
+ });
49426
+ }
49370
49427
  }, {
49371
49428
  key: "calcColWidth",
49372
49429
  value: function calcColWidth() {
@@ -49503,6 +49560,7 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
49503
49560
  }
49504
49561
 
49505
49562
  this._rowCount += 1;
49563
+ this.countChildNodes();
49506
49564
  this._drawTable.needUpdate = true;
49507
49565
  }
49508
49566
 
@@ -49763,6 +49821,7 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
49763
49821
  }
49764
49822
 
49765
49823
  this._colCount += count;
49824
+ this.countChildNodes();
49766
49825
  this.updateWidth(); // }
49767
49826
  }
49768
49827
  /**
@@ -49948,6 +50007,7 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
49948
50007
  // }
49949
50008
  // vampireCell.updateHeight(aHeight);
49950
50009
 
50010
+ this.countChildNodes();
49951
50011
  vampireCell.drawCell.needUpdate = true;
49952
50012
  return vampireCell;
49953
50013
  }
@@ -50204,6 +50264,8 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
50204
50264
  // }
50205
50265
 
50206
50266
  this._rows.splice(index, count);
50267
+
50268
+ this.countChildNodes();
50207
50269
  }
50208
50270
  }, {
50209
50271
  key: "deleteCols",
@@ -50295,6 +50357,8 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
50295
50357
  if (cols.length > 0) {
50296
50358
  this.updateColsWidth(cols, newWidth);
50297
50359
  }
50360
+
50361
+ this.countChildNodes();
50298
50362
  }
50299
50363
  }, {
50300
50364
  key: "unMergeCell",
@@ -50336,6 +50400,8 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
50336
50400
  } else if (bUnMergeCol) {
50337
50401
  this.doUnMergeCol(r, c);
50338
50402
  }
50403
+
50404
+ this.countChildNodes();
50339
50405
  }
50340
50406
  }
50341
50407
  }, {
@@ -51846,6 +51912,7 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
51846
51912
  }
51847
51913
  }
51848
51914
 
51915
+ tableNode.countChildNodes();
51849
51916
  return tableNode;
51850
51917
  }
51851
51918
  }, {
@@ -61653,14 +61720,6 @@ var getPrototypeOf = __webpack_require__(24084);
61653
61720
  var inherits = __webpack_require__(99640);
61654
61721
  // EXTERNAL MODULE: ./node_modules/@babel/runtime/helpers/esm/createSuper.js + 2 modules
61655
61722
  var createSuper = __webpack_require__(28214);
61656
- // EXTERNAL MODULE: ./node_modules/core-js/modules/es.function.name.js
61657
- var es_function_name = __webpack_require__(68309);
61658
- // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.includes.js
61659
- var es_array_includes = __webpack_require__(26699);
61660
- // EXTERNAL MODULE: ./node_modules/core-js/modules/es.string.includes.js
61661
- var es_string_includes = __webpack_require__(32023);
61662
- // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.splice.js
61663
- var es_array_splice = __webpack_require__(40561);
61664
61723
  // EXTERNAL MODULE: ./node_modules/core-js/modules/es.error.cause.js
61665
61724
  var es_error_cause = __webpack_require__(21703);
61666
61725
  // EXTERNAL MODULE: ./src/editor/dom/TableProperty.ts
@@ -62015,10 +62074,6 @@ var DrawPageTable = __webpack_require__(46002);
62015
62074
 
62016
62075
 
62017
62076
 
62018
-
62019
-
62020
-
62021
-
62022
62077
 
62023
62078
 
62024
62079
  var DrawPageCell = /*#__PURE__*/function (_DrawArea) {
@@ -62353,7 +62408,7 @@ var DrawPageCell = /*#__PURE__*/function (_DrawArea) {
62353
62408
  // return true;
62354
62409
  // }
62355
62410
 
62356
- if (this._startDline >= this.cell.drawCell.drawLines.length) {
62411
+ if (this._startDline >= this.cell.drawCell.drawLines.length || index == -1) {
62357
62412
  return true;
62358
62413
  } // if (this._lastDrawLine instanceof DrawPageTable) {
62359
62414
  // index = this._cell.drawCell.drawLines.indexOf(
@@ -62489,6 +62544,8 @@ var DrawPageCell = /*#__PURE__*/function (_DrawArea) {
62489
62544
  key: "startPaintBackGround",
62490
62545
  value: function startPaintBackGround() {
62491
62546
  this._backImg.uncache();
62547
+
62548
+ this._backImg.graphics.clear();
62492
62549
  }
62493
62550
  }, {
62494
62551
  key: "endPaintBackGround",
@@ -62497,34 +62554,28 @@ var DrawPageCell = /*#__PURE__*/function (_DrawArea) {
62497
62554
  }
62498
62555
  }, {
62499
62556
  key: "paintMarker",
62500
- value: function paintMarker(r, c) {
62501
- var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID);
62502
-
62503
- for (var i = this.children.length - 1; i >= 0; i--) {
62504
- if (this.children[i].name && this.children[i].name.includes("markline")) {
62505
- this.children.splice(i, 1);
62506
- }
62507
- }
62557
+ value: function paintMarker(color) {
62558
+ var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID); // for (let i = this.children.length - 1; i >= 0; i--) {
62559
+ // if (this.children[i].name && this.children[i].name.includes("markline")) {
62560
+ // this.children.splice(i, 1);
62561
+ // }
62562
+ // }
62508
62563
 
62509
62564
  if (hoEditorFactory.drawTree.paintStatus !== DrawTree/* PaintState.psPreview */.Dh.psPreview && hoEditorFactory.drawTree.paintStatus !== DrawTree/* PaintState.psPrint */.Dh.psPrint) {
62510
- var markerLine1 = new createjs.Shape();
62511
- var markerLine2 = new createjs.Shape();
62512
- var markerLine3 = new createjs.Shape();
62513
- var markerLine4 = new createjs.Shape();
62565
+ // const markerLine1 = new createjs.Shape();
62566
+ // const markerLine2 = new createjs.Shape();
62567
+ // const markerLine3 = new createjs.Shape();
62568
+ // const markerLine4 = new createjs.Shape();
62514
62569
  var width = this.dWidth;
62515
- var height = this.dHeight;
62516
- markerLine1.name = "markline1";
62517
- markerLine2.name = "markline2";
62518
- markerLine3.name = "markline3";
62519
- markerLine4.name = "markline4";
62520
- markerLine1.graphics.beginStroke("#FB0101").moveTo(width - 7, height - 0.5).lineTo(width - 0.5, height - 7);
62521
- markerLine2.graphics.beginStroke("#FB0101").moveTo(width - 5, height - 0.5).lineTo(width - 0.5, height - 5);
62522
- markerLine3.graphics.beginStroke("#FB0101").moveTo(width - 3, height - 0.5).lineTo(width - 0.5, height - 3);
62523
- markerLine4.graphics.beginStroke("#FB0101").moveTo(width - 2, height - 0.5).lineTo(width - 0.5, height - 2);
62524
- this.addChild(markerLine1);
62525
- this.addChild(markerLine2);
62526
- this.addChild(markerLine3);
62527
- this.addChild(markerLine4);
62570
+ var height = this.dHeight; // markerLine1.name = "markline1";
62571
+ // markerLine2.name = "markline2";
62572
+ // markerLine3.name = "markline3";
62573
+ // markerLine4.name = "markline4";
62574
+
62575
+ this._backImg.graphics.clear().beginStroke(color).moveTo(width - 7, height - 0.5).lineTo(width - 0.5, height - 7).moveTo(width - 5, height - 0.5).lineTo(width - 0.5, height - 5).moveTo(width - 3, height - 0.5).lineTo(width - 0.5, height - 3).moveTo(width - 2, height - 0.5).lineTo(width - 0.5, height - 2);
62576
+
62577
+ this._backImg.graphics.endStroke(); // this.addChild(markerLine1);
62578
+
62528
62579
  }
62529
62580
  }
62530
62581
  }, {
@@ -62533,9 +62584,7 @@ var DrawPageCell = /*#__PURE__*/function (_DrawArea) {
62533
62584
  var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID);
62534
62585
  this._backImg.x = 0;
62535
62586
  this._backImg.y = 0; // this._backImg.uncache();
62536
-
62537
- this._backImg.graphics.clear(); // 白色背景转透明 处理转换pdf生成的多余线
62538
-
62587
+ // 白色背景转透明 处理转换pdf生成的多余线
62539
62588
 
62540
62589
  this._backImg.graphics.beginFill(this._cell.cellProperty.backColor === '#FFFFFF' ? 'transparent' : this._cell.cellProperty.backColor);
62541
62590
 
@@ -63056,7 +63105,7 @@ var DrawPageMarkNode = /*#__PURE__*/function (_DrawCombineNode) {
63056
63105
  /* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(5914);
63057
63106
  /* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_inherits_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(99640);
63058
63107
  /* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createSuper_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(28214);
63059
- /* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(22342);
63108
+ /* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(22342);
63060
63109
  /* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_classCallCheck_js__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(35671);
63061
63110
  /* harmony import */ var core_js_modules_es_array_sort_js__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(2707);
63062
63111
  /* harmony import */ var core_js_modules_es_array_sort_js__WEBPACK_IMPORTED_MODULE_5___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_sort_js__WEBPACK_IMPORTED_MODULE_5__);
@@ -63066,12 +63115,16 @@ var DrawPageMarkNode = /*#__PURE__*/function (_DrawCombineNode) {
63066
63115
  /* harmony import */ var core_js_modules_es_error_cause_js__WEBPACK_IMPORTED_MODULE_7___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_error_cause_js__WEBPACK_IMPORTED_MODULE_7__);
63067
63116
  /* harmony import */ var core_js_modules_es_array_concat_js__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(92222);
63068
63117
  /* harmony import */ var core_js_modules_es_array_concat_js__WEBPACK_IMPORTED_MODULE_8___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_concat_js__WEBPACK_IMPORTED_MODULE_8__);
63069
- /* harmony import */ var _editor_dom_treeNode_TableNode__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(95883);
63070
- /* harmony import */ var _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(41005);
63071
- /* harmony import */ var _drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(24093);
63072
- /* harmony import */ var _IDrawInfos__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(70692);
63073
- /* harmony import */ var _DrawPageCell__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(39648);
63074
- /* harmony import */ var _DrawRect__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(152);
63118
+ /* harmony import */ var _editor_dom_treeNode_BaseCombineNode__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(8);
63119
+ /* harmony import */ var _editor_dom_treeNode_TableFormula__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(39869);
63120
+ /* harmony import */ var _editor_dom_treeNode_TableNode__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(95883);
63121
+ /* harmony import */ var _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(41005);
63122
+ /* harmony import */ var _drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(24093);
63123
+ /* harmony import */ var _IDrawInfos__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(70692);
63124
+ /* harmony import */ var _DrawPageCell__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(39648);
63125
+ /* harmony import */ var _DrawRect__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(152);
63126
+
63127
+
63075
63128
 
63076
63129
 
63077
63130
 
@@ -63133,7 +63186,7 @@ var DrawPageMarkNode = /*#__PURE__*/function (_DrawCombineNode) {
63133
63186
  // }
63134
63187
  // }
63135
63188
 
63136
- var PartRowHeight = /*#__PURE__*/(0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_14__/* ["default"] */ .Z)(function PartRowHeight() {
63189
+ var PartRowHeight = /*#__PURE__*/(0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_16__/* ["default"] */ .Z)(function PartRowHeight() {
63137
63190
  (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_classCallCheck_js__WEBPACK_IMPORTED_MODULE_4__/* ["default"] */ .Z)(this, PartRowHeight);
63138
63191
  });
63139
63192
  var PartRowHeights = /*#__PURE__*/function () {
@@ -63144,7 +63197,7 @@ var PartRowHeights = /*#__PURE__*/function () {
63144
63197
  this._drawPageTable = drawPageTable;
63145
63198
  }
63146
63199
 
63147
- (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_14__/* ["default"] */ .Z)(PartRowHeights, [{
63200
+ (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_16__/* ["default"] */ .Z)(PartRowHeights, [{
63148
63201
  key: "getLastRow",
63149
63202
  value: function getLastRow() {
63150
63203
  if (this._rowHeights.length > 0) {
@@ -63238,7 +63291,7 @@ var DrawPageTable = /*#__PURE__*/function (_DrawRect) {
63238
63291
  _this._table = tableNode;
63239
63292
  _this._dParent = dParent;
63240
63293
  _this._charSpace = paragraphNode.combineParagraph.charSpace;
63241
- _this._discriminator = _IDrawInfos__WEBPACK_IMPORTED_MODULE_15__/* .gDrawIntfID */ .t;
63294
+ _this._discriminator = _IDrawInfos__WEBPACK_IMPORTED_MODULE_17__/* .gDrawIntfID */ .t;
63242
63295
  _this._dTop = dTop;
63243
63296
  _this._node = tableNode;
63244
63297
  _this._dWidth = aWidth;
@@ -63253,7 +63306,7 @@ var DrawPageTable = /*#__PURE__*/function (_DrawRect) {
63253
63306
  } // private _endRowinfos: EndRowInfo;
63254
63307
 
63255
63308
 
63256
- (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_14__/* ["default"] */ .Z)(DrawPageTable, [{
63309
+ (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_16__/* ["default"] */ .Z)(DrawPageTable, [{
63257
63310
  key: "startRow",
63258
63311
  get: function get() {
63259
63312
  return this._startRow;
@@ -63533,19 +63586,42 @@ var DrawPageTable = /*#__PURE__*/function (_DrawRect) {
63533
63586
  }, {
63534
63587
  key: "paintCellBorder",
63535
63588
  value: function paintCellBorder(partCell, r, c, newHeight) {
63589
+ partCell.startPaintBackGround();
63536
63590
  var colInfo = this._table.colInfos[c];
63537
63591
 
63538
63592
  if (partCell.cell.cellProperty.editorProperty !== 0 || colInfo.colProperty.editorProperty !== 0) {
63539
- partCell.paintMarker(r, c);
63593
+ partCell.paintMarker("#FF0000");
63594
+ }
63595
+
63596
+ var isHasTableFormula = false;
63597
+
63598
+ var loopNodes = function loopNodes(nodes) {
63599
+ for (var k = 0; k < nodes.length; k++) {
63600
+ var node = nodes[k];
63601
+
63602
+ if (node instanceof _editor_dom_treeNode_TableFormula__WEBPACK_IMPORTED_MODULE_10__/* .TableFormula */ .N) {
63603
+ isHasTableFormula = true;
63604
+ break;
63605
+ }
63606
+
63607
+ if (node instanceof _editor_dom_treeNode_BaseCombineNode__WEBPACK_IMPORTED_MODULE_9__/* .BaseCombineNode */ .V) {
63608
+ loopNodes(node.childNodes);
63609
+ }
63610
+ }
63611
+ };
63612
+
63613
+ loopNodes(partCell.cell.childNodes);
63614
+
63615
+ if (isHasTableFormula) {
63616
+ partCell.paintMarker("#0000FF");
63540
63617
  }
63541
63618
 
63542
- partCell.startPaintBackGround();
63543
63619
  partCell.paintCellBackground(newHeight, r, c);
63544
63620
  partCell.endPaintBackGround(newHeight);
63545
63621
  partCell.updateCrossShap();
63546
- var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_10__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this.table.hoEditorFactoryID);
63622
+ var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_12__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this.table.hoEditorFactoryID);
63547
63623
 
63548
- if (hoEditorFactory.drawTree.paintStatus === _drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_11__/* .PaintState.psPreview */ .Dh.psPreview || hoEditorFactory.drawTree.paintStatus === _drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_11__/* .PaintState.psPrint */ .Dh.psPrint) {
63624
+ if (hoEditorFactory.drawTree.paintStatus === _drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_13__/* .PaintState.psPreview */ .Dh.psPreview || hoEditorFactory.drawTree.paintStatus === _drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_13__/* .PaintState.psPrint */ .Dh.psPrint) {
63549
63625
  return;
63550
63626
  }
63551
63627
 
@@ -63586,7 +63662,7 @@ var DrawPageTable = /*#__PURE__*/function (_DrawRect) {
63586
63662
  }
63587
63663
  }
63588
63664
 
63589
- var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_10__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._table.hoEditorFactoryID);
63665
+ var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_12__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._table.hoEditorFactoryID);
63590
63666
  var tableRestHeight = pageRestHeight;
63591
63667
  this._endRow = this._startRow;
63592
63668
  var emptyRowHeight = 0;
@@ -63595,13 +63671,13 @@ var DrawPageTable = /*#__PURE__*/function (_DrawRect) {
63595
63671
  for (var r = this._startRow; r < this._table.rowCount; r++) {
63596
63672
  var rowRestHeight = 0;
63597
63673
 
63598
- if (pageRestHeight < _editor_dom_treeNode_TableNode__WEBPACK_IMPORTED_MODULE_9__/* .gDefaultRowHeight */ .dT) {
63674
+ if (pageRestHeight < _editor_dom_treeNode_TableNode__WEBPACK_IMPORTED_MODULE_11__/* .gDefaultRowHeight */ .dT) {
63599
63675
  break;
63600
63676
  } //开始行需要判断是否存在上一个未绘制完成的表格
63601
63677
 
63602
63678
 
63603
63679
  if (r === this._startRow && index > 0 && !bStartRowFinished) {
63604
- rowRestHeight = Math.max(this._table.drawTable.getRowRestHeight(index - 1, this._startRow), _editor_dom_treeNode_TableNode__WEBPACK_IMPORTED_MODULE_9__/* .gDefaultRowHeight */ .dT);
63680
+ rowRestHeight = Math.max(this._table.drawTable.getRowRestHeight(index - 1, this._startRow), _editor_dom_treeNode_TableNode__WEBPACK_IMPORTED_MODULE_11__/* .gDefaultRowHeight */ .dT);
63605
63681
  } else {
63606
63682
  rowRestHeight = this._table.rowInfos[r].rowHeight;
63607
63683
  }
@@ -63624,7 +63700,7 @@ var DrawPageTable = /*#__PURE__*/function (_DrawRect) {
63624
63700
 
63625
63701
  if (isEmptyRow) {
63626
63702
  if (r >= this._startRow) {
63627
- var aRowHeight = Math.max(this._table.rowInfos[r].rowHeight, _editor_dom_treeNode_TableNode__WEBPACK_IMPORTED_MODULE_9__/* .gDefaultRowHeight */ .dT);
63703
+ var aRowHeight = Math.max(this._table.rowInfos[r].rowHeight, _editor_dom_treeNode_TableNode__WEBPACK_IMPORTED_MODULE_11__/* .gDefaultRowHeight */ .dT);
63628
63704
 
63629
63705
  this._partRowHeights.set(r, aRowHeight);
63630
63706
 
@@ -63727,7 +63803,7 @@ var DrawPageTable = /*#__PURE__*/function (_DrawRect) {
63727
63803
 
63728
63804
  if (cell.rowSpan + r - 1 === row) {
63729
63805
  var partCell = cell.drawCell.getDrawPageCell(this);
63730
- var hoeditorfactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_10__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._table.hoEditorFactoryID);
63806
+ var hoeditorfactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_12__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._table.hoEditorFactoryID);
63731
63807
 
63732
63808
  if (partCell) {
63733
63809
  // const dobj = partCell.lastDrawLine;
@@ -63738,14 +63814,14 @@ var DrawPageTable = /*#__PURE__*/function (_DrawRect) {
63738
63814
 
63739
63815
  if (index == 0 || index == partCell.cell.drawCell.drawPageCells.length - 1) {
63740
63816
  if (index == 0 && index == partCell.cell.drawCell.drawPageCells.length - 1) {
63741
- dHeight = Math.max(_editor_dom_treeNode_TableNode__WEBPACK_IMPORTED_MODULE_9__/* .gDefaultRowHeight */ .dT, innerTop + partCell.docHeight + innerBottom);
63817
+ dHeight = Math.max(_editor_dom_treeNode_TableNode__WEBPACK_IMPORTED_MODULE_11__/* .gDefaultRowHeight */ .dT, innerTop + partCell.docHeight + innerBottom);
63742
63818
  } else if (index == 0) {
63743
- dHeight = Math.max(_editor_dom_treeNode_TableNode__WEBPACK_IMPORTED_MODULE_9__/* .gDefaultRowHeight */ .dT, innerTop + partCell.docHeight);
63819
+ dHeight = Math.max(_editor_dom_treeNode_TableNode__WEBPACK_IMPORTED_MODULE_11__/* .gDefaultRowHeight */ .dT, innerTop + partCell.docHeight);
63744
63820
  } else if (index == partCell.cell.drawCell.drawPageCells.length - 1) {
63745
- dHeight = Math.max(_editor_dom_treeNode_TableNode__WEBPACK_IMPORTED_MODULE_9__/* .gDefaultRowHeight */ .dT, innerBottom + partCell.docHeight);
63821
+ dHeight = Math.max(_editor_dom_treeNode_TableNode__WEBPACK_IMPORTED_MODULE_11__/* .gDefaultRowHeight */ .dT, innerBottom + partCell.docHeight);
63746
63822
  }
63747
63823
  } else {
63748
- dHeight = Math.max(_editor_dom_treeNode_TableNode__WEBPACK_IMPORTED_MODULE_9__/* .gDefaultRowHeight */ .dT, partCell.docHeight);
63824
+ dHeight = Math.max(_editor_dom_treeNode_TableNode__WEBPACK_IMPORTED_MODULE_11__/* .gDefaultRowHeight */ .dT, partCell.docHeight);
63749
63825
  }
63750
63826
 
63751
63827
  if (index === partCell.cell.drawCell.drawPageCells.length - 1 || this._table.rowInfos[r].rowProperty.repeatAsTitleAtPageTop) {
@@ -63868,7 +63944,7 @@ var DrawPageTable = /*#__PURE__*/function (_DrawRect) {
63868
63944
 
63869
63945
 
63870
63946
  if (partCellindex === cell.drawCell.drawPageCells.length - 1) {
63871
- dPartCell = new _DrawPageCell__WEBPACK_IMPORTED_MODULE_12__/* .DrawPageCell */ .k(this.table.hoEditorFactoryID, this, cell, aleft, cellRowTop, awidth, cellMaxHeight, partCellindex + 1, startChildIndex, cellMaxHeight);
63947
+ dPartCell = new _DrawPageCell__WEBPACK_IMPORTED_MODULE_14__/* .DrawPageCell */ .k(this.table.hoEditorFactoryID, this, cell, aleft, cellRowTop, awidth, cellMaxHeight, partCellindex + 1, startChildIndex, cellMaxHeight);
63872
63948
  cell.drawCell.drawPageCells.push(dPartCell);
63873
63949
  dPartCell.y = cellRowTop;
63874
63950
  dPartCell.x = aleft; //this.drawItems.push(dPartCell);
@@ -63912,7 +63988,7 @@ var DrawPageTable = /*#__PURE__*/function (_DrawRect) {
63912
63988
  }, {
63913
63989
  key: "getMainRestHeight",
63914
63990
  value: function getMainRestHeight() {
63915
- var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_10__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this.table.hoEditorFactoryID);
63991
+ var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_12__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this.table.hoEditorFactoryID);
63916
63992
  var mainArea = hoEditorFactory.drawPageTree.getMainRootArea(this);
63917
63993
  if (!mainArea) return 0;
63918
63994
  var pos = this.localToLocal(0, 0, mainArea);
@@ -63920,7 +63996,7 @@ var DrawPageTable = /*#__PURE__*/function (_DrawRect) {
63920
63996
  var pArea = hoEditorFactory.drawTree.getParentDrawArea(this);
63921
63997
 
63922
63998
  while (pArea && pArea !== mainArea) {
63923
- if (pArea instanceof _DrawPageCell__WEBPACK_IMPORTED_MODULE_12__/* .DrawPageCell */ .k) {
63999
+ if (pArea instanceof _DrawPageCell__WEBPACK_IMPORTED_MODULE_14__/* .DrawPageCell */ .k) {
63924
64000
  var rowIndex = pArea.cell.table.rows.indexOf(pArea.cell.row);
63925
64001
 
63926
64002
  if (rowIndex >= 0) {
@@ -63940,7 +64016,7 @@ var DrawPageTable = /*#__PURE__*/function (_DrawRect) {
63940
64016
  }, {
63941
64017
  key: "getAndUpdatePartRowHeight",
63942
64018
  value: function getAndUpdatePartRowHeight(row) {
63943
- var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_10__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this.table.hoEditorFactoryID);
64019
+ var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_12__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this.table.hoEditorFactoryID);
63944
64020
  var aHeight = 0;
63945
64021
 
63946
64022
  for (var c = 0; c < this._table.colCount; c++) {
@@ -63959,7 +64035,7 @@ var DrawPageTable = /*#__PURE__*/function (_DrawRect) {
63959
64035
  }
63960
64036
  }
63961
64037
 
63962
- aHeight = Math.ceil(Math.max(aHeight, _editor_dom_treeNode_TableNode__WEBPACK_IMPORTED_MODULE_9__/* .gDefaultRowHeight */ .dT));
64038
+ aHeight = Math.ceil(Math.max(aHeight, _editor_dom_treeNode_TableNode__WEBPACK_IMPORTED_MODULE_11__/* .gDefaultRowHeight */ .dT));
63963
64039
 
63964
64040
  if (this._table.rowInfos[row].rowProperty.isSpecifyHeight && this._table.rowInfos[row].rowProperty.isLockRowHeight) {
63965
64041
  aHeight = hoEditorFactory.unitConvert.mmConversionPx(this._table.rowInfos[row].rowProperty.rowHeight * 10, false);
@@ -64169,7 +64245,7 @@ var DrawPageTable = /*#__PURE__*/function (_DrawRect) {
64169
64245
  }, {
64170
64246
  key: "getRowDocHeight",
64171
64247
  value: function getRowDocHeight(r) {
64172
- var ret = _editor_dom_treeNode_TableNode__WEBPACK_IMPORTED_MODULE_9__/* .gDefaultRowHeight */ .dT;
64248
+ var ret = _editor_dom_treeNode_TableNode__WEBPACK_IMPORTED_MODULE_11__/* .gDefaultRowHeight */ .dT;
64173
64249
 
64174
64250
  for (var c = 0; c < this._table.colCount; c++) {
64175
64251
  var cell = this._table.rows[r][c];
@@ -64276,7 +64352,7 @@ var DrawPageTable = /*#__PURE__*/function (_DrawRect) {
64276
64352
  var _this$_partRowHeights2;
64277
64353
 
64278
64354
  var startHeight = (_this$_partRowHeights2 = this._partRowHeights.get(this._startRow)) === null || _this$_partRowHeights2 === void 0 ? void 0 : _this$_partRowHeights2.rowHeight;
64279
- var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_10__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._table.hoEditorFactoryID);
64355
+ var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_12__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._table.hoEditorFactoryID);
64280
64356
  var dPage = null;
64281
64357
  if (this.stage) dPage = hoEditorFactory.drawPageTree.getDrawPageByDNode(this);
64282
64358
 
@@ -64296,7 +64372,7 @@ var DrawPageTable = /*#__PURE__*/function (_DrawRect) {
64296
64372
  }, {
64297
64373
  key: "drawUpdate",
64298
64374
  value: function drawUpdate(prevdPageTable, dRestHeight) {
64299
- var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_10__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this.table.hoEditorFactoryID);
64375
+ var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_12__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this.table.hoEditorFactoryID);
64300
64376
 
64301
64377
  if (this.table.tableProperty.fixedOnePage) {
64302
64378
  dRestHeight = Infinity;
@@ -64348,12 +64424,12 @@ var DrawPageTable = /*#__PURE__*/function (_DrawRect) {
64348
64424
 
64349
64425
  for (var r = startRow; r < this._table.rowCount; r++) {
64350
64426
  if (r === this._startRow && index > 0 && !bStartRowFinished) {
64351
- rowRestHeight = Math.max(this._table.drawTable.getRowRestHeight(index, this._startRow), _editor_dom_treeNode_TableNode__WEBPACK_IMPORTED_MODULE_9__/* .gDefaultRowHeight */ .dT);
64427
+ rowRestHeight = Math.max(this._table.drawTable.getRowRestHeight(index, this._startRow), _editor_dom_treeNode_TableNode__WEBPACK_IMPORTED_MODULE_11__/* .gDefaultRowHeight */ .dT);
64352
64428
  } else {
64353
64429
  rowRestHeight = this._table.rowInfos[r].rowHeight;
64354
64430
  }
64355
64431
 
64356
- if (pageRestHeight < _editor_dom_treeNode_TableNode__WEBPACK_IMPORTED_MODULE_9__/* .gDefaultRowHeight */ .dT) {
64432
+ if (pageRestHeight < _editor_dom_treeNode_TableNode__WEBPACK_IMPORTED_MODULE_11__/* .gDefaultRowHeight */ .dT) {
64357
64433
  this.removeDrawCellAfterRow(r);
64358
64434
  break;
64359
64435
  }
@@ -64377,7 +64453,7 @@ var DrawPageTable = /*#__PURE__*/function (_DrawRect) {
64377
64453
 
64378
64454
  if (isEmptyRow) {
64379
64455
  if (r >= this._startRow) {
64380
- var aRowHeight = Math.max(this._table.rowInfos[r].rowHeight, _editor_dom_treeNode_TableNode__WEBPACK_IMPORTED_MODULE_9__/* .gDefaultRowHeight */ .dT);
64456
+ var aRowHeight = Math.max(this._table.rowInfos[r].rowHeight, _editor_dom_treeNode_TableNode__WEBPACK_IMPORTED_MODULE_11__/* .gDefaultRowHeight */ .dT);
64381
64457
 
64382
64458
  this._partRowHeights.set(r, aRowHeight);
64383
64459
 
@@ -64425,7 +64501,7 @@ var DrawPageTable = /*#__PURE__*/function (_DrawRect) {
64425
64501
 
64426
64502
  if (partCellindex === _cell2.drawCell.drawPageCells.length - 1) {
64427
64503
  bRowHeightChanged = true;
64428
- dPartCell = new _DrawPageCell__WEBPACK_IMPORTED_MODULE_12__/* .DrawPageCell */ .k(this.table.hoEditorFactoryID, this, _cell2, aleft, cellRowTop, awidth, rowRestHeight, partCellindex + 1, startChildIndex, cellMaxHeight);
64504
+ dPartCell = new _DrawPageCell__WEBPACK_IMPORTED_MODULE_14__/* .DrawPageCell */ .k(this.table.hoEditorFactoryID, this, _cell2, aleft, cellRowTop, awidth, rowRestHeight, partCellindex + 1, startChildIndex, cellMaxHeight);
64429
64505
 
64430
64506
  _cell2.drawCell.drawPageCells.push(dPartCell);
64431
64507
 
@@ -64591,7 +64667,7 @@ var DrawPageTable = /*#__PURE__*/function (_DrawRect) {
64591
64667
  }]);
64592
64668
 
64593
64669
  return DrawPageTable;
64594
- }(_DrawRect__WEBPACK_IMPORTED_MODULE_13__/* .DrawRect */ .t);
64670
+ }(_DrawRect__WEBPACK_IMPORTED_MODULE_15__/* .DrawRect */ .t);
64595
64671
 
64596
64672
  /***/ }),
64597
64673
 
@@ -65309,7 +65385,7 @@ var DrawRect = /*#__PURE__*/function (_DrawContainer) {
65309
65385
  /*
65310
65386
  * @Author: your name
65311
65387
  * @Date: 2021-09-01 16:51:49
65312
- * @LastEditTime: 2022-08-01 10:19:27
65388
+ * @LastEditTime: 2022-08-18 14:08:29
65313
65389
  * @LastEditors: liyanan 2441631434@qq.com
65314
65390
  * @Description: In User Settings Edit
65315
65391
  * @FilePath: \hoeditor-web\src\editor\draw\drawNode\DrawSignNode.ts
@@ -65423,7 +65499,7 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
65423
65499
  }
65424
65500
  }
65425
65501
 
65426
- if (imgWidth == 0 && imgHeight == 0 && (imgSrc || fingerPrintSrc) && type == 1 || type == 3) {
65502
+ if ((imgSrc || fingerPrintSrc) && type == 1 || type == 3) {
65427
65503
  _this.drawWriteSignNode(node);
65428
65504
  } else {
65429
65505
  _this.drawSignNode();
@@ -75230,7 +75306,7 @@ var NodeDeleteUndoUnit = /*#__PURE__*/function (_UndoInfo) {
75230
75306
  /*
75231
75307
  * @Author: your name
75232
75308
  * @Date: 2020-09-24 15:56:09
75233
- * @LastEditTime: 2022-06-07 15:10:10
75309
+ * @LastEditTime: 2022-08-17 09:27:01
75234
75310
  * @LastEditors: liyanan 2441631434@qq.com
75235
75311
  * @Description: In User Settings Edit
75236
75312
  * @FilePath: \hoeditor-web\src\editor\undoRedo\NodeInsertUndoUnit.ts
@@ -75421,19 +75497,23 @@ var NodeInsertUndoUnit = /*#__PURE__*/function (_UndoInfo) {
75421
75497
 
75422
75498
  if (this.node instanceof _dom_treeNode_MarkNode__WEBPACK_IMPORTED_MODULE_22__/* .MarkNode */ .j && this.node.MarkNodeType === _dom_treeNode_MarkNode__WEBPACK_IMPORTED_MODULE_22__/* .MarkNodeType.mtContent */ .q.mtContent) {//变更文本域时,删除原内容插入标题时不移动光标
75423
75499
  } else {
75424
- setTimeout(function () {
75425
- //等待变更完成
75426
- hoEditorFactory.drawTree.moveCaretToPath(strAfterPath);
75427
- }, this.node.rootPath.startsWith(_editor_dom_DocTree__WEBPACK_IMPORTED_MODULE_10__/* .gMainPath */ .d9) ? 0 : 110);
75500
+ // setTimeout(
75501
+ // () => {
75502
+ // //等待变更完成
75503
+ hoEditorFactory.drawTree.moveCaretToPath(strAfterPath); // },
75504
+ // this.node.rootPath.startsWith(gMainPath) ? 0 : 110
75505
+ // );
75428
75506
  }
75429
75507
 
75430
- this.ParentRepaint();
75508
+ _context2.next = 9;
75509
+ return this.ParentRepaint();
75431
75510
 
75511
+ case 9:
75432
75512
  if (this.node instanceof _dom_treeNode_TextNode__WEBPACK_IMPORTED_MODULE_12__/* .TextNode */ .R) {
75433
75513
  hoEditorFactory.timeStamp.update();
75434
75514
  }
75435
75515
 
75436
- case 9:
75516
+ case 10:
75437
75517
  case "end":
75438
75518
  return _context2.stop();
75439
75519
  }
@@ -76069,9 +76149,9 @@ var NodeStyleUndoUnit = /*#__PURE__*/function () {
76069
76149
  /* harmony export */ __webpack_require__.d(__webpack_exports__, {
76070
76150
  /* harmony export */ "F": function() { return /* binding */ NodesDeleteUndoUnit; }
76071
76151
  /* harmony export */ });
76072
- /* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_regeneratorRuntime_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(86160);
76073
- /* harmony import */ var element_ui_lib_message_box__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(86769);
76074
- /* harmony import */ var element_ui_lib_message_box__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(element_ui_lib_message_box__WEBPACK_IMPORTED_MODULE_1__);
76152
+ /* harmony import */ var element_ui_lib_message_box__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(86769);
76153
+ /* harmony import */ var element_ui_lib_message_box__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(element_ui_lib_message_box__WEBPACK_IMPORTED_MODULE_0__);
76154
+ /* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_regeneratorRuntime_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(86160);
76075
76155
  /* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_asyncToGenerator_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(39873);
76076
76156
  /* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(37174);
76077
76157
  /* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_classCallCheck_js__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(35671);
@@ -76202,73 +76282,96 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
76202
76282
  }
76203
76283
  }, {
76204
76284
  key: "doUndo",
76205
- value: function doUndo() {
76206
- var arr = Array.from(this._undoNodes).reverse();
76207
- var i = 0;
76208
- var prevIsTable = false;
76209
- var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_29__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
76285
+ value: function () {
76286
+ var _doUndo = (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_asyncToGenerator_js__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z)( /*#__PURE__*/(0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_regeneratorRuntime_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)().mark(function _callee() {
76287
+ var arr, i, prevIsTable, hoEditorFactory, value, np, aendPaht, changeEvent, newRange, cgEvent;
76288
+ return (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_regeneratorRuntime_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)().wrap(function _callee$(_context) {
76289
+ while (1) {
76290
+ switch (_context.prev = _context.next) {
76291
+ case 0:
76292
+ arr = Array.from(this._undoNodes).reverse();
76293
+ i = 0;
76294
+ prevIsTable = false;
76295
+ hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_29__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
76210
76296
 
76211
- while (i < arr.length) {
76212
- var value = arr[i];
76297
+ while (i < arr.length) {
76298
+ value = arr[i];
76213
76299
 
76214
- if (value[1] instanceof _dom_treeNode_CellNode__WEBPACK_IMPORTED_MODULE_26__/* .CellNode */ .D) {// (value[1] as CellNode).redrawCell(true, DocAction.daInsert);
76215
- } else {
76216
- if (prevIsTable) {
76217
- hoEditorFactory.docTree.insertNodeAfterNode(arr[i - 1][1], arr[i][1]);
76218
- } else {
76219
- hoEditorFactory.docTree.insertNodeAfterPath(value[0], value[1]);
76220
- }
76300
+ if (value[1] instanceof _dom_treeNode_CellNode__WEBPACK_IMPORTED_MODULE_26__/* .CellNode */ .D) {// (value[1] as CellNode).redrawCell(true, DocAction.daInsert);
76301
+ } else {
76302
+ if (prevIsTable) {
76303
+ hoEditorFactory.docTree.insertNodeAfterNode(arr[i - 1][1], arr[i][1]);
76304
+ } else {
76305
+ hoEditorFactory.docTree.insertNodeAfterPath(value[0], value[1]);
76306
+ }
76221
76307
 
76222
- if (value[1] instanceof _dom_treeNode_TableNode__WEBPACK_IMPORTED_MODULE_28__/* .TableNode */ .Fh) {
76223
- prevIsTable = true; // value[1].clearDrawNodes();
76224
- // value[1].drawTable.drawPageTables.length = 0;
76308
+ if (value[1] instanceof _dom_treeNode_TableNode__WEBPACK_IMPORTED_MODULE_28__/* .TableNode */ .Fh) {
76309
+ prevIsTable = true; // value[1].clearDrawNodes();
76310
+ // value[1].drawTable.drawPageTables.length = 0;
76225
76311
 
76226
- var np = hoEditorFactory.docTree.findNodePositionByPath(value[0]);
76227
- if (np && np.node && np.node instanceof _dom_treeNode_ParagraphNode__WEBPACK_IMPORTED_MODULE_25__/* .ParagraphNode */ .C) value[1].drawTable.paragraphNode = np.node;
76228
- } else {
76229
- prevIsTable = false;
76230
- }
76231
- }
76312
+ np = hoEditorFactory.docTree.findNodePositionByPath(value[0]);
76313
+ if (np && np.node && np.node instanceof _dom_treeNode_ParagraphNode__WEBPACK_IMPORTED_MODULE_25__/* .ParagraphNode */ .C) value[1].drawTable.paragraphNode = np.node;
76314
+ } else {
76315
+ prevIsTable = false;
76316
+ }
76317
+ }
76232
76318
 
76233
- i += 1;
76234
- }
76319
+ i += 1;
76320
+ }
76235
76321
 
76236
- var aendPaht = hoEditorFactory.docTree.getNodeLastPath(arr[arr.length - 1][1]);
76237
- var changeEvent = new _events_NodeChangeEvent__WEBPACK_IMPORTED_MODULE_16__/* .NodeChangeEvent */ .G(this._hoEditorFactoryID, _editor_dom_DocTree__WEBPACK_IMPORTED_MODULE_14__/* .DocAction.daInsert */ .gk.daInsert, arr[0][0], aendPaht);
76238
- hoEditorFactory.docTree.change(changeEvent); //3.合并拆分节点
76322
+ aendPaht = hoEditorFactory.docTree.getNodeLastPath(arr[arr.length - 1][1]);
76323
+ changeEvent = new _events_NodeChangeEvent__WEBPACK_IMPORTED_MODULE_16__/* .NodeChangeEvent */ .G(this._hoEditorFactoryID, _editor_dom_DocTree__WEBPACK_IMPORTED_MODULE_14__/* .DocAction.daInsert */ .gk.daInsert, arr[0][0], aendPaht);
76324
+ _context.next = 9;
76325
+ return hoEditorFactory.docTree.change(changeEvent);
76239
76326
 
76240
- while (!this._undo.atBottom()) {
76241
- this._undo.undo();
76242
- } // let startPath = this._startPath;
76243
- // let endPath = this._endPath;
76244
- // if (NodePosition.treePathCompare(this._startPath, this._endPath) > 0) {
76245
- // startPath = this._endPath;
76246
- // endPath = this._startPath;
76247
- // }
76248
- // if (startPath !== "" && endPath !== "") {
76249
- // const arange = new DomRange(
76250
- // this._hoEditorFactoryID,
76251
- // startPath,
76252
- // endPath
76253
- // ).normalize();
76254
- // const changeEvent = new NodeChangeEvent(
76255
- // this._hoEditorFactoryID,
76256
- // DocAction.daInsert,
76257
- // arange.startPath,
76258
- // arange.endPath
76259
- // );
76260
- // hoEditorFactory.docTree.change(changeEvent);
76261
- // }
76262
- //选中范围变化事件
76327
+ case 9:
76328
+ //3.合并拆分节点
76329
+ while (!this._undo.atBottom()) {
76330
+ this._undo.undo();
76331
+ } // let startPath = this._startPath;
76332
+ // let endPath = this._endPath;
76333
+ // if (NodePosition.treePathCompare(this._startPath, this._endPath) > 0) {
76334
+ // startPath = this._endPath;
76335
+ // endPath = this._startPath;
76336
+ // }
76337
+ // if (startPath !== "" && endPath !== "") {
76338
+ // const arange = new DomRange(
76339
+ // this._hoEditorFactoryID,
76340
+ // startPath,
76341
+ // endPath
76342
+ // ).normalize();
76343
+ // const changeEvent = new NodeChangeEvent(
76344
+ // this._hoEditorFactoryID,
76345
+ // DocAction.daInsert,
76346
+ // arange.startPath,
76347
+ // arange.endPath
76348
+ // );
76349
+ // hoEditorFactory.docTree.change(changeEvent);
76350
+ // }
76351
+ //选中范围变化事件
76263
76352
 
76264
76353
 
76265
- var newRange = new _dom_DomRange__WEBPACK_IMPORTED_MODULE_18__/* .DomRange */ .a(this._hoEditorFactoryID, this._startPath, this._endPath).normalize();
76266
- hoEditorFactory.docTree.curDomRange = newRange;
76267
- var cgEvent = new _events_SelectionChangeEvent__WEBPACK_IMPORTED_MODULE_20__/* .SelectionChangeEvent */ .r(hoEditorFactory.docTree.curDomRange, newRange);
76268
- hoEditorFactory.docTree.selectChange(cgEvent); //光标定位
76354
+ newRange = new _dom_DomRange__WEBPACK_IMPORTED_MODULE_18__/* .DomRange */ .a(this._hoEditorFactoryID, this._startPath, this._endPath).normalize();
76355
+ hoEditorFactory.docTree.curDomRange = newRange;
76356
+ cgEvent = new _events_SelectionChangeEvent__WEBPACK_IMPORTED_MODULE_20__/* .SelectionChangeEvent */ .r(hoEditorFactory.docTree.curDomRange, newRange);
76357
+ hoEditorFactory.docTree.selectChange(cgEvent); //光标定位
76269
76358
 
76270
- hoEditorFactory.drawTree.moveCaretToPath(newRange.endPath);
76271
- }
76359
+ hoEditorFactory.drawTree.moveCaretToPath(newRange.endPath);
76360
+
76361
+ case 15:
76362
+ case "end":
76363
+ return _context.stop();
76364
+ }
76365
+ }
76366
+ }, _callee, this);
76367
+ }));
76368
+
76369
+ function doUndo() {
76370
+ return _doUndo.apply(this, arguments);
76371
+ }
76372
+
76373
+ return doUndo;
76374
+ }()
76272
76375
  /**
76273
76376
  * @description 初始化变量,因为有撤销恢复可能需要反复操作,初始化不能放到create里
76274
76377
  */
@@ -76505,8 +76608,8 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
76505
76608
  var _tmp = _this.getPrevNodeDomRange(Anode); //1.移动光标
76506
76609
 
76507
76610
 
76508
- _this.MoveCaret(_tmp.endPath); //2.删除内容
76509
-
76611
+ hoEditorFactory.docTree.curDomRange = new _dom_DomRange__WEBPACK_IMPORTED_MODULE_18__/* .DomRange */ .a(_this._hoEditorFactoryID, _tmp.endPath, _tmp.endPath); // this.MoveCaret(tmp.endPath);
76612
+ //2.删除内容
76510
76613
 
76511
76614
  info[0] = 1;
76512
76615
  info[1] = _tmp;
@@ -76514,7 +76617,7 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
76514
76617
  //移动光标到文本域外
76515
76618
  var _tmp2 = _this.getPrevNodeDomRange(Anode);
76516
76619
 
76517
- _this.MoveCaret(_tmp2.endPath);
76620
+ hoEditorFactory.docTree.curDomRange = new _dom_DomRange__WEBPACK_IMPORTED_MODULE_18__/* .DomRange */ .a(_this._hoEditorFactoryID, _tmp2.endPath, _tmp2.endPath); // this.MoveCaret(tmp.endPath);
76518
76621
 
76519
76622
  info[0] = 2;
76520
76623
  info[1] = _tmp2;
@@ -76640,14 +76743,14 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
76640
76743
  }, {
76641
76744
  key: "doRedo",
76642
76745
  value: function () {
76643
- var _doRedo = (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_asyncToGenerator_js__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z)( /*#__PURE__*/(0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_regeneratorRuntime_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z)().mark(function _callee() {
76746
+ var _doRedo = (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_asyncToGenerator_js__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z)( /*#__PURE__*/(0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_regeneratorRuntime_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)().mark(function _callee2() {
76644
76747
  var _currRange$npEnd$node;
76645
76748
 
76646
76749
  var currRange, hoEditorFactory, textStyle, nodes, n, node, tip, pnode, pTiNode, _res, changeEvent, startPath, endPath, res, cgEvent, aNode;
76647
76750
 
76648
- return (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_regeneratorRuntime_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z)().wrap(function _callee$(_context) {
76751
+ return (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_regeneratorRuntime_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)().wrap(function _callee2$(_context2) {
76649
76752
  while (1) {
76650
- switch (_context.prev = _context.next) {
76753
+ switch (_context2.prev = _context2.next) {
76651
76754
  case 0:
76652
76755
  this.initParam();
76653
76756
  currRange = new _dom_DomRange__WEBPACK_IMPORTED_MODULE_18__/* .DomRange */ .a(this._hoEditorFactoryID, this._startPath, this._endPath).normalize();
@@ -76655,26 +76758,26 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
76655
76758
  hoEditorFactory.docTree.curDomRange = currRange;
76656
76759
 
76657
76760
  if (!(hoEditorFactory.drawTree.paintStatus === _draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_17__/* .PaintState.psReview */ .Dh.psReview)) {
76658
- _context.next = 11;
76761
+ _context2.next = 11;
76659
76762
  break;
76660
76763
  }
76661
76764
 
76662
76765
  if (!(currRange.npEnd.node && currRange.npEnd.node instanceof _dom_treeNode_TextNode__WEBPACK_IMPORTED_MODULE_15__/* .TextNode */ .R)) {
76663
- _context.next = 11;
76766
+ _context2.next = 11;
76664
76767
  break;
76665
76768
  }
76666
76769
 
76667
76770
  textStyle = hoEditorFactory.docTree.styles[currRange.npEnd.node.styleIndex];
76668
76771
 
76669
76772
  if (!(textStyle.strikeout && currRange.npEnd.node.text.length > 0)) {
76670
- _context.next = 11;
76773
+ _context2.next = 11;
76671
76774
  break;
76672
76775
  }
76673
76776
 
76674
- element_ui_lib_message_box__WEBPACK_IMPORTED_MODULE_1___default().alert("该内容当前已处于删除状态!");
76777
+ element_ui_lib_message_box__WEBPACK_IMPORTED_MODULE_0___default().alert("该内容当前已处于删除状态!");
76675
76778
 
76676
76779
  this._isError = true;
76677
- return _context.abrupt("return");
76780
+ return _context2.abrupt("return");
76678
76781
 
76679
76782
  case 11:
76680
76783
  nodes = _dom_DomRange__WEBPACK_IMPORTED_MODULE_18__/* .DomRange.getSelectDomNodesForDelete */ .a.getSelectDomNodesForDelete(this._hoEditorFactoryID, this._startPath, this._endPath); // const npFirst = hoEditorFactory.docTree.findNodePositionByPath(this._startPath);
@@ -76689,7 +76792,7 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
76689
76792
  //if(nodes.length == 0) return;
76690
76793
 
76691
76794
  if (!(hoEditorFactory.drawTree.paintStatus !== _draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_17__/* .PaintState.psDesign */ .Dh.psDesign && !this._isForceDelete)) {
76692
- _context.next = 38;
76795
+ _context2.next = 38;
76693
76796
  break;
76694
76797
  }
76695
76798
 
@@ -76697,21 +76800,21 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
76697
76800
 
76698
76801
  case 14:
76699
76802
  if (!(n < nodes.length)) {
76700
- _context.next = 38;
76803
+ _context2.next = 38;
76701
76804
  break;
76702
76805
  }
76703
76806
 
76704
76807
  node = nodes[n];
76705
76808
 
76706
76809
  if (!(node instanceof _dom_treeNode_MarkNode__WEBPACK_IMPORTED_MODULE_23__/* .MarkNode */ .j && node.parentNode instanceof _dom_treeNode_TextInputFieldNode__WEBPACK_IMPORTED_MODULE_22__/* .TextInputFieldNode */ .re && node.MarkNodeType === 1 && !node.parentNode.isAllowDelete)) {
76707
- _context.next = 20;
76810
+ _context2.next = 20;
76708
76811
  break;
76709
76812
  }
76710
76813
 
76711
- element_ui_lib_message_box__WEBPACK_IMPORTED_MODULE_1___default().alert("元素已设置为不允许删除。请先右键元素属性设置成允许删除,再进行删除操作。", "系统提示");
76814
+ element_ui_lib_message_box__WEBPACK_IMPORTED_MODULE_0___default().alert("元素已设置为不允许删除。请先右键元素属性设置成允许删除,再进行删除操作。", "系统提示");
76712
76815
 
76713
76816
  this._isError = true;
76714
- return _context.abrupt("return");
76817
+ return _context2.abrupt("return");
76715
76818
 
76716
76819
  case 20:
76717
76820
  if (nodes.length === 1 && nodes[0] instanceof _dom_treeNode_TextInputFieldNode__WEBPACK_IMPORTED_MODULE_22__/* .TextInputFieldNode */ .re && nodes[0].childNodes[1] instanceof _dom_treeNode_MarkNode__WEBPACK_IMPORTED_MODULE_23__/* .MarkNode */ .j) {
@@ -76719,12 +76822,12 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
76719
76822
  }
76720
76823
 
76721
76824
  if (!(node instanceof _dom_treeNode_ControlNode__WEBPACK_IMPORTED_MODULE_30__/* .ControlNode */ .w || node instanceof _dom_treeNode_TextInputFieldNode__WEBPACK_IMPORTED_MODULE_22__/* .TextInputFieldNode */ .re)) {
76722
- _context.next = 31;
76825
+ _context2.next = 31;
76723
76826
  break;
76724
76827
  }
76725
76828
 
76726
76829
  if (node.isAllowDelete) {
76727
- _context.next = 31;
76830
+ _context2.next = 31;
76728
76831
  break;
76729
76832
  }
76730
76833
 
@@ -76746,32 +76849,32 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
76746
76849
  tip = "下拉列表";
76747
76850
  }
76748
76851
 
76749
- element_ui_lib_message_box__WEBPACK_IMPORTED_MODULE_1___default().alert(tip + "元素已设置为不允许删除。请先右键元素属性设置成允许删除,再进行删除操作。", "系统提示");
76852
+ element_ui_lib_message_box__WEBPACK_IMPORTED_MODULE_0___default().alert(tip + "元素已设置为不允许删除。请先右键元素属性设置成允许删除,再进行删除操作。", "系统提示");
76750
76853
 
76751
76854
  this._isError = true;
76752
- return _context.abrupt("return");
76855
+ return _context2.abrupt("return");
76753
76856
 
76754
76857
  case 31:
76755
76858
  if (!(node instanceof _dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_35__/* .SignNode */ .N && node.isTemplate && node.number === 0)) {
76756
- _context.next = 35;
76859
+ _context2.next = 35;
76757
76860
  break;
76758
76861
  }
76759
76862
 
76760
- element_ui_lib_message_box__WEBPACK_IMPORTED_MODULE_1___default().alert("该签名元素不允许删除!", "系统提示");
76863
+ element_ui_lib_message_box__WEBPACK_IMPORTED_MODULE_0___default().alert("该签名元素不允许删除!", "系统提示");
76761
76864
 
76762
76865
  this._isError = true;
76763
- return _context.abrupt("return");
76866
+ return _context2.abrupt("return");
76764
76867
 
76765
76868
  case 35:
76766
76869
  n++;
76767
- _context.next = 14;
76870
+ _context2.next = 14;
76768
76871
  break;
76769
76872
 
76770
76873
  case 38:
76771
76874
  pnode = (_currRange$npEnd$node = currRange.npEnd.node) === null || _currRange$npEnd$node === void 0 ? void 0 : _currRange$npEnd$node.parentNode;
76772
76875
 
76773
76876
  if (!(pnode && pnode instanceof _dom_treeNode_TextInputFieldNode__WEBPACK_IMPORTED_MODULE_22__/* .TextInputFieldNode */ .re && currRange.npEnd.path != hoEditorFactory.docTree.getNodeLastPath(pnode))) {
76774
- _context.next = 44;
76877
+ _context2.next = 44;
76775
76878
  break;
76776
76879
  }
76777
76880
 
@@ -76784,18 +76887,18 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
76784
76887
  });
76785
76888
 
76786
76889
  if (_res[0]) {
76787
- _context.next = 44;
76890
+ _context2.next = 44;
76788
76891
  break;
76789
76892
  }
76790
76893
 
76791
- return _context.abrupt("return");
76894
+ return _context2.abrupt("return");
76792
76895
 
76793
76896
  case 44:
76794
76897
  changeEvent = new _events_NodeChangeEvent__WEBPACK_IMPORTED_MODULE_16__/* .NodeChangeEvent */ .G(this._hoEditorFactoryID, _editor_dom_DocTree__WEBPACK_IMPORTED_MODULE_14__/* .DocAction.daUndoInsert */ .gk.daUndoInsert, currRange.startPath, ""); //FIXME:deleteRange函数完成后调用这个
76795
76898
  // hoEditorFactory.docTree.deleteRange(arange.startPath, arange.endPath);
76796
76899
 
76797
76900
  if (currRange.npStart.node && currRange.npEnd.node) {
76798
- _context.next = 47;
76901
+ _context2.next = 47;
76799
76902
  break;
76800
76903
  }
76801
76904
 
@@ -76814,13 +76917,13 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
76814
76917
  res = this.deleteRange(currRange.endPath, currRange.startPath);
76815
76918
 
76816
76919
  if (!(res == 1)) {
76817
- _context.next = 59;
76920
+ _context2.next = 59;
76818
76921
  break;
76819
76922
  }
76820
76923
 
76821
76924
  changeEvent.beforeChangePath = startPath;
76822
76925
  changeEvent.afterChangePath = this._tmp.start;
76823
- _context.next = 57;
76926
+ _context2.next = 57;
76824
76927
  return hoEditorFactory.docTree.change(changeEvent);
76825
76928
 
76826
76929
  case 57:
@@ -76833,19 +76936,19 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
76833
76936
  aNode = currRange.npStart.node;
76834
76937
 
76835
76938
  if (!(aNode && pnode)) {
76836
- _context.next = 65;
76939
+ _context2.next = 65;
76837
76940
  break;
76838
76941
  }
76839
76942
 
76840
- _context.next = 65;
76943
+ _context2.next = 65;
76841
76944
  return this.ParentRepaint(pnode);
76842
76945
 
76843
76946
  case 65:
76844
76947
  case "end":
76845
- return _context.stop();
76948
+ return _context2.stop();
76846
76949
  }
76847
76950
  }
76848
- }, _callee, this);
76951
+ }, _callee2, this);
76849
76952
  }));
76850
76953
 
76851
76954
  function doRedo() {
@@ -212292,7 +212395,7 @@ var map = {
212292
212395
  "./radioCheckBox/RadioCheckbox.vue": 48961,
212293
212396
  "./selectDialog/SelectDialog.vue": 54891,
212294
212397
  "./sign/Sign.vue": 44801,
212295
- "./table/TableCellPoper.vue": 99083,
212398
+ "./table/TableCellPoper.vue": 16981,
212296
212399
  "./table/TableCellProperty.vue": 52445,
212297
212400
  "./table/TableColProperty.vue": 97160,
212298
212401
  "./table/TableProperty.vue": 44680,
@@ -213838,9 +213941,9 @@ var es_string_match = __webpack_require__(4723);
213838
213941
  var es_number_constructor = __webpack_require__(9653);
213839
213942
  // EXTERNAL MODULE: ./node_modules/core-js/modules/es.json.stringify.js
213840
213943
  var es_json_stringify = __webpack_require__(38862);
213841
- ;// CONCATENATED MODULE: ./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/HoDoc.vue?vue&type=template&id=44f9ba19&
213842
- var HoDocvue_type_template_id_44f9ba19_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{class:_vm.docClassNames},[_c('div',{ref:"editorArea",staticClass:"editors"},[(_vm.drawPageLength > 0)?_c('div',{staticClass:"editor",on:{"click":function($event){return _vm.setActiveDocIndex(_vm.hoEditorId)}}},[_vm._l((_vm.drawPageCount.count),function(pgIndex){return [_c('HoPage',{key:pgIndex - 1,attrs:{"data-id":pgIndex - 1,"index":pgIndex - 1,"docIndex":_vm.docIndex,"canvasWidth":_vm.canvasParams.width,"canvasHeight":_vm.canvasParams.height,"currentActivePages":_vm.activePageIndex.index,"hoEditorId":_vm.hoEditorId,"hoEditorFactoryIdList":_vm.hoEditorFactoryIdList,"mouseMoveNodes":_vm.mouseMoveNodes,"viewableAreaObserver":_vm.viewableAreaObserver,"inViewPages":_vm.inViewPages,"canvasHeadFootPos":_vm.canvasHeadFootPos,"poperTipPos":_vm.poperTipPos,"textStyle":_vm.textStyle,"aiInfo":_vm.aiInfo},on:{"pageReady":_vm.pageReady,"canvasRightClick":_vm.mouseRightClickEvent},scopedSlots:_vm._u([{key:"hoPageHead",fn:function(){return [_vm._t("hoDocHead")]},proxy:true},{key:"hoPageFoot",fn:function(){return [_vm._t("hoDocFoot")]},proxy:true}],null,true)})]})],2):_vm._e()]),(_vm.poperType === 'datePoper' || _vm.poperType === 'selectPoper')?_c('PoperSelectModal',{attrs:{"poperType":_vm.poperType,"poperSelectList":_vm.poperSelectList,"poperPos":_vm.poperPos,"hoEditorId":_vm.hoEditorId},on:{"poperClose":_vm.poperClose}}):_vm._e(),_c('PoperMark',{directives:[{name:"show",rawName:"v-show",value:(_vm.poperType === 'datePoper' || _vm.poperType === 'selectPoper' || _vm.poperType === 'table-cell-poper'),expression:"poperType === 'datePoper' || poperType === 'selectPoper' || poperType === 'table-cell-poper'"}]}),(_vm.poperType === 'table-cell-poper')?_c('TableCellPoper',{attrs:{"poperNode":_vm.nodeValue,"poperPos":_vm.poperPos},on:{"poperClose":_vm.poperClose}}):_vm._e(),_c('HoToPage',{attrs:{"hoEditorId":_vm.hoEditorId,"inViewPages":_vm.inViewPages}}),_c('PoperTipText',{attrs:{"isPoperText":_vm.isPoperText,"poperText":_vm.poperText,"poperPos":_vm.poperTextPos},on:{"poperTextClose":_vm.poperTextClose}}),_c('ul',{directives:[{name:"click-outside",rawName:"v-click-outside",value:(function () { return (_vm.isCreateRightMenuModal = false); }),expression:"() => (isCreateRightMenuModal = false)"},{name:"show",rawName:"v-show",value:(_vm.isCreateRightMenuModal),expression:"isCreateRightMenuModal"}],ref:"rightMenuModal",staticClass:"create-right-menu"},[(_vm.showCommentsBtn)?_c('li',{staticClass:"mouse-menu-item",on:{"click":_vm.hideComments}},[_vm._v(_vm._s(_vm.isHideComments ? '显示' : '隐藏')+"批注")]):_vm._e(),(_vm.eleNode && _vm.eleNode.type == 'sign'&& _vm.currentNode.customProperty)?_c('li',{staticClass:"mouse-menu-item",on:{"click":_vm.deleteSignNode}},[_vm._v("删除签名")]):_vm._e(),_c('li',{staticClass:"mouse-menu-item"},[_vm._v(" 编辑器内核版本:   "),_c('span',{staticStyle:{"font-size":"14px","color":"#0a77e3"}},[_vm._v("v "+_vm._s(_vm.version))])])])],1)}
213843
- var HoDocvue_type_template_id_44f9ba19_staticRenderFns = []
213944
+ ;// CONCATENATED MODULE: ./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/HoDoc.vue?vue&type=template&id=7d9a158e&
213945
+ var HoDocvue_type_template_id_7d9a158e_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{class:_vm.docClassNames},[_c('div',{ref:"editorArea",staticClass:"editors"},[(_vm.drawPageLength > 0)?_c('div',{staticClass:"editor",on:{"click":function($event){return _vm.setActiveDocIndex(_vm.hoEditorId)}}},[_vm._l((_vm.drawPageCount.count),function(pgIndex){return [_c('HoPage',{key:pgIndex - 1,attrs:{"data-id":pgIndex - 1,"index":pgIndex - 1,"docIndex":_vm.docIndex,"canvasWidth":_vm.canvasParams.width,"canvasHeight":_vm.canvasParams.height,"currentActivePages":_vm.activePageIndex.index,"hoEditorId":_vm.hoEditorId,"hoEditorFactoryIdList":_vm.hoEditorFactoryIdList,"mouseMoveNodes":_vm.mouseMoveNodes,"viewableAreaObserver":_vm.viewableAreaObserver,"inViewPages":_vm.inViewPages,"canvasHeadFootPos":_vm.canvasHeadFootPos,"poperTipPos":_vm.poperTipPos,"textStyle":_vm.textStyle,"aiInfo":_vm.aiInfo},on:{"pageReady":_vm.pageReady,"canvasRightClick":_vm.mouseRightClickEvent},scopedSlots:_vm._u([{key:"hoPageHead",fn:function(){return [_vm._t("hoDocHead")]},proxy:true},{key:"hoPageFoot",fn:function(){return [_vm._t("hoDocFoot")]},proxy:true}],null,true)})]})],2):_vm._e()]),(_vm.poperType === 'datePoper' || _vm.poperType === 'selectPoper')?_c('PoperSelectModal',{attrs:{"poperType":_vm.poperType,"poperSelectList":_vm.poperSelectList,"poperPos":_vm.poperPos,"hoEditorId":_vm.hoEditorId},on:{"poperClose":_vm.poperClose}}):_vm._e(),_c('PoperMark',{directives:[{name:"show",rawName:"v-show",value:(_vm.poperType === 'datePoper' || _vm.poperType === 'selectPoper' || _vm.poperType === 'table-cell-poper'),expression:"poperType === 'datePoper' || poperType === 'selectPoper' || poperType === 'table-cell-poper'"}]}),(_vm.poperType === 'table-cell-poper')?_c('TableCellPoper',{attrs:{"poperNode":_vm.nodeValue,"poperPos":_vm.poperPos},on:{"poperClose":_vm.poperClose}}):_vm._e(),_c('HoToPage',{attrs:{"hoEditorId":_vm.hoEditorId,"inViewPages":_vm.inViewPages}}),_c('PoperTipText',{attrs:{"isPoperText":_vm.isPoperText,"poperText":_vm.poperText,"poperPos":_vm.poperTextPos},on:{"poperTextClose":_vm.poperTextClose}}),_c('ul',{directives:[{name:"click-outside",rawName:"v-click-outside",value:(function () { return (_vm.isCreateRightMenuModal = false); }),expression:"() => (isCreateRightMenuModal = false)"},{name:"show",rawName:"v-show",value:(_vm.isCreateRightMenuModal),expression:"isCreateRightMenuModal"}],ref:"rightMenuModal",staticClass:"create-right-menu"},[(_vm.showCommentsBtn)?_c('li',{staticClass:"mouse-menu-item",on:{"click":_vm.hideComments}},[_vm._v(_vm._s(_vm.isHideComments ? '显示' : '隐藏')+"批注")]):_vm._e(),(_vm.currentNode && _vm.currentNode.customProperty && _vm.currentNode.signFormat )?_c('li',{staticClass:"mouse-menu-item",on:{"click":_vm.deleteSignNode}},[_vm._v("删除签名")]):_vm._e(),_c('li',{staticClass:"mouse-menu-item"},[_vm._v(" 编辑器内核版本:   "),_c('span',{staticStyle:{"font-size":"14px","color":"#0a77e3"}},[_vm._v("v "+_vm._s(_vm.version))])])])],1)}
213946
+ var HoDocvue_type_template_id_7d9a158e_staticRenderFns = []
213844
213947
 
213845
213948
 
213846
213949
  // EXTERNAL MODULE: ./node_modules/element-ui/lib/message-box.js
@@ -214728,7 +214831,13 @@ var DrawDomLevel = /*#__PURE__*/function () {
214728
214831
  hoeditorfactory.subDocManger.paintSubDoc(dPage.pageIndex, SubDocManger/* HeaderFooterType.hftFoot */.pi.hftFoot);
214729
214832
  hoeditorfactory.subDocManger.repaintPageMarkNodes(dPage.drawFooter, SubDocManger/* HeaderFooterType.hftFoot */.pi.hftFoot);
214730
214833
 
214731
- var keys = (0,toConsumableArray/* default */.Z)(hoeditorfactory.drawPageTree.needUpdateMainDocInfo.keys()).sort();
214834
+ var keys = (0,toConsumableArray/* default */.Z)(hoeditorfactory.drawPageTree.needUpdateMainDocInfo.keys()).sort(function (a, b) {
214835
+ if (a > b) {
214836
+ return 1;
214837
+ } else {
214838
+ return -1;
214839
+ }
214840
+ });
214732
214841
 
214733
214842
  if (keys.length > 0) {
214734
214843
  for (var index = keys[0]; index <= keys[keys.length - 1]; index++) {
@@ -215774,7 +215883,7 @@ var PoperMark = __webpack_require__(93069);
215774
215883
 
215775
215884
 
215776
215885
  // EXTERNAL MODULE: ./src/components/controls/table/TableCellPoper.vue + 5 modules
215777
- var TableCellPoper = __webpack_require__(99083);
215886
+ var TableCellPoper = __webpack_require__(16981);
215778
215887
  // EXTERNAL MODULE: ./src/editor/dom/treeNode/DateTimeNode.ts
215779
215888
  var DateTimeNode = __webpack_require__(36395);
215780
215889
  // EXTERNAL MODULE: ./src/editor/dom/treeNode/DownListNode.ts
@@ -217478,7 +217587,7 @@ var SignNode = __webpack_require__(34450);
217478
217587
  // EXTERNAL MODULE: ./src/editor/dom/treeNode/ParagraphNode.ts
217479
217588
  var ParagraphNode = __webpack_require__(14208);
217480
217589
  ;// CONCATENATED MODULE: ./src/components/version.ts
217481
- /* harmony default export */ var version = ('2.0.86');
217590
+ /* harmony default export */ var version = ('2.0.90');
217482
217591
  // EXTERNAL MODULE: ./src/components/controls/poperTipText/PoperTipText.vue + 5 modules
217483
217592
  var PoperTipText = __webpack_require__(91831);
217484
217593
  ;// CONCATENATED MODULE: ./src/components/controls/poperTipText/index.ts
@@ -217801,19 +217910,23 @@ var ImageNode = __webpack_require__(88389);
217801
217910
  },
217802
217911
  methods: {
217803
217912
  deleteSignNode: function deleteSignNode() {
217804
- var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this.hoEditorId);
217805
- var signUserId = this.currentNode.customProperty.bce01 || '';
217913
+ var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this.hoEditorId); // const signUserId = this.currentNode.customProperty.bce01 || '';
217914
+ // if (hoEditorFactory.userInfo.id != signUserId) {
217915
+ // MessageBox.alert("不是本人签名,不允许删除!");
217916
+ // this.eleNode = null;
217917
+ // this.currentNode = null;
217918
+ // this.isCreateRightMenuModal = false;
217919
+ // return;
217920
+ // }
217806
217921
 
217807
- if (hoEditorFactory.userInfo.id != signUserId) {
217808
- message_box_default().alert("不是本人签名,不允许删除!");
217922
+ if (!this.currentNode instanceof SignNode/* SignNode */.N) {
217923
+ message_box_default().alert("请右键签名元素进行删除");
217809
217924
 
217810
- this.eleNode = null;
217811
- this.currentNode = null;
217812
- this.isCreateRightMenuModal = false;
217813
217925
  return;
217814
217926
  }
217815
217927
 
217816
- hoEditorFactory.elementController.deleteNode(this.eleNode.node());
217928
+ hoEditorFactory.elementController.deleteNode(this.currentNode); // hoEditorFactory.vueController.forceDelete();
217929
+
217817
217930
  this.eleNode = null;
217818
217931
  this.currentNode = null;
217819
217932
  this.isCreateRightMenuModal = false;
@@ -217853,7 +217966,7 @@ var ImageNode = __webpack_require__(88389);
217853
217966
 
217854
217967
  if (v.intersectionRatio === 0) {
217855
217968
  inViewPages = inViewPages.filter(function (v) {
217856
- return dPage && v !== dPage.pageIndex;
217969
+ return v !== pageIndex;
217857
217970
  });
217858
217971
  } else {
217859
217972
  inViewPages.includes(dPage.pageIndex) ? null : inViewPages.push(dPage.pageIndex);
@@ -218164,7 +218277,7 @@ var ImageNode = __webpack_require__(88389);
218164
218277
  var node = (_hoEditorFactory$vueC2 = hoEditorFactory.vueController.findNodebyPath(path)) === null || _hoEditorFactory$vueC2 === void 0 ? void 0 : _hoEditorFactory$vueC2.node;
218165
218278
  this.setRightClickNodeValue(node);
218166
218279
  this.eleNode = this.getRightClickNodeValue();
218167
- this.currentNode = this.getCurrentSelectNode();
218280
+ this.currentNode = node;
218168
218281
  var rightPosition = {
218169
218282
  clientX: e.clientX || e.pageX,
218170
218283
  clientY: e.clientY || e.pageY
@@ -218257,8 +218370,8 @@ var ImageNode = __webpack_require__(88389);
218257
218370
 
218258
218371
  var HoDoc_component = (0,componentNormalizer/* default */.Z)(
218259
218372
  components_HoDocvue_type_script_lang_js_,
218260
- HoDocvue_type_template_id_44f9ba19_render,
218261
- HoDocvue_type_template_id_44f9ba19_staticRenderFns,
218373
+ HoDocvue_type_template_id_7d9a158e_render,
218374
+ HoDocvue_type_template_id_7d9a158e_staticRenderFns,
218262
218375
  false,
218263
218376
  null,
218264
218377
  null,
@@ -218818,7 +218931,7 @@ var DrawPageTree = /*#__PURE__*/function () {
218818
218931
  drawTop = 0;
218819
218932
  }
218820
218933
 
218821
- this.update(mainArea, dMainRoots, drawTop, mainIndex, mainIndex);
218934
+ this.update(mainArea, dMainRoots, drawTop, mainIndex, mainIndex, true);
218822
218935
  } finally {
218823
218936
  // const iendDraw= hoEditorFactory.drawTree.inViewPages[hoEditorFactory.drawTree.inViewPages.length-1];
218824
218937
  // const istartDraw=hoEditorFactory.drawTree.inViewPages[0];
@@ -219066,7 +219179,7 @@ var DrawPageTree = /*#__PURE__*/function () {
219066
219179
  }, {
219067
219180
  key: "update",
219068
219181
  value: function update(drawArea, dRoots, // startDline: DrawLine | DrawPageTable,
219069
- dTop, startLine, endLine) {
219182
+ dTop, startLine, endLine, callFromPaint) {
219070
219183
  var _this2 = this;
219071
219184
 
219072
219185
  var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID);
@@ -219220,9 +219333,12 @@ var DrawPageTree = /*#__PURE__*/function () {
219220
219333
  // this._endNeedUpdatePage = -1;
219221
219334
 
219222
219335
 
219223
- hoEditorFactory.drawTree.inViewPages.forEach(function (i) {
219224
- _this2.updateDrawPage(i);
219225
- }); // }
219336
+ if (!callFromPaint) {
219337
+ hoEditorFactory.drawTree.inViewPages.forEach(function (i) {
219338
+ _this2.updateDrawPage(i);
219339
+ });
219340
+ } // }
219341
+
219226
219342
  } // if (hoEditorFactory.drawTree.paintStatus === PaintState.psReview) {
219227
219343
  // drawArea.drawComments();
219228
219344
  // }
@@ -219555,16 +219671,15 @@ var DrawPageTree = /*#__PURE__*/function () {
219555
219671
  }
219556
219672
 
219557
219673
  for (var j = 0; j < hoEditorFactory.drawTree.inViewPages.length; j++) {
219558
- var _dPage = hoEditorFactory.drawTree.drawPages[hoEditorFactory.drawTree.inViewPages[j]];
219674
+ var aPage = hoEditorFactory.drawTree.drawPages[hoEditorFactory.drawTree.inViewPages[j]];
219559
219675
 
219560
- if (_dPage.drawDomLevel && !_dPage.drawDomLevel.stage) {
219561
- _dPage.drawDomLevel.bindStage();
219562
-
219563
- this.updateDrawPage(_dPage.pageIndex);
219676
+ if (aPage.drawDomLevel && !aPage.drawDomLevel.stage) {
219677
+ aPage.drawDomLevel.bindStage();
219678
+ this.updateDrawPage(aPage.pageIndex);
219564
219679
  }
219565
219680
 
219566
- if (_dPage.drawSelectLevel && !_dPage.drawSelectLevel.stage) {
219567
- _dPage.drawSelectLevel.bindStage();
219681
+ if (aPage.drawSelectLevel && !aPage.drawSelectLevel.stage) {
219682
+ aPage.drawSelectLevel.bindStage();
219568
219683
  }
219569
219684
  }
219570
219685
  }
@@ -222511,8 +222626,11 @@ var StructureConvert = /*#__PURE__*/function () {
222511
222626
  }
222512
222627
 
222513
222628
  this._comments = [];
222514
- var comments = xx.comments;
222515
- this._comments = comments.comment; // if (xx.logs) {
222629
+
222630
+ if (!isClearSign) {
222631
+ var comments = xx.comments;
222632
+ this._comments = comments.comment;
222633
+ } // if (xx.logs) {
222516
222634
  // const logs = xx.logs;
222517
222635
  // let logsArr = [];
222518
222636
  // if (logs.log.length === undefined) {
@@ -222530,6 +222648,7 @@ var StructureConvert = /*#__PURE__*/function () {
222530
222648
  // }
222531
222649
  // }
222532
222650
 
222651
+
222533
222652
  hoEditorFactory.docTree.userHistories = [];
222534
222653
  var histories = xx.userHistories;
222535
222654
  var historiesArr = histories.userHistory;
@@ -232145,7 +232264,7 @@ var EditController = /*#__PURE__*/function () {
232145
232264
  var style = hoeditorfactory.docTree.styles[node.styleIndex];
232146
232265
 
232147
232266
  if (style.combineStyle.script != 0) {
232148
- var newStyle = style.clone();
232267
+ var newStyle = hoeditorfactory.docTree.styles[hoeditorfactory.docTree.curStyleIndex].clone();
232149
232268
  newStyle.script = style.combineStyle.script;
232150
232269
  var newStyleIndex = hoeditorfactory.docTree.styleCompare(newStyle);
232151
232270
  node.styleIndex = newStyleIndex;
@@ -241679,9 +241798,9 @@ var ToolControlvue_type_template_id_a55c0f5a_render = function () {var _vm=this;
241679
241798
  var ToolControlvue_type_template_id_a55c0f5a_staticRenderFns = []
241680
241799
 
241681
241800
 
241682
- ;// CONCATENATED MODULE: ./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/toolbar/insert/HoSpecialChars.vue?vue&type=template&id=146e538d&scoped=true&
241683
- var HoSpecialCharsvue_type_template_id_146e538d_scoped_true_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('el-dropdown',{class:_vm.dropdownClassName,attrs:{"trigger":"click","placement":"bottom-start","popper-append-to-body":"","tabindex":-1},on:{"visible-change":_vm.dropdownChange}},[_c('span',{staticClass:"el-dropdown-link"},[_c('svg',{staticStyle:{"transform":"translateY(0px)"},attrs:{"viewBox":"0 0 1024 1024","version":"1.1","xmlns":"http://www.w3.org/2000/svg","width":"16","height":"16"}},[_c('path',{attrs:{"d":"M825.163595 883.651765H416.226184v-10.842353c62.162824-39.996235 99.629176-117.157647 99.629176-211.727059 0-32.768-4.999529-64.813176-12.047059-95.232H727.642654a18.432 18.432 0 0 0 18.130824-18.672941V477.605647a18.432 18.432 0 0 0-18.130824-18.612706h-254.192941c-16.263529-52.525176-30.358588-106.194824-30.358588-163.84 0-101.074824 77.101176-163.117176 198.053647-163.117176 48.790588 0 96.496941 9.517176 137.095529 24.395294 11.806118 4.457412 24.094118-4.638118 24.094118-17.648941V46.983529a18.853647 18.853647 0 0 0-11.866353-17.468235A448.752941 448.752941 0 0 0 630.904772 0c-210.823529 0-343.762824 103.424-343.762824 279.491765 0 61.138824 15.661176 120.892235 33.129412 179.2H198.776772A18.432 18.432 0 0 0 180.706184 477.304471V546.936471c0 10.24 8.192 18.612706 18.130823 18.612705H351.172066c7.710118 34.153412 13.372235 68.306824 13.372235 102.701177 0 105.050353-65.355294 193.536-165.165176 218.895059a18.552471 18.552471 0 0 0-13.854118 18.070588v89.509647c0 10.24 8.192 18.612706 18.130824 18.612706H825.223831a18.432 18.432 0 0 0 18.130823-18.672941V902.324706a18.432 18.432 0 0 0-18.130823-18.672941z"}})]),_c('span',[_vm._v("特殊字符")]),_c('i',{staticClass:"el-icon-arrow-down el-icon--right"})]),_c('el-dropdown-menu',{attrs:{"slot":"dropdown"},slot:"dropdown"},[_c('el-dropdown-item',{staticClass:"special-characters",attrs:{"disabled":""}},[_c('section',[_c('ul',[_c('li',[_c('header',[_vm._v("特殊字符")]),_c('p',{staticClass:"chars-list special-chars-list"},_vm._l((_vm.specialChars),function(chars){return _c('span',{key:chars,on:{"click":function($event){return _vm.specialCharsClick(chars)}}},[_vm._v(_vm._s(chars))])}),0)]),_c('li',[_c('header',[_vm._v("罗马字符")]),_c('p',{staticClass:"chars-list"},_vm._l((_vm.romanChars),function(chars){return _c('span',{key:chars,on:{"click":function($event){return _vm.specialCharsClick(chars)}}},[_vm._v(_vm._s(chars))])}),0)]),_c('li',[_c('header',[_vm._v("数学字符")]),_c('p',{staticClass:"chars-list"},_vm._l((_vm.mathChars),function(chars){return _c('span',{key:chars,on:{"click":function($event){return _vm.specialCharsClick(chars)}}},[_vm._v(_vm._s(chars))])}),0)])])])])],1)],1)}
241684
- var HoSpecialCharsvue_type_template_id_146e538d_scoped_true_staticRenderFns = []
241801
+ ;// CONCATENATED MODULE: ./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/toolbar/insert/HoSpecialChars.vue?vue&type=template&id=463b09d0&scoped=true&
241802
+ var HoSpecialCharsvue_type_template_id_463b09d0_scoped_true_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('el-dropdown',{class:_vm.dropdownClassName,attrs:{"trigger":"click","placement":"bottom-start","popper-append-to-body":"","tabindex":-1},on:{"visible-change":_vm.dropdownChange}},[_c('span',{staticClass:"el-dropdown-link"},[_c('svg',{staticStyle:{"transform":"translateY(0px)"},attrs:{"viewBox":"0 0 1024 1024","version":"1.1","xmlns":"http://www.w3.org/2000/svg","width":"16","height":"16"}},[_c('path',{attrs:{"d":"M825.163595 883.651765H416.226184v-10.842353c62.162824-39.996235 99.629176-117.157647 99.629176-211.727059 0-32.768-4.999529-64.813176-12.047059-95.232H727.642654a18.432 18.432 0 0 0 18.130824-18.672941V477.605647a18.432 18.432 0 0 0-18.130824-18.612706h-254.192941c-16.263529-52.525176-30.358588-106.194824-30.358588-163.84 0-101.074824 77.101176-163.117176 198.053647-163.117176 48.790588 0 96.496941 9.517176 137.095529 24.395294 11.806118 4.457412 24.094118-4.638118 24.094118-17.648941V46.983529a18.853647 18.853647 0 0 0-11.866353-17.468235A448.752941 448.752941 0 0 0 630.904772 0c-210.823529 0-343.762824 103.424-343.762824 279.491765 0 61.138824 15.661176 120.892235 33.129412 179.2H198.776772A18.432 18.432 0 0 0 180.706184 477.304471V546.936471c0 10.24 8.192 18.612706 18.130823 18.612705H351.172066c7.710118 34.153412 13.372235 68.306824 13.372235 102.701177 0 105.050353-65.355294 193.536-165.165176 218.895059a18.552471 18.552471 0 0 0-13.854118 18.070588v89.509647c0 10.24 8.192 18.612706 18.130824 18.612706H825.223831a18.432 18.432 0 0 0 18.130823-18.672941V902.324706a18.432 18.432 0 0 0-18.130823-18.672941z"}})]),_c('span',[_vm._v("特殊字符")]),_c('i',{staticClass:"el-icon-arrow-down el-icon--right"})]),_c('el-dropdown-menu',{attrs:{"slot":"dropdown"},slot:"dropdown"},[_c('el-dropdown-item',{staticClass:"special-characters",attrs:{"disabled":""}},[_c('section',[_c('ul',[_c('li',[_c('header',[_vm._v("特殊字符")]),_c('p',{staticClass:"chars-list special-chars-list"},_vm._l((_vm.specialChars),function(chars){return _c('span',{key:chars,on:{"click":function($event){return _vm.specialCharsClick(chars)}}},[_vm._v(_vm._s(chars))])}),0)]),_c('li',[_c('header',[_vm._v("罗马字符")]),_c('p',{staticClass:"chars-list"},_vm._l((_vm.romanChars),function(chars){return _c('span',{key:chars,on:{"click":function($event){return _vm.specialCharsClick(chars)}}},[_vm._v(_vm._s(chars))])}),0)]),_c('li',[_c('header',[_vm._v("数学字符")]),_c('p',{staticClass:"chars-list"},_vm._l((_vm.mathChars),function(chars){return _c('span',{key:chars,on:{"click":function($event){return _vm.specialCharsClick(chars)}}},[_vm._v(_vm._s(chars))])}),0)])])])])],1)],1)}
241803
+ var HoSpecialCharsvue_type_template_id_463b09d0_scoped_true_staticRenderFns = []
241685
241804
 
241686
241805
 
241687
241806
  ;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40[0].rules[0].use[0]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/toolbar/insert/HoSpecialChars.vue?vue&type=script&lang=js&
@@ -241748,7 +241867,7 @@ var HoSpecialCharsvue_type_template_id_146e538d_scoped_true_staticRenderFns = []
241748
241867
  arrChars: ['㎎', '㎏', '㎜', '㎝', '㎞', '㎡', '㏄', '㏎', '㏑', '㏒', '㏕', '℡'],
241749
241868
  specialChars: ['、', '。', '·', 'ˉ', 'ˇ', '¨', '〃', '々', '—', '~', '‖', '…', '‘', '’', '“', '”', '〔', '〕', '〈', '〉', '《', '》', '「', '」', '『', '』', '±', '×', '÷', '∶', '∧', '∨', '∑', '∏', '∪', '∩', '∈', 'α', 'β', 'γ', '∷', '√', '⊥', '∥', '∠', '⌒', '⊙', '∫', '∮', '≡', '≌', '≈', '∽', '∝', '≠', '≮', '≯', '≤', '≥', '∞', '∵', '∴', '♂', '♀', '°', '′', '″', '℃', '$', '¤', '¢', '£', '‰', '§', '№', '※', '→', '←', '↑', '↓', '㎎', '㎏', '㎜', '㎝', '㎞', '㎡', '㏄', '㏎', '㏑', '㏒', '㏕', '℡', '▽', '△', '▷', '◁', '/', '∕'],
241750
241869
  romanChars: ['ⅰ', 'ⅱ', 'ⅲ', 'ⅳ', 'ⅴ', 'ⅵ', 'ⅶ', 'ⅷ', 'ⅸ', 'ⅹ', 'Ⅰ', 'Ⅱ', 'Ⅲ', 'Ⅳ', 'Ⅴ', 'Ⅵ', 'Ⅶ', 'Ⅷ', 'Ⅸ', 'Ⅹ', 'Ⅺ', 'Ⅻ'],
241751
- //mathChars: [],
241870
+ usedChars: [],
241752
241871
  mathChars: ['⒈', '⒉', '⒊', '⒋', '⒌', '⒍', '⒎', '⒏', '⒐', '⒑', '⒒', '⒓', '⒔', '⒕', '⒖', '⒗', '⒘', '⒙', '⒚', '⒛', '⑴', '⑵', '⑶', '⑷', '⑸', '⑹', '⑺', '⑻', '⑼', '⑽', '⑾', '⑿', '⒀', '⒁', '⒂', '⒃', '⒄', '⒅', '⒆', '⒇', '①', '②', '③', '④', '⑤', '⑥', '⑦', '⑧', '⑨', '⑩', '㈠', '㈡', '㈢', '㈣', '㈤', '㈥', '㈦', '㈧', '㈨', '㈩']
241753
241872
  };
241754
241873
  },
@@ -241780,10 +241899,10 @@ var HoSpecialCharsvue_type_template_id_146e538d_scoped_true_staticRenderFns = []
241780
241899
  });
241781
241900
  ;// CONCATENATED MODULE: ./src/components/toolbar/insert/HoSpecialChars.vue?vue&type=script&lang=js&
241782
241901
  /* harmony default export */ var insert_HoSpecialCharsvue_type_script_lang_js_ = (HoSpecialCharsvue_type_script_lang_js_);
241783
- ;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-22[0].rules[0].use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22[0].rules[0].use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22[0].rules[0].use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22[0].rules[0].use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/toolbar/insert/HoSpecialChars.vue?vue&type=style&index=0&id=146e538d&lang=scss&scoped=true&
241902
+ ;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-22[0].rules[0].use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22[0].rules[0].use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22[0].rules[0].use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22[0].rules[0].use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/toolbar/insert/HoSpecialChars.vue?vue&type=style&index=0&id=463b09d0&lang=scss&scoped=true&
241784
241903
  // extracted by mini-css-extract-plugin
241785
241904
 
241786
- ;// CONCATENATED MODULE: ./src/components/toolbar/insert/HoSpecialChars.vue?vue&type=style&index=0&id=146e538d&lang=scss&scoped=true&
241905
+ ;// CONCATENATED MODULE: ./src/components/toolbar/insert/HoSpecialChars.vue?vue&type=style&index=0&id=463b09d0&lang=scss&scoped=true&
241787
241906
 
241788
241907
  ;// CONCATENATED MODULE: ./src/components/toolbar/insert/HoSpecialChars.vue
241789
241908
 
@@ -241796,11 +241915,11 @@ var HoSpecialCharsvue_type_template_id_146e538d_scoped_true_staticRenderFns = []
241796
241915
 
241797
241916
  var HoSpecialChars_component = (0,componentNormalizer/* default */.Z)(
241798
241917
  insert_HoSpecialCharsvue_type_script_lang_js_,
241799
- HoSpecialCharsvue_type_template_id_146e538d_scoped_true_render,
241800
- HoSpecialCharsvue_type_template_id_146e538d_scoped_true_staticRenderFns,
241918
+ HoSpecialCharsvue_type_template_id_463b09d0_scoped_true_render,
241919
+ HoSpecialCharsvue_type_template_id_463b09d0_scoped_true_staticRenderFns,
241801
241920
  false,
241802
241921
  null,
241803
- "146e538d",
241922
+ "463b09d0",
241804
241923
  null
241805
241924
 
241806
241925
  )