hoeditor-web 3.1.108 → 3.1.110

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.
@@ -18453,7 +18453,7 @@ var component = (0,componentNormalizer/* default */.Z)(
18453
18453
 
18454
18454
  /***/ }),
18455
18455
 
18456
- /***/ 83316:
18456
+ /***/ 90546:
18457
18457
  /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
18458
18458
 
18459
18459
  "use strict";
@@ -18469,7 +18469,7 @@ __webpack_require__.d(__webpack_exports__, {
18469
18469
  var es_array_includes = __webpack_require__(26699);
18470
18470
  // EXTERNAL MODULE: ./node_modules/core-js/modules/es.string.includes.js
18471
18471
  var es_string_includes = __webpack_require__(32023);
18472
- ;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/table/TableCellProperty.vue?vue&type=template&id=e618a5b6&
18472
+ ;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/table/TableCellProperty.vue?vue&type=template&id=8849ff10&
18473
18473
 
18474
18474
 
18475
18475
  var render = function render() {
@@ -18862,7 +18862,7 @@ var render = function render() {
18862
18862
  }
18863
18863
  }, [_vm._v("日期")]), _c('a-select-option', {
18864
18864
  attrs: {
18865
- "value": 3
18865
+ "value": 7
18866
18866
  }
18867
18867
  }, [_vm._v("计算公式")])], 1)], 1), _vm.editorProperty === 1 ? [_c('li', {
18868
18868
  staticClass: "control-item"
@@ -19128,7 +19128,7 @@ var render = function render() {
19128
19128
  },
19129
19129
  expression: "isAutoInputCurDate"
19130
19130
  }
19131
- }, [_vm._v("双击设置当前日期时间")])], 1)])] : _vm.editorProperty === 3 ? [_c('li', {
19131
+ }, [_vm._v("双击设置当前日期时间")])], 1)])] : _vm.editorProperty === 7 ? [_c('li', {
19132
19132
  staticClass: "control-item"
19133
19133
  }, [_c('span', {
19134
19134
  staticClass: "label"
@@ -19260,7 +19260,7 @@ var render = function render() {
19260
19260
  };
19261
19261
  var staticRenderFns = [];
19262
19262
 
19263
- ;// CONCATENATED MODULE: ./src/components/controls/table/TableCellProperty.vue?vue&type=template&id=e618a5b6&
19263
+ ;// CONCATENATED MODULE: ./src/components/controls/table/TableCellProperty.vue?vue&type=template&id=8849ff10&
19264
19264
 
19265
19265
  // EXTERNAL MODULE: ./node_modules/@babel/runtime/helpers/esm/slicedToArray.js + 3 modules
19266
19266
  var slicedToArray = __webpack_require__(27222);
@@ -19663,10 +19663,10 @@ var columns = [{
19663
19663
  });
19664
19664
  ;// CONCATENATED MODULE: ./src/components/controls/table/TableCellProperty.vue?vue&type=script&lang=js&
19665
19665
  /* harmony default export */ var table_TableCellPropertyvue_type_script_lang_js_ = (TableCellPropertyvue_type_script_lang_js_);
19666
- ;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-32.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-32.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-32.use[2]!./node_modules/less-loader/dist/cjs.js??clonedRuleSet-32.use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/table/TableCellProperty.vue?vue&type=style&index=0&id=e618a5b6&prod&lang=less&
19666
+ ;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-32.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-32.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-32.use[2]!./node_modules/less-loader/dist/cjs.js??clonedRuleSet-32.use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/table/TableCellProperty.vue?vue&type=style&index=0&id=8849ff10&prod&lang=less&
19667
19667
  // extracted by mini-css-extract-plugin
19668
19668
 
19669
- ;// CONCATENATED MODULE: ./src/components/controls/table/TableCellProperty.vue?vue&type=style&index=0&id=e618a5b6&prod&lang=less&
19669
+ ;// CONCATENATED MODULE: ./src/components/controls/table/TableCellProperty.vue?vue&type=style&index=0&id=8849ff10&prod&lang=less&
19670
19670
 
19671
19671
  // EXTERNAL MODULE: ./node_modules/@vue/vue-loader-v15/lib/runtime/componentNormalizer.js
19672
19672
  var componentNormalizer = __webpack_require__(70713);
@@ -35496,9 +35496,19 @@ var Print = /*#__PURE__*/function () {
35496
35496
  var _chromes;
35497
35497
  if ((_chromes = chromes) !== null && _chromes !== void 0 && _chromes.webview && printSilently) {
35498
35498
  var _chromes2;
35499
+ // console.log({
35500
+ // exec: 'printpdf',
35501
+ // data: {
35502
+ // orientation: orientation == 'l' ? '2' : '1', // 当前判断是字母l
35503
+ // paperSize: pageSize?.toUpperCase(),
35504
+ // showsetup: true,
35505
+ // base64: PDF.output('datauristring').replace(/^data:application\/pdf;filename=generated.pdf;base64,/, ''),
35506
+ // },
35507
+ // })
35499
35508
  (_chromes2 = chromes) === null || _chromes2 === void 0 ? void 0 : _chromes2.webview.postMessage({
35500
35509
  exec: 'printpdf',
35501
35510
  data: {
35511
+ // showsetup: true, // 是否显示打印设置
35502
35512
  orientation: orientation == 'l' ? '2' : '1',
35503
35513
  paperSize: pageSize === null || pageSize === void 0 ? void 0 : pageSize.toUpperCase(),
35504
35514
  base64: PDF.output('datauristring').replace(/^data:application\/pdf;filename=generated.pdf;base64,/, '')
@@ -45435,7 +45445,7 @@ var PageProperty = /*#__PURE__*/function () {
45435
45445
  /* harmony export */ q5: function() { return /* binding */ SignProperty; },
45436
45446
  /* harmony export */ vE: function() { return /* binding */ TableProperty; }
45437
45447
  /* harmony export */ });
45438
- /* unused harmony exports DataSource, Formula */
45448
+ /* unused harmony export DataSource */
45439
45449
  /* harmony import */ var D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_typeof_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(8495);
45440
45450
  /* harmony import */ var D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_classCallCheck_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(70280);
45441
45451
  /* harmony import */ var D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(66298);
@@ -46265,39 +46275,32 @@ var DiagonalType;
46265
46275
  DiagonalType[DiagonalType["Left"] = 1] = "Left";
46266
46276
  DiagonalType[DiagonalType["Right"] = 2] = "Right";
46267
46277
  })(DiagonalType || (DiagonalType = {}));
46268
- var Formula = /*#__PURE__*/function () {
46269
- function Formula(objectValues) {
46270
- (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_classCallCheck_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)(this, Formula);
46271
- (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_3__/* ["default"] */ .Z)(this, "_formulaStr", "");
46272
- (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_3__/* ["default"] */ .Z)(this, "_oldValue", "");
46273
- //this._formularType = objectValues["formularType"] ? objectValues["formularType"] : objectValues["_formularType"];
46274
- this._formulaStr = objectValues["formulaStr"] ? objectValues["formulaStr"] : objectValues["_formulaStr"];
46275
- }
46276
- // get formularType(): FormularType {
46277
- // return this._formularType;
46278
- // }
46279
- // set formularType(value: FormularType) {
46280
- // this._formularType = value;
46281
- // }
46282
- (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z)(Formula, [{
46283
- key: "formulaStr",
46284
- get: function get() {
46285
- return this._formulaStr;
46286
- },
46287
- set: function set(value) {
46288
- this._formulaStr = value;
46289
- }
46290
- }, {
46291
- key: "oldValue",
46292
- get: function get() {
46293
- return this._oldValue;
46294
- },
46295
- set: function set(value) {
46296
- this._oldValue = value;
46297
- }
46298
- }]);
46299
- return Formula;
46300
- }();
46278
+ // export class Formula { //计算公式
46279
+ // private _formulaStr = "";
46280
+ // private _oldValue = "";
46281
+ // constructor(objectValues: any) {
46282
+ // //this._formularType = objectValues["formularType"] ? objectValues["formularType"] : objectValues["_formularType"];
46283
+ // this._formulaStr = objectValues["formulaStr"] ? objectValues["formulaStr"] : objectValues["_formulaStr"];
46284
+ // }
46285
+ // // get formularType(): FormularType {
46286
+ // // return this._formularType;
46287
+ // // }
46288
+ // // set formularType(value: FormularType) {
46289
+ // // this._formularType = value;
46290
+ // // }
46291
+ // get formulaStr(): string {
46292
+ // return this._formulaStr;
46293
+ // }
46294
+ // set formulaStr(value: string) {
46295
+ // this._formulaStr = value;
46296
+ // }
46297
+ // get oldValue(): string {
46298
+ // return this._oldValue;
46299
+ // }
46300
+ // set oldValue(value: string) {
46301
+ // this._oldValue = value;
46302
+ // }
46303
+ // }
46301
46304
  var CellProperty = /*#__PURE__*/function () {
46302
46305
  function CellProperty(objectValues //, table: TableNode
46303
46306
  ) {
@@ -46334,7 +46337,8 @@ var CellProperty = /*#__PURE__*/function () {
46334
46337
  (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_3__/* ["default"] */ .Z)(this, "_downListProperty", void 0);
46335
46338
  (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_3__/* ["default"] */ .Z)(this, "_dateTimeProperty", void 0);
46336
46339
  (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_3__/* ["default"] */ .Z)(this, "_diagonalType", DiagonalType.None);
46337
- (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_3__/* ["default"] */ .Z)(this, "_formula", void 0);
46340
+ (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_3__/* ["default"] */ .Z)(this, "_formula", "");
46341
+ (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_3__/* ["default"] */ .Z)(this, "_oldValue", "");
46338
46342
  //this._dataSource = new DataSource();
46339
46343
  if (objectValues !== "") {
46340
46344
  var valuesObj = eval('(' + objectValues + ')');
@@ -46372,9 +46376,9 @@ var CellProperty = /*#__PURE__*/function () {
46372
46376
  if (valuesObj["editorProperty"] === EditorProperty.DateTime) {
46373
46377
  this._dateTimeProperty = new DateTimeProperty(valuesObj["dateTimeProperty"]);
46374
46378
  }
46375
- if (valuesObj["editorProperty"] === EditorProperty.Formula) {
46376
- this._formula = new Formula(valuesObj["formula"]);
46377
- }
46379
+ // if (valuesObj["editorProperty"] === EditorProperty.Formula) {
46380
+ // this._formula = new Formula(valuesObj["formula"]);
46381
+ // }
46378
46382
  }
46379
46383
  }
46380
46384
  // get id(): string {
@@ -46541,6 +46545,16 @@ var CellProperty = /*#__PURE__*/function () {
46541
46545
  this._formula = value;
46542
46546
  }
46543
46547
  }
46548
+ }, {
46549
+ key: "oldValue",
46550
+ get: function get() {
46551
+ return this._oldValue;
46552
+ },
46553
+ set: function set(value) {
46554
+ if (this._oldValue != value) {
46555
+ this._oldValue = value;
46556
+ }
46557
+ }
46544
46558
  }]);
46545
46559
  return CellProperty;
46546
46560
  }();
@@ -50357,7 +50371,8 @@ var CellNode = /*#__PURE__*/function (_RectNode) {
50357
50371
  editorProperty: this.cellProperty.editorProperty,
50358
50372
  downListProperty: this.cellProperty.downListProperty,
50359
50373
  dateTimeProperty: this.cellProperty.dateTimeProperty,
50360
- diagonalType: this.cellProperty.diagonalType
50374
+ diagonalType: this.cellProperty.diagonalType,
50375
+ formula: this.cellProperty.formula
50361
50376
  };
50362
50377
  var cellPropertyJson = JSON.parse(JSON.stringify(cellProperty));
50363
50378
  var keysName = Object.keys(defaultCellPropJson);
@@ -59665,8 +59680,17 @@ var SignNode = /*#__PURE__*/function (_BaseNode) {
59665
59680
  json.fingerPrintSrc = '';
59666
59681
  }
59667
59682
  var signNode = new SignNode(hoEditorFactoryID, rootNodes, pNode ? pNode : null, _BaseNode__WEBPACK_IMPORTED_MODULE_20__/* .NodeType */ .Jq.ntSign, number, type, json.name, json.signType ? Number(json.signType) : 0, json.signFormat ? json.signFormat : "签名医师", isClearSign ? "" : json.signor, isClearSign ? "" : json.signTime, json.signTimeFormat ? json.signTimeFormat : "yyyy-MM-dd HH:mm", isClearSign ? "" : json.imgSrc, imgWidth, imgHeight, isClearSign ? undefined : json.customProperty, isTemplate, json.styleIndex ? Number(json.styleIndex) : undefined, json.connectMode, isFront, allowEditSignTime, isClearSign ? "" : json.fingerPrintSrc, isClearSign ? 0 : json.fingerPosition, attribute, json.connectChar, json.otherProperties, json.dataId, json.associatedElement);
59683
+ // 旧的上级医生签名锁定判断方式 上级医生签名位置 存bec01数组 病历加载时根据签名元素内的bec01处理
59684
+ var superLuck = hoEditorFactory.superiorSigns.length > 0 && hoEditorFactory.superiorSigns.includes(signNode.customProperty.bce01);
59685
+ // hoEditorFactory.forbidEditBeforeSign 锁定已签名元素前内容
59686
+ // hoEditorFactory.lockContent 锁定非患者签名所在行内容
59687
+ if (signNode.imgSrc) {}
59668
59688
  if (signNode.attribute != 1) {
59669
- if (signNode.imgSrc != "" && (hoEditorFactory.superiorSigns.length > 0 && hoEditorFactory.superiorSigns.includes(signNode.customProperty.bce01) || hoEditorFactory.forbidEditBeforeSign) || hoEditorFactory.lockContent) {
59689
+ if (signNode.imgSrc && (superLuck || hoEditorFactory.forbidEditBeforeSign) || hoEditorFactory.lockContent) {
59690
+ hoEditorFactory.structureConvert._superiorSign[0] = signNode;
59691
+ }
59692
+ } else {
59693
+ if (hoEditorFactory.reviewMode && (signNode.imgSrc || signNode.fingerPrintSrc)) {
59670
59694
  hoEditorFactory.structureConvert._superiorSign[0] = signNode;
59671
59695
  }
59672
59696
  }
@@ -61237,42 +61261,51 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
61237
61261
  /* harmony import */ var core_js_modules_es_error_cause_js__WEBPACK_IMPORTED_MODULE_14___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_error_cause_js__WEBPACK_IMPORTED_MODULE_14__);
61238
61262
  /* harmony import */ var core_js_modules_es_array_splice_js__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(40561);
61239
61263
  /* harmony import */ var core_js_modules_es_array_splice_js__WEBPACK_IMPORTED_MODULE_15___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_splice_js__WEBPACK_IMPORTED_MODULE_15__);
61240
- /* harmony import */ var core_js_modules_es_array_concat_js__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(92222);
61241
- /* harmony import */ var core_js_modules_es_array_concat_js__WEBPACK_IMPORTED_MODULE_16___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_concat_js__WEBPACK_IMPORTED_MODULE_16__);
61242
- /* harmony import */ var core_js_modules_web_dom_collections_for_each_js__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(54747);
61243
- /* harmony import */ var core_js_modules_web_dom_collections_for_each_js__WEBPACK_IMPORTED_MODULE_17___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_web_dom_collections_for_each_js__WEBPACK_IMPORTED_MODULE_17__);
61244
- /* harmony import */ var core_js_modules_es_object_keys_js__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(47941);
61245
- /* harmony import */ var core_js_modules_es_object_keys_js__WEBPACK_IMPORTED_MODULE_18___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_object_keys_js__WEBPACK_IMPORTED_MODULE_18__);
61246
- /* harmony import */ var core_js_modules_es_json_stringify_js__WEBPACK_IMPORTED_MODULE_19__ = __webpack_require__(38862);
61247
- /* harmony import */ var core_js_modules_es_json_stringify_js__WEBPACK_IMPORTED_MODULE_19___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_json_stringify_js__WEBPACK_IMPORTED_MODULE_19__);
61248
- /* harmony import */ var core_js_modules_es_regexp_to_string_js__WEBPACK_IMPORTED_MODULE_20__ = __webpack_require__(39714);
61249
- /* 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__);
61250
- /* harmony import */ var core_js_modules_es_number_constructor_js__WEBPACK_IMPORTED_MODULE_21__ = __webpack_require__(9653);
61251
- /* harmony import */ var core_js_modules_es_number_constructor_js__WEBPACK_IMPORTED_MODULE_21___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_number_constructor_js__WEBPACK_IMPORTED_MODULE_21__);
61252
- /* harmony import */ var core_js_modules_es_string_starts_with_js__WEBPACK_IMPORTED_MODULE_22__ = __webpack_require__(23157);
61253
- /* harmony import */ var core_js_modules_es_string_starts_with_js__WEBPACK_IMPORTED_MODULE_22___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_string_starts_with_js__WEBPACK_IMPORTED_MODULE_22__);
61254
- /* harmony import */ var core_js_modules_es_array_iterator_js__WEBPACK_IMPORTED_MODULE_23__ = __webpack_require__(66992);
61255
- /* harmony import */ var core_js_modules_es_array_iterator_js__WEBPACK_IMPORTED_MODULE_23___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_iterator_js__WEBPACK_IMPORTED_MODULE_23__);
61256
- /* harmony import */ var core_js_modules_es_map_js__WEBPACK_IMPORTED_MODULE_24__ = __webpack_require__(51532);
61257
- /* harmony import */ var core_js_modules_es_map_js__WEBPACK_IMPORTED_MODULE_24___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_map_js__WEBPACK_IMPORTED_MODULE_24__);
61258
- /* harmony import */ var core_js_modules_es_string_iterator_js__WEBPACK_IMPORTED_MODULE_25__ = __webpack_require__(78783);
61259
- /* harmony import */ var core_js_modules_es_string_iterator_js__WEBPACK_IMPORTED_MODULE_25___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_string_iterator_js__WEBPACK_IMPORTED_MODULE_25__);
61260
- /* harmony import */ var core_js_modules_web_dom_collections_iterator_js__WEBPACK_IMPORTED_MODULE_26__ = __webpack_require__(33948);
61261
- /* harmony import */ var core_js_modules_web_dom_collections_iterator_js__WEBPACK_IMPORTED_MODULE_26___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_web_dom_collections_iterator_js__WEBPACK_IMPORTED_MODULE_26__);
61262
- /* harmony import */ var _CellNode__WEBPACK_IMPORTED_MODULE_27__ = __webpack_require__(68598);
61263
- /* harmony import */ var _BaseNode__WEBPACK_IMPORTED_MODULE_28__ = __webpack_require__(62358);
61264
- /* harmony import */ var _ParagraphNode__WEBPACK_IMPORTED_MODULE_29__ = __webpack_require__(67945);
61265
- /* harmony import */ var _RectNode__WEBPACK_IMPORTED_MODULE_30__ = __webpack_require__(67800);
61266
- /* harmony import */ var _editor_draw_drawNode_DrawTable__WEBPACK_IMPORTED_MODULE_31__ = __webpack_require__(74298);
61267
- /* harmony import */ var _TableProperty__WEBPACK_IMPORTED_MODULE_32__ = __webpack_require__(79546);
61268
- /* harmony import */ var _DomRange__WEBPACK_IMPORTED_MODULE_33__ = __webpack_require__(94639);
61269
- /* harmony import */ var _NodePosition__WEBPACK_IMPORTED_MODULE_34__ = __webpack_require__(42921);
61270
- /* harmony import */ var _editor_events_Exception__WEBPACK_IMPORTED_MODULE_35__ = __webpack_require__(8277);
61271
- /* harmony import */ var _editor_events_NodeChangeEvent__WEBPACK_IMPORTED_MODULE_36__ = __webpack_require__(2613);
61272
- /* harmony import */ var _DocTree__WEBPACK_IMPORTED_MODULE_37__ = __webpack_require__(32629);
61273
- /* harmony import */ var _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_38__ = __webpack_require__(74089);
61274
- /* harmony import */ var _editor_draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_39__ = __webpack_require__(51760);
61275
- /* harmony import */ var _editor_draw_drawNode_DrawPageTable__WEBPACK_IMPORTED_MODULE_40__ = __webpack_require__(15694);
61264
+ /* harmony import */ var core_js_modules_es_regexp_exec_js__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(74916);
61265
+ /* harmony import */ var core_js_modules_es_regexp_exec_js__WEBPACK_IMPORTED_MODULE_16___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_regexp_exec_js__WEBPACK_IMPORTED_MODULE_16__);
61266
+ /* harmony import */ var core_js_modules_es_string_replace_js__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(15306);
61267
+ /* harmony import */ var core_js_modules_es_string_replace_js__WEBPACK_IMPORTED_MODULE_17___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_string_replace_js__WEBPACK_IMPORTED_MODULE_17__);
61268
+ /* harmony import */ var core_js_modules_es_string_replace_all_js__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(68757);
61269
+ /* harmony import */ var core_js_modules_es_string_replace_all_js__WEBPACK_IMPORTED_MODULE_18___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_string_replace_all_js__WEBPACK_IMPORTED_MODULE_18__);
61270
+ /* harmony import */ var core_js_modules_es_regexp_to_string_js__WEBPACK_IMPORTED_MODULE_19__ = __webpack_require__(39714);
61271
+ /* harmony import */ var core_js_modules_es_regexp_to_string_js__WEBPACK_IMPORTED_MODULE_19___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_regexp_to_string_js__WEBPACK_IMPORTED_MODULE_19__);
61272
+ /* harmony import */ var core_js_modules_es_array_concat_js__WEBPACK_IMPORTED_MODULE_20__ = __webpack_require__(92222);
61273
+ /* harmony import */ var core_js_modules_es_array_concat_js__WEBPACK_IMPORTED_MODULE_20___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_concat_js__WEBPACK_IMPORTED_MODULE_20__);
61274
+ /* harmony import */ var core_js_modules_web_dom_collections_for_each_js__WEBPACK_IMPORTED_MODULE_21__ = __webpack_require__(54747);
61275
+ /* harmony import */ var core_js_modules_web_dom_collections_for_each_js__WEBPACK_IMPORTED_MODULE_21___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_web_dom_collections_for_each_js__WEBPACK_IMPORTED_MODULE_21__);
61276
+ /* harmony import */ var core_js_modules_es_object_keys_js__WEBPACK_IMPORTED_MODULE_22__ = __webpack_require__(47941);
61277
+ /* harmony import */ var core_js_modules_es_object_keys_js__WEBPACK_IMPORTED_MODULE_22___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_object_keys_js__WEBPACK_IMPORTED_MODULE_22__);
61278
+ /* harmony import */ var core_js_modules_es_json_stringify_js__WEBPACK_IMPORTED_MODULE_23__ = __webpack_require__(38862);
61279
+ /* harmony import */ var core_js_modules_es_json_stringify_js__WEBPACK_IMPORTED_MODULE_23___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_json_stringify_js__WEBPACK_IMPORTED_MODULE_23__);
61280
+ /* harmony import */ var core_js_modules_es_number_constructor_js__WEBPACK_IMPORTED_MODULE_24__ = __webpack_require__(9653);
61281
+ /* harmony import */ var core_js_modules_es_number_constructor_js__WEBPACK_IMPORTED_MODULE_24___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_number_constructor_js__WEBPACK_IMPORTED_MODULE_24__);
61282
+ /* harmony import */ var core_js_modules_es_string_starts_with_js__WEBPACK_IMPORTED_MODULE_25__ = __webpack_require__(23157);
61283
+ /* harmony import */ var core_js_modules_es_string_starts_with_js__WEBPACK_IMPORTED_MODULE_25___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_string_starts_with_js__WEBPACK_IMPORTED_MODULE_25__);
61284
+ /* harmony import */ var core_js_modules_es_array_iterator_js__WEBPACK_IMPORTED_MODULE_26__ = __webpack_require__(66992);
61285
+ /* harmony import */ var core_js_modules_es_array_iterator_js__WEBPACK_IMPORTED_MODULE_26___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_iterator_js__WEBPACK_IMPORTED_MODULE_26__);
61286
+ /* harmony import */ var core_js_modules_es_map_js__WEBPACK_IMPORTED_MODULE_27__ = __webpack_require__(51532);
61287
+ /* harmony import */ var core_js_modules_es_map_js__WEBPACK_IMPORTED_MODULE_27___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_map_js__WEBPACK_IMPORTED_MODULE_27__);
61288
+ /* harmony import */ var core_js_modules_es_string_iterator_js__WEBPACK_IMPORTED_MODULE_28__ = __webpack_require__(78783);
61289
+ /* harmony import */ var core_js_modules_es_string_iterator_js__WEBPACK_IMPORTED_MODULE_28___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_string_iterator_js__WEBPACK_IMPORTED_MODULE_28__);
61290
+ /* harmony import */ var core_js_modules_web_dom_collections_iterator_js__WEBPACK_IMPORTED_MODULE_29__ = __webpack_require__(33948);
61291
+ /* harmony import */ var core_js_modules_web_dom_collections_iterator_js__WEBPACK_IMPORTED_MODULE_29___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_web_dom_collections_iterator_js__WEBPACK_IMPORTED_MODULE_29__);
61292
+ /* harmony import */ var _CellNode__WEBPACK_IMPORTED_MODULE_30__ = __webpack_require__(68598);
61293
+ /* harmony import */ var _BaseNode__WEBPACK_IMPORTED_MODULE_31__ = __webpack_require__(62358);
61294
+ /* harmony import */ var _ParagraphNode__WEBPACK_IMPORTED_MODULE_32__ = __webpack_require__(67945);
61295
+ /* harmony import */ var _RectNode__WEBPACK_IMPORTED_MODULE_33__ = __webpack_require__(67800);
61296
+ /* harmony import */ var _editor_draw_drawNode_DrawTable__WEBPACK_IMPORTED_MODULE_34__ = __webpack_require__(74298);
61297
+ /* harmony import */ var _TableProperty__WEBPACK_IMPORTED_MODULE_35__ = __webpack_require__(79546);
61298
+ /* harmony import */ var _DomRange__WEBPACK_IMPORTED_MODULE_36__ = __webpack_require__(94639);
61299
+ /* harmony import */ var _NodePosition__WEBPACK_IMPORTED_MODULE_37__ = __webpack_require__(42921);
61300
+ /* harmony import */ var _editor_events_Exception__WEBPACK_IMPORTED_MODULE_38__ = __webpack_require__(8277);
61301
+ /* harmony import */ var _editor_events_NodeChangeEvent__WEBPACK_IMPORTED_MODULE_39__ = __webpack_require__(2613);
61302
+ /* harmony import */ var _DocTree__WEBPACK_IMPORTED_MODULE_40__ = __webpack_require__(32629);
61303
+ /* harmony import */ var _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_41__ = __webpack_require__(74089);
61304
+ /* harmony import */ var _editor_draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_42__ = __webpack_require__(51760);
61305
+ /* harmony import */ var _editor_draw_drawNode_DrawPageTable__WEBPACK_IMPORTED_MODULE_43__ = __webpack_require__(15694);
61306
+
61307
+
61308
+
61276
61309
 
61277
61310
 
61278
61311
 
@@ -61484,7 +61517,7 @@ var RowInfos = /*#__PURE__*/function () {
61484
61517
  mainCell = _this$_table$getMainC2[0],
61485
61518
  mr = _this$_table$getMainC2[1],
61486
61519
  mc = _this$_table$getMainC2[2];
61487
- if (mainCell && mainCell.cellProperty.align !== _TableProperty__WEBPACK_IMPORTED_MODULE_32__/* .VAlign */ .TR.vatop) {
61520
+ if (mainCell && mainCell.cellProperty.align !== _TableProperty__WEBPACK_IMPORTED_MODULE_35__/* .VAlign */ .TR.vatop) {
61488
61521
  mainCell.drawCell.needUpdate = true;
61489
61522
  }
61490
61523
  }
@@ -61581,7 +61614,7 @@ var ColInfos = /*#__PURE__*/function () {
61581
61614
  }, {
61582
61615
  key: "clone",
61583
61616
  value: function clone() {
61584
- var colProperty = new _TableProperty__WEBPACK_IMPORTED_MODULE_32__/* .ColProperty */ .Ti("");
61617
+ var colProperty = new _TableProperty__WEBPACK_IMPORTED_MODULE_35__/* .ColProperty */ .Ti("");
61585
61618
  var ret = new ColInfos(this._table, this._colWidth, colProperty);
61586
61619
  ret._widthFixed = this._widthFixed;
61587
61620
  ret._dLeft = this._dLeft;
@@ -61596,7 +61629,7 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
61596
61629
  function TableNode(hoEditorFactoryID, rootNodes, pNode, rowCount, colCount, tableProperty) {
61597
61630
  var _this;
61598
61631
  (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_classCallCheck_js__WEBPACK_IMPORTED_MODULE_6__/* ["default"] */ .Z)(this, TableNode);
61599
- _this = _super.call(this, hoEditorFactoryID, rootNodes, pNode, _BaseNode__WEBPACK_IMPORTED_MODULE_28__/* .NodeType */ .Jq.ntTable);
61632
+ _this = _super.call(this, hoEditorFactoryID, rootNodes, pNode, _BaseNode__WEBPACK_IMPORTED_MODULE_31__/* .NodeType */ .Jq.ntTable);
61600
61633
  (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_8__/* ["default"] */ .Z)((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z)(_this), "_rows", void 0);
61601
61634
  //单元格矩阵
61602
61635
  (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_8__/* ["default"] */ .Z)((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z)(_this), "_rowCount", void 0);
@@ -61628,12 +61661,12 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
61628
61661
  _this._tableProperty = tableProperty;
61629
61662
  var colWidth = _this.calcColWidth();
61630
61663
  for (var i = 0; i < _this._colCount; i++) {
61631
- var colProperty = new _TableProperty__WEBPACK_IMPORTED_MODULE_32__/* .ColProperty */ .Ti("");
61664
+ var colProperty = new _TableProperty__WEBPACK_IMPORTED_MODULE_35__/* .ColProperty */ .Ti("");
61632
61665
  var colInfos = new ColInfos((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z)(_this), colWidth, colProperty);
61633
61666
  _this._colInfos[i] = colInfos;
61634
61667
  }
61635
61668
  for (var j = 0; j < _this._rowCount; j++) {
61636
- var rowProperty = new _TableProperty__WEBPACK_IMPORTED_MODULE_32__/* .RowProperty */ .Nr("");
61669
+ var rowProperty = new _TableProperty__WEBPACK_IMPORTED_MODULE_35__/* .RowProperty */ .Nr("");
61637
61670
  var rowInfos = new RowInfos((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z)(_this), rowProperty);
61638
61671
  _this._rowInfos[j] = rowInfos;
61639
61672
  }
@@ -61641,8 +61674,8 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
61641
61674
  var aRow = new Array();
61642
61675
  _this._rows.push(aRow);
61643
61676
  for (var c = 0; c < colCount; c++) {
61644
- var cellProperty = new _TableProperty__WEBPACK_IMPORTED_MODULE_32__/* .CellProperty */ .$W("");
61645
- var aCell = new _CellNode__WEBPACK_IMPORTED_MODULE_27__/* .CellNode */ .D(_this._hoEditorFactoryID, rootNodes, (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z)(_this), aRow, undefined, r, c, 1, 1, cellProperty);
61677
+ var cellProperty = new _TableProperty__WEBPACK_IMPORTED_MODULE_35__/* .CellProperty */ .$W("");
61678
+ var aCell = new _CellNode__WEBPACK_IMPORTED_MODULE_30__/* .CellNode */ .D(_this._hoEditorFactoryID, rootNodes, (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z)(_this), aRow, undefined, r, c, 1, 1, cellProperty);
61646
61679
  aRow.push(aCell);
61647
61680
  aCell.initBlankDoc();
61648
61681
  }
@@ -61814,7 +61847,7 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
61814
61847
  var copyRowProperty = this._rowInfos[copyIndex].rowProperty;
61815
61848
  for (var i = 0; i < count; i++) {
61816
61849
  var row = new Array();
61817
- var rowProperty = new _TableProperty__WEBPACK_IMPORTED_MODULE_32__/* .RowProperty */ .Nr("");
61850
+ var rowProperty = new _TableProperty__WEBPACK_IMPORTED_MODULE_35__/* .RowProperty */ .Nr("");
61818
61851
  rowProperty.rowHeight = copyRowProperty.rowHeight;
61819
61852
  rowProperty.isSpecifyHeight = copyRowProperty.isSpecifyHeight;
61820
61853
  rowProperty.isLockRowHeight = copyRowProperty.isLockRowHeight;
@@ -61838,8 +61871,8 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
61838
61871
  cell = null;
61839
61872
  }
61840
61873
  if (cell) {
61841
- var cellProperty = new _TableProperty__WEBPACK_IMPORTED_MODULE_32__/* .CellProperty */ .$W("");
61842
- if (cell.cellProperty.editorProperty != _TableProperty__WEBPACK_IMPORTED_MODULE_32__/* .EditorProperty */ .YS.None) {
61874
+ var cellProperty = new _TableProperty__WEBPACK_IMPORTED_MODULE_35__/* .CellProperty */ .$W("");
61875
+ if (cell.cellProperty.editorProperty != _TableProperty__WEBPACK_IMPORTED_MODULE_35__/* .EditorProperty */ .YS.None) {
61843
61876
  cellProperty.editorProperty = cell.cellProperty.editorProperty;
61844
61877
  if (cell.cellProperty.dateTimeProperty) {
61845
61878
  cellProperty.dateTimeProperty = cell.cellProperty.dateTimeProperty;
@@ -61852,10 +61885,13 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
61852
61885
  cellProperty.gridLineDisplay = cell.cellProperty.gridLineDisplay;
61853
61886
  cellProperty.gridLinesColor = cell.cellProperty.gridLinesColor;
61854
61887
  cellProperty.gridLinesStyle = cell.cellProperty.gridLinesStyle;
61888
+ if (cell.cellProperty.editorProperty === _TableProperty__WEBPACK_IMPORTED_MODULE_35__/* .EditorProperty */ .YS.Formula && cell.cellProperty.formula !== "") {
61889
+ cellProperty.formula = cell.cellProperty.formula.replaceAll(/\d/g, (r + 1 + i).toString());
61890
+ }
61855
61891
  if (cell.cellProperty.align != 0) {
61856
61892
  cellProperty.align = cell.cellProperty.align;
61857
61893
  }
61858
- var newCell = new _CellNode__WEBPACK_IMPORTED_MODULE_27__/* .CellNode */ .D(this._hoEditorFactoryID, this.rootNodes, this, row, cell, r + i, c, 1, cell.colSpan, cellProperty);
61894
+ var newCell = new _CellNode__WEBPACK_IMPORTED_MODULE_30__/* .CellNode */ .D(this._hoEditorFactoryID, this.rootNodes, this, row, cell, r + i, c, 1, cell.colSpan, cellProperty);
61859
61895
  row.splice(c, 0, newCell);
61860
61896
  newCell.initBlankDoc();
61861
61897
  newCell.childNodes[0].styleIndex = cell.childNodes[0].styleIndex;
@@ -61878,8 +61914,8 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
61878
61914
  c += 1;
61879
61915
  }
61880
61916
  this._rows.splice(r + i, 0, row);
61881
- var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_38__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID);
61882
- if (hoEditorFactory.docTree.docProperty.type === _DocTree__WEBPACK_IMPORTED_MODULE_37__/* .EmrType */ .Fr.etForm) {
61917
+ var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_41__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID);
61918
+ if (hoEditorFactory.docTree.docProperty.type === _DocTree__WEBPACK_IMPORTED_MODULE_40__/* .EmrType */ .Fr.etForm) {
61883
61919
  this.updateGridRowValign(r + i);
61884
61920
  }
61885
61921
  this._rowCount += 1;
@@ -61969,7 +62005,7 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
61969
62005
  this.updateColsWidth(cols, newWidth);
61970
62006
  }
61971
62007
  for (var i = 0; i < count; i++) {
61972
- var colProperty = new _TableProperty__WEBPACK_IMPORTED_MODULE_32__/* .ColProperty */ .Ti("");
62008
+ var colProperty = new _TableProperty__WEBPACK_IMPORTED_MODULE_35__/* .ColProperty */ .Ti("");
61973
62009
  var colInfos = new ColInfos(this, newWidth, colProperty);
61974
62010
  this._colInfos.splice(c, 0, colInfos);
61975
62011
  }
@@ -62028,8 +62064,8 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
62028
62064
  }
62029
62065
  for (var _i = 0; _i < count; _i++) {
62030
62066
  if (cell) {
62031
- var cellProperty = new _TableProperty__WEBPACK_IMPORTED_MODULE_32__/* .CellProperty */ .$W("");
62032
- if (cell.cellProperty.editorProperty !== _TableProperty__WEBPACK_IMPORTED_MODULE_32__/* .EditorProperty */ .YS.None) {
62067
+ var cellProperty = new _TableProperty__WEBPACK_IMPORTED_MODULE_35__/* .CellProperty */ .$W("");
62068
+ if (cell.cellProperty.editorProperty !== _TableProperty__WEBPACK_IMPORTED_MODULE_35__/* .EditorProperty */ .YS.None) {
62033
62069
  cellProperty.editorProperty = cell.cellProperty.editorProperty;
62034
62070
  if (cell.cellProperty.dateTimeProperty) {
62035
62071
  cellProperty.dateTimeProperty = cell.cellProperty.dateTimeProperty;
@@ -62042,10 +62078,11 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
62042
62078
  cellProperty.gridLineDisplay = cell.cellProperty.gridLineDisplay;
62043
62079
  cellProperty.gridLinesColor = cell.cellProperty.gridLinesColor;
62044
62080
  cellProperty.gridLinesStyle = cell.cellProperty.gridLinesStyle;
62081
+ cellProperty.formula = cell.cellProperty.formula;
62045
62082
  if (cell.cellProperty.align != 0) {
62046
62083
  cellProperty.align = cell.cellProperty.align;
62047
62084
  }
62048
- var newCell = new _CellNode__WEBPACK_IMPORTED_MODULE_27__/* .CellNode */ .D(this._hoEditorFactoryID, this.rootNodes, this, rows, cell, r, c, cell.rowSpan, 1, cellProperty);
62085
+ var newCell = new _CellNode__WEBPACK_IMPORTED_MODULE_30__/* .CellNode */ .D(this._hoEditorFactoryID, this.rootNodes, this, rows, cell, r, c, cell.rowSpan, 1, cellProperty);
62049
62086
  rows.splice(c, 0, newCell);
62050
62087
  newCell.drawCell.needUpdate;
62051
62088
  if (newCell.rowSpan > 1) {
@@ -62392,8 +62429,8 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
62392
62429
  value: function doSplitCellHorz(r, c, row2) {
62393
62430
  var cell = this._rows[r][c];
62394
62431
  if (cell) {
62395
- var cellProperty = new _TableProperty__WEBPACK_IMPORTED_MODULE_32__/* .CellProperty */ .$W("");
62396
- var newCell = new _CellNode__WEBPACK_IMPORTED_MODULE_27__/* .CellNode */ .D(this._hoEditorFactoryID, this.rootNodes, this, this._rows[row2], cell, row2, c, 1, 1, cellProperty);
62432
+ var cellProperty = new _TableProperty__WEBPACK_IMPORTED_MODULE_35__/* .CellProperty */ .$W("");
62433
+ var newCell = new _CellNode__WEBPACK_IMPORTED_MODULE_30__/* .CellNode */ .D(this._hoEditorFactoryID, this.rootNodes, this, this._rows[row2], cell, row2, c, 1, 1, cellProperty);
62397
62434
  cell.drawCell.removeAllPartCell();
62398
62435
  newCell.drawCell.needUpdate = true;
62399
62436
  newCell.colSpan = cell.colSpan;
@@ -62407,8 +62444,8 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
62407
62444
  value: function doSplitCellVert(r, c, col2) {
62408
62445
  var cell = this._rows[r][c];
62409
62446
  if (cell) {
62410
- var cellProperty = new _TableProperty__WEBPACK_IMPORTED_MODULE_32__/* .CellProperty */ .$W("");
62411
- var newCell = new _CellNode__WEBPACK_IMPORTED_MODULE_27__/* .CellNode */ .D(this._hoEditorFactoryID, this.rootNodes, this, this._rows[r], cell, r, col2, 1, 1, cellProperty);
62447
+ var cellProperty = new _TableProperty__WEBPACK_IMPORTED_MODULE_35__/* .CellProperty */ .$W("");
62448
+ var newCell = new _CellNode__WEBPACK_IMPORTED_MODULE_30__/* .CellNode */ .D(this._hoEditorFactoryID, this.rootNodes, this, this._rows[r], cell, r, col2, 1, 1, cellProperty);
62412
62449
  cell.drawCell.removeAllPartCell();
62413
62450
  newCell.drawCell.needUpdate = true;
62414
62451
  newCell.rowSpan = cell.rowSpan;
@@ -62555,8 +62592,8 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
62555
62592
  if (bunMergeRow) {
62556
62593
  var rowSpan = cell.rowSpan;
62557
62594
  for (var i = r + 1; i <= r + rowSpan - 1; i++) {
62558
- var cellProperty = new _TableProperty__WEBPACK_IMPORTED_MODULE_32__/* .CellProperty */ .$W("");
62559
- var newCell = new _CellNode__WEBPACK_IMPORTED_MODULE_27__/* .CellNode */ .D(this._hoEditorFactoryID, this.rootNodes, this, this._rows[i], cell, i, c, 1, 1, cellProperty);
62595
+ var cellProperty = new _TableProperty__WEBPACK_IMPORTED_MODULE_35__/* .CellProperty */ .$W("");
62596
+ var newCell = new _CellNode__WEBPACK_IMPORTED_MODULE_30__/* .CellNode */ .D(this._hoEditorFactoryID, this.rootNodes, this, this._rows[i], cell, i, c, 1, 1, cellProperty);
62560
62597
  this._rows[i][c] = newCell;
62561
62598
  newCell.initBlankDoc();
62562
62599
  newCell.colSpan = cell.colSpan;
@@ -62581,8 +62618,8 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
62581
62618
  var cell = this._rows[r][c];
62582
62619
  if (cell) {
62583
62620
  for (var col = c + 1; col <= c + cell.colSpan - 1; col++) {
62584
- var cellProperty = new _TableProperty__WEBPACK_IMPORTED_MODULE_32__/* .CellProperty */ .$W("");
62585
- var newCell = new _CellNode__WEBPACK_IMPORTED_MODULE_27__/* .CellNode */ .D(this._hoEditorFactoryID, this.rootNodes, this, this._rows[r], cell, r, col, 1, 1, cellProperty);
62621
+ var cellProperty = new _TableProperty__WEBPACK_IMPORTED_MODULE_35__/* .CellProperty */ .$W("");
62622
+ var newCell = new _CellNode__WEBPACK_IMPORTED_MODULE_30__/* .CellNode */ .D(this._hoEditorFactoryID, this.rootNodes, this, this._rows[r], cell, r, col, 1, 1, cellProperty);
62586
62623
  this._rows[r][col] = newCell;
62587
62624
  newCell.rowSpan = cell.rowSpan;
62588
62625
  newCell.initBlankDoc();
@@ -62683,7 +62720,7 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
62683
62720
  }, {
62684
62721
  key: "node2DrawNodeRange",
62685
62722
  value: function node2DrawNodeRange(startIndex, endIndex) {
62686
- var drawTable = new _editor_draw_drawNode_DrawTable__WEBPACK_IMPORTED_MODULE_31__/* .DrawTable */ .t(this._hoEditorFactoryID, this._rootPath, this, 0);
62723
+ var drawTable = new _editor_draw_drawNode_DrawTable__WEBPACK_IMPORTED_MODULE_34__/* .DrawTable */ .t(this._hoEditorFactoryID, this._rootPath, this, 0);
62687
62724
  this._drawTable = drawTable;
62688
62725
  this._drawNodes.push(drawTable);
62689
62726
  }
@@ -62698,7 +62735,7 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
62698
62735
  }, {
62699
62736
  key: "range",
62700
62737
  value: function range() {
62701
- var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_38__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID);
62738
+ var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_41__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID);
62702
62739
  return {
62703
62740
  from: hoEditorFactory.docTree.getNodeFirstPath(this),
62704
62741
  to: hoEditorFactory.docTree.getNodeLastPath(this)
@@ -62713,13 +62750,13 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
62713
62750
  if (range) r = this.mixed(range);
62714
62751
  //根据路径范围确定被选中的行列信息 {col:{from,to},row:{from,to}}
62715
62752
  var getcell = function getcell(path) {
62716
- var node = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_38__/* .HOEditorFactorys */ .b.instance().getFactory(_this4._hoEditorFactoryID).docTree.findNodePositionByPath(path).node;
62753
+ var node = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_41__/* .HOEditorFactorys */ .b.instance().getFactory(_this4._hoEditorFactoryID).docTree.findNodePositionByPath(path).node;
62717
62754
  // while (node && !(node instanceof CellNode) && node.parentNode == this) {
62718
62755
  // node = node?.parentNode;
62719
62756
  // }
62720
62757
  for (;;) {
62721
- if (!node) throw _editor_events_Exception__WEBPACK_IMPORTED_MODULE_35__/* .Exception */ .P.NodeNotFound();
62722
- if (!(node instanceof _CellNode__WEBPACK_IMPORTED_MODULE_27__/* .CellNode */ .D)) {
62758
+ if (!node) throw _editor_events_Exception__WEBPACK_IMPORTED_MODULE_38__/* .Exception */ .P.NodeNotFound();
62759
+ if (!(node instanceof _CellNode__WEBPACK_IMPORTED_MODULE_30__/* .CellNode */ .D)) {
62723
62760
  node = node.parentNode;
62724
62761
  continue;
62725
62762
  } else {
@@ -62744,7 +62781,7 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
62744
62781
  col: 0,
62745
62782
  row: 0
62746
62783
  };
62747
- if (from && from instanceof _CellNode__WEBPACK_IMPORTED_MODULE_27__/* .CellNode */ .D) {
62784
+ if (from && from instanceof _CellNode__WEBPACK_IMPORTED_MODULE_30__/* .CellNode */ .D) {
62748
62785
  var _from$table$getCellIn = from.table.getCellInfos(from),
62749
62786
  _from$table$getCellIn2 = (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_5__/* ["default"] */ .Z)(_from$table$getCellIn, 2),
62750
62787
  _r2 = _from$table$getCellIn2[0],
@@ -62753,7 +62790,7 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
62753
62790
  pfrom.col = c;
62754
62791
  pfrom.row = _r2;
62755
62792
  }
62756
- if (to && to instanceof _CellNode__WEBPACK_IMPORTED_MODULE_27__/* .CellNode */ .D) {
62793
+ if (to && to instanceof _CellNode__WEBPACK_IMPORTED_MODULE_30__/* .CellNode */ .D) {
62757
62794
  var _to$table$getCellInfo = to.table.getCellInfos(to),
62758
62795
  _to$table$getCellInfo2 = (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_5__/* ["default"] */ .Z)(_to$table$getCellInfo, 2),
62759
62796
  _r3 = _to$table$getCellInfo2[0],
@@ -62837,8 +62874,8 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
62837
62874
  rowInfosArray.push(rowProp);
62838
62875
  }
62839
62876
  var defaultColProp = {
62840
- editorProperty: _TableProperty__WEBPACK_IMPORTED_MODULE_32__/* .EditorProperty */ .YS[_TableProperty__WEBPACK_IMPORTED_MODULE_32__/* .EditorProperty */ .YS.None],
62841
- align: _TableProperty__WEBPACK_IMPORTED_MODULE_32__/* .VAlign */ .TR[_TableProperty__WEBPACK_IMPORTED_MODULE_32__/* .VAlign */ .TR.vatop],
62877
+ editorProperty: _TableProperty__WEBPACK_IMPORTED_MODULE_35__/* .EditorProperty */ .YS[_TableProperty__WEBPACK_IMPORTED_MODULE_35__/* .EditorProperty */ .YS.None],
62878
+ align: _TableProperty__WEBPACK_IMPORTED_MODULE_35__/* .VAlign */ .TR[_TableProperty__WEBPACK_IMPORTED_MODULE_35__/* .VAlign */ .TR.vatop],
62842
62879
  width: 0,
62843
62880
  specifyWidth: false,
62844
62881
  downListProperty: "",
@@ -62859,8 +62896,8 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
62859
62896
  customProperty: Array(colInfo.colProperty.customProperties)
62860
62897
  };
62861
62898
  var colProperty = {
62862
- editorProperty: _TableProperty__WEBPACK_IMPORTED_MODULE_32__/* .EditorProperty */ .YS[colInfo.colProperty.editorProperty],
62863
- align: _TableProperty__WEBPACK_IMPORTED_MODULE_32__/* .VAlign */ .TR[colInfo.colProperty.align],
62899
+ editorProperty: _TableProperty__WEBPACK_IMPORTED_MODULE_35__/* .EditorProperty */ .YS[colInfo.colProperty.editorProperty],
62900
+ align: _TableProperty__WEBPACK_IMPORTED_MODULE_35__/* .VAlign */ .TR[colInfo.colProperty.align],
62864
62901
  width: colInfo.colProperty.width ? colInfo.colProperty.width : 0,
62865
62902
  specifyWidth: colInfo.colProperty.isSpecifyWidth,
62866
62903
  downListProperty: colInfo.colProperty.downListProperty,
@@ -62902,12 +62939,12 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
62902
62939
  }
62903
62940
  var defaultCellProp = {
62904
62941
  //title: "",
62905
- align: _TableProperty__WEBPACK_IMPORTED_MODULE_32__/* .VAlign */ .TR.vatop,
62906
- obliqueSplitLine: _TableProperty__WEBPACK_IMPORTED_MODULE_32__/* .ObliqueSplitLine */ .lH.None,
62942
+ align: _TableProperty__WEBPACK_IMPORTED_MODULE_35__/* .VAlign */ .TR.vatop,
62943
+ obliqueSplitLine: _TableProperty__WEBPACK_IMPORTED_MODULE_35__/* .ObliqueSplitLine */ .lH.None,
62907
62944
  printGridLines: true,
62908
62945
  alignTextToGridline: true,
62909
62946
  span: 0,
62910
- gridLinesStyle: _TableProperty__WEBPACK_IMPORTED_MODULE_32__/* .GridLinesStyle */ .he.solid,
62947
+ gridLinesStyle: _TableProperty__WEBPACK_IMPORTED_MODULE_35__/* .GridLinesStyle */ .he.solid,
62911
62948
  gridLinesColor: "#000000,#000000,#000000,#000000",
62912
62949
  isDrawGridlines: true,
62913
62950
  gridLineDisplay: "true,true,true,true",
@@ -62916,10 +62953,11 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
62916
62953
  //lightCellBorders: false,
62917
62954
  //dataSource: "",
62918
62955
  backColor: "#FFFFFF",
62919
- editorProperty: _TableProperty__WEBPACK_IMPORTED_MODULE_32__/* .EditorProperty */ .YS.None,
62956
+ editorProperty: _TableProperty__WEBPACK_IMPORTED_MODULE_35__/* .EditorProperty */ .YS.None,
62920
62957
  downListProperty: "",
62921
62958
  dateTimeProperty: "",
62922
- diagonalType: _TableProperty__WEBPACK_IMPORTED_MODULE_32__/* .DiagonalType */ .IF.None
62959
+ diagonalType: _TableProperty__WEBPACK_IMPORTED_MODULE_35__/* .DiagonalType */ .IF.None,
62960
+ formula: ""
62923
62961
  };
62924
62962
  var defaultCellPropJson = JSON.parse(JSON.stringify(defaultCellProp));
62925
62963
  //处理单元格
@@ -63093,7 +63131,7 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
63093
63131
  tableProperty.customProperties = customProperties;
63094
63132
  }
63095
63133
  var retJson = {
63096
- nodeType: _BaseNode__WEBPACK_IMPORTED_MODULE_28__/* .NodeType */ .Jq[this.nodeType],
63134
+ nodeType: _BaseNode__WEBPACK_IMPORTED_MODULE_31__/* .NodeType */ .Jq[this.nodeType],
63097
63135
  rowCount: rowCount,
63098
63136
  colCount: colCount,
63099
63137
  //borderVisible: this.borderVisible.toString(),
@@ -63221,7 +63259,7 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
63221
63259
  }, {
63222
63260
  key: "update",
63223
63261
  value: function update() {
63224
- var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_38__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID);
63262
+ var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_41__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID);
63225
63263
  for (var r = 0; r < this.rowCount; r++) {
63226
63264
  for (var c = 0; c < this.colCount; c++) {
63227
63265
  var cell = this._rows[r][c];
@@ -63229,8 +63267,8 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
63229
63267
  cell.drawCell.clear();
63230
63268
  cell.drawCell.removeAllPartCell();
63231
63269
  var endPath = hoEditorFactory.docTree.getNodeLastPath(cell);
63232
- var aRange = new _DomRange__WEBPACK_IMPORTED_MODULE_33__/* .DomRange */ .a(this._hoEditorFactoryID, cell.childNodes[0].getNodePath(), endPath);
63233
- var cgEvent = new _editor_events_NodeChangeEvent__WEBPACK_IMPORTED_MODULE_36__/* .NodeChangeEvent */ .G(this._hoEditorFactoryID, _DocTree__WEBPACK_IMPORTED_MODULE_37__/* .DocAction */ .gk.daInsert, aRange.startPath, aRange.endPath);
63270
+ var aRange = new _DomRange__WEBPACK_IMPORTED_MODULE_36__/* .DomRange */ .a(this._hoEditorFactoryID, cell.childNodes[0].getNodePath(), endPath);
63271
+ var cgEvent = new _editor_events_NodeChangeEvent__WEBPACK_IMPORTED_MODULE_39__/* .NodeChangeEvent */ .G(this._hoEditorFactoryID, _DocTree__WEBPACK_IMPORTED_MODULE_40__/* .DocAction */ .gk.daInsert, aRange.startPath, aRange.endPath);
63234
63272
  cgEvent.repaintImmediate = false;
63235
63273
  hoEditorFactory.docTree.change(cgEvent);
63236
63274
  }
@@ -63240,7 +63278,7 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
63240
63278
  var mainArea = hoEditorFactory.drawPageTree.getMainRootArea(this.drawTable.drawPageTables[0]);
63241
63279
  if (mainArea) {
63242
63280
  var drawTop = this.drawTable.drawPageTables[0].y;
63243
- if (mainArea.contains(this.drawTable.drawPageTables[0]) && this.drawTable.drawPageTables[0] instanceof _editor_draw_drawNode_DrawPageTable__WEBPACK_IMPORTED_MODULE_40__/* .DrawPageTable */ .ox && this.drawTable.drawPageTables[0].table.drawTable.drawPageTables.indexOf(this.drawTable.drawPageTables[0]) > 0) {
63281
+ if (mainArea.contains(this.drawTable.drawPageTables[0]) && this.drawTable.drawPageTables[0] instanceof _editor_draw_drawNode_DrawPageTable__WEBPACK_IMPORTED_MODULE_43__/* .DrawPageTable */ .ox && this.drawTable.drawPageTables[0].table.drawTable.drawPageTables.indexOf(this.drawTable.drawPageTables[0]) > 0) {
63244
63282
  drawTop = 0;
63245
63283
  }
63246
63284
  hoEditorFactory.drawPageTree.update(mainArea, dpos[0].drawRoots, drawTop, dpos[0].index, dpos[0].index);
@@ -63325,20 +63363,20 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
63325
63363
  value: function isTotalSelected(arange, bNormalized) {
63326
63364
  var ret = false;
63327
63365
  var nextNode = this.nextSibling();
63328
- var startPath = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_38__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID).docTree.getNodeFirstPath(this);
63366
+ var startPath = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_41__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID).docTree.getNodeFirstPath(this);
63329
63367
  var newRange = arange;
63330
63368
  if (!bNormalized) newRange = arange.normalize();
63331
- if (nextNode && _NodePosition__WEBPACK_IMPORTED_MODULE_34__/* .NodePosition */ .F.pathCanCompare(newRange.startPath, startPath)) {
63369
+ if (nextNode && _NodePosition__WEBPACK_IMPORTED_MODULE_37__/* .NodePosition */ .F.pathCanCompare(newRange.startPath, startPath)) {
63332
63370
  var nextPath = nextNode.getNodePath();
63333
- ret = _NodePosition__WEBPACK_IMPORTED_MODULE_34__/* .NodePosition */ .F.treePathCompare(newRange.startPath, startPath) <= 0 && _NodePosition__WEBPACK_IMPORTED_MODULE_34__/* .NodePosition */ .F.treePathCompare(newRange.endPath, nextPath) >= 0;
63371
+ ret = _NodePosition__WEBPACK_IMPORTED_MODULE_37__/* .NodePosition */ .F.treePathCompare(newRange.startPath, startPath) <= 0 && _NodePosition__WEBPACK_IMPORTED_MODULE_37__/* .NodePosition */ .F.treePathCompare(newRange.endPath, nextPath) >= 0;
63334
63372
  }
63335
63373
  return ret;
63336
63374
  }
63337
63375
  }, {
63338
63376
  key: "delete",
63339
63377
  value: function _delete(operType) {
63340
- var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_38__/* .HOEditorFactorys */ .b.instance().getFactory(this.hoEditorFactoryID);
63341
- if (hoEditorFactory.drawTree.paintStatus === _editor_draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_39__/* .PaintState */ .Dh.psDesign || this.tableProperty.canDeleteTable) {
63378
+ var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_41__/* .HOEditorFactorys */ .b.instance().getFactory(this.hoEditorFactoryID);
63379
+ if (hoEditorFactory.drawTree.paintStatus === _editor_draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_42__/* .PaintState */ .Dh.psDesign || this.tableProperty.canDeleteTable) {
63342
63380
  var parentNodes = this.getParentNodes();
63343
63381
  var nextParagraphNode = this.nextSibling();
63344
63382
  var ret = false;
@@ -63378,7 +63416,7 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
63378
63416
  var ret = null;
63379
63417
  if (this._rows[0][0]) {
63380
63418
  var tableStartPath = this._rows[0][0].getNodePath();
63381
- var tableEndPath = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_38__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID).docTree.getNodeLastPath(this);
63419
+ var tableEndPath = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_41__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID).docTree.getNodeLastPath(this);
63382
63420
  var tablePath = this.getNodePath() + "/";
63383
63421
  if (path.startsWith(tablePath)) {
63384
63422
  var cellPath = path.substr(tablePath.length, path.length);
@@ -63473,7 +63511,7 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
63473
63511
  }, {
63474
63512
  key: "getInRangeRowColInfos",
63475
63513
  value: function getInRangeRowColInfos(range, bNormalized) {
63476
- var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_38__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID);
63514
+ var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_41__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID);
63477
63515
  var aRange = range;
63478
63516
  if (!bNormalized) {
63479
63517
  aRange = range.normalize();
@@ -63483,11 +63521,11 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
63483
63521
  var tableEndPath = hoEditorFactory.docTree.getNodeLastPath(this);
63484
63522
  var tableSelectStart = "";
63485
63523
  var tableSelectEnd = "";
63486
- if (_NodePosition__WEBPACK_IMPORTED_MODULE_34__/* .NodePosition */ .F.pathCanCompare(tableStartPath, aRange.startPath)) {
63487
- var startCompareStartRet = _NodePosition__WEBPACK_IMPORTED_MODULE_34__/* .NodePosition */ .F.treePathCompare(aRange.startPath, tableStartPath);
63488
- var startCompareEndRet = _NodePosition__WEBPACK_IMPORTED_MODULE_34__/* .NodePosition */ .F.treePathCompare(aRange.startPath, tableEndPath);
63489
- var endCompareStartRet = _NodePosition__WEBPACK_IMPORTED_MODULE_34__/* .NodePosition */ .F.treePathCompare(aRange.endPath, tableStartPath);
63490
- var endCompareEndRet = _NodePosition__WEBPACK_IMPORTED_MODULE_34__/* .NodePosition */ .F.treePathCompare(aRange.endPath, tableEndPath);
63524
+ if (_NodePosition__WEBPACK_IMPORTED_MODULE_37__/* .NodePosition */ .F.pathCanCompare(tableStartPath, aRange.startPath)) {
63525
+ var startCompareStartRet = _NodePosition__WEBPACK_IMPORTED_MODULE_37__/* .NodePosition */ .F.treePathCompare(aRange.startPath, tableStartPath);
63526
+ var startCompareEndRet = _NodePosition__WEBPACK_IMPORTED_MODULE_37__/* .NodePosition */ .F.treePathCompare(aRange.startPath, tableEndPath);
63527
+ var endCompareStartRet = _NodePosition__WEBPACK_IMPORTED_MODULE_37__/* .NodePosition */ .F.treePathCompare(aRange.endPath, tableStartPath);
63528
+ var endCompareEndRet = _NodePosition__WEBPACK_IMPORTED_MODULE_37__/* .NodePosition */ .F.treePathCompare(aRange.endPath, tableEndPath);
63491
63529
  //table起始位置在选中范围中间
63492
63530
  if (startCompareStartRet <= 0 && endCompareStartRet >= 0) {
63493
63531
  tableSelectStart = tableStartPath;
@@ -63730,14 +63768,14 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
63730
63768
  }, {
63731
63769
  key: "getTableFullRange",
63732
63770
  value: function getTableFullRange() {
63733
- var hoeditfactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_38__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID);
63771
+ var hoeditfactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_41__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID);
63734
63772
  var startPath = this._paragraphNode.getNodePath();
63735
63773
  var prevNode = this._paragraphNode.prevSibling();
63736
63774
  var nextNode = this.nextSibling();
63737
63775
  if (prevNode) {
63738
63776
  if (prevNode instanceof TableNode && nextNode) {
63739
63777
  var nnextNode = nextNode.nextLeaf();
63740
- if (!(nnextNode instanceof _ParagraphNode__WEBPACK_IMPORTED_MODULE_29__/* .ParagraphNode */ .C)) {
63778
+ if (!(nnextNode instanceof _ParagraphNode__WEBPACK_IMPORTED_MODULE_32__/* .ParagraphNode */ .C)) {
63741
63779
  startPath = this._paragraphNode.getNodePath();
63742
63780
  } else {
63743
63781
  return null;
@@ -63747,7 +63785,7 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
63747
63785
  }
63748
63786
  }
63749
63787
  var endPath = hoeditfactory.docTree.getNodeLastPath(this);
63750
- return new _DomRange__WEBPACK_IMPORTED_MODULE_33__/* .DomRange */ .a(this._hoEditorFactoryID, startPath, endPath);
63788
+ return new _DomRange__WEBPACK_IMPORTED_MODULE_36__/* .DomRange */ .a(this._hoEditorFactoryID, startPath, endPath);
63751
63789
  }
63752
63790
  }, {
63753
63791
  key: "getTagNameCn",
@@ -63759,7 +63797,7 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
63759
63797
  value: function json2Node(hoEditorFactoryID, json, rootNodes, pNode, isPaste, isClearSign) {
63760
63798
  // console.log("加载表格", json.rowCount, json.colCount)
63761
63799
  json = this.transType(json);
63762
- var tableProperty = new _TableProperty__WEBPACK_IMPORTED_MODULE_32__/* .TableProperty */ .vE("");
63800
+ var tableProperty = new _TableProperty__WEBPACK_IMPORTED_MODULE_35__/* .TableProperty */ .vE("");
63763
63801
  if (json.tableProperty) {
63764
63802
  var tp = json.tableProperty;
63765
63803
  tableProperty.canAdjustRowHeight = tp["canAdjustRowHeight"] === true || tp["canAdjustRowHeight"] == "true" ? true : false;
@@ -63846,28 +63884,28 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
63846
63884
  var colProperty = colInfo.colProperty;
63847
63885
  if (colProperty) {
63848
63886
  if (colProperty.align) {
63849
- tableNode.colInfos[_i6].colProperty.align = Number(_TableProperty__WEBPACK_IMPORTED_MODULE_32__/* .VAlign */ .TR[colProperty.align]);
63887
+ tableNode.colInfos[_i6].colProperty.align = Number(_TableProperty__WEBPACK_IMPORTED_MODULE_35__/* .VAlign */ .TR[colProperty.align]);
63850
63888
  } else {
63851
- tableNode.colInfos[_i6].colProperty.align = _TableProperty__WEBPACK_IMPORTED_MODULE_32__/* .VAlign */ .TR.vatop;
63889
+ tableNode.colInfos[_i6].colProperty.align = _TableProperty__WEBPACK_IMPORTED_MODULE_35__/* .VAlign */ .TR.vatop;
63852
63890
  }
63853
63891
  if (colProperty.editorProperty) {
63854
- tableNode.colInfos[_i6].colProperty.editorProperty = Number(_TableProperty__WEBPACK_IMPORTED_MODULE_32__/* .EditorProperty */ .YS[colProperty.editorProperty]);
63892
+ tableNode.colInfos[_i6].colProperty.editorProperty = Number(_TableProperty__WEBPACK_IMPORTED_MODULE_35__/* .EditorProperty */ .YS[colProperty.editorProperty]);
63855
63893
  } else {
63856
- tableNode.colInfos[_i6].colProperty.editorProperty = _TableProperty__WEBPACK_IMPORTED_MODULE_32__/* .EditorProperty */ .YS.None;
63894
+ tableNode.colInfos[_i6].colProperty.editorProperty = _TableProperty__WEBPACK_IMPORTED_MODULE_35__/* .EditorProperty */ .YS.None;
63857
63895
  }
63858
63896
  tableNode.colInfos[_i6].colProperty.width = colProperty.width ? Number(colProperty.width) : 0;
63859
63897
  tableNode.colInfos[_i6].colProperty.isSpecifyWidth = colProperty.isSpecifyWidth;
63860
63898
  if (colProperty.downListProperty) {
63861
- tableNode.colInfos[_i6].colProperty.downListProperty = new _TableProperty__WEBPACK_IMPORTED_MODULE_32__/* .ColDownListProperty */ .cW(colProperty.downListProperty);
63899
+ tableNode.colInfos[_i6].colProperty.downListProperty = new _TableProperty__WEBPACK_IMPORTED_MODULE_35__/* .ColDownListProperty */ .cW(colProperty.downListProperty);
63862
63900
  }
63863
63901
  if (colProperty.dateTimeProperty) {
63864
- tableNode.colInfos[_i6].colProperty.dateTimeProperty = new _TableProperty__WEBPACK_IMPORTED_MODULE_32__/* .DateTimeProperty */ .Ks(colProperty.dateTimeProperty);
63902
+ tableNode.colInfos[_i6].colProperty.dateTimeProperty = new _TableProperty__WEBPACK_IMPORTED_MODULE_35__/* .DateTimeProperty */ .Ks(colProperty.dateTimeProperty);
63865
63903
  }
63866
63904
  if (colProperty.numberProperty) {
63867
- tableNode.colInfos[_i6].colProperty.numberProperty = new _TableProperty__WEBPACK_IMPORTED_MODULE_32__/* .NumberProperty */ .Y6(colProperty.numberProperty);
63905
+ tableNode.colInfos[_i6].colProperty.numberProperty = new _TableProperty__WEBPACK_IMPORTED_MODULE_35__/* .NumberProperty */ .Y6(colProperty.numberProperty);
63868
63906
  }
63869
63907
  if (colProperty.signProperty) {
63870
- tableNode.colInfos[_i6].colProperty.signProperty = new _TableProperty__WEBPACK_IMPORTED_MODULE_32__/* .SignProperty */ .q5(colProperty.signProperty);
63908
+ tableNode.colInfos[_i6].colProperty.signProperty = new _TableProperty__WEBPACK_IMPORTED_MODULE_35__/* .SignProperty */ .q5(colProperty.signProperty);
63871
63909
  }
63872
63910
  if (colProperty.customProperties) {
63873
63911
  tableNode.colInfos[_i6].colProperty.customProperties = Array.isArray(colProperty.customProperties.customProperty) ? colProperty.customProperties.customProperty : Array(colProperty.customProperties.customProperty);
@@ -63940,7 +63978,7 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
63940
63978
  var _rowNo = parseInt(_node.rowNo);
63941
63979
  var colNo = parseInt(_node.colNo);
63942
63980
  existMap.set(_rowNo + "-" + colNo, 1);
63943
- aRow = _CellNode__WEBPACK_IMPORTED_MODULE_27__/* .CellNode */ .D.json2Node(hoEditorFactoryID, _node, rootNodes, tableNode, aRow, rowsMap, rows,
63981
+ aRow = _CellNode__WEBPACK_IMPORTED_MODULE_30__/* .CellNode */ .D.json2Node(hoEditorFactoryID, _node, rootNodes, tableNode, aRow, rowsMap, rows,
63944
63982
  //defaultCellProperty,
63945
63983
  isPaste, isClearSign);
63946
63984
  }
@@ -63965,7 +64003,7 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
63965
64003
  value: function isNodeInTable(node) {
63966
64004
  var pNode = node.parentNode;
63967
64005
  while (pNode) {
63968
- if (pNode instanceof _CellNode__WEBPACK_IMPORTED_MODULE_27__/* .CellNode */ .D) {
64006
+ if (pNode instanceof _CellNode__WEBPACK_IMPORTED_MODULE_30__/* .CellNode */ .D) {
63969
64007
  return [true, pNode.table, pNode];
63970
64008
  }
63971
64009
  pNode = pNode.parentNode;
@@ -63975,14 +64013,14 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
63975
64013
  }, {
63976
64014
  key: "getSelectTableRowColInfos",
63977
64015
  value: function getSelectTableRowColInfos(hoEditorFactoryID, range) {
63978
- var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_38__/* .HOEditorFactorys */ .b.instance().getFactory(hoEditorFactoryID);
64016
+ var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_41__/* .HOEditorFactorys */ .b.instance().getFactory(hoEditorFactoryID);
63979
64017
  var aRange = range.normalize();
63980
64018
  var np1 = hoEditorFactory.docTree.findNodePositionByPath(aRange.startPath);
63981
64019
  var np2 = hoEditorFactory.docTree.findNodePositionByPath(aRange.endPath);
63982
64020
  if (np1 && np1.node && np2 && np2.node) {
63983
64021
  var cell1 = hoEditorFactory.docTree.getParentRectNode(np1.node);
63984
64022
  var cell2 = hoEditorFactory.docTree.getParentRectNode(np2.node);
63985
- if (!(cell1 instanceof _CellNode__WEBPACK_IMPORTED_MODULE_27__/* .CellNode */ .D) || !(cell2 instanceof _CellNode__WEBPACK_IMPORTED_MODULE_27__/* .CellNode */ .D) || cell1.table !== cell2.table) {
64023
+ if (!(cell1 instanceof _CellNode__WEBPACK_IMPORTED_MODULE_30__/* .CellNode */ .D) || !(cell2 instanceof _CellNode__WEBPACK_IMPORTED_MODULE_30__/* .CellNode */ .D) || cell1.table !== cell2.table) {
63986
64024
  return [null, -1, -1, -1, -1];
63987
64025
  }
63988
64026
  var _cell1$table$getCellI = cell1.table.getCellInfos(cell1),
@@ -63999,7 +64037,7 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
63999
64037
  }
64000
64038
  }]);
64001
64039
  return TableNode;
64002
- }(_RectNode__WEBPACK_IMPORTED_MODULE_30__/* .RectNode */ .z);
64040
+ }(_RectNode__WEBPACK_IMPORTED_MODULE_33__/* .RectNode */ .z);
64003
64041
 
64004
64042
  /***/ }),
64005
64043
 
@@ -70567,17 +70605,23 @@ var PagePaintPosition = /*#__PURE__*/function () {
70567
70605
  /* harmony import */ var core_js_modules_es_array_push_js__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_push_js__WEBPACK_IMPORTED_MODULE_4__);
70568
70606
  /* harmony import */ var core_js_modules_es_array_concat_js__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(92222);
70569
70607
  /* harmony import */ var core_js_modules_es_array_concat_js__WEBPACK_IMPORTED_MODULE_5___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_concat_js__WEBPACK_IMPORTED_MODULE_5__);
70570
- /* harmony import */ var core_js_modules_es_error_cause_js__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(21703);
70571
- /* harmony import */ var core_js_modules_es_error_cause_js__WEBPACK_IMPORTED_MODULE_6___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_error_cause_js__WEBPACK_IMPORTED_MODULE_6__);
70572
- /* harmony import */ var _StagePosition__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(63074);
70573
- /* harmony import */ var _dom_NodePosition__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(42921);
70574
- /* harmony import */ var _drawNode_DrawTable__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(74298);
70575
- /* harmony import */ var _dom_DomRange__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(94639);
70576
- /* harmony import */ var _dom_treeNode_CellNode__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(68598);
70577
- /* harmony import */ var _dom_treeNode_TableNode__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(5010);
70578
- /* harmony import */ var _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(74089);
70579
- /* harmony import */ var _dom_treeNode_TextNode__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(27198);
70580
- /* harmony import */ var _drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(51760);
70608
+ /* harmony import */ var core_js_modules_es_function_name_js__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(68309);
70609
+ /* harmony import */ var core_js_modules_es_function_name_js__WEBPACK_IMPORTED_MODULE_6___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_function_name_js__WEBPACK_IMPORTED_MODULE_6__);
70610
+ /* harmony import */ var core_js_modules_es_array_splice_js__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(40561);
70611
+ /* harmony import */ var core_js_modules_es_array_splice_js__WEBPACK_IMPORTED_MODULE_7___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_splice_js__WEBPACK_IMPORTED_MODULE_7__);
70612
+ /* harmony import */ var core_js_modules_es_error_cause_js__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(21703);
70613
+ /* harmony import */ var core_js_modules_es_error_cause_js__WEBPACK_IMPORTED_MODULE_8___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_error_cause_js__WEBPACK_IMPORTED_MODULE_8__);
70614
+ /* harmony import */ var _StagePosition__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(63074);
70615
+ /* harmony import */ var _dom_NodePosition__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(42921);
70616
+ /* harmony import */ var _drawNode_DrawTable__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(74298);
70617
+ /* harmony import */ var _dom_DomRange__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(94639);
70618
+ /* harmony import */ var _dom_treeNode_CellNode__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(68598);
70619
+ /* harmony import */ var _dom_treeNode_TableNode__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(5010);
70620
+ /* harmony import */ var _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(74089);
70621
+ /* harmony import */ var _dom_treeNode_TextNode__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(27198);
70622
+ /* harmony import */ var _drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(51760);
70623
+
70624
+
70581
70625
 
70582
70626
 
70583
70627
 
@@ -70625,13 +70669,13 @@ var SelectRange = /*#__PURE__*/function () {
70625
70669
  key: "getRangeDrawLines",
70626
70670
  value: function getRangeDrawLines(startPath, endPath, bSelectAllParagraphLine, bIsDelete) {
70627
70671
  var ret = new Array();
70628
- var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_13__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID);
70672
+ var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_15__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID);
70629
70673
  if (bSelectAllParagraphLine) {
70630
70674
  var paraInfos = hoEditorFactory.docTree.getPathParagraphLastPath(endPath);
70631
70675
  var paraEndPath = paraInfos[1];
70632
70676
  endPath = paraEndPath;
70633
70677
  }
70634
- var aRange = new _dom_DomRange__WEBPACK_IMPORTED_MODULE_10__/* .DomRange */ .a(this._hoEditorFactoryID, startPath, endPath).normalize();
70678
+ var aRange = new _dom_DomRange__WEBPACK_IMPORTED_MODULE_12__/* .DomRange */ .a(this._hoEditorFactoryID, startPath, endPath).normalize();
70635
70679
  var aline = hoEditorFactory.drawTree.getDlineDTableByPath(aRange.startPath);
70636
70680
  if (!aline) {
70637
70681
  return ret;
@@ -70639,10 +70683,10 @@ var SelectRange = /*#__PURE__*/function () {
70639
70683
  var aendLine = hoEditorFactory.drawTree.getDlineDTableByPath(aRange.endPath);
70640
70684
  //const startParent = aline.paragraphNode.parentNode;
70641
70685
  //const endParent = aendLine ? aendLine.paragraphNode.parentNode : null;
70642
- var inSameRect = _dom_NodePosition__WEBPACK_IMPORTED_MODULE_8__/* .NodePosition */ .F.pathInSameRect(this._hoEditorFactoryID, aRange.startPath, aRange.endPath);
70686
+ var inSameRect = _dom_NodePosition__WEBPACK_IMPORTED_MODULE_10__/* .NodePosition */ .F.pathInSameRect(this._hoEditorFactoryID, aRange.startPath, aRange.endPath);
70643
70687
  while (aline) {
70644
70688
  var pNode = aline.paragraphNode.parentNode;
70645
- if (pNode && pNode instanceof _dom_treeNode_CellNode__WEBPACK_IMPORTED_MODULE_11__/* .CellNode */ .D && !inSameRect) {
70689
+ if (pNode && pNode instanceof _dom_treeNode_CellNode__WEBPACK_IMPORTED_MODULE_13__/* .CellNode */ .D && !inSameRect) {
70646
70690
  var aTable = pNode.table;
70647
70691
  ret = ret.concat(SelectRange.getTableSelectDrawLine(aTable, aRange, true));
70648
70692
  if (ret.indexOf(aendLine) >= 0) {
@@ -70650,7 +70694,7 @@ var SelectRange = /*#__PURE__*/function () {
70650
70694
  }
70651
70695
  aline = pNode.table.drawTable;
70652
70696
  } else {
70653
- if (aline instanceof _drawNode_DrawTable__WEBPACK_IMPORTED_MODULE_9__/* .DrawTable */ .t) {
70697
+ if (aline instanceof _drawNode_DrawTable__WEBPACK_IMPORTED_MODULE_11__/* .DrawTable */ .t) {
70654
70698
  ret = ret.concat(SelectRange.getTableSelectDrawLine(aline.table, aRange, true));
70655
70699
  } else {
70656
70700
  ret.push(aline);
@@ -70661,7 +70705,7 @@ var SelectRange = /*#__PURE__*/function () {
70661
70705
  var paraNode = null;
70662
70706
  paraNode = hoEditorFactory.docTree.getSameRectNextParanode(aline.paragraphNode);
70663
70707
  //2024 - 02 - 01 处理隐藏段落导致绘制异常
70664
- while (hoEditorFactory.drawTree.paintStatus != _drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_15__/* .PaintState */ .Dh.psDesign && !bIsDelete && paraNode && paraNode.customProperty.hidden == "true") {
70708
+ while (hoEditorFactory.drawTree.paintStatus != _drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_17__/* .PaintState */ .Dh.psDesign && !bIsDelete && paraNode && paraNode.customProperty.hidden == "true") {
70665
70709
  paraNode = hoEditorFactory.docTree.getSameRectNextParanode(paraNode);
70666
70710
  }
70667
70711
  if (paraNode) {
@@ -70682,21 +70726,21 @@ var SelectRange = /*#__PURE__*/function () {
70682
70726
  key: "getRangeDrawTreeLines",
70683
70727
  value: function getRangeDrawTreeLines(startPath, endPath) {
70684
70728
  var ret = new Array();
70685
- var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_13__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID);
70729
+ var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_15__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID);
70686
70730
  var paraInfos = hoEditorFactory.docTree.getPathParagraphLastPath(endPath);
70687
70731
  var paraEndPath = paraInfos[1];
70688
70732
  endPath = paraEndPath;
70689
- var aRange = new _dom_DomRange__WEBPACK_IMPORTED_MODULE_10__/* .DomRange */ .a(this._hoEditorFactoryID, startPath, endPath).normalize();
70733
+ var aRange = new _dom_DomRange__WEBPACK_IMPORTED_MODULE_12__/* .DomRange */ .a(this._hoEditorFactoryID, startPath, endPath).normalize();
70690
70734
  if (!aRange.npStart.node || !aRange.npEnd.node) {
70691
70735
  return ret;
70692
70736
  }
70693
- var bInSameRect = _dom_NodePosition__WEBPACK_IMPORTED_MODULE_8__/* .NodePosition */ .F.pathInSameRect(this._hoEditorFactoryID, aRange.startPath, aRange.endPath);
70694
- var _TableNode$isNodeInTa = _dom_treeNode_TableNode__WEBPACK_IMPORTED_MODULE_12__/* .TableNode */ .Fh.isNodeInTable(aRange.npStart.node),
70737
+ var bInSameRect = _dom_NodePosition__WEBPACK_IMPORTED_MODULE_10__/* .NodePosition */ .F.pathInSameRect(this._hoEditorFactoryID, aRange.startPath, aRange.endPath);
70738
+ var _TableNode$isNodeInTa = _dom_treeNode_TableNode__WEBPACK_IMPORTED_MODULE_14__/* .TableNode */ .Fh.isNodeInTable(aRange.npStart.node),
70695
70739
  _TableNode$isNodeInTa2 = (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z)(_TableNode$isNodeInTa, 3),
70696
70740
  bstartInTable = _TableNode$isNodeInTa2[0],
70697
70741
  astartTable = _TableNode$isNodeInTa2[1],
70698
70742
  startCell = _TableNode$isNodeInTa2[2];
70699
- var _TableNode$isNodeInTa3 = _dom_treeNode_TableNode__WEBPACK_IMPORTED_MODULE_12__/* .TableNode */ .Fh.isNodeInTable(aRange.npEnd.node),
70743
+ var _TableNode$isNodeInTa3 = _dom_treeNode_TableNode__WEBPACK_IMPORTED_MODULE_14__/* .TableNode */ .Fh.isNodeInTable(aRange.npEnd.node),
70700
70744
  _TableNode$isNodeInTa4 = (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z)(_TableNode$isNodeInTa3, 3),
70701
70745
  bEndInTable = _TableNode$isNodeInTa4[0],
70702
70746
  aendTable = _TableNode$isNodeInTa4[1],
@@ -70721,7 +70765,7 @@ var SelectRange = /*#__PURE__*/function () {
70721
70765
  if (!aline) {
70722
70766
  return ret;
70723
70767
  }
70724
- if (endNode instanceof _dom_treeNode_TextNode__WEBPACK_IMPORTED_MODULE_14__/* .TextNode */ .R && hoEditorFactory.docTree.styles[endNode.styleIndex].combineStyle.deleterIndex >= 0) {
70768
+ if (endNode instanceof _dom_treeNode_TextNode__WEBPACK_IMPORTED_MODULE_16__/* .TextNode */ .R && hoEditorFactory.docTree.styles[endNode.styleIndex].combineStyle.deleterIndex >= 0) {
70725
70769
  return [aline];
70726
70770
  }
70727
70771
  var aendLine = hoEditorFactory.drawTree.getDlineDTableByPath(hoEditorFactory.docTree.getNodeLastPath(endNode));
@@ -70764,16 +70808,30 @@ var SelectRange = /*#__PURE__*/function () {
70764
70808
  var pages = [];
70765
70809
  if (SelectRange.shapes.length > 0) {
70766
70810
  for (var i = 0; i < SelectRange.shapes.length; i++) {
70767
- var aPage = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_13__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID).drawPageTree.getDrawPageBySelectContainer(SelectRange.shapes[i].parent);
70811
+ var shape = SelectRange.shapes[i];
70812
+ var aPage = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_15__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID).drawPageTree.getDrawPageBySelectContainer(shape.parent);
70768
70813
  if (aPage) {
70814
+ //aPage.selectContainer.removeAllChildren();
70769
70815
  aPage.selectContainer.removeChild(SelectRange.shapes[i]);
70770
- //aPage.selectContainer.removeChild(SelectRange.shapes[i]);
70771
- if (pages.indexOf(aPage)) {
70816
+ if (pages.indexOf(aPage) === -1) {
70772
70817
  pages.push(aPage);
70773
70818
  }
70774
70819
  }
70775
70820
  }
70776
70821
  SelectRange.shapes.length = 0;
70822
+ } else {
70823
+ var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_15__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID);
70824
+ var dPage = hoEditorFactory.drawTree.activePage;
70825
+ if (dPage) {
70826
+ var children = dPage.selectContainer.children;
70827
+ for (var j = children.length - 1; j >= 0; j--) {
70828
+ var child = children[j];
70829
+ if (child && child.name && child.name === "select") {
70830
+ children.splice(j, 1);
70831
+ }
70832
+ }
70833
+ pages.push(dPage);
70834
+ }
70777
70835
  }
70778
70836
  for (var _i = 0; _i < pages.length; _i++) {
70779
70837
  var page = pages[_i];
@@ -70786,7 +70844,7 @@ var SelectRange = /*#__PURE__*/function () {
70786
70844
  var pages = [];
70787
70845
  if (SelectRange.customShapes.length > 0) {
70788
70846
  for (var i = 0; i < SelectRange.customShapes.length; i++) {
70789
- var aPage = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_13__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID).drawPageTree.getDrawPageBySelectContainer(SelectRange.customShapes[i].parent);
70847
+ var aPage = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_15__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID).drawPageTree.getDrawPageBySelectContainer(SelectRange.customShapes[i].parent);
70790
70848
  if (aPage) {
70791
70849
  aPage.selectContainer.removeChild(SelectRange.customShapes[i]);
70792
70850
  if (pages.indexOf(aPage)) {
@@ -70809,12 +70867,12 @@ var SelectRange = /*#__PURE__*/function () {
70809
70867
  }, {
70810
70868
  key: "normalize",
70811
70869
  value: function normalize() {
70812
- if (!_dom_NodePosition__WEBPACK_IMPORTED_MODULE_8__/* .NodePosition */ .F.pathCanCompare(this._spStart.path, this._spEnd.path)) {
70870
+ if (!_dom_NodePosition__WEBPACK_IMPORTED_MODULE_10__/* .NodePosition */ .F.pathCanCompare(this._spStart.path, this._spEnd.path)) {
70813
70871
  throw new Error("\u65E0\u6CD5\u8FDB\u884C\u4F4D\u7F6E\u6BD4\u8F83".concat(this._spStart.path, ",").concat(this._spEnd.path));
70814
70872
  }
70815
- if (_dom_NodePosition__WEBPACK_IMPORTED_MODULE_8__/* .NodePosition */ .F.treePathCompare(this._spStart.path, this._spEnd.path) > 0) {
70816
- var aEnd = new _StagePosition__WEBPACK_IMPORTED_MODULE_7__/* .StagePosition */ .M(this._hoEditorFactoryID, this._spStart.page, this._spStart.dline, this._spStart.index, this._spStart.path);
70817
- var aStart = new _StagePosition__WEBPACK_IMPORTED_MODULE_7__/* .StagePosition */ .M(this._hoEditorFactoryID, this._spEnd.page, this._spEnd.dline, this._spEnd.index, this._spEnd.path);
70873
+ if (_dom_NodePosition__WEBPACK_IMPORTED_MODULE_10__/* .NodePosition */ .F.treePathCompare(this._spStart.path, this._spEnd.path) > 0) {
70874
+ var aEnd = new _StagePosition__WEBPACK_IMPORTED_MODULE_9__/* .StagePosition */ .M(this._hoEditorFactoryID, this._spStart.page, this._spStart.dline, this._spStart.index, this._spStart.path);
70875
+ var aStart = new _StagePosition__WEBPACK_IMPORTED_MODULE_9__/* .StagePosition */ .M(this._hoEditorFactoryID, this._spEnd.page, this._spEnd.dline, this._spEnd.index, this._spEnd.path);
70818
70876
  var ret = new SelectRange(this._hoEditorFactoryID);
70819
70877
  ret._beginRangeSelect = this._beginRangeSelect;
70820
70878
  ret._spStart = aStart;
@@ -70859,8 +70917,8 @@ var SelectRange = /*#__PURE__*/function () {
70859
70917
  value: function clone() {
70860
70918
  var ret = new SelectRange(this._hoEditorFactoryID);
70861
70919
  ret._beginRangeSelect = this._beginRangeSelect;
70862
- ret._spStart = new _StagePosition__WEBPACK_IMPORTED_MODULE_7__/* .StagePosition */ .M(this._hoEditorFactoryID, this._spStart.page, this._spStart.dline, this._spStart.index, this._spStart.path);
70863
- ret._spEnd = new _StagePosition__WEBPACK_IMPORTED_MODULE_7__/* .StagePosition */ .M(this._hoEditorFactoryID, this._spEnd.page, this._spEnd.dline, this._spEnd.index, this._spEnd.path);
70920
+ ret._spStart = new _StagePosition__WEBPACK_IMPORTED_MODULE_9__/* .StagePosition */ .M(this._hoEditorFactoryID, this._spStart.page, this._spStart.dline, this._spStart.index, this._spStart.path);
70921
+ ret._spEnd = new _StagePosition__WEBPACK_IMPORTED_MODULE_9__/* .StagePosition */ .M(this._hoEditorFactoryID, this._spEnd.page, this._spEnd.dline, this._spEnd.index, this._spEnd.path);
70864
70922
  return ret;
70865
70923
  }
70866
70924
  }], [{
@@ -82507,6 +82565,8 @@ var es_json_stringify = __webpack_require__(38862);
82507
82565
  var es_string_starts_with = __webpack_require__(23157);
82508
82566
  // EXTERNAL MODULE: ./node_modules/core-js/modules/es.regexp.to-string.js
82509
82567
  var es_regexp_to_string = __webpack_require__(39714);
82568
+ // EXTERNAL MODULE: ./node_modules/core-js/modules/es.function.name.js
82569
+ var es_function_name = __webpack_require__(68309);
82510
82570
  // EXTERNAL MODULE: ./src/yuki-createjs/index.ts
82511
82571
  var yuki_createjs = __webpack_require__(38205);
82512
82572
  // EXTERNAL MODULE: ./src/editor/dom/DocTree.ts
@@ -83804,6 +83864,7 @@ var UserHistory = __webpack_require__(48458);
83804
83864
 
83805
83865
 
83806
83866
 
83867
+
83807
83868
 
83808
83869
 
83809
83870
  //当前的显示状态,psDesign为设计状态,psEdit为正常编辑状态 psPreview为打印预览态态 psPrint 正在打印状态, psReview审阅状态
@@ -87033,6 +87094,7 @@ var DrawTree = /*#__PURE__*/function () {
87033
87094
  // } else {
87034
87095
  if (dPage && dPage.selectContainer) {
87035
87096
  var shape = new DrawSelect(this._hoEditorFactoryID, dPage.pageIndex, dnextDline, left, right, bInSameRect, aRange.spStart.dline.paragraphNode.parentNode, aRange.spEnd.dline.paragraphNode.parentNode, "blue");
87097
+ shape.name = "select";
87036
87098
  shape.alpha = 0.5;
87037
87099
  dPage.selectContainer.addChild(shape);
87038
87100
  if (dPages.indexOf(dPage) < 0) {
@@ -87142,6 +87204,7 @@ var DrawTree = /*#__PURE__*/function () {
87142
87204
  var color = hoeditorfacotry.option.getColorByLevel(15);
87143
87205
  if (dPage && dPage.selectContainer) {
87144
87206
  var shape = new DrawSelect(this._hoEditorFactoryID, dPage.pageIndex, dnextDline, left, right, bInSameRect, aRange.spStart.dline.paragraphNode.parentNode, aRange.spEnd.dline.paragraphNode.parentNode, color, true);
87207
+ //shape.name = "select";
87145
87208
  //shape.alpha = 0.3;
87146
87209
  dPage.selectContainer.addChild(shape);
87147
87210
  if (dPages.indexOf(dPage) < 0) {
@@ -168946,7 +169009,7 @@ var map = {
168946
169009
  "./specialChars/HoSpecialChars.vue": 71361,
168947
169010
  "./table/TableCellPoper.vue": 97628,
168948
169011
  "./table/TableCellPoper1.vue": 44645,
168949
- "./table/TableCellProperty.vue": 83316,
169012
+ "./table/TableCellProperty.vue": 90546,
168950
169013
  "./table/TableColProperty.vue": 15417,
168951
169014
  "./table/TableForm.vue": 79036,
168952
169015
  "./table/TableFormTree.vue": 84804,
@@ -206264,7 +206327,7 @@ Input.install = function (Vue) {
206264
206327
 
206265
206328
 
206266
206329
  /* harmony default export */ var antd = ([es_button, input, input_number, es_checkbox, date_picker, time_picker, es_radio, es_select, es_tabs, es_dropdown, es_menu, es_upload, tooltip, table, popover, es_icon/* default */.Z, config_provider]);
206267
- ;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/HoDocs.vue?vue&type=template&id=643185d5&
206330
+ ;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/HoDocs.vue?vue&type=template&id=2055fa91&
206268
206331
  var render = function render() {
206269
206332
  var _vm = this,
206270
206333
  _c = _vm._self._c;
@@ -209582,7 +209645,7 @@ var TextNode = __webpack_require__(27198);
209582
209645
  // EXTERNAL MODULE: ./src/editor/dom/treeNode/ParagraphNode.ts
209583
209646
  var ParagraphNode = __webpack_require__(67945);
209584
209647
  ;// CONCATENATED MODULE: ./src/components/version.ts
209585
- /* harmony default export */ var version = ('3.1.108');
209648
+ /* harmony default export */ var version = ('3.1.110');
209586
209649
  // EXTERNAL MODULE: ./src/components/controls/poperTipText/PoperTipText.vue + 5 modules
209587
209650
  var PoperTipText = __webpack_require__(50987);
209588
209651
  ;// CONCATENATED MODULE: ./src/components/controls/poperTipText/index.ts
@@ -219645,7 +219708,7 @@ var VueController = /*#__PURE__*/function () {
219645
219708
  key: "hiddenMask",
219646
219709
  value: function () {
219647
219710
  var _hiddenMask = (0,asyncToGenerator/* default */.Z)( /*#__PURE__*/(0,regeneratorRuntime/* default */.Z)().mark(function _callee(isHidden) {
219648
- var hoEditorFactory, i, drawPage, children, j, superiorSign, signNode, _this$getAllSignNodeL, bce01List, curArea, actualHeight, pageWidth, pageHeight, curPageIndex, pageCount, paintMask, _yield$this$getPreEmp, _yield$this$getPreEmp2, isExist, pSignArr, drawNode, dline, stagePt, localPt, arrs, g, pSign, pDrawNode, pArea, pageIndex, pline, stagePt1, localPt1, start, h, n, k, _k, t, arr, _h, parr, _k2, sarr, _n, _k3, _k4, _i, _i2;
219711
+ var hoEditorFactory, i, drawPage, children, j, superiorSign, signNode, _this$getAllSignNodeL, bce01List, patientSign, hasPatientSign, curArea, actualHeight, pageWidth, pageHeight, curPageIndex, pageCount, paintMask, _yield$this$getPreEmp, _yield$this$getPreEmp2, isExist, pSignArr, drawNode, dline, stagePt, localPt, arrs, g, pSign, pDrawNode, pArea, pageIndex, pline, stagePt1, localPt1, start, h, n, k, _k, t, arr, _h, parr, _k2, sarr, _n, _k3, _k4, _i, _i2;
219649
219712
  return (0,regeneratorRuntime/* default */.Z)().wrap(function _callee$(_context) {
219650
219713
  while (1) switch (_context.prev = _context.next) {
219651
219714
  case 0:
@@ -219664,27 +219727,30 @@ var VueController = /*#__PURE__*/function () {
219664
219727
  }
219665
219728
  hoEditorFactory.drawPageTree.updateDrawPage(i);
219666
219729
  }
219667
- _context.next = 60;
219730
+ _context.next = 61;
219668
219731
  break;
219669
219732
  case 5:
219670
219733
  superiorSign = hoEditorFactory.structureConvert._superiorSign;
219671
219734
  signNode = superiorSign[0];
219672
219735
  if (!(hoEditorFactory.forbidEditBeforeSign && hoEditorFactory.reviewMode)) {
219673
- _context.next = 12;
219736
+ _context.next = 13;
219674
219737
  break;
219675
219738
  }
219676
- _this$getAllSignNodeL = this.getAllSignNodeList(hoEditorFactory.userInfo.id), bce01List = _this$getAllSignNodeL.bce01List;
219677
- if (bce01List.length) {
219678
- _context.next = 12;
219739
+ _this$getAllSignNodeL = this.getAllSignNodeList(hoEditorFactory.userInfo.id), bce01List = _this$getAllSignNodeL.bce01List, patientSign = _this$getAllSignNodeL.patientSign;
219740
+ hasPatientSign = patientSign.filter(function (v) {
219741
+ return v.signed;
219742
+ }).length > 0;
219743
+ if (!(!bce01List.length && !hasPatientSign)) {
219744
+ _context.next = 13;
219679
219745
  break;
219680
219746
  }
219681
219747
  this.hiddenMask(true);
219682
219748
  return _context.abrupt("return");
219683
- case 12:
219749
+ case 13:
219684
219750
  curArea = hoEditorFactory.drawPageTree.getMainRootArea(signNode.drawNodes[0]);
219685
219751
  actualHeight = hoEditorFactory.drawPageTree.drawHeaders[0].displayHeight;
219686
219752
  if (!(curArea && curArea instanceof DrawPageMainDoc/* DrawPageMainDoc */.$)) {
219687
- _context.next = 60;
219753
+ _context.next = 61;
219688
219754
  break;
219689
219755
  }
219690
219756
  pageWidth = hoEditorFactory.pageProperty.widthPixes + 1;
@@ -219720,9 +219786,9 @@ var VueController = /*#__PURE__*/function () {
219720
219786
  selectContainer.addChild(mask);
219721
219787
  hoEditorFactory.drawPageTree.updateDrawPage(index);
219722
219788
  };
219723
- _context.next = 22;
219789
+ _context.next = 23;
219724
219790
  return this.getPreEmptySign(signNode);
219725
- case 22:
219791
+ case 23:
219726
219792
  _yield$this$getPreEmp = _context.sent;
219727
219793
  _yield$this$getPreEmp2 = (0,esm_slicedToArray/* default */.Z)(_yield$this$getPreEmp, 2);
219728
219794
  isExist = _yield$this$getPreEmp2[0];
@@ -219735,21 +219801,21 @@ var VueController = /*#__PURE__*/function () {
219735
219801
  localPt = curArea.globalToLocal(stagePt.x, stagePt.y);
219736
219802
  superiorSign[2] = localPt.y - hoEditorFactory.signHeight;
219737
219803
  if (!isExist) {
219738
- _context.next = 59;
219804
+ _context.next = 60;
219739
219805
  break;
219740
219806
  }
219741
219807
  arrs = [];
219742
219808
  g = 0;
219743
- case 35:
219809
+ case 36:
219744
219810
  if (!(g < pSignArr.length)) {
219745
- _context.next = 54;
219811
+ _context.next = 55;
219746
219812
  break;
219747
219813
  }
219748
219814
  pSign = pSignArr[g];
219749
219815
  pDrawNode = pSign.drawNodes[0];
219750
219816
  pArea = hoEditorFactory.drawPageTree.getMainRootArea(pDrawNode);
219751
219817
  if (!(pArea && pArea instanceof DrawPageMainDoc/* DrawPageMainDoc */.$)) {
219752
- _context.next = 51;
219818
+ _context.next = 52;
219753
219819
  break;
219754
219820
  }
219755
219821
  pageIndex = pArea.pageIndex;
@@ -219758,7 +219824,7 @@ var VueController = /*#__PURE__*/function () {
219758
219824
  localPt1 = pArea.globalToLocal(stagePt1.x, stagePt1.y);
219759
219825
  start = localPt1.y;
219760
219826
  if (!(pSignArr.length === 1)) {
219761
- _context.next = 50;
219827
+ _context.next = 51;
219762
219828
  break;
219763
219829
  }
219764
219830
  for (h = 0; h < pageIndex; h++) {
@@ -219788,13 +219854,13 @@ var VueController = /*#__PURE__*/function () {
219788
219854
  }
219789
219855
  }
219790
219856
  return _context.abrupt("return");
219791
- case 50:
219792
- arrs.push([pageIndex, start]);
219793
219857
  case 51:
219858
+ arrs.push([pageIndex, start]);
219859
+ case 52:
219794
219860
  g++;
219795
- _context.next = 35;
219861
+ _context.next = 36;
219796
219862
  break;
219797
- case 54:
219863
+ case 55:
219798
219864
  for (t = 0; t < arrs.length; t++) {
219799
219865
  arr = arrs[t];
219800
219866
  if (t === 0) {
@@ -219838,9 +219904,9 @@ var VueController = /*#__PURE__*/function () {
219838
219904
  paintMask(curPageIndex, localPt.y + actualHeight - hoEditorFactory.signHeight);
219839
219905
  }
219840
219906
  }
219841
- _context.next = 60;
219907
+ _context.next = 61;
219842
219908
  break;
219843
- case 59:
219909
+ case 60:
219844
219910
  if (hoEditorFactory.lockContent) {
219845
219911
  for (_i = 0; _i < pageCount; _i++) {
219846
219912
  //给前面的页画遮罩层
@@ -219856,7 +219922,7 @@ var VueController = /*#__PURE__*/function () {
219856
219922
  //画当前页的遮罩层
219857
219923
  paintMask(curPageIndex, localPt.y + actualHeight - hoEditorFactory.signHeight);
219858
219924
  }
219859
- case 60:
219925
+ case 61:
219860
219926
  case "end":
219861
219927
  return _context.stop();
219862
219928
  }
@@ -219877,7 +219943,7 @@ var VueController = /*#__PURE__*/function () {
219877
219943
  var iteratesNodes = function iteratesNodes(nodes) {
219878
219944
  for (var i = 0; i < nodes.length; i++) {
219879
219945
  var anode = nodes[i];
219880
- if (anode instanceof SignNode/* SignNode */.N && anode.imgSrc === "") {
219946
+ if (anode instanceof SignNode/* SignNode */.N && anode.imgSrc === "" && anode.fingerPrintSrc === "") {
219881
219947
  if (hoEditorFactory.lockContent && anode.attribute == 1) {
219882
219948
  mark = true;
219883
219949
  signArr.push(anode);
@@ -220098,6 +220164,9 @@ var VueController = /*#__PURE__*/function () {
220098
220164
  var paragraphNode = new ParagraphNode/* ParagraphNode */.C(this._hoEditorFactoryID, npStart.roots, npStart.node.parentNode, hoEditorFactory.docTree.curParaNo);
220099
220165
  nodes.push(paragraphNode);
220100
220166
  }
220167
+ } else if (isAppentText) {
220168
+ var _paragraphNode = new ParagraphNode/* ParagraphNode */.C(this._hoEditorFactoryID, npStart.roots, npStart.node.parentNode, hoEditorFactory.docTree.curParaNo);
220169
+ nodes.push(_paragraphNode);
220101
220170
  }
220102
220171
  }
220103
220172
  hoEditorFactory.docController.parseNodeData(nodes);
@@ -221044,9 +221113,9 @@ var VueController = /*#__PURE__*/function () {
221044
221113
  var dFooter = new DrawFooter/* DrawFooter */.d(this._hoEditorFactoryID, _arootPath, pageCount);
221045
221114
  hoEditorFactory.drawPageTree.drawFooters.push(dFooter);
221046
221115
  hoEditorFactory.drawTree.footerDNodes.push(new Array());
221047
- var _paragraphNode = new ParagraphNode/* ParagraphNode */.C(this._hoEditorFactoryID, arrNodes, null, 0);
221048
- arrNodes.push(_paragraphNode);
221049
- _paragraphNode.rootPath = _arootPath;
221116
+ var _paragraphNode2 = new ParagraphNode/* ParagraphNode */.C(this._hoEditorFactoryID, arrNodes, null, 0);
221117
+ arrNodes.push(_paragraphNode2);
221118
+ _paragraphNode2.rootPath = _arootPath;
221050
221119
  //paragraphNode.rootNodes = arrNodes;
221051
221120
  var newFooter = new SubDocManger/* SubDocTree */.UJ(pageCount, '');
221052
221121
  newFooter.subDocNodes = arrNodes;
@@ -225065,7 +225134,8 @@ var VueController = /*#__PURE__*/function () {
225065
225134
  backColor: 'transparent',
225066
225135
  editorProperty: TableProperty/* EditorProperty */.YS.None,
225067
225136
  downListProperty: '',
225068
- dateTimeProperty: ''
225137
+ dateTimeProperty: '',
225138
+ formula: ''
225069
225139
  };
225070
225140
  var _defaultCellPropJson = JSON.parse(JSON.stringify(defaultCellProp));
225071
225141
  //处理单元格
@@ -225183,7 +225253,8 @@ var VueController = /*#__PURE__*/function () {
225183
225253
  editorProperty: node.cellProperty.editorProperty,
225184
225254
  downListProperty: node.cellProperty.downListProperty,
225185
225255
  dateTimeProperty: node.cellProperty.dateTimeProperty,
225186
- diagonalType: node.cellProperty.diagonalType
225256
+ diagonalType: node.cellProperty.diagonalType,
225257
+ formula: node.cellProperty.formula
225187
225258
  };
225188
225259
  var cellPropertyJson = JSON.parse(JSON.stringify(cellProperty));
225189
225260
  var _keysName = Object.keys(defaultCellPropJson);
@@ -226025,14 +226096,14 @@ var VueController = /*#__PURE__*/function () {
226025
226096
  _cell.childNodes.push(textNode);
226026
226097
  } else {
226027
226098
  if (_cell.cellProperty.editorProperty === TableProperty/* EditorProperty */.YS.Formula) {
226028
- var formulaStr = _cell.cellProperty.formula.formulaStr;
226099
+ var formulaStr = _cell.cellProperty.formula;
226029
226100
  var result = this.clacFormula(_cell, formulaStr);
226030
226101
  if (result !== "") {
226031
226102
  _cell.childNodes.splice(1, _cell.childNodes.length);
226032
226103
  var _textNode = new TextNode/* TextNode */.R(this._hoEditorFactoryID, table.rootNodes, _cell, BaseNode/* NodeType */.Jq.ntText, result, _cell.childNodes[0].styleIndex);
226033
226104
  _cell.drawCell.needUpdate = true;
226034
226105
  _cell.childNodes.push(_textNode);
226035
- _cell.cellProperty.formula.oldValue = result;
226106
+ _cell.cellProperty.oldValue = result;
226036
226107
  }
226037
226108
  }
226038
226109
  }
@@ -226067,8 +226138,9 @@ var VueController = /*#__PURE__*/function () {
226067
226138
  _hoEditorFactory$unit2 = (0,esm_slicedToArray/* default */.Z)(_hoEditorFactory$unit, 2),
226068
226139
  r = _hoEditorFactory$unit2[0],
226069
226140
  c = _hoEditorFactory$unit2[1];
226070
- if (r >= 0 && c >= 0 && r < table.rowCount && c < table.colCount) {
226071
- var strValue = cell.getCellText();
226141
+ var acell = table.rows[r][c];
226142
+ if (r >= 0 && c >= 0 && r < table.rowCount && c < table.colCount && acell) {
226143
+ var strValue = acell.getCellText();
226072
226144
  var ivalue = Number(strValue === "" ? '0' : strValue);
226073
226145
  if (!isNaN(ivalue)) {
226074
226146
  value[i] = strValue;
@@ -226122,9 +226194,9 @@ var VueController = /*#__PURE__*/function () {
226122
226194
  var textNode = new TextNode/* TextNode */.R(_this13._hoEditorFactoryID, cell.table.rootNodes, cell, BaseNode/* NodeType */.Jq.ntText, text, newIndex);
226123
226195
  cell.childNodes.push(textNode);
226124
226196
  };
226125
- if (text !== cell.cellProperty.formula.oldValue) {
226197
+ if (text !== cell.cellProperty.oldValue) {
226126
226198
  repaint(1);
226127
- } else if (cell.cellProperty.formula.oldValue !== "") {
226199
+ } else if (cell.cellProperty.oldValue !== "") {
226128
226200
  repaint(2);
226129
226201
  }
226130
226202
  cell.drawCell.needUpdate = true;
@@ -241150,10 +241222,10 @@ var commondata = __webpack_require__(76285);
241150
241222
  });
241151
241223
  ;// CONCATENATED MODULE: ./src/components/HoDocs.vue?vue&type=script&lang=js&
241152
241224
  /* harmony default export */ var components_HoDocsvue_type_script_lang_js_ = (HoDocsvue_type_script_lang_js_);
241153
- ;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-32.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-32.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-32.use[2]!./node_modules/less-loader/dist/cjs.js??clonedRuleSet-32.use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/HoDocs.vue?vue&type=style&index=0&id=643185d5&prod&lang=less&media=print&
241225
+ ;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-32.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-32.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-32.use[2]!./node_modules/less-loader/dist/cjs.js??clonedRuleSet-32.use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/HoDocs.vue?vue&type=style&index=0&id=2055fa91&prod&lang=less&media=print&
241154
241226
  // extracted by mini-css-extract-plugin
241155
241227
 
241156
- ;// CONCATENATED MODULE: ./src/components/HoDocs.vue?vue&type=style&index=0&id=643185d5&prod&lang=less&media=print&
241228
+ ;// CONCATENATED MODULE: ./src/components/HoDocs.vue?vue&type=style&index=0&id=2055fa91&prod&lang=less&media=print&
241157
241229
 
241158
241230
  ;// CONCATENATED MODULE: ./src/components/HoDocs.vue
241159
241231
 
@@ -242938,8 +243010,8 @@ var UpdateDocument_component = (0,componentNormalizer/* default */.Z)(
242938
243010
  )
242939
243011
 
242940
243012
  /* harmony default export */ var UpdateDocument = (UpdateDocument_component.exports);
242941
- ;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/toolbar/PageSetting.vue?vue&type=template&id=43e8d8c6&
242942
- var PageSettingvue_type_template_id_43e8d8c6_render = function render() {
243013
+ ;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/toolbar/PageSetting.vue?vue&type=template&id=73d1e29e&
243014
+ var PageSettingvue_type_template_id_73d1e29e_render = function render() {
242943
243015
  var _vm = this,
242944
243016
  _c = _vm._self._c;
242945
243017
  return _c('div', {
@@ -243415,7 +243487,7 @@ var PageSettingvue_type_template_id_43e8d8c6_render = function render() {
243415
243487
  }
243416
243488
  }, [_vm._v("取消")])], 1)])]);
243417
243489
  };
243418
- var PageSettingvue_type_template_id_43e8d8c6_staticRenderFns = [];
243490
+ var PageSettingvue_type_template_id_73d1e29e_staticRenderFns = [];
243419
243491
 
243420
243492
  // EXTERNAL MODULE: ./src/components/mixins/appendToBody.ts
243421
243493
  var appendToBody = __webpack_require__(95677);
@@ -243563,10 +243635,10 @@ var HoColorPicker = __webpack_require__(10306);
243563
243635
  });
243564
243636
  ;// CONCATENATED MODULE: ./src/components/toolbar/PageSetting.vue?vue&type=script&lang=js&
243565
243637
  /* harmony default export */ var toolbar_PageSettingvue_type_script_lang_js_ = (PageSettingvue_type_script_lang_js_);
243566
- ;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-32.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-32.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-32.use[2]!./node_modules/less-loader/dist/cjs.js??clonedRuleSet-32.use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/toolbar/PageSetting.vue?vue&type=style&index=0&id=43e8d8c6&prod&lang=less&
243638
+ ;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-32.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-32.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-32.use[2]!./node_modules/less-loader/dist/cjs.js??clonedRuleSet-32.use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/toolbar/PageSetting.vue?vue&type=style&index=0&id=73d1e29e&prod&lang=less&
243567
243639
  // extracted by mini-css-extract-plugin
243568
243640
 
243569
- ;// CONCATENATED MODULE: ./src/components/toolbar/PageSetting.vue?vue&type=style&index=0&id=43e8d8c6&prod&lang=less&
243641
+ ;// CONCATENATED MODULE: ./src/components/toolbar/PageSetting.vue?vue&type=style&index=0&id=73d1e29e&prod&lang=less&
243570
243642
 
243571
243643
  ;// CONCATENATED MODULE: ./src/components/toolbar/PageSetting.vue
243572
243644
 
@@ -243579,8 +243651,8 @@ var HoColorPicker = __webpack_require__(10306);
243579
243651
 
243580
243652
  var PageSetting_component = (0,componentNormalizer/* default */.Z)(
243581
243653
  toolbar_PageSettingvue_type_script_lang_js_,
243582
- PageSettingvue_type_template_id_43e8d8c6_render,
243583
- PageSettingvue_type_template_id_43e8d8c6_staticRenderFns,
243654
+ PageSettingvue_type_template_id_73d1e29e_render,
243655
+ PageSettingvue_type_template_id_73d1e29e_staticRenderFns,
243584
243656
  false,
243585
243657
  null,
243586
243658
  null,
@@ -244483,8 +244555,8 @@ var ToolControlvue_type_template_id_5eea3dcd_render = function render() {
244483
244555
  };
244484
244556
  var ToolControlvue_type_template_id_5eea3dcd_staticRenderFns = [];
244485
244557
 
244486
- ;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/toolbar/insert/HoDateTime.vue?vue&type=template&id=d4373800&
244487
- var HoDateTimevue_type_template_id_d4373800_render = function render() {
244558
+ ;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/toolbar/insert/HoDateTime.vue?vue&type=template&id=545a7112&
244559
+ var HoDateTimevue_type_template_id_545a7112_render = function render() {
244488
244560
  var _vm = this,
244489
244561
  _c = _vm._self._c;
244490
244562
  return _c('a-dropdown', {
@@ -244545,7 +244617,7 @@ var HoDateTimevue_type_template_id_d4373800_render = function render() {
244545
244617
  staticClass: "date-time-item"
244546
244618
  }, [_vm._v("更多日期属性")])], 2)], 1)], 2);
244547
244619
  };
244548
- var HoDateTimevue_type_template_id_d4373800_staticRenderFns = [];
244620
+ var HoDateTimevue_type_template_id_545a7112_staticRenderFns = [];
244549
244621
 
244550
244622
  ;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/toolbar/insert/HoDateTime.vue?vue&type=script&lang=js&
244551
244623
 
@@ -244599,6 +244671,7 @@ var HoDateTimevue_type_template_id_d4373800_staticRenderFns = [];
244599
244671
  var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this.hoEditorProvider.activeDocId);
244600
244672
  var params = {
244601
244673
  id: this.vueController.generateID('DT'),
244674
+ innerIdentifier: '',
244602
244675
  name: '',
244603
244676
  text: value,
244604
244677
  title: '',
@@ -244625,8 +244698,8 @@ var HoDateTimevue_type_template_id_d4373800_staticRenderFns = [];
244625
244698
  ;
244626
244699
  var HoDateTime_component = (0,componentNormalizer/* default */.Z)(
244627
244700
  insert_HoDateTimevue_type_script_lang_js_,
244628
- HoDateTimevue_type_template_id_d4373800_render,
244629
- HoDateTimevue_type_template_id_d4373800_staticRenderFns,
244701
+ HoDateTimevue_type_template_id_545a7112_render,
244702
+ HoDateTimevue_type_template_id_545a7112_staticRenderFns,
244630
244703
  false,
244631
244704
  null,
244632
244705
  null,