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.
Files changed (5) hide show
  1. package/lib/hoeditor.common.js +401 -282
  2. package/lib/hoeditor.css +1 -1
  3. package/lib/hoeditor.umd.js +401 -282
  4. package/lib/hoeditor.umd.min.js +3 -3
  5. package/package.json +1 -1
package/lib/hoeditor.umd.js CHANGED
@@ -10808,7 +10808,7 @@ var component = (0,componentNormalizer/* default */.Z)(
10808
10808
 
10809
10809
  /***/ }),
10810
10810
 
10811
- /***/ 61620:
10811
+ /***/ 41998:
10812
10812
  /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
10813
10813
 
10814
10814
  "use strict";
@@ -10820,8 +10820,8 @@ __webpack_require__.d(__webpack_exports__, {
10820
10820
  "default": function() { return /* binding */ TableCellPoper; }
10821
10821
  });
10822
10822
 
10823
- ;// 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&
10824
- 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)}
10823
+ ;// 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&
10824
+ 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)}
10825
10825
  var staticRenderFns = []
10826
10826
 
10827
10827
 
@@ -10926,6 +10926,8 @@ var HOEditorFactorys = __webpack_require__(28831);
10926
10926
  //
10927
10927
  //
10928
10928
  //
10929
+ //
10930
+ //
10929
10931
 
10930
10932
 
10931
10933
 
@@ -11285,10 +11287,10 @@ var HOEditorFactorys = __webpack_require__(28831);
11285
11287
  });
11286
11288
  ;// CONCATENATED MODULE: ./src/components/controls/table/TableCellPoper.vue?vue&type=script&lang=js&
11287
11289
  /* harmony default export */ var table_TableCellPopervue_type_script_lang_js_ = (TableCellPopervue_type_script_lang_js_);
11288
- ;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-65[0].rules[0].use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-65[0].rules[0].use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-65[0].rules[0].use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-65[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&
11290
+ ;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-65[0].rules[0].use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-65[0].rules[0].use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-65[0].rules[0].use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-65[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&
11289
11291
  // extracted by mini-css-extract-plugin
11290
11292
 
11291
- ;// CONCATENATED MODULE: ./src/components/controls/table/TableCellPoper.vue?vue&type=style&index=0&id=29a19e91&lang=scss&scoped=true&
11293
+ ;// CONCATENATED MODULE: ./src/components/controls/table/TableCellPoper.vue?vue&type=style&index=0&id=56a2ba09&lang=scss&scoped=true&
11292
11294
 
11293
11295
  // EXTERNAL MODULE: ./node_modules/@vue/vue-loader-v15/lib/runtime/componentNormalizer.js
11294
11296
  var componentNormalizer = __webpack_require__(1001);
@@ -11307,7 +11309,7 @@ var component = (0,componentNormalizer/* default */.Z)(
11307
11309
  staticRenderFns,
11308
11310
  false,
11309
11311
  null,
11310
- "29a19e91",
11312
+ "56a2ba09",
11311
11313
  null
11312
11314
 
11313
11315
  )
@@ -47761,7 +47763,7 @@ var SpecialCharsNode = /*#__PURE__*/function (_ControlNode) {
47761
47763
  /* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(91347);
47762
47764
  /* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_typeof_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(36768);
47763
47765
  /* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_classCallCheck_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(42015);
47764
- /* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_34__ = __webpack_require__(16296);
47766
+ /* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_35__ = __webpack_require__(16296);
47765
47767
  /* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_get_js__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(16862);
47766
47768
  /* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_getPrototypeOf_js__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(79123);
47767
47769
  /* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_inherits_js__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(83964);
@@ -47780,18 +47782,18 @@ var SpecialCharsNode = /*#__PURE__*/function (_ControlNode) {
47780
47782
  /* 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__);
47781
47783
  /* harmony import */ var core_js_modules_es_string_split_js__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(23123);
47782
47784
  /* 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__);
47783
- /* harmony import */ var core_js_modules_es_string_replace_js__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(15306);
47784
- /* 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__);
47785
- /* harmony import */ var core_js_modules_es_string_replace_all_js__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(68757);
47786
- /* 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__);
47787
- /* harmony import */ var core_js_modules_es_regexp_constructor_js__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(24603);
47788
- /* 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__);
47789
- /* harmony import */ var core_js_modules_es_regexp_dot_all_js__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(28450);
47790
- /* 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__);
47791
- /* harmony import */ var core_js_modules_es_regexp_sticky_js__WEBPACK_IMPORTED_MODULE_19__ = __webpack_require__(88386);
47792
- /* 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__);
47793
- /* harmony import */ var core_js_modules_es_regexp_to_string_js__WEBPACK_IMPORTED_MODULE_20__ = __webpack_require__(39714);
47794
- /* 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__);
47785
+ /* harmony import */ var core_js_modules_es_regexp_to_string_js__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(39714);
47786
+ /* 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__);
47787
+ /* harmony import */ var core_js_modules_es_string_replace_js__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(15306);
47788
+ /* 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__);
47789
+ /* harmony import */ var core_js_modules_es_string_replace_all_js__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(68757);
47790
+ /* 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__);
47791
+ /* harmony import */ var core_js_modules_es_regexp_constructor_js__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(24603);
47792
+ /* 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__);
47793
+ /* harmony import */ var core_js_modules_es_regexp_dot_all_js__WEBPACK_IMPORTED_MODULE_19__ = __webpack_require__(28450);
47794
+ /* 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__);
47795
+ /* harmony import */ var core_js_modules_es_regexp_sticky_js__WEBPACK_IMPORTED_MODULE_20__ = __webpack_require__(88386);
47796
+ /* 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__);
47795
47797
  /* harmony import */ var core_js_modules_es_array_splice_js__WEBPACK_IMPORTED_MODULE_21__ = __webpack_require__(40561);
47796
47798
  /* 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__);
47797
47799
  /* harmony import */ var core_js_modules_es_string_match_all_js__WEBPACK_IMPORTED_MODULE_22__ = __webpack_require__(76373);
@@ -47808,9 +47810,11 @@ var SpecialCharsNode = /*#__PURE__*/function (_ControlNode) {
47808
47810
  /* harmony import */ var _editor_utils_ExpressionCalculator__WEBPACK_IMPORTED_MODULE_28__ = __webpack_require__(77564);
47809
47811
  /* harmony import */ var _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_29__ = __webpack_require__(28831);
47810
47812
  /* harmony import */ var _plugins_util__WEBPACK_IMPORTED_MODULE_30__ = __webpack_require__(17987);
47811
- /* harmony import */ var _BaseNode__WEBPACK_IMPORTED_MODULE_31__ = __webpack_require__(92178);
47812
- /* harmony import */ var _CellNode__WEBPACK_IMPORTED_MODULE_32__ = __webpack_require__(69088);
47813
- /* harmony import */ var _ControlNode__WEBPACK_IMPORTED_MODULE_33__ = __webpack_require__(99964);
47813
+ /* harmony import */ var _BaseCombineNode__WEBPACK_IMPORTED_MODULE_31__ = __webpack_require__(3267);
47814
+ /* harmony import */ var _BaseNode__WEBPACK_IMPORTED_MODULE_32__ = __webpack_require__(92178);
47815
+ /* harmony import */ var _CellNode__WEBPACK_IMPORTED_MODULE_33__ = __webpack_require__(69088);
47816
+ /* harmony import */ var _ControlNode__WEBPACK_IMPORTED_MODULE_34__ = __webpack_require__(99964);
47817
+
47814
47818
 
47815
47819
 
47816
47820
 
@@ -47907,7 +47911,7 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
47907
47911
  return _this;
47908
47912
  }
47909
47913
 
47910
- (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_34__/* ["default"] */ .Z)(TableFormula, [{
47914
+ (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_35__/* ["default"] */ .Z)(TableFormula, [{
47911
47915
  key: "setCustomProperty",
47912
47916
  value: function setCustomProperty(customProperty) {
47913
47917
  var assignvalue = function assignvalue(target, source) {
@@ -48022,9 +48026,9 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
48022
48026
  }, {
48023
48027
  key: "node2DrawNodeRange",
48024
48028
  value: function node2DrawNodeRange(startIndex, endIndex) {
48025
- this.refreshDrawStyle();
48026
- var text = this._hideZero && (this._text == "0" || this._text === "0.00") ? " " : this._text;
48027
- var dNode = new _editor_draw_drawNode_DrawTableFormular__WEBPACK_IMPORTED_MODULE_27__/* .DrawTableFormular */ .A(this._rootPath, this, text);
48029
+ this.refreshDrawStyle(); //const text = this._hideZero && (this._text == "0" || this._text === "0.00") ? " " : this._text;
48030
+
48031
+ var dNode = new _editor_draw_drawNode_DrawTableFormular__WEBPACK_IMPORTED_MODULE_27__/* .DrawTableFormular */ .A(this._rootPath, this, this._text);
48028
48032
 
48029
48033
  this._drawNodes.push(dNode);
48030
48034
  }
@@ -48067,7 +48071,7 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
48067
48071
  key: "node2Json",
48068
48072
  value: function node2Json(range, isCopy) {
48069
48073
  var retObj = {
48070
- nodeType: _BaseNode__WEBPACK_IMPORTED_MODULE_31__/* .NodeType */ .Jq[this.nodeType],
48074
+ nodeType: _BaseNode__WEBPACK_IMPORTED_MODULE_32__/* .NodeType */ .Jq[this.nodeType],
48071
48075
  text: this._formulaStr,
48072
48076
  styleIndex: this.styleIndex,
48073
48077
  hideZero: this._hideZero,
@@ -48089,7 +48093,7 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
48089
48093
  var pNode = this.parentNode;
48090
48094
 
48091
48095
  while (pNode) {
48092
- if (pNode instanceof _CellNode__WEBPACK_IMPORTED_MODULE_32__/* .CellNode */ .D) {
48096
+ if (pNode instanceof _CellNode__WEBPACK_IMPORTED_MODULE_33__/* .CellNode */ .D) {
48093
48097
  return pNode;
48094
48098
  }
48095
48099
 
@@ -48105,7 +48109,7 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
48105
48109
 
48106
48110
  var table = this.getParentCell().table;
48107
48111
  var totalOk = false;
48108
- var total = 0.0;
48112
+ var total = " ";
48109
48113
 
48110
48114
  if (arr.length == 2) {
48111
48115
  var _this$getRowColByCell = this.getRowColByCellAdress(arr[0]),
@@ -48125,6 +48129,7 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
48125
48129
  for (var r = istartRow; r <= iEndRow; r++) {
48126
48130
  for (var c = istartCol; c <= iEndCol; c++) {
48127
48131
  if (bCalc) {
48132
+ if (!table.rows[r]) return "?";
48128
48133
  var cell = table.rows[r][c];
48129
48134
  if (!cell) continue;
48130
48135
 
@@ -48135,7 +48140,10 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
48135
48140
 
48136
48141
  if (cell.cellProperty.downListProperty) {
48137
48142
  if (bret) {
48138
- total += value;
48143
+ //total+=value;
48144
+ if (value !== "") {
48145
+ total = ((total == " " ? 0.00 : Number(total)) + Number(value)).toString();
48146
+ }
48139
48147
  } else {
48140
48148
  var cellText = cell.getCellText();
48141
48149
  var downListProperty = cell.cellProperty.downListProperty;
@@ -48153,7 +48161,8 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
48153
48161
  var val = Number(listItem.value);
48154
48162
 
48155
48163
  if (!isNaN(val)) {
48156
- total += val;
48164
+ //total += val;
48165
+ total = ((total == " " ? 0.00 : Number(total)) + val).toString();
48157
48166
  } else {
48158
48167
  totalOk = false;
48159
48168
  break;
@@ -48173,8 +48182,11 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
48173
48182
  break;
48174
48183
  }
48175
48184
 
48176
- ;
48177
- total += value;
48185
+ ; //total += value;
48186
+
48187
+ if (value !== "") {
48188
+ total = ((total == " " ? 0.00 : Number(total)) + Number(value)).toString();
48189
+ }
48178
48190
  }
48179
48191
  } else {
48180
48192
  this._cellRange.push([r, c]);
@@ -48198,7 +48210,7 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
48198
48210
  }, {
48199
48211
  key: "getCellNumber",
48200
48212
  value: function getCellNumber(tb, irow, icol) {
48201
- var ret = 0;
48213
+ var ret = "";
48202
48214
  var bret = false;
48203
48215
  var cell = tb.rows[irow][icol];
48204
48216
 
@@ -48225,7 +48237,7 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
48225
48237
 
48226
48238
  if (!isNaN(ivalue)) {
48227
48239
  bret = true;
48228
- ret = ivalue;
48240
+ ret = strValue;
48229
48241
  }
48230
48242
  }
48231
48243
 
@@ -48255,7 +48267,7 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
48255
48267
  }, {
48256
48268
  key: "clacFormula",
48257
48269
  value: function clacFormula(bCalc) {
48258
- var strRet = '?';
48270
+ var strRet = ' ';
48259
48271
 
48260
48272
  var strFormula = this._formulaStr.toLowerCase();
48261
48273
 
@@ -48307,7 +48319,8 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
48307
48319
  avalue = _this$getCellNumber4[1];
48308
48320
 
48309
48321
  if (isNumber) {
48310
- value[i] = avalue.toString();
48322
+ //value[i] = avalue.toString();
48323
+ value[i] = avalue;
48311
48324
  } else {
48312
48325
  totalOk = false;
48313
48326
  break;
@@ -48324,7 +48337,7 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
48324
48337
  }
48325
48338
 
48326
48339
  if (!bCalc) {
48327
- return '0';
48340
+ return ' ';
48328
48341
  }
48329
48342
 
48330
48343
  if (totalOk) {
@@ -48332,20 +48345,25 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
48332
48345
  var isRet = true;
48333
48346
 
48334
48347
  for (var m = 0; m < value.length; m++) {
48335
- if (value[m] !== "0") {
48348
+ // if (value[m] !== "0") {
48349
+ // isRet = false;
48350
+ // }
48351
+ if (value[m] !== "") {
48336
48352
  isRet = false;
48353
+ break;
48337
48354
  }
48338
48355
  }
48339
48356
 
48340
48357
  if (isRet) {
48341
- return '0';
48358
+ return " ";
48342
48359
  }
48343
48360
 
48344
48361
  for (var k = arr.length - 1; k >= 0; k--) {
48345
48362
  strFormula = hoEditorFactory.unitConvert.replaceAll(strFormula, arr[k], value[k]); //strFormula.replaceAll(arr[k], value[k]);
48346
48363
  }
48347
48364
 
48348
- strRet = '' + (0,_editor_utils_ExpressionCalculator__WEBPACK_IMPORTED_MODULE_28__/* .expressionCalculator */ .C)(strFormula);
48365
+ var result = (0,_editor_utils_ExpressionCalculator__WEBPACK_IMPORTED_MODULE_28__/* .expressionCalculator */ .C)(strFormula);
48366
+ strRet = result.toString() == "NaN" ? " " : result.toString();
48349
48367
  }
48350
48368
 
48351
48369
  return strRet;
@@ -48353,7 +48371,7 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
48353
48371
  }, {
48354
48372
  key: "clacBMI",
48355
48373
  value: function clacBMI() {
48356
- var strRet = "0";
48374
+ var strRet = " ";
48357
48375
  var table = this.getParentCell().table;
48358
48376
  var arrStr = this.formulaStr.split(",");
48359
48377
 
@@ -48372,6 +48390,8 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
48372
48390
  heightCol = _this$getRowColByCell10[1];
48373
48391
 
48374
48392
  if (weightRow >= 0 && weightCol >= 0 && heightRow >= 0 && heightCol >= 0) {
48393
+ if (!table.rows[weightRow]) return strRet;
48394
+ if (!table.rows[heightRow]) return strRet;
48375
48395
  var wCell = table.rows[weightRow][weightCol];
48376
48396
  var hCell = table.rows[heightRow][heightCol];
48377
48397
 
@@ -48379,14 +48399,17 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
48379
48399
  var _this$getCellNumber5 = this.getCellNumber(table, weightRow, weightCol),
48380
48400
  _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),
48381
48401
  wRet = _this$getCellNumber6[0],
48382
- weightNum = _this$getCellNumber6[1];
48402
+ weight = _this$getCellNumber6[1];
48383
48403
 
48384
48404
  var _this$getCellNumber7 = this.getCellNumber(table, heightRow, heightCol),
48385
48405
  _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),
48386
48406
  hRet = _this$getCellNumber8[0],
48387
- heightNum = _this$getCellNumber8[1];
48407
+ height = _this$getCellNumber8[1];
48388
48408
 
48389
- if (hRet && heightNum === 0) return strRet;
48409
+ if (height == "0" || height == "") return strRet;
48410
+ if (weight == "") return strRet;
48411
+ var weightNum = Number(weight);
48412
+ var heightNum = Number(height);
48390
48413
 
48391
48414
  if (wRet && hRet) {
48392
48415
  if (heightNum > 3) {
@@ -48434,6 +48457,8 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
48434
48457
  }
48435
48458
 
48436
48459
  if (sRow >= 0 && sCol >= 0 && eRow >= 0 && eCol >= 0) {
48460
+ if (!table.rows[sRow]) return "0";
48461
+ if (!table.rows[eRow]) return "0";
48437
48462
  var sCell = table.rows[sRow][sCol];
48438
48463
  var eCell = table.rows[eRow][eCol];
48439
48464
 
@@ -48492,6 +48517,7 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
48492
48517
 
48493
48518
  if (arrStr.length === 3) {
48494
48519
  if (aRow >= 0 && aCol >= 0) {
48520
+ if (!table.rows[aRow]) return "0";
48495
48521
  var aCell = table.rows[aRow][aCol];
48496
48522
 
48497
48523
  if (aCell) {
@@ -48602,6 +48628,7 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
48602
48628
  col = _this$getRowColByCell18[1];
48603
48629
 
48604
48630
  if (row >= 0 && col >= 0) {
48631
+ if (!table.rows[row]) return "0";
48605
48632
  var cell = table.rows[row][col];
48606
48633
 
48607
48634
  if (cell) {
@@ -48646,6 +48673,7 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
48646
48673
  col = _this$getRowColByCell20[1];
48647
48674
 
48648
48675
  if (row >= 0 && col >= 0) {
48676
+ if (!table.rows[row]) return "0";
48649
48677
  var cell = table.rows[row][col];
48650
48678
 
48651
48679
  if (cell) {
@@ -48679,7 +48707,7 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
48679
48707
  }, {
48680
48708
  key: "getScoreMapping",
48681
48709
  value: function getScoreMapping() {
48682
- var strRet = "0";
48710
+ var strRet = " ";
48683
48711
  var formularJson = JSON.parse(this.formulaStr);
48684
48712
  var cellNo = formularJson.cell;
48685
48713
  var items = formularJson.items;
@@ -48691,20 +48719,38 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
48691
48719
  col = _this$getRowColByCell22[1];
48692
48720
 
48693
48721
  if (row >= 0 && col >= 0) {
48722
+ if (!table.rows[row]) return " ";
48694
48723
  var cell = table.rows[row][col];
48695
48724
 
48696
- if (cell && cell.childNodes[1] instanceof TableFormula) {
48697
- var tableFormular = cell.childNodes[1]; //const scoreText = cell.getCellText();
48725
+ if (cell) {
48726
+ var tableFormular = cell.childNodes[0];
48727
+
48728
+ var loopNodes = function loopNodes(nodes) {
48729
+ for (var k = 0; k < nodes.length; k++) {
48730
+ var node = nodes[k];
48731
+
48732
+ if (node instanceof TableFormula) {
48733
+ tableFormular = node;
48734
+ break;
48735
+ }
48736
+
48737
+ if (node instanceof _BaseCombineNode__WEBPACK_IMPORTED_MODULE_31__/* .BaseCombineNode */ .V) {
48738
+ loopNodes(node.childNodes);
48739
+ }
48740
+ }
48741
+ };
48742
+
48743
+ loopNodes(cell.childNodes);
48744
+ if (!(tableFormular instanceof TableFormula)) return " "; //const scoreText = cell.getCellText();
48698
48745
 
48699
48746
  var scoreText = tableFormular.text;
48700
48747
 
48701
48748
  if (scoreText == "" || scoreText == " ") {
48702
48749
  return strRet;
48703
- }
48750
+ } // if (tableFormular.hideZero && (scoreText == "0" || scoreText == "0.00")) {
48751
+ // return strRet;
48752
+ // }
48704
48753
 
48705
- if (tableFormular.hideZero && (scoreText == "0" || scoreText == "0.00")) {
48706
- return strRet;
48707
- }
48708
48754
 
48709
48755
  var score = Number(scoreText);
48710
48756
 
@@ -48827,13 +48873,13 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
48827
48873
  formularType = json.text.indexOf(':') > 0 ? FormularType.ftSum : FormularType.ftFormular;
48828
48874
  }
48829
48875
 
48830
- 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);
48876
+ 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);
48831
48877
  return ret;
48832
48878
  }
48833
48879
  }]);
48834
48880
 
48835
48881
  return TableFormula;
48836
- }(_ControlNode__WEBPACK_IMPORTED_MODULE_33__/* .ControlNode */ .w);
48882
+ }(_ControlNode__WEBPACK_IMPORTED_MODULE_34__/* .ControlNode */ .w);
48837
48883
 
48838
48884
  /***/ }),
48839
48885
 
@@ -49267,6 +49313,8 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
49267
49313
  }
49268
49314
  }
49269
49315
 
49316
+ _this.countChildNodes();
49317
+
49270
49318
  _this.node2DrawNode();
49271
49319
 
49272
49320
  _this.updateWidth();
@@ -49363,11 +49411,11 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
49363
49411
  }, {
49364
49412
  key: "childNodes",
49365
49413
  get: function get() {
49366
- var arr = this._rows.flat();
49414
+ if (!this._childNodes) {
49415
+ this.countChildNodes();
49416
+ }
49367
49417
 
49368
- return arr.filter(function (element) {
49369
- return element !== undefined;
49370
- });
49418
+ return this._childNodes;
49371
49419
  }
49372
49420
  }, {
49373
49421
  key: "borderWidth",
@@ -49377,6 +49425,15 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
49377
49425
  set: function set(borderWidth) {
49378
49426
  this._borderWidth = borderWidth;
49379
49427
  }
49428
+ }, {
49429
+ key: "countChildNodes",
49430
+ value: function countChildNodes() {
49431
+ var arr = this._rows.flat();
49432
+
49433
+ this._childNodes = arr.filter(function (element) {
49434
+ return element !== undefined;
49435
+ });
49436
+ }
49380
49437
  }, {
49381
49438
  key: "calcColWidth",
49382
49439
  value: function calcColWidth() {
@@ -49513,6 +49570,7 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
49513
49570
  }
49514
49571
 
49515
49572
  this._rowCount += 1;
49573
+ this.countChildNodes();
49516
49574
  this._drawTable.needUpdate = true;
49517
49575
  }
49518
49576
 
@@ -49773,6 +49831,7 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
49773
49831
  }
49774
49832
 
49775
49833
  this._colCount += count;
49834
+ this.countChildNodes();
49776
49835
  this.updateWidth(); // }
49777
49836
  }
49778
49837
  /**
@@ -49958,6 +50017,7 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
49958
50017
  // }
49959
50018
  // vampireCell.updateHeight(aHeight);
49960
50019
 
50020
+ this.countChildNodes();
49961
50021
  vampireCell.drawCell.needUpdate = true;
49962
50022
  return vampireCell;
49963
50023
  }
@@ -50214,6 +50274,8 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
50214
50274
  // }
50215
50275
 
50216
50276
  this._rows.splice(index, count);
50277
+
50278
+ this.countChildNodes();
50217
50279
  }
50218
50280
  }, {
50219
50281
  key: "deleteCols",
@@ -50305,6 +50367,8 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
50305
50367
  if (cols.length > 0) {
50306
50368
  this.updateColsWidth(cols, newWidth);
50307
50369
  }
50370
+
50371
+ this.countChildNodes();
50308
50372
  }
50309
50373
  }, {
50310
50374
  key: "unMergeCell",
@@ -50346,6 +50410,8 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
50346
50410
  } else if (bUnMergeCol) {
50347
50411
  this.doUnMergeCol(r, c);
50348
50412
  }
50413
+
50414
+ this.countChildNodes();
50349
50415
  }
50350
50416
  }
50351
50417
  }, {
@@ -51856,6 +51922,7 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
51856
51922
  }
51857
51923
  }
51858
51924
 
51925
+ tableNode.countChildNodes();
51859
51926
  return tableNode;
51860
51927
  }
51861
51928
  }, {
@@ -61663,14 +61730,6 @@ var getPrototypeOf = __webpack_require__(79123);
61663
61730
  var inherits = __webpack_require__(83964);
61664
61731
  // EXTERNAL MODULE: ./node_modules/@babel/runtime/helpers/esm/createSuper.js + 2 modules
61665
61732
  var createSuper = __webpack_require__(46455);
61666
- // EXTERNAL MODULE: ./node_modules/core-js/modules/es.function.name.js
61667
- var es_function_name = __webpack_require__(68309);
61668
- // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.includes.js
61669
- var es_array_includes = __webpack_require__(26699);
61670
- // EXTERNAL MODULE: ./node_modules/core-js/modules/es.string.includes.js
61671
- var es_string_includes = __webpack_require__(32023);
61672
- // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.splice.js
61673
- var es_array_splice = __webpack_require__(40561);
61674
61733
  // EXTERNAL MODULE: ./node_modules/core-js/modules/es.error.cause.js
61675
61734
  var es_error_cause = __webpack_require__(21703);
61676
61735
  // EXTERNAL MODULE: ./src/editor/dom/TableProperty.ts
@@ -62025,10 +62084,6 @@ var DrawPageTable = __webpack_require__(24552);
62025
62084
 
62026
62085
 
62027
62086
 
62028
-
62029
-
62030
-
62031
-
62032
62087
 
62033
62088
 
62034
62089
  var DrawPageCell = /*#__PURE__*/function (_DrawArea) {
@@ -62363,7 +62418,7 @@ var DrawPageCell = /*#__PURE__*/function (_DrawArea) {
62363
62418
  // return true;
62364
62419
  // }
62365
62420
 
62366
- if (this._startDline >= this.cell.drawCell.drawLines.length) {
62421
+ if (this._startDline >= this.cell.drawCell.drawLines.length || index == -1) {
62367
62422
  return true;
62368
62423
  } // if (this._lastDrawLine instanceof DrawPageTable) {
62369
62424
  // index = this._cell.drawCell.drawLines.indexOf(
@@ -62499,6 +62554,8 @@ var DrawPageCell = /*#__PURE__*/function (_DrawArea) {
62499
62554
  key: "startPaintBackGround",
62500
62555
  value: function startPaintBackGround() {
62501
62556
  this._backImg.uncache();
62557
+
62558
+ this._backImg.graphics.clear();
62502
62559
  }
62503
62560
  }, {
62504
62561
  key: "endPaintBackGround",
@@ -62507,34 +62564,28 @@ var DrawPageCell = /*#__PURE__*/function (_DrawArea) {
62507
62564
  }
62508
62565
  }, {
62509
62566
  key: "paintMarker",
62510
- value: function paintMarker(r, c) {
62511
- var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID);
62512
-
62513
- for (var i = this.children.length - 1; i >= 0; i--) {
62514
- if (this.children[i].name && this.children[i].name.includes("markline")) {
62515
- this.children.splice(i, 1);
62516
- }
62517
- }
62567
+ value: function paintMarker(color) {
62568
+ var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID); // for (let i = this.children.length - 1; i >= 0; i--) {
62569
+ // if (this.children[i].name && this.children[i].name.includes("markline")) {
62570
+ // this.children.splice(i, 1);
62571
+ // }
62572
+ // }
62518
62573
 
62519
62574
  if (hoEditorFactory.drawTree.paintStatus !== DrawTree/* PaintState.psPreview */.Dh.psPreview && hoEditorFactory.drawTree.paintStatus !== DrawTree/* PaintState.psPrint */.Dh.psPrint) {
62520
- var markerLine1 = new createjs.Shape();
62521
- var markerLine2 = new createjs.Shape();
62522
- var markerLine3 = new createjs.Shape();
62523
- var markerLine4 = new createjs.Shape();
62575
+ // const markerLine1 = new createjs.Shape();
62576
+ // const markerLine2 = new createjs.Shape();
62577
+ // const markerLine3 = new createjs.Shape();
62578
+ // const markerLine4 = new createjs.Shape();
62524
62579
  var width = this.dWidth;
62525
- var height = this.dHeight;
62526
- markerLine1.name = "markline1";
62527
- markerLine2.name = "markline2";
62528
- markerLine3.name = "markline3";
62529
- markerLine4.name = "markline4";
62530
- markerLine1.graphics.beginStroke("#FB0101").moveTo(width - 7, height - 0.5).lineTo(width - 0.5, height - 7);
62531
- markerLine2.graphics.beginStroke("#FB0101").moveTo(width - 5, height - 0.5).lineTo(width - 0.5, height - 5);
62532
- markerLine3.graphics.beginStroke("#FB0101").moveTo(width - 3, height - 0.5).lineTo(width - 0.5, height - 3);
62533
- markerLine4.graphics.beginStroke("#FB0101").moveTo(width - 2, height - 0.5).lineTo(width - 0.5, height - 2);
62534
- this.addChild(markerLine1);
62535
- this.addChild(markerLine2);
62536
- this.addChild(markerLine3);
62537
- this.addChild(markerLine4);
62580
+ var height = this.dHeight; // markerLine1.name = "markline1";
62581
+ // markerLine2.name = "markline2";
62582
+ // markerLine3.name = "markline3";
62583
+ // markerLine4.name = "markline4";
62584
+
62585
+ 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);
62586
+
62587
+ this._backImg.graphics.endStroke(); // this.addChild(markerLine1);
62588
+
62538
62589
  }
62539
62590
  }
62540
62591
  }, {
@@ -62543,9 +62594,7 @@ var DrawPageCell = /*#__PURE__*/function (_DrawArea) {
62543
62594
  var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID);
62544
62595
  this._backImg.x = 0;
62545
62596
  this._backImg.y = 0; // this._backImg.uncache();
62546
-
62547
- this._backImg.graphics.clear(); // 白色背景转透明 处理转换pdf生成的多余线
62548
-
62597
+ // 白色背景转透明 处理转换pdf生成的多余线
62549
62598
 
62550
62599
  this._backImg.graphics.beginFill(this._cell.cellProperty.backColor === '#FFFFFF' ? 'transparent' : this._cell.cellProperty.backColor);
62551
62600
 
@@ -63066,7 +63115,7 @@ var DrawPageMarkNode = /*#__PURE__*/function (_DrawCombineNode) {
63066
63115
  /* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(14409);
63067
63116
  /* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_inherits_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(83964);
63068
63117
  /* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createSuper_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(46455);
63069
- /* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(16296);
63118
+ /* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(16296);
63070
63119
  /* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_classCallCheck_js__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(42015);
63071
63120
  /* harmony import */ var core_js_modules_es_array_sort_js__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(2707);
63072
63121
  /* 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__);
@@ -63076,12 +63125,16 @@ var DrawPageMarkNode = /*#__PURE__*/function (_DrawCombineNode) {
63076
63125
  /* 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__);
63077
63126
  /* harmony import */ var core_js_modules_es_array_concat_js__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(92222);
63078
63127
  /* 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__);
63079
- /* harmony import */ var _editor_dom_treeNode_TableNode__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(59530);
63080
- /* harmony import */ var _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(28831);
63081
- /* harmony import */ var _drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(27546);
63082
- /* harmony import */ var _IDrawInfos__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(32418);
63083
- /* harmony import */ var _DrawPageCell__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(12337);
63084
- /* harmony import */ var _DrawRect__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(6963);
63128
+ /* harmony import */ var _editor_dom_treeNode_BaseCombineNode__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(3267);
63129
+ /* harmony import */ var _editor_dom_treeNode_TableFormula__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(72330);
63130
+ /* harmony import */ var _editor_dom_treeNode_TableNode__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(59530);
63131
+ /* harmony import */ var _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(28831);
63132
+ /* harmony import */ var _drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(27546);
63133
+ /* harmony import */ var _IDrawInfos__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(32418);
63134
+ /* harmony import */ var _DrawPageCell__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(12337);
63135
+ /* harmony import */ var _DrawRect__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(6963);
63136
+
63137
+
63085
63138
 
63086
63139
 
63087
63140
 
@@ -63143,7 +63196,7 @@ var DrawPageMarkNode = /*#__PURE__*/function (_DrawCombineNode) {
63143
63196
  // }
63144
63197
  // }
63145
63198
 
63146
- 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() {
63199
+ 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() {
63147
63200
  (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_classCallCheck_js__WEBPACK_IMPORTED_MODULE_4__/* ["default"] */ .Z)(this, PartRowHeight);
63148
63201
  });
63149
63202
  var PartRowHeights = /*#__PURE__*/function () {
@@ -63154,7 +63207,7 @@ var PartRowHeights = /*#__PURE__*/function () {
63154
63207
  this._drawPageTable = drawPageTable;
63155
63208
  }
63156
63209
 
63157
- (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_14__/* ["default"] */ .Z)(PartRowHeights, [{
63210
+ (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_16__/* ["default"] */ .Z)(PartRowHeights, [{
63158
63211
  key: "getLastRow",
63159
63212
  value: function getLastRow() {
63160
63213
  if (this._rowHeights.length > 0) {
@@ -63248,7 +63301,7 @@ var DrawPageTable = /*#__PURE__*/function (_DrawRect) {
63248
63301
  _this._table = tableNode;
63249
63302
  _this._dParent = dParent;
63250
63303
  _this._charSpace = paragraphNode.combineParagraph.charSpace;
63251
- _this._discriminator = _IDrawInfos__WEBPACK_IMPORTED_MODULE_15__/* .gDrawIntfID */ .t;
63304
+ _this._discriminator = _IDrawInfos__WEBPACK_IMPORTED_MODULE_17__/* .gDrawIntfID */ .t;
63252
63305
  _this._dTop = dTop;
63253
63306
  _this._node = tableNode;
63254
63307
  _this._dWidth = aWidth;
@@ -63263,7 +63316,7 @@ var DrawPageTable = /*#__PURE__*/function (_DrawRect) {
63263
63316
  } // private _endRowinfos: EndRowInfo;
63264
63317
 
63265
63318
 
63266
- (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_14__/* ["default"] */ .Z)(DrawPageTable, [{
63319
+ (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_16__/* ["default"] */ .Z)(DrawPageTable, [{
63267
63320
  key: "startRow",
63268
63321
  get: function get() {
63269
63322
  return this._startRow;
@@ -63543,19 +63596,42 @@ var DrawPageTable = /*#__PURE__*/function (_DrawRect) {
63543
63596
  }, {
63544
63597
  key: "paintCellBorder",
63545
63598
  value: function paintCellBorder(partCell, r, c, newHeight) {
63599
+ partCell.startPaintBackGround();
63546
63600
  var colInfo = this._table.colInfos[c];
63547
63601
 
63548
63602
  if (partCell.cell.cellProperty.editorProperty !== 0 || colInfo.colProperty.editorProperty !== 0) {
63549
- partCell.paintMarker(r, c);
63603
+ partCell.paintMarker("#FF0000");
63604
+ }
63605
+
63606
+ var isHasTableFormula = false;
63607
+
63608
+ var loopNodes = function loopNodes(nodes) {
63609
+ for (var k = 0; k < nodes.length; k++) {
63610
+ var node = nodes[k];
63611
+
63612
+ if (node instanceof _editor_dom_treeNode_TableFormula__WEBPACK_IMPORTED_MODULE_10__/* .TableFormula */ .N) {
63613
+ isHasTableFormula = true;
63614
+ break;
63615
+ }
63616
+
63617
+ if (node instanceof _editor_dom_treeNode_BaseCombineNode__WEBPACK_IMPORTED_MODULE_9__/* .BaseCombineNode */ .V) {
63618
+ loopNodes(node.childNodes);
63619
+ }
63620
+ }
63621
+ };
63622
+
63623
+ loopNodes(partCell.cell.childNodes);
63624
+
63625
+ if (isHasTableFormula) {
63626
+ partCell.paintMarker("#0000FF");
63550
63627
  }
63551
63628
 
63552
- partCell.startPaintBackGround();
63553
63629
  partCell.paintCellBackground(newHeight, r, c);
63554
63630
  partCell.endPaintBackGround(newHeight);
63555
63631
  partCell.updateCrossShap();
63556
- var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_10__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this.table.hoEditorFactoryID);
63632
+ var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_12__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this.table.hoEditorFactoryID);
63557
63633
 
63558
- 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) {
63634
+ 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) {
63559
63635
  return;
63560
63636
  }
63561
63637
 
@@ -63596,7 +63672,7 @@ var DrawPageTable = /*#__PURE__*/function (_DrawRect) {
63596
63672
  }
63597
63673
  }
63598
63674
 
63599
- var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_10__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._table.hoEditorFactoryID);
63675
+ var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_12__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._table.hoEditorFactoryID);
63600
63676
  var tableRestHeight = pageRestHeight;
63601
63677
  this._endRow = this._startRow;
63602
63678
  var emptyRowHeight = 0;
@@ -63605,13 +63681,13 @@ var DrawPageTable = /*#__PURE__*/function (_DrawRect) {
63605
63681
  for (var r = this._startRow; r < this._table.rowCount; r++) {
63606
63682
  var rowRestHeight = 0;
63607
63683
 
63608
- if (pageRestHeight < _editor_dom_treeNode_TableNode__WEBPACK_IMPORTED_MODULE_9__/* .gDefaultRowHeight */ .dT) {
63684
+ if (pageRestHeight < _editor_dom_treeNode_TableNode__WEBPACK_IMPORTED_MODULE_11__/* .gDefaultRowHeight */ .dT) {
63609
63685
  break;
63610
63686
  } //开始行需要判断是否存在上一个未绘制完成的表格
63611
63687
 
63612
63688
 
63613
63689
  if (r === this._startRow && index > 0 && !bStartRowFinished) {
63614
- rowRestHeight = Math.max(this._table.drawTable.getRowRestHeight(index - 1, this._startRow), _editor_dom_treeNode_TableNode__WEBPACK_IMPORTED_MODULE_9__/* .gDefaultRowHeight */ .dT);
63690
+ rowRestHeight = Math.max(this._table.drawTable.getRowRestHeight(index - 1, this._startRow), _editor_dom_treeNode_TableNode__WEBPACK_IMPORTED_MODULE_11__/* .gDefaultRowHeight */ .dT);
63615
63691
  } else {
63616
63692
  rowRestHeight = this._table.rowInfos[r].rowHeight;
63617
63693
  }
@@ -63634,7 +63710,7 @@ var DrawPageTable = /*#__PURE__*/function (_DrawRect) {
63634
63710
 
63635
63711
  if (isEmptyRow) {
63636
63712
  if (r >= this._startRow) {
63637
- var aRowHeight = Math.max(this._table.rowInfos[r].rowHeight, _editor_dom_treeNode_TableNode__WEBPACK_IMPORTED_MODULE_9__/* .gDefaultRowHeight */ .dT);
63713
+ var aRowHeight = Math.max(this._table.rowInfos[r].rowHeight, _editor_dom_treeNode_TableNode__WEBPACK_IMPORTED_MODULE_11__/* .gDefaultRowHeight */ .dT);
63638
63714
 
63639
63715
  this._partRowHeights.set(r, aRowHeight);
63640
63716
 
@@ -63737,7 +63813,7 @@ var DrawPageTable = /*#__PURE__*/function (_DrawRect) {
63737
63813
 
63738
63814
  if (cell.rowSpan + r - 1 === row) {
63739
63815
  var partCell = cell.drawCell.getDrawPageCell(this);
63740
- var hoeditorfactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_10__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._table.hoEditorFactoryID);
63816
+ var hoeditorfactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_12__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._table.hoEditorFactoryID);
63741
63817
 
63742
63818
  if (partCell) {
63743
63819
  // const dobj = partCell.lastDrawLine;
@@ -63748,14 +63824,14 @@ var DrawPageTable = /*#__PURE__*/function (_DrawRect) {
63748
63824
 
63749
63825
  if (index == 0 || index == partCell.cell.drawCell.drawPageCells.length - 1) {
63750
63826
  if (index == 0 && index == partCell.cell.drawCell.drawPageCells.length - 1) {
63751
- dHeight = Math.max(_editor_dom_treeNode_TableNode__WEBPACK_IMPORTED_MODULE_9__/* .gDefaultRowHeight */ .dT, innerTop + partCell.docHeight + innerBottom);
63827
+ dHeight = Math.max(_editor_dom_treeNode_TableNode__WEBPACK_IMPORTED_MODULE_11__/* .gDefaultRowHeight */ .dT, innerTop + partCell.docHeight + innerBottom);
63752
63828
  } else if (index == 0) {
63753
- dHeight = Math.max(_editor_dom_treeNode_TableNode__WEBPACK_IMPORTED_MODULE_9__/* .gDefaultRowHeight */ .dT, innerTop + partCell.docHeight);
63829
+ dHeight = Math.max(_editor_dom_treeNode_TableNode__WEBPACK_IMPORTED_MODULE_11__/* .gDefaultRowHeight */ .dT, innerTop + partCell.docHeight);
63754
63830
  } else if (index == partCell.cell.drawCell.drawPageCells.length - 1) {
63755
- dHeight = Math.max(_editor_dom_treeNode_TableNode__WEBPACK_IMPORTED_MODULE_9__/* .gDefaultRowHeight */ .dT, innerBottom + partCell.docHeight);
63831
+ dHeight = Math.max(_editor_dom_treeNode_TableNode__WEBPACK_IMPORTED_MODULE_11__/* .gDefaultRowHeight */ .dT, innerBottom + partCell.docHeight);
63756
63832
  }
63757
63833
  } else {
63758
- dHeight = Math.max(_editor_dom_treeNode_TableNode__WEBPACK_IMPORTED_MODULE_9__/* .gDefaultRowHeight */ .dT, partCell.docHeight);
63834
+ dHeight = Math.max(_editor_dom_treeNode_TableNode__WEBPACK_IMPORTED_MODULE_11__/* .gDefaultRowHeight */ .dT, partCell.docHeight);
63759
63835
  }
63760
63836
 
63761
63837
  if (index === partCell.cell.drawCell.drawPageCells.length - 1 || this._table.rowInfos[r].rowProperty.repeatAsTitleAtPageTop) {
@@ -63878,7 +63954,7 @@ var DrawPageTable = /*#__PURE__*/function (_DrawRect) {
63878
63954
 
63879
63955
 
63880
63956
  if (partCellindex === cell.drawCell.drawPageCells.length - 1) {
63881
- dPartCell = new _DrawPageCell__WEBPACK_IMPORTED_MODULE_12__/* .DrawPageCell */ .k(this.table.hoEditorFactoryID, this, cell, aleft, cellRowTop, awidth, cellMaxHeight, partCellindex + 1, startChildIndex, cellMaxHeight);
63957
+ dPartCell = new _DrawPageCell__WEBPACK_IMPORTED_MODULE_14__/* .DrawPageCell */ .k(this.table.hoEditorFactoryID, this, cell, aleft, cellRowTop, awidth, cellMaxHeight, partCellindex + 1, startChildIndex, cellMaxHeight);
63882
63958
  cell.drawCell.drawPageCells.push(dPartCell);
63883
63959
  dPartCell.y = cellRowTop;
63884
63960
  dPartCell.x = aleft; //this.drawItems.push(dPartCell);
@@ -63922,7 +63998,7 @@ var DrawPageTable = /*#__PURE__*/function (_DrawRect) {
63922
63998
  }, {
63923
63999
  key: "getMainRestHeight",
63924
64000
  value: function getMainRestHeight() {
63925
- var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_10__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this.table.hoEditorFactoryID);
64001
+ var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_12__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this.table.hoEditorFactoryID);
63926
64002
  var mainArea = hoEditorFactory.drawPageTree.getMainRootArea(this);
63927
64003
  if (!mainArea) return 0;
63928
64004
  var pos = this.localToLocal(0, 0, mainArea);
@@ -63930,7 +64006,7 @@ var DrawPageTable = /*#__PURE__*/function (_DrawRect) {
63930
64006
  var pArea = hoEditorFactory.drawTree.getParentDrawArea(this);
63931
64007
 
63932
64008
  while (pArea && pArea !== mainArea) {
63933
- if (pArea instanceof _DrawPageCell__WEBPACK_IMPORTED_MODULE_12__/* .DrawPageCell */ .k) {
64009
+ if (pArea instanceof _DrawPageCell__WEBPACK_IMPORTED_MODULE_14__/* .DrawPageCell */ .k) {
63934
64010
  var rowIndex = pArea.cell.table.rows.indexOf(pArea.cell.row);
63935
64011
 
63936
64012
  if (rowIndex >= 0) {
@@ -63950,7 +64026,7 @@ var DrawPageTable = /*#__PURE__*/function (_DrawRect) {
63950
64026
  }, {
63951
64027
  key: "getAndUpdatePartRowHeight",
63952
64028
  value: function getAndUpdatePartRowHeight(row) {
63953
- var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_10__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this.table.hoEditorFactoryID);
64029
+ var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_12__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this.table.hoEditorFactoryID);
63954
64030
  var aHeight = 0;
63955
64031
 
63956
64032
  for (var c = 0; c < this._table.colCount; c++) {
@@ -63969,7 +64045,7 @@ var DrawPageTable = /*#__PURE__*/function (_DrawRect) {
63969
64045
  }
63970
64046
  }
63971
64047
 
63972
- aHeight = Math.ceil(Math.max(aHeight, _editor_dom_treeNode_TableNode__WEBPACK_IMPORTED_MODULE_9__/* .gDefaultRowHeight */ .dT));
64048
+ aHeight = Math.ceil(Math.max(aHeight, _editor_dom_treeNode_TableNode__WEBPACK_IMPORTED_MODULE_11__/* .gDefaultRowHeight */ .dT));
63973
64049
 
63974
64050
  if (this._table.rowInfos[row].rowProperty.isSpecifyHeight && this._table.rowInfos[row].rowProperty.isLockRowHeight) {
63975
64051
  aHeight = hoEditorFactory.unitConvert.mmConversionPx(this._table.rowInfos[row].rowProperty.rowHeight * 10, false);
@@ -64179,7 +64255,7 @@ var DrawPageTable = /*#__PURE__*/function (_DrawRect) {
64179
64255
  }, {
64180
64256
  key: "getRowDocHeight",
64181
64257
  value: function getRowDocHeight(r) {
64182
- var ret = _editor_dom_treeNode_TableNode__WEBPACK_IMPORTED_MODULE_9__/* .gDefaultRowHeight */ .dT;
64258
+ var ret = _editor_dom_treeNode_TableNode__WEBPACK_IMPORTED_MODULE_11__/* .gDefaultRowHeight */ .dT;
64183
64259
 
64184
64260
  for (var c = 0; c < this._table.colCount; c++) {
64185
64261
  var cell = this._table.rows[r][c];
@@ -64286,7 +64362,7 @@ var DrawPageTable = /*#__PURE__*/function (_DrawRect) {
64286
64362
  var _this$_partRowHeights2;
64287
64363
 
64288
64364
  var startHeight = (_this$_partRowHeights2 = this._partRowHeights.get(this._startRow)) === null || _this$_partRowHeights2 === void 0 ? void 0 : _this$_partRowHeights2.rowHeight;
64289
- var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_10__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._table.hoEditorFactoryID);
64365
+ var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_12__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._table.hoEditorFactoryID);
64290
64366
  var dPage = null;
64291
64367
  if (this.stage) dPage = hoEditorFactory.drawPageTree.getDrawPageByDNode(this);
64292
64368
 
@@ -64306,7 +64382,7 @@ var DrawPageTable = /*#__PURE__*/function (_DrawRect) {
64306
64382
  }, {
64307
64383
  key: "drawUpdate",
64308
64384
  value: function drawUpdate(prevdPageTable, dRestHeight) {
64309
- var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_10__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this.table.hoEditorFactoryID);
64385
+ var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_12__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this.table.hoEditorFactoryID);
64310
64386
 
64311
64387
  if (this.table.tableProperty.fixedOnePage) {
64312
64388
  dRestHeight = Infinity;
@@ -64358,12 +64434,12 @@ var DrawPageTable = /*#__PURE__*/function (_DrawRect) {
64358
64434
 
64359
64435
  for (var r = startRow; r < this._table.rowCount; r++) {
64360
64436
  if (r === this._startRow && index > 0 && !bStartRowFinished) {
64361
- rowRestHeight = Math.max(this._table.drawTable.getRowRestHeight(index, this._startRow), _editor_dom_treeNode_TableNode__WEBPACK_IMPORTED_MODULE_9__/* .gDefaultRowHeight */ .dT);
64437
+ rowRestHeight = Math.max(this._table.drawTable.getRowRestHeight(index, this._startRow), _editor_dom_treeNode_TableNode__WEBPACK_IMPORTED_MODULE_11__/* .gDefaultRowHeight */ .dT);
64362
64438
  } else {
64363
64439
  rowRestHeight = this._table.rowInfos[r].rowHeight;
64364
64440
  }
64365
64441
 
64366
- if (pageRestHeight < _editor_dom_treeNode_TableNode__WEBPACK_IMPORTED_MODULE_9__/* .gDefaultRowHeight */ .dT) {
64442
+ if (pageRestHeight < _editor_dom_treeNode_TableNode__WEBPACK_IMPORTED_MODULE_11__/* .gDefaultRowHeight */ .dT) {
64367
64443
  this.removeDrawCellAfterRow(r);
64368
64444
  break;
64369
64445
  }
@@ -64387,7 +64463,7 @@ var DrawPageTable = /*#__PURE__*/function (_DrawRect) {
64387
64463
 
64388
64464
  if (isEmptyRow) {
64389
64465
  if (r >= this._startRow) {
64390
- var aRowHeight = Math.max(this._table.rowInfos[r].rowHeight, _editor_dom_treeNode_TableNode__WEBPACK_IMPORTED_MODULE_9__/* .gDefaultRowHeight */ .dT);
64466
+ var aRowHeight = Math.max(this._table.rowInfos[r].rowHeight, _editor_dom_treeNode_TableNode__WEBPACK_IMPORTED_MODULE_11__/* .gDefaultRowHeight */ .dT);
64391
64467
 
64392
64468
  this._partRowHeights.set(r, aRowHeight);
64393
64469
 
@@ -64435,7 +64511,7 @@ var DrawPageTable = /*#__PURE__*/function (_DrawRect) {
64435
64511
 
64436
64512
  if (partCellindex === _cell2.drawCell.drawPageCells.length - 1) {
64437
64513
  bRowHeightChanged = true;
64438
- dPartCell = new _DrawPageCell__WEBPACK_IMPORTED_MODULE_12__/* .DrawPageCell */ .k(this.table.hoEditorFactoryID, this, _cell2, aleft, cellRowTop, awidth, rowRestHeight, partCellindex + 1, startChildIndex, cellMaxHeight);
64514
+ dPartCell = new _DrawPageCell__WEBPACK_IMPORTED_MODULE_14__/* .DrawPageCell */ .k(this.table.hoEditorFactoryID, this, _cell2, aleft, cellRowTop, awidth, rowRestHeight, partCellindex + 1, startChildIndex, cellMaxHeight);
64439
64515
 
64440
64516
  _cell2.drawCell.drawPageCells.push(dPartCell);
64441
64517
 
@@ -64601,7 +64677,7 @@ var DrawPageTable = /*#__PURE__*/function (_DrawRect) {
64601
64677
  }]);
64602
64678
 
64603
64679
  return DrawPageTable;
64604
- }(_DrawRect__WEBPACK_IMPORTED_MODULE_13__/* .DrawRect */ .t);
64680
+ }(_DrawRect__WEBPACK_IMPORTED_MODULE_15__/* .DrawRect */ .t);
64605
64681
 
64606
64682
  /***/ }),
64607
64683
 
@@ -65319,7 +65395,7 @@ var DrawRect = /*#__PURE__*/function (_DrawContainer) {
65319
65395
  /*
65320
65396
  * @Author: your name
65321
65397
  * @Date: 2021-09-01 16:51:49
65322
- * @LastEditTime: 2022-08-01 10:19:27
65398
+ * @LastEditTime: 2022-08-18 14:08:29
65323
65399
  * @LastEditors: liyanan 2441631434@qq.com
65324
65400
  * @Description: In User Settings Edit
65325
65401
  * @FilePath: \hoeditor-web\src\editor\draw\drawNode\DrawSignNode.ts
@@ -65433,7 +65509,7 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
65433
65509
  }
65434
65510
  }
65435
65511
 
65436
- if (imgWidth == 0 && imgHeight == 0 && (imgSrc || fingerPrintSrc) && type == 1 || type == 3) {
65512
+ if ((imgSrc || fingerPrintSrc) && type == 1 || type == 3) {
65437
65513
  _this.drawWriteSignNode(node);
65438
65514
  } else {
65439
65515
  _this.drawSignNode();
@@ -75240,7 +75316,7 @@ var NodeDeleteUndoUnit = /*#__PURE__*/function (_UndoInfo) {
75240
75316
  /*
75241
75317
  * @Author: your name
75242
75318
  * @Date: 2020-09-24 15:56:09
75243
- * @LastEditTime: 2022-06-07 15:10:10
75319
+ * @LastEditTime: 2022-08-17 09:27:01
75244
75320
  * @LastEditors: liyanan 2441631434@qq.com
75245
75321
  * @Description: In User Settings Edit
75246
75322
  * @FilePath: \hoeditor-web\src\editor\undoRedo\NodeInsertUndoUnit.ts
@@ -75431,19 +75507,23 @@ var NodeInsertUndoUnit = /*#__PURE__*/function (_UndoInfo) {
75431
75507
 
75432
75508
  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) {//变更文本域时，删除原内容插入标题时不移动光标
75433
75509
  } else {
75434
- setTimeout(function () {
75435
- //等待变更完成
75436
- hoEditorFactory.drawTree.moveCaretToPath(strAfterPath);
75437
- }, this.node.rootPath.startsWith(_editor_dom_DocTree__WEBPACK_IMPORTED_MODULE_10__/* .gMainPath */ .d9) ? 0 : 110);
75510
+ // setTimeout(
75511
+ // () => {
75512
+ // //等待变更完成
75513
+ hoEditorFactory.drawTree.moveCaretToPath(strAfterPath); // },
75514
+ // this.node.rootPath.startsWith(gMainPath) ? 0 : 110
75515
+ // );
75438
75516
  }
75439
75517
 
75440
- this.ParentRepaint();
75518
+ _context2.next = 9;
75519
+ return this.ParentRepaint();
75441
75520
 
75521
+ case 9:
75442
75522
  if (this.node instanceof _dom_treeNode_TextNode__WEBPACK_IMPORTED_MODULE_12__/* .TextNode */ .R) {
75443
75523
  hoEditorFactory.timeStamp.update();
75444
75524
  }
75445
75525
 
75446
- case 9:
75526
+ case 10:
75447
75527
  case "end":
75448
75528
  return _context2.stop();
75449
75529
  }
@@ -76079,9 +76159,9 @@ var NodeStyleUndoUnit = /*#__PURE__*/function () {
76079
76159
  /* harmony export */ __webpack_require__.d(__webpack_exports__, {
76080
76160
  /* harmony export */ "F": function() { return /* binding */ NodesDeleteUndoUnit; }
76081
76161
  /* harmony export */ });
76082
- /* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_regeneratorRuntime_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(87461);
76083
- /* harmony import */ var element_ui_lib_message_box__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(86769);
76084
- /* 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__);
76162
+ /* harmony import */ var element_ui_lib_message_box__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(86769);
76163
+ /* 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__);
76164
+ /* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_regeneratorRuntime_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(87461);
76085
76165
  /* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_asyncToGenerator_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(60199);
76086
76166
  /* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(91347);
76087
76167
  /* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_classCallCheck_js__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(42015);
@@ -76212,73 +76292,96 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
76212
76292
  }
76213
76293
  }, {
76214
76294
  key: "doUndo",
76215
- value: function doUndo() {
76216
- var arr = Array.from(this._undoNodes).reverse();
76217
- var i = 0;
76218
- var prevIsTable = false;
76219
- var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_29__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
76295
+ value: function () {
76296
+ 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() {
76297
+ var arr, i, prevIsTable, hoEditorFactory, value, np, aendPaht, changeEvent, newRange, cgEvent;
76298
+ 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) {
76299
+ while (1) {
76300
+ switch (_context.prev = _context.next) {
76301
+ case 0:
76302
+ arr = Array.from(this._undoNodes).reverse();
76303
+ i = 0;
76304
+ prevIsTable = false;
76305
+ hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_29__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
76220
76306
 
76221
- while (i < arr.length) {
76222
- var value = arr[i];
76307
+ while (i < arr.length) {
76308
+ value = arr[i];
76223
76309
 
76224
- if (value[1] instanceof _dom_treeNode_CellNode__WEBPACK_IMPORTED_MODULE_26__/* .CellNode */ .D) {// (value[1] as CellNode).redrawCell(true, DocAction.daInsert);
76225
- } else {
76226
- if (prevIsTable) {
76227
- hoEditorFactory.docTree.insertNodeAfterNode(arr[i - 1][1], arr[i][1]);
76228
- } else {
76229
- hoEditorFactory.docTree.insertNodeAfterPath(value[0], value[1]);
76230
- }
76310
+ if (value[1] instanceof _dom_treeNode_CellNode__WEBPACK_IMPORTED_MODULE_26__/* .CellNode */ .D) {// (value[1] as CellNode).redrawCell(true, DocAction.daInsert);
76311
+ } else {
76312
+ if (prevIsTable) {
76313
+ hoEditorFactory.docTree.insertNodeAfterNode(arr[i - 1][1], arr[i][1]);
76314
+ } else {
76315
+ hoEditorFactory.docTree.insertNodeAfterPath(value[0], value[1]);
76316
+ }
76231
76317
 
76232
- if (value[1] instanceof _dom_treeNode_TableNode__WEBPACK_IMPORTED_MODULE_28__/* .TableNode */ .Fh) {
76233
- prevIsTable = true; // value[1].clearDrawNodes();
76234
- // value[1].drawTable.drawPageTables.length = 0;
76318
+ if (value[1] instanceof _dom_treeNode_TableNode__WEBPACK_IMPORTED_MODULE_28__/* .TableNode */ .Fh) {
76319
+ prevIsTable = true; // value[1].clearDrawNodes();
76320
+ // value[1].drawTable.drawPageTables.length = 0;
76235
76321
 
76236
- var np = hoEditorFactory.docTree.findNodePositionByPath(value[0]);
76237
- if (np && np.node && np.node instanceof _dom_treeNode_ParagraphNode__WEBPACK_IMPORTED_MODULE_25__/* .ParagraphNode */ .C) value[1].drawTable.paragraphNode = np.node;
76238
- } else {
76239
- prevIsTable = false;
76240
- }
76241
- }
76322
+ np = hoEditorFactory.docTree.findNodePositionByPath(value[0]);
76323
+ if (np && np.node && np.node instanceof _dom_treeNode_ParagraphNode__WEBPACK_IMPORTED_MODULE_25__/* .ParagraphNode */ .C) value[1].drawTable.paragraphNode = np.node;
76324
+ } else {
76325
+ prevIsTable = false;
76326
+ }
76327
+ }
76242
76328
 
76243
- i += 1;
76244
- }
76329
+ i += 1;
76330
+ }
76245
76331
 
76246
- var aendPaht = hoEditorFactory.docTree.getNodeLastPath(arr[arr.length - 1][1]);
76247
- 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);
76248
- hoEditorFactory.docTree.change(changeEvent); //3.合并拆分节点
76332
+ aendPaht = hoEditorFactory.docTree.getNodeLastPath(arr[arr.length - 1][1]);
76333
+ 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);
76334
+ _context.next = 9;
76335
+ return hoEditorFactory.docTree.change(changeEvent);
76249
76336
 
76250
- while (!this._undo.atBottom()) {
76251
- this._undo.undo();
76252
- } // let startPath = this._startPath;
76253
- // let endPath = this._endPath;
76254
- // if (NodePosition.treePathCompare(this._startPath, this._endPath) > 0) {
76255
- // startPath = this._endPath;
76256
- // endPath = this._startPath;
76257
- // }
76258
- // if (startPath !== "" && endPath !== "") {
76259
- // const arange = new DomRange(
76260
- // this._hoEditorFactoryID,
76261
- // startPath,
76262
- // endPath
76263
- // ).normalize();
76264
- // const changeEvent = new NodeChangeEvent(
76265
- // this._hoEditorFactoryID,
76266
- // DocAction.daInsert,
76267
- // arange.startPath,
76268
- // arange.endPath
76269
- // );
76270
- // hoEditorFactory.docTree.change(changeEvent);
76271
- // }
76272
- //选中范围变化事件
76337
+ case 9:
76338
+ //3.合并拆分节点
76339
+ while (!this._undo.atBottom()) {
76340
+ this._undo.undo();
76341
+ } // let startPath = this._startPath;
76342
+ // let endPath = this._endPath;
76343
+ // if (NodePosition.treePathCompare(this._startPath, this._endPath) > 0) {
76344
+ // startPath = this._endPath;
76345
+ // endPath = this._startPath;
76346
+ // }
76347
+ // if (startPath !== "" && endPath !== "") {
76348
+ // const arange = new DomRange(
76349
+ // this._hoEditorFactoryID,
76350
+ // startPath,
76351
+ // endPath
76352
+ // ).normalize();
76353
+ // const changeEvent = new NodeChangeEvent(
76354
+ // this._hoEditorFactoryID,
76355
+ // DocAction.daInsert,
76356
+ // arange.startPath,
76357
+ // arange.endPath
76358
+ // );
76359
+ // hoEditorFactory.docTree.change(changeEvent);
76360
+ // }
76361
+ //选中范围变化事件
76273
76362
 
76274
76363
 
76275
- var newRange = new _dom_DomRange__WEBPACK_IMPORTED_MODULE_18__/* .DomRange */ .a(this._hoEditorFactoryID, this._startPath, this._endPath).normalize();
76276
- hoEditorFactory.docTree.curDomRange = newRange;
76277
- var cgEvent = new _events_SelectionChangeEvent__WEBPACK_IMPORTED_MODULE_20__/* .SelectionChangeEvent */ .r(hoEditorFactory.docTree.curDomRange, newRange);
76278
- hoEditorFactory.docTree.selectChange(cgEvent); //光标定位
76364
+ newRange = new _dom_DomRange__WEBPACK_IMPORTED_MODULE_18__/* .DomRange */ .a(this._hoEditorFactoryID, this._startPath, this._endPath).normalize();
76365
+ hoEditorFactory.docTree.curDomRange = newRange;
76366
+ cgEvent = new _events_SelectionChangeEvent__WEBPACK_IMPORTED_MODULE_20__/* .SelectionChangeEvent */ .r(hoEditorFactory.docTree.curDomRange, newRange);
76367
+ hoEditorFactory.docTree.selectChange(cgEvent); //光标定位
76279
76368
 
76280
- hoEditorFactory.drawTree.moveCaretToPath(newRange.endPath);
76281
- }
76369
+ hoEditorFactory.drawTree.moveCaretToPath(newRange.endPath);
76370
+
76371
+ case 15:
76372
+ case "end":
76373
+ return _context.stop();
76374
+ }
76375
+ }
76376
+ }, _callee, this);
76377
+ }));
76378
+
76379
+ function doUndo() {
76380
+ return _doUndo.apply(this, arguments);
76381
+ }
76382
+
76383
+ return doUndo;
76384
+ }()
76282
76385
  /**
76283
76386
  * @description 初始化变量，因为有撤销恢复可能需要反复操作，初始化不能放到create里
76284
76387
  */
@@ -76515,8 +76618,8 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
76515
76618
  var _tmp = _this.getPrevNodeDomRange(Anode); //1.移动光标
76516
76619
 
76517
76620
 
76518
- _this.MoveCaret(_tmp.endPath); //2.删除内容
76519
-
76621
+ hoEditorFactory.docTree.curDomRange = new _dom_DomRange__WEBPACK_IMPORTED_MODULE_18__/* .DomRange */ .a(_this._hoEditorFactoryID, _tmp.endPath, _tmp.endPath); // this.MoveCaret(tmp.endPath);
76622
+ //2.删除内容
76520
76623
 
76521
76624
  info[0] = 1;
76522
76625
  info[1] = _tmp;
@@ -76524,7 +76627,7 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
76524
76627
  //移动光标到文本域外
76525
76628
  var _tmp2 = _this.getPrevNodeDomRange(Anode);
76526
76629
 
76527
- _this.MoveCaret(_tmp2.endPath);
76630
+ hoEditorFactory.docTree.curDomRange = new _dom_DomRange__WEBPACK_IMPORTED_MODULE_18__/* .DomRange */ .a(_this._hoEditorFactoryID, _tmp2.endPath, _tmp2.endPath); // this.MoveCaret(tmp.endPath);
76528
76631
 
76529
76632
  info[0] = 2;
76530
76633
  info[1] = _tmp2;
@@ -76650,14 +76753,14 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
76650
76753
  }, {
76651
76754
  key: "doRedo",
76652
76755
  value: function () {
76653
- 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() {
76756
+ 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() {
76654
76757
  var _currRange$npEnd$node;
76655
76758
 
76656
76759
  var currRange, hoEditorFactory, textStyle, nodes, n, node, tip, pnode, pTiNode, _res, changeEvent, startPath, endPath, res, cgEvent, aNode;
76657
76760
 
76658
- 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) {
76761
+ 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) {
76659
76762
  while (1) {
76660
- switch (_context.prev = _context.next) {
76763
+ switch (_context2.prev = _context2.next) {
76661
76764
  case 0:
76662
76765
  this.initParam();
76663
76766
  currRange = new _dom_DomRange__WEBPACK_IMPORTED_MODULE_18__/* .DomRange */ .a(this._hoEditorFactoryID, this._startPath, this._endPath).normalize();
@@ -76665,26 +76768,26 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
76665
76768
  hoEditorFactory.docTree.curDomRange = currRange;
76666
76769
 
76667
76770
  if (!(hoEditorFactory.drawTree.paintStatus === _draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_17__/* .PaintState.psReview */ .Dh.psReview)) {
76668
- _context.next = 11;
76771
+ _context2.next = 11;
76669
76772
  break;
76670
76773
  }
76671
76774
 
76672
76775
  if (!(currRange.npEnd.node && currRange.npEnd.node instanceof _dom_treeNode_TextNode__WEBPACK_IMPORTED_MODULE_15__/* .TextNode */ .R)) {
76673
- _context.next = 11;
76776
+ _context2.next = 11;
76674
76777
  break;
76675
76778
  }
76676
76779
 
76677
76780
  textStyle = hoEditorFactory.docTree.styles[currRange.npEnd.node.styleIndex];
76678
76781
 
76679
76782
  if (!(textStyle.strikeout && currRange.npEnd.node.text.length > 0)) {
76680
- _context.next = 11;
76783
+ _context2.next = 11;
76681
76784
  break;
76682
76785
  }
76683
76786
 
76684
- element_ui_lib_message_box__WEBPACK_IMPORTED_MODULE_1___default().alert("该内容当前已处于删除状态!");
76787
+ element_ui_lib_message_box__WEBPACK_IMPORTED_MODULE_0___default().alert("该内容当前已处于删除状态!");
76685
76788
 
76686
76789
  this._isError = true;
76687
- return _context.abrupt("return");
76790
+ return _context2.abrupt("return");
76688
76791
 
76689
76792
  case 11:
76690
76793
  nodes = _dom_DomRange__WEBPACK_IMPORTED_MODULE_18__/* .DomRange.getSelectDomNodesForDelete */ .a.getSelectDomNodesForDelete(this._hoEditorFactoryID, this._startPath, this._endPath); // const npFirst = hoEditorFactory.docTree.findNodePositionByPath(this._startPath);
@@ -76699,7 +76802,7 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
76699
76802
  //if(nodes.length == 0) return;
76700
76803
 
76701
76804
  if (!(hoEditorFactory.drawTree.paintStatus !== _draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_17__/* .PaintState.psDesign */ .Dh.psDesign && !this._isForceDelete)) {
76702
- _context.next = 38;
76805
+ _context2.next = 38;
76703
76806
  break;
76704
76807
  }
76705
76808
 
@@ -76707,21 +76810,21 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
76707
76810
 
76708
76811
  case 14:
76709
76812
  if (!(n < nodes.length)) {
76710
- _context.next = 38;
76813
+ _context2.next = 38;
76711
76814
  break;
76712
76815
  }
76713
76816
 
76714
76817
  node = nodes[n];
76715
76818
 
76716
76819
  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)) {
76717
- _context.next = 20;
76820
+ _context2.next = 20;
76718
76821
  break;
76719
76822
  }
76720
76823
 
76721
- element_ui_lib_message_box__WEBPACK_IMPORTED_MODULE_1___default().alert("元素已设置为不允许删除。请先右键元素属性设置成允许删除,再进行删除操作。", "系统提示");
76824
+ element_ui_lib_message_box__WEBPACK_IMPORTED_MODULE_0___default().alert("元素已设置为不允许删除。请先右键元素属性设置成允许删除,再进行删除操作。", "系统提示");
76722
76825
 
76723
76826
  this._isError = true;
76724
- return _context.abrupt("return");
76827
+ return _context2.abrupt("return");
76725
76828
 
76726
76829
  case 20:
76727
76830
  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) {
@@ -76729,12 +76832,12 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
76729
76832
  }
76730
76833
 
76731
76834
  if (!(node instanceof _dom_treeNode_ControlNode__WEBPACK_IMPORTED_MODULE_30__/* .ControlNode */ .w || node instanceof _dom_treeNode_TextInputFieldNode__WEBPACK_IMPORTED_MODULE_22__/* .TextInputFieldNode */ .re)) {
76732
- _context.next = 31;
76835
+ _context2.next = 31;
76733
76836
  break;
76734
76837
  }
76735
76838
 
76736
76839
  if (node.isAllowDelete) {
76737
- _context.next = 31;
76840
+ _context2.next = 31;
76738
76841
  break;
76739
76842
  }
76740
76843
 
@@ -76756,32 +76859,32 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
76756
76859
  tip = "下拉列表";
76757
76860
  }
76758
76861
 
76759
- element_ui_lib_message_box__WEBPACK_IMPORTED_MODULE_1___default().alert(tip + "元素已设置为不允许删除。请先右键元素属性设置成允许删除,再进行删除操作。", "系统提示");
76862
+ element_ui_lib_message_box__WEBPACK_IMPORTED_MODULE_0___default().alert(tip + "元素已设置为不允许删除。请先右键元素属性设置成允许删除,再进行删除操作。", "系统提示");
76760
76863
 
76761
76864
  this._isError = true;
76762
- return _context.abrupt("return");
76865
+ return _context2.abrupt("return");
76763
76866
 
76764
76867
  case 31:
76765
76868
  if (!(node instanceof _dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_35__/* .SignNode */ .N && node.isTemplate && node.number === 0)) {
76766
- _context.next = 35;
76869
+ _context2.next = 35;
76767
76870
  break;
76768
76871
  }
76769
76872
 
76770
- element_ui_lib_message_box__WEBPACK_IMPORTED_MODULE_1___default().alert("该签名元素不允许删除！", "系统提示");
76873
+ element_ui_lib_message_box__WEBPACK_IMPORTED_MODULE_0___default().alert("该签名元素不允许删除！", "系统提示");
76771
76874
 
76772
76875
  this._isError = true;
76773
- return _context.abrupt("return");
76876
+ return _context2.abrupt("return");
76774
76877
 
76775
76878
  case 35:
76776
76879
  n++;
76777
- _context.next = 14;
76880
+ _context2.next = 14;
76778
76881
  break;
76779
76882
 
76780
76883
  case 38:
76781
76884
  pnode = (_currRange$npEnd$node = currRange.npEnd.node) === null || _currRange$npEnd$node === void 0 ? void 0 : _currRange$npEnd$node.parentNode;
76782
76885
 
76783
76886
  if (!(pnode && pnode instanceof _dom_treeNode_TextInputFieldNode__WEBPACK_IMPORTED_MODULE_22__/* .TextInputFieldNode */ .re && currRange.npEnd.path != hoEditorFactory.docTree.getNodeLastPath(pnode))) {
76784
- _context.next = 44;
76887
+ _context2.next = 44;
76785
76888
  break;
76786
76889
  }
76787
76890
 
@@ -76794,18 +76897,18 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
76794
76897
  });
76795
76898
 
76796
76899
  if (_res[0]) {
76797
- _context.next = 44;
76900
+ _context2.next = 44;
76798
76901
  break;
76799
76902
  }
76800
76903
 
76801
- return _context.abrupt("return");
76904
+ return _context2.abrupt("return");
76802
76905
 
76803
76906
  case 44:
76804
76907
  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函数完成后调用这个
76805
76908
  // hoEditorFactory.docTree.deleteRange(arange.startPath, arange.endPath);
76806
76909
 
76807
76910
  if (currRange.npStart.node && currRange.npEnd.node) {
76808
- _context.next = 47;
76911
+ _context2.next = 47;
76809
76912
  break;
76810
76913
  }
76811
76914
 
@@ -76824,13 +76927,13 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
76824
76927
  res = this.deleteRange(currRange.endPath, currRange.startPath);
76825
76928
 
76826
76929
  if (!(res == 1)) {
76827
- _context.next = 59;
76930
+ _context2.next = 59;
76828
76931
  break;
76829
76932
  }
76830
76933
 
76831
76934
  changeEvent.beforeChangePath = startPath;
76832
76935
  changeEvent.afterChangePath = this._tmp.start;
76833
- _context.next = 57;
76936
+ _context2.next = 57;
76834
76937
  return hoEditorFactory.docTree.change(changeEvent);
76835
76938
 
76836
76939
  case 57:
@@ -76843,19 +76946,19 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
76843
76946
  aNode = currRange.npStart.node;
76844
76947
 
76845
76948
  if (!(aNode && pnode)) {
76846
- _context.next = 65;
76949
+ _context2.next = 65;
76847
76950
  break;
76848
76951
  }
76849
76952
 
76850
- _context.next = 65;
76953
+ _context2.next = 65;
76851
76954
  return this.ParentRepaint(pnode);
76852
76955
 
76853
76956
  case 65:
76854
76957
  case "end":
76855
- return _context.stop();
76958
+ return _context2.stop();
76856
76959
  }
76857
76960
  }
76858
- }, _callee, this);
76961
+ }, _callee2, this);
76859
76962
  }));
76860
76963
 
76861
76964
  function doRedo() {
@@ -212302,7 +212405,7 @@ var map = {
212302
212405
  "./radioCheckBox/RadioCheckbox.vue": 29385,
212303
212406
  "./selectDialog/SelectDialog.vue": 32949,
212304
212407
  "./sign/Sign.vue": 54089,
212305
- "./table/TableCellPoper.vue": 61620,
212408
+ "./table/TableCellPoper.vue": 41998,
212306
212409
  "./table/TableCellProperty.vue": 84650,
212307
212410
  "./table/TableColProperty.vue": 59243,
212308
212411
  "./table/TableProperty.vue": 1527,
@@ -213848,9 +213951,9 @@ var es_string_match = __webpack_require__(4723);
213848
213951
  var es_number_constructor = __webpack_require__(9653);
213849
213952
  // EXTERNAL MODULE: ./node_modules/core-js/modules/es.json.stringify.js
213850
213953
  var es_json_stringify = __webpack_require__(38862);
213851
- ;// 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&
213852
- 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)}
213853
- var HoDocvue_type_template_id_44f9ba19_staticRenderFns = []
213954
+ ;// 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&
213955
+ 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)}
213956
+ var HoDocvue_type_template_id_7d9a158e_staticRenderFns = []
213854
213957
 
213855
213958
 
213856
213959
  // EXTERNAL MODULE: ./node_modules/element-ui/lib/message-box.js
@@ -214738,7 +214841,13 @@ var DrawDomLevel = /*#__PURE__*/function () {
214738
214841
  hoeditorfactory.subDocManger.paintSubDoc(dPage.pageIndex, SubDocManger/* HeaderFooterType.hftFoot */.pi.hftFoot);
214739
214842
  hoeditorfactory.subDocManger.repaintPageMarkNodes(dPage.drawFooter, SubDocManger/* HeaderFooterType.hftFoot */.pi.hftFoot);
214740
214843
 
214741
- var keys = (0,toConsumableArray/* default */.Z)(hoeditorfactory.drawPageTree.needUpdateMainDocInfo.keys()).sort();
214844
+ var keys = (0,toConsumableArray/* default */.Z)(hoeditorfactory.drawPageTree.needUpdateMainDocInfo.keys()).sort(function (a, b) {
214845
+ if (a > b) {
214846
+ return 1;
214847
+ } else {
214848
+ return -1;
214849
+ }
214850
+ });
214742
214851
 
214743
214852
  if (keys.length > 0) {
214744
214853
  for (var index = keys[0]; index <= keys[keys.length - 1]; index++) {
@@ -215784,7 +215893,7 @@ var PoperMark = __webpack_require__(39959);
215784
215893
 
215785
215894
 
215786
215895
  // EXTERNAL MODULE: ./src/components/controls/table/TableCellPoper.vue + 5 modules
215787
- var TableCellPoper = __webpack_require__(61620);
215896
+ var TableCellPoper = __webpack_require__(41998);
215788
215897
  // EXTERNAL MODULE: ./src/editor/dom/treeNode/DateTimeNode.ts
215789
215898
  var DateTimeNode = __webpack_require__(40253);
215790
215899
  // EXTERNAL MODULE: ./src/editor/dom/treeNode/DownListNode.ts
@@ -217488,7 +217597,7 @@ var SignNode = __webpack_require__(78975);
217488
217597
  // EXTERNAL MODULE: ./src/editor/dom/treeNode/ParagraphNode.ts
217489
217598
  var ParagraphNode = __webpack_require__(13880);
217490
217599
  ;// CONCATENATED MODULE: ./src/components/version.ts
217491
- /* harmony default export */ var version = ('2.0.86');
217600
+ /* harmony default export */ var version = ('2.0.90');
217492
217601
  // EXTERNAL MODULE: ./src/components/controls/poperTipText/PoperTipText.vue + 5 modules
217493
217602
  var PoperTipText = __webpack_require__(97824);
217494
217603
  ;// CONCATENATED MODULE: ./src/components/controls/poperTipText/index.ts
@@ -217811,19 +217920,23 @@ var ImageNode = __webpack_require__(23778);
217811
217920
  },
217812
217921
  methods: {
217813
217922
  deleteSignNode: function deleteSignNode() {
217814
- var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this.hoEditorId);
217815
- var signUserId = this.currentNode.customProperty.bce01 || '';
217923
+ var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this.hoEditorId); // const signUserId = this.currentNode.customProperty.bce01 || '';
217924
+ // if (hoEditorFactory.userInfo.id != signUserId) {
217925
+ // MessageBox.alert("不是本人签名，不允许删除！");
217926
+ // this.eleNode = null;
217927
+ // this.currentNode = null;
217928
+ // this.isCreateRightMenuModal = false;
217929
+ // return;
217930
+ // }
217816
217931
 
217817
- if (hoEditorFactory.userInfo.id != signUserId) {
217818
- message_box_default().alert("不是本人签名，不允许删除！");
217932
+ if (!this.currentNode instanceof SignNode/* SignNode */.N) {
217933
+ message_box_default().alert("请右键签名元素进行删除");
217819
217934
 
217820
- this.eleNode = null;
217821
- this.currentNode = null;
217822
- this.isCreateRightMenuModal = false;
217823
217935
  return;
217824
217936
  }
217825
217937
 
217826
- hoEditorFactory.elementController.deleteNode(this.eleNode.node());
217938
+ hoEditorFactory.elementController.deleteNode(this.currentNode); // hoEditorFactory.vueController.forceDelete();
217939
+
217827
217940
  this.eleNode = null;
217828
217941
  this.currentNode = null;
217829
217942
  this.isCreateRightMenuModal = false;
@@ -217863,7 +217976,7 @@ var ImageNode = __webpack_require__(23778);
217863
217976
 
217864
217977
  if (v.intersectionRatio === 0) {
217865
217978
  inViewPages = inViewPages.filter(function (v) {
217866
- return dPage && v !== dPage.pageIndex;
217979
+ return v !== pageIndex;
217867
217980
  });
217868
217981
  } else {
217869
217982
  inViewPages.includes(dPage.pageIndex) ? null : inViewPages.push(dPage.pageIndex);
@@ -218174,7 +218287,7 @@ var ImageNode = __webpack_require__(23778);
218174
218287
  var node = (_hoEditorFactory$vueC2 = hoEditorFactory.vueController.findNodebyPath(path)) === null || _hoEditorFactory$vueC2 === void 0 ? void 0 : _hoEditorFactory$vueC2.node;
218175
218288
  this.setRightClickNodeValue(node);
218176
218289
  this.eleNode = this.getRightClickNodeValue();
218177
- this.currentNode = this.getCurrentSelectNode();
218290
+ this.currentNode = node;
218178
218291
  var rightPosition = {
218179
218292
  clientX: e.clientX || e.pageX,
218180
218293
  clientY: e.clientY || e.pageY
@@ -218267,8 +218380,8 @@ var ImageNode = __webpack_require__(23778);
218267
218380
 
218268
218381
  var HoDoc_component = (0,componentNormalizer/* default */.Z)(
218269
218382
  components_HoDocvue_type_script_lang_js_,
218270
- HoDocvue_type_template_id_44f9ba19_render,
218271
- HoDocvue_type_template_id_44f9ba19_staticRenderFns,
218383
+ HoDocvue_type_template_id_7d9a158e_render,
218384
+ HoDocvue_type_template_id_7d9a158e_staticRenderFns,
218272
218385
  false,
218273
218386
  null,
218274
218387
  null,
@@ -218828,7 +218941,7 @@ var DrawPageTree = /*#__PURE__*/function () {
218828
218941
  drawTop = 0;
218829
218942
  }
218830
218943
 
218831
- this.update(mainArea, dMainRoots, drawTop, mainIndex, mainIndex);
218944
+ this.update(mainArea, dMainRoots, drawTop, mainIndex, mainIndex, true);
218832
218945
  } finally {
218833
218946
  // const iendDraw= hoEditorFactory.drawTree.inViewPages[hoEditorFactory.drawTree.inViewPages.length-1];
218834
218947
  // const istartDraw=hoEditorFactory.drawTree.inViewPages[0];
@@ -219076,7 +219189,7 @@ var DrawPageTree = /*#__PURE__*/function () {
219076
219189
  }, {
219077
219190
  key: "update",
219078
219191
  value: function update(drawArea, dRoots, // startDline: DrawLine | DrawPageTable,
219079
- dTop, startLine, endLine) {
219192
+ dTop, startLine, endLine, callFromPaint) {
219080
219193
  var _this2 = this;
219081
219194
 
219082
219195
  var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID);
@@ -219230,9 +219343,12 @@ var DrawPageTree = /*#__PURE__*/function () {
219230
219343
  // this._endNeedUpdatePage = -1;
219231
219344
 
219232
219345
 
219233
- hoEditorFactory.drawTree.inViewPages.forEach(function (i) {
219234
- _this2.updateDrawPage(i);
219235
- }); // }
219346
+ if (!callFromPaint) {
219347
+ hoEditorFactory.drawTree.inViewPages.forEach(function (i) {
219348
+ _this2.updateDrawPage(i);
219349
+ });
219350
+ } // }
219351
+
219236
219352
  } // if (hoEditorFactory.drawTree.paintStatus === PaintState.psReview) {
219237
219353
  // drawArea.drawComments();
219238
219354
  // }
@@ -219565,16 +219681,15 @@ var DrawPageTree = /*#__PURE__*/function () {
219565
219681
  }
219566
219682
 
219567
219683
  for (var j = 0; j < hoEditorFactory.drawTree.inViewPages.length; j++) {
219568
- var _dPage = hoEditorFactory.drawTree.drawPages[hoEditorFactory.drawTree.inViewPages[j]];
219684
+ var aPage = hoEditorFactory.drawTree.drawPages[hoEditorFactory.drawTree.inViewPages[j]];
219569
219685
 
219570
- if (_dPage.drawDomLevel && !_dPage.drawDomLevel.stage) {
219571
- _dPage.drawDomLevel.bindStage();
219572
-
219573
- this.updateDrawPage(_dPage.pageIndex);
219686
+ if (aPage.drawDomLevel && !aPage.drawDomLevel.stage) {
219687
+ aPage.drawDomLevel.bindStage();
219688
+ this.updateDrawPage(aPage.pageIndex);
219574
219689
  }
219575
219690
 
219576
- if (_dPage.drawSelectLevel && !_dPage.drawSelectLevel.stage) {
219577
- _dPage.drawSelectLevel.bindStage();
219691
+ if (aPage.drawSelectLevel && !aPage.drawSelectLevel.stage) {
219692
+ aPage.drawSelectLevel.bindStage();
219578
219693
  }
219579
219694
  }
219580
219695
  }
@@ -222521,8 +222636,11 @@ var StructureConvert = /*#__PURE__*/function () {
222521
222636
  }
222522
222637
 
222523
222638
  this._comments = [];
222524
- var comments = xx.comments;
222525
- this._comments = comments.comment; // if (xx.logs) {
222639
+
222640
+ if (!isClearSign) {
222641
+ var comments = xx.comments;
222642
+ this._comments = comments.comment;
222643
+ } // if (xx.logs) {
222526
222644
  // const logs = xx.logs;
222527
222645
  // let logsArr = [];
222528
222646
  // if (logs.log.length === undefined) {
@@ -222540,6 +222658,7 @@ var StructureConvert = /*#__PURE__*/function () {
222540
222658
  // }
222541
222659
  // }
222542
222660
 
222661
+
222543
222662
  hoEditorFactory.docTree.userHistories = [];
222544
222663
  var histories = xx.userHistories;
222545
222664
  var historiesArr = histories.userHistory;
@@ -232155,7 +232274,7 @@ var EditController = /*#__PURE__*/function () {
232155
232274
  var style = hoeditorfactory.docTree.styles[node.styleIndex];
232156
232275
 
232157
232276
  if (style.combineStyle.script != 0) {
232158
- var newStyle = style.clone();
232277
+ var newStyle = hoeditorfactory.docTree.styles[hoeditorfactory.docTree.curStyleIndex].clone();
232159
232278
  newStyle.script = style.combineStyle.script;
232160
232279
  var newStyleIndex = hoeditorfactory.docTree.styleCompare(newStyle);
232161
232280
  node.styleIndex = newStyleIndex;
@@ -241689,9 +241808,9 @@ var ToolControlvue_type_template_id_a55c0f5a_render = function () {var _vm=this;
241689
241808
  var ToolControlvue_type_template_id_a55c0f5a_staticRenderFns = []
241690
241809
 
241691
241810
 
241692
- ;// 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&
241693
- 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)}
241694
- var HoSpecialCharsvue_type_template_id_146e538d_scoped_true_staticRenderFns = []
241811
+ ;// 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&
241812
+ 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)}
241813
+ var HoSpecialCharsvue_type_template_id_463b09d0_scoped_true_staticRenderFns = []
241695
241814
 
241696
241815
 
241697
241816
  ;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-83[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&
@@ -241758,7 +241877,7 @@ var HoSpecialCharsvue_type_template_id_146e538d_scoped_true_staticRenderFns = []
241758
241877
  arrChars: ['㎎', '㎏', '㎜', '㎝', '㎞', '㎡', '㏄', '㏎', '㏑', '㏒', '㏕', '℡'],
241759
241878
  specialChars: ['、', '。', '·', 'ˉ', 'ˇ', '¨', '〃', '々', '—', '～', '‖', '…', '‘', '’', '“', '”', '〔', '〕', '〈', '〉', '《', '》', '「', '」', '『', '』', '±', '×', '÷', '∶', '∧', '∨', '∑', '∏', '∪', '∩', '∈', 'α', 'β', 'γ', '∷', '√', '⊥', '∥', '∠', '⌒', '⊙', '∫', '∮', '≡', '≌', '≈', '∽', '∝', '≠', '≮', '≯', '≤', '≥', '∞', '∵', '∴', '♂', '♀', '°', '′', '″', '℃', '＄', '¤', '￠', '￡', '‰', '§', '№', '※', '→', '←', '↑', '↓', '㎎', '㎏', '㎜', '㎝', '㎞', '㎡', '㏄', '㏎', '㏑', '㏒', '㏕', '℡', '▽', '△', '▷', '◁', '/', '∕'],
241760
241879
  romanChars: ['ⅰ', 'ⅱ', 'ⅲ', 'ⅳ', 'ⅴ', 'ⅵ', 'ⅶ', 'ⅷ', 'ⅸ', 'ⅹ', 'Ⅰ', 'Ⅱ', 'Ⅲ', 'Ⅳ', 'Ⅴ', 'Ⅵ', 'Ⅶ', 'Ⅷ', 'Ⅸ', 'Ⅹ', 'Ⅺ', 'Ⅻ'],
241761
- //mathChars: [],
241880
+ usedChars: [],
241762
241881
  mathChars: ['⒈', '⒉', '⒊', '⒋', '⒌', '⒍', '⒎', '⒏', '⒐', '⒑', '⒒', '⒓', '⒔', '⒕', '⒖', '⒗', '⒘', '⒙', '⒚', '⒛', '⑴', '⑵', '⑶', '⑷', '⑸', '⑹', '⑺', '⑻', '⑼', '⑽', '⑾', '⑿', '⒀', '⒁', '⒂', '⒃', '⒄', '⒅', '⒆', '⒇', '①', '②', '③', '④', '⑤', '⑥', '⑦', '⑧', '⑨', '⑩', '㈠', '㈡', '㈢', '㈣', '㈤', '㈥', '㈦', '㈧', '㈨', '㈩']
241763
241882
  };
241764
241883
  },
@@ -241790,10 +241909,10 @@ var HoSpecialCharsvue_type_template_id_146e538d_scoped_true_staticRenderFns = []
241790
241909
  });
241791
241910
  ;// CONCATENATED MODULE: ./src/components/toolbar/insert/HoSpecialChars.vue?vue&type=script&lang=js&
241792
241911
  /* harmony default export */ var insert_HoSpecialCharsvue_type_script_lang_js_ = (HoSpecialCharsvue_type_script_lang_js_);
241793
- ;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-65[0].rules[0].use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-65[0].rules[0].use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-65[0].rules[0].use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-65[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&
241912
+ ;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-65[0].rules[0].use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-65[0].rules[0].use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-65[0].rules[0].use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-65[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&
241794
241913
  // extracted by mini-css-extract-plugin
241795
241914
 
241796
- ;// CONCATENATED MODULE: ./src/components/toolbar/insert/HoSpecialChars.vue?vue&type=style&index=0&id=146e538d&lang=scss&scoped=true&
241915
+ ;// CONCATENATED MODULE: ./src/components/toolbar/insert/HoSpecialChars.vue?vue&type=style&index=0&id=463b09d0&lang=scss&scoped=true&
241797
241916
 
241798
241917
  ;// CONCATENATED MODULE: ./src/components/toolbar/insert/HoSpecialChars.vue
241799
241918
 
@@ -241806,11 +241925,11 @@ var HoSpecialCharsvue_type_template_id_146e538d_scoped_true_staticRenderFns = []
241806
241925
 
241807
241926
  var HoSpecialChars_component = (0,componentNormalizer/* default */.Z)(
241808
241927
  insert_HoSpecialCharsvue_type_script_lang_js_,
241809
- HoSpecialCharsvue_type_template_id_146e538d_scoped_true_render,
241810
- HoSpecialCharsvue_type_template_id_146e538d_scoped_true_staticRenderFns,
241928
+ HoSpecialCharsvue_type_template_id_463b09d0_scoped_true_render,
241929
+ HoSpecialCharsvue_type_template_id_463b09d0_scoped_true_staticRenderFns,
241811
241930
  false,
241812
241931
  null,
241813
- "146e538d",
241932
+ "463b09d0",
241814
241933
  null
241815
241934
 
241816
241935
  )