hoeditor-web 3.1.188 → 3.1.190

package/lib/hoeditor.umd.js

@@ -90660,7 +90660,7 @@ var component = (0,componentNormalizer/* default */.A)(
 
 /***/ }),
 
-/***/ 77092:
+/***/ 83466:
 /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -90676,7 +90676,7 @@ __webpack_require__.d(__webpack_exports__, {
 var es_function_name = __webpack_require__(62010);
 // EXTERNAL MODULE: ./src/i18n/index.ts + 1 modules
 var i18n = __webpack_require__(49850);
-;// ./node_modules/babel-loader/lib/index.js??ruleSet[1].rules[3].use[0]!./node_modules/unplugin/dist/webpack/loaders/transform.js?unpluginName=vite-plugin-i18n-helper!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[5]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/figure/HoFigure.vue?vue&type=template&id=88c1b12e
+;// ./node_modules/babel-loader/lib/index.js??ruleSet[1].rules[3].use[0]!./node_modules/unplugin/dist/webpack/loaders/transform.js?unpluginName=vite-plugin-i18n-helper!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[5]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/figure/HoFigure.vue?vue&type=template&id=452a3fca
 
 
 
@@ -91849,7 +91849,7 @@ var render = function render() {
 };
 var staticRenderFns = [];
 
-;// ./src/components/controls/figure/HoFigure.vue?vue&type=template&id=88c1b12e
+;// ./src/components/controls/figure/HoFigure.vue?vue&type=template&id=452a3fca
 
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.iterator.js
 var es_array_iterator = __webpack_require__(23792);
@@ -92057,7 +92057,10 @@ var EditorType = __webpack_require__(27195);
         json.push(g.id.replace(/ho-|-selected/g, ''));
       });
       this.figure.selectJson = JSON.stringify(json);
-      var associatedElement = this.figure.associatedElement.split("___")[1];
+      var associatedElement = "";
+      if (this.figure.associatedElement) {
+        associatedElement = this.figure.associatedElement.split("___")[1];
+      }
       this.svgToImage(function (url) {
         _this.figure.value = url;
         if (_this.controlStatus === 'update') {
@@ -92152,10 +92155,10 @@ var EditorType = __webpack_require__(27195);
 
 /* harmony default export */ var figure_HoFigurevue_type_script_lang_js = (HoFigurevue_type_script_lang_js);
 
-;// ./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/figure/HoFigure.vue?vue&type=style&index=0&id=88c1b12e&prod&lang=less
+;// ./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/figure/HoFigure.vue?vue&type=style&index=0&id=452a3fca&prod&lang=less
 // extracted by mini-css-extract-plugin
 
-;// ./src/components/controls/figure/HoFigure.vue?vue&type=style&index=0&id=88c1b12e&prod&lang=less
+;// ./src/components/controls/figure/HoFigure.vue?vue&type=style&index=0&id=452a3fca&prod&lang=less
 
 // EXTERNAL MODULE: ./node_modules/@vue/vue-loader-v15/lib/runtime/componentNormalizer.js
 var componentNormalizer = __webpack_require__(81656);
@@ -101486,7 +101489,7 @@ var component = (0,componentNormalizer/* default */.A)(
 
 /***/ }),
 
-/***/ 74858:
+/***/ 46839:
 /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -101502,7 +101505,7 @@ __webpack_require__.d(__webpack_exports__, {
 var es_function_name = __webpack_require__(62010);
 // EXTERNAL MODULE: ./src/i18n/index.ts + 1 modules
 var i18n = __webpack_require__(49850);
-;// ./node_modules/babel-loader/lib/index.js??ruleSet[1].rules[3].use[0]!./node_modules/unplugin/dist/webpack/loaders/transform.js?unpluginName=vite-plugin-i18n-helper!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[5]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/slider/Slider.vue?vue&type=template&id=723c521d
+;// ./node_modules/babel-loader/lib/index.js??ruleSet[1].rules[3].use[0]!./node_modules/unplugin/dist/webpack/loaders/transform.js?unpluginName=vite-plugin-i18n-helper!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[5]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/slider/Slider.vue?vue&type=template&id=4f1b43f2
 
 
 
@@ -101848,7 +101851,7 @@ var render = function render() {
 };
 var staticRenderFns = [];
 
-;// ./src/components/controls/slider/Slider.vue?vue&type=template&id=723c521d
+;// ./src/components/controls/slider/Slider.vue?vue&type=template&id=4f1b43f2
 
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.push.js
 var es_array_push = __webpack_require__(44114);
@@ -101939,7 +101942,10 @@ var EditorType = __webpack_require__(27195);
       }
     },
     insertDelimiter: function insertDelimiter() {
-      var associatedElement = this.slider.associatedElement.split("___")[1];
+      var associatedElement = "";
+      if (this.slider.associatedElement) {
+        associatedElement = this.slider.associatedElement.split("___")[1];
+      }
       this.vueController.insertSliderNode(this.controlStatus, (0,objectSpread2/* default */.A)((0,objectSpread2/* default */.A)({}, this.slider), {}, {
         associatedElement: associatedElement
       }));
@@ -101985,10 +101991,10 @@ var EditorType = __webpack_require__(27195);
 
 /* harmony default export */ var slider_Slidervue_type_script_lang_js = (Slidervue_type_script_lang_js);
 
-;// ./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/slider/Slider.vue?vue&type=style&index=0&id=723c521d&prod&lang=less
+;// ./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/slider/Slider.vue?vue&type=style&index=0&id=4f1b43f2&prod&lang=less
 // extracted by mini-css-extract-plugin
 
-;// ./src/components/controls/slider/Slider.vue?vue&type=style&index=0&id=723c521d&prod&lang=less
+;// ./src/components/controls/slider/Slider.vue?vue&type=style&index=0&id=4f1b43f2&prod&lang=less
 
 // EXTERNAL MODULE: ./node_modules/@vue/vue-loader-v15/lib/runtime/componentNormalizer.js
 var componentNormalizer = __webpack_require__(81656);
@@ -109372,7 +109378,7 @@ var component = (0,componentNormalizer/* default */.A)(
 
 /***/ }),
 
-/***/ 90209:
+/***/ 5380:
 /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -109388,7 +109394,7 @@ __webpack_require__.d(__webpack_exports__, {
 var es_function_name = __webpack_require__(62010);
 // EXTERNAL MODULE: ./src/i18n/index.ts + 1 modules
 var i18n = __webpack_require__(49850);
-;// ./node_modules/babel-loader/lib/index.js??ruleSet[1].rules[3].use[0]!./node_modules/unplugin/dist/webpack/loaders/transform.js?unpluginName=vite-plugin-i18n-helper!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[5]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/textDialog/TextToLabelDialog.vue?vue&type=template&id=c08d131a
+;// ./node_modules/babel-loader/lib/index.js??ruleSet[1].rules[3].use[0]!./node_modules/unplugin/dist/webpack/loaders/transform.js?unpluginName=vite-plugin-i18n-helper!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[5]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/textDialog/TextToLabelDialog.vue?vue&type=template&id=1b8a03fc
 
 
 
@@ -109473,7 +109479,7 @@ var render = function render() {
 };
 var staticRenderFns = [];
 
-;// ./src/components/controls/textDialog/TextToLabelDialog.vue?vue&type=template&id=c08d131a
+;// ./src/components/controls/textDialog/TextToLabelDialog.vue?vue&type=template&id=1b8a03fc
 
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.push.js
 var es_array_push = __webpack_require__(44114);
@@ -109481,6 +109487,8 @@ var es_array_push = __webpack_require__(44114);
 var es_object_to_string = __webpack_require__(26099);
 // EXTERNAL MODULE: ./node_modules/core-js/modules/web.dom-collections.for-each.js
 var web_dom_collections_for_each = __webpack_require__(23500);
+// EXTERNAL MODULE: ./node_modules/@babel/runtime/helpers/esm/readOnlyError.js
+var readOnlyError = __webpack_require__(62991);
 // EXTERNAL MODULE: ./src/HOEditorFactorys.ts
 var HOEditorFactorys = __webpack_require__(57703);
 // EXTERNAL MODULE: ./src/editor/dom/treeNode/TextInputFieldNode.ts + 1 modules
@@ -109505,6 +109513,7 @@ var LabelNode = __webpack_require__(82188);
 
 
 
+
 /* harmony default export */ var TextToLabelDialogvue_type_script_lang_js = ({
   name: 'TextToLabelDialog',
   components: {},
@@ -109560,9 +109569,12 @@ var LabelNode = __webpack_require__(82188);
       return labelNode;
     },
     sure: function sure() {
-      var _this$labelTextId;
       var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys */.O.instance().getFactory(this.hoEditorFactoryId);
-      var arr = (_this$labelTextId = this.labelTextId) === null || _this$labelTextId === void 0 ? void 0 : _this$labelTextId.split('___');
+      var arr = [];
+      if (this.labelTextId) {
+        var _this$labelTextId;
+        (_this$labelTextId = this.labelTextId) !== null && _this$labelTextId !== void 0 && _this$labelTextId.split('___'), (0,readOnlyError/* default */.A)("arr");
+      }
       var id = '';
       if (arr && arr.length === 3) {
         id = arr[1];
@@ -109634,10 +109646,10 @@ var LabelNode = __webpack_require__(82188);
 
 /* harmony default export */ var textDialog_TextToLabelDialogvue_type_script_lang_js = (TextToLabelDialogvue_type_script_lang_js);
 
-;// ./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/textDialog/TextToLabelDialog.vue?vue&type=style&index=0&id=c08d131a&prod&lang=less
+;// ./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/textDialog/TextToLabelDialog.vue?vue&type=style&index=0&id=1b8a03fc&prod&lang=less
 // extracted by mini-css-extract-plugin
 
-;// ./src/components/controls/textDialog/TextToLabelDialog.vue?vue&type=style&index=0&id=c08d131a&prod&lang=less
+;// ./src/components/controls/textDialog/TextToLabelDialog.vue?vue&type=style&index=0&id=1b8a03fc&prod&lang=less
 
 // EXTERNAL MODULE: ./node_modules/@vue/vue-loader-v15/lib/runtime/componentNormalizer.js
 var componentNormalizer = __webpack_require__(81656);
@@ -140408,7 +140420,9 @@ var DrawSliderNode = /*#__PURE__*/function (_DrawCombineNode) {
         if (_this2.dNode.value) {
           _this2.dNode.value = Math.min(Math.max(Number(_this2.dNode.value), _this2.dNode.minValue), _this2.dNode.maxValue);
           bitMap.x = (_this2.dNode.value - _this2.dNode.minValue) * _this2.dNode.sWidth / (_this2.dNode.maxValue - _this2.dNode.minValue);
-          sliderContainer.stage.update();
+          if (sliderContainer.stage) {
+            sliderContainer.stage.update();
+          }
         }
       }, 0);
       sliderContainer.addEventListener('pressup', function () {
@@ -140437,7 +140451,9 @@ var DrawSliderNode = /*#__PURE__*/function (_DrawCombineNode) {
         } else {
           bitMap.x = local.x;
         }
-        sliderContainer.stage.update();
+        if (sliderContainer.stage) {
+          sliderContainer.stage.update();
+        }
         // const dArea = hoEditorFactory.drawPageTree.getMainRootArea(this);
         // if (dArea) {
         //     hoEditorFactory.drawPageTree.updateDrawPage(dArea.index);
@@ -144744,8 +144760,8 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
       // console.log("加载表格", json.rowCount, json.colCount)
       json = this.transType(json);
       var tableProperty = new _TableProperty__WEBPACK_IMPORTED_MODULE_35__/* .TableProperty */ .s8("");
+      var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_41__/* .HOEditorFactorys */ .O.instance().getFactory(hoEditorFactoryID);
       if (json.tableProperty) {
-        var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_41__/* .HOEditorFactorys */ .O.instance().getFactory(hoEditorFactoryID);
         var tableId = hoEditorFactory.vueController.generateID("TB");
         var tp = json.tableProperty;
         tableProperty.canAdjustRowHeight = tp["canAdjustRowHeight"] === true || tp["canAdjustRowHeight"] == "true" ? true : false;
@@ -144914,26 +144930,80 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
       var cellNodes = transArr(json); //table.childNodes.childNodes
       var existMap = new Map();
       var rowsMap = new Map();
+      var colSpanArr = new Array();
+      var rowSpanArr = new Array();
       for (var _i7 = 0; _i7 < cellNodes.length; _i7++) {
         var node = cellNodes[_i7];
         var rowNo = parseInt(node.rowNo);
         var _aRow = new Array();
+        var nodeRowSpan = node.rowSpan ? parseInt(node.rowSpan) : 1;
+        var nodeColSpan = node.colSpan ? parseInt(node.colSpan) : 1;
+        if (nodeRowSpan > 1) {
+          for (var r = parseInt(node.rowNo) + 1; r < parseInt(node.rowNo) + nodeRowSpan; r++) {
+            rowSpanArr.push({
+              rowCount: r,
+              colCount: parseInt(node.colNo)
+            });
+          }
+        }
+        if (nodeColSpan > 1) {
+          for (var c = parseInt(node.colNo) + 1; c < parseInt(node.colNo) + nodeColSpan; c++) {
+            colSpanArr.push({
+              rowCount: parseInt(node.rowNo),
+              colCount: c
+            });
+          }
+        }
         _aRow.length = tableNode._colCount;
         rowsMap.set(rowNo, _aRow);
       }
       rowsMap.delete(NaN);
       //const defaultCellProperty = json.childNodes.defaultCellProperty;
       var aRow;
-      for (var s = 0; s < cellNodes.length; s++) {
-        var _node = cellNodes[s];
-        if (_node && _node.nodeType) {
-          var _rowNo = parseInt(_node.rowNo);
-          var colNo = parseInt(_node.colNo);
+      var emptyCellNode = {
+        nodeType: "ntCell",
+        childNodes: {
+          node: [{
+            nodeType: "ntParagraph",
+            styleIndex: "0",
+            textStyleNo: "0"
+          }]
+        },
+        rowNo: "0",
+        colNo: "0",
+        text: ""
+      };
+      var _loop2 = function _loop2() {
+        var node = cellNodes[s];
+        if (!node && hoEditorFactory.drawTree.paintStatus == _editor_draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_42__/* .PaintState */ .ak.psDesign) {
+          var rowCount = Math.floor(s / Number(json.colCount));
+          var colCount = s % Number(json.colCount);
+          var isMerge = false;
+          rowSpanArr.forEach(function (rowSpanItem) {
+            if (rowCount == rowSpanItem.rowCount && colCount == rowSpanItem.colCount) {
+              isMerge = true;
+            }
+          });
+          colSpanArr.forEach(function (colSpanItem) {
+            if (rowCount == colSpanItem.rowCount && colCount == colSpanItem.colCount) {
+              isMerge = true;
+            }
+          });
+          if (!isMerge) {
+            node = emptyCellNode;
+            node.rowNo = rowCount;
+            node.colNo = colCount;
+          }
+        }
+        if (node && node.nodeType) {
+          var _rowNo = parseInt(node.rowNo);
+          var colNo = parseInt(node.colNo);
           existMap.set(_rowNo + "-" + colNo, 1);
-          aRow = _CellNode__WEBPACK_IMPORTED_MODULE_30__/* .CellNode */ .H.json2Node(hoEditorFactoryID, _node, rootNodes, tableNode, aRow, rowsMap, rows,
-          //defaultCellProperty,
-          isPaste, isClearSign);
+          aRow = _CellNode__WEBPACK_IMPORTED_MODULE_30__/* .CellNode */ .H.json2Node(hoEditorFactoryID, node, rootNodes, tableNode, aRow, rowsMap, rows, isPaste, isClearSign);
         }
+      };
+      for (var s = 0; s < cellNodes.length; s++) {
+        _loop2();
       }
       //删除掉不存在的合并节点
       for (var x = 0; x < tableNode._rowCount; x++) {
@@ -154073,7 +154143,7 @@ var DrawCell = /*#__PURE__*/function (_DrawRect) {
   }, {
     key: "paintCell",
     value: function paintCell(dParent, dTop, dHeight, maxHeight, startDline) {
-      var ret = 0;
+      // let ret = 0;
       var _this$_cell$getLeftWi = this._cell.getLeftWidth(),
         _this$_cell$getLeftWi2 = (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .A)(_this$_cell$getLeftWi, 2),
         aleft = _this$_cell$getLeftWi2[0],
@@ -154100,7 +154170,7 @@ var DrawCell = /*#__PURE__*/function (_DrawRect) {
       this.drawPageCells.push(dPartCell);
       dPartCell.paintArea(this._drawLines, startDline, valignTop);
       dPartCell.valignTop = valignTop;
-      ret = this._drawLines[this._drawLines.length - 1].dHeight + this._drawLines[this._drawLines.length - 1].dTop;
+      // ret = this._drawLines[this._drawLines.length - 1].dHeight + this._drawLines[this._drawLines.length - 1].dTop;
     }
   }, {
     key: "clear",
@@ -161210,7 +161280,7 @@ var DrawTable = /*#__PURE__*/function (_DrawRect) {
           cell = _this$_table$getMainC6[0],
           mr = _this$_table$getMainC6[1],
           mc = _this$_table$getMainC6[2];
-        if (cell && mc === c) {
+        if (cell && mc === c && cell.drawCell.drawLines[0]) {
           var aHeight = cell.drawCell.drawLines[0].dHeight;
           if (aHeight > maxRowHeight) {
             maxRowHeight = aHeight;
@@ -166747,11 +166817,12 @@ var DrawTree = /*#__PURE__*/function () {
       var dTop = 0;
       if (!prevPara || hoeditorFactory.drawTree.paintStatus != PaintState.psDesign && prevPara.customProperty && prevPara.customProperty.hidden == "true") {
         dTop = paraNode.combineParagraph.topMarginPixes;
-      }
-      //存在上一个同区域段落节点
-      else {
+      } else {
+        //存在上一个同区域段落节点
         var dline = prevPara.drawlines[prevPara.drawlines.length - 1];
-        dTop = dline.dTop + dline.dHeight + dline.paragraphNode.combineParagraph.lineSpace;
+        if (dline) {
+          dTop = dline.dTop + dline.dHeight + dline.paragraphNode.combineParagraph.lineSpace;
+        }
       }
       return dTop;
     }
@@ -176295,7 +176366,7 @@ var map = {
 	"./delimiter/Delimiter.vue": 28556,
 	"./expressionForm/ExpressionForm.vue": 40647,
 	"./figure/EditHoFigure.vue": 22297,
-	"./figure/HoFigure.vue": 77092,
+	"./figure/HoFigure.vue": 83466,
 	"./findReplace/FindReplace.vue": 12004,
 	"./gestation/Gestation.vue": 18132,
 	"./hoprint/HoPrint.vue": 46018,
@@ -176313,7 +176384,7 @@ var map = {
 	"./radioCheckBox/RadioCheckbox.vue": 49237,
 	"./selectDialog/SelectDialog.vue": 91934,
 	"./sign/Sign.vue": 69914,
-	"./slider/Slider.vue": 74858,
+	"./slider/Slider.vue": 46839,
 	"./specialChars/HoSpecialChars.vue": 33336,
 	"./table/TableCellPoper.vue": 12097,
 	"./table/TableCellPoper1.vue": 8813,
@@ -176326,7 +176397,7 @@ var map = {
 	"./table/TableRowProperty.vue": 51653,
 	"./textDialog/TextBorderDialog.vue": 80713,
 	"./textDialog/TextDialog.vue": 70628,
-	"./textDialog/TextToLabelDialog.vue": 90209,
+	"./textDialog/TextToLabelDialog.vue": 5380,
 	"./textDialog/VerifyTip.vue": 7900,
 	"./upload/CanvasImageDialog.vue": 97377,
 	"./upload/HoFabric.vue": 7843,
@@ -193367,7 +193438,9 @@ function _objectSpread2(e) {
 /***/ (function(__unused_webpack___webpack_module__, __webpack_exports__, __webpack_require__) {
 
 "use strict";
-/* unused harmony export default */
+/* harmony export */ __webpack_require__.d(__webpack_exports__, {
+/* harmony export */   A: function() { return /* binding */ _readOnlyError; }
+/* harmony export */ });
 /* harmony import */ var core_js_modules_es_error_cause_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(16280);
 
 function _readOnlyError(r) {
@@ -232360,7 +232433,7 @@ var TextNode = __webpack_require__(32083);
 // EXTERNAL MODULE: ./src/editor/dom/treeNode/ParagraphNode.ts
 var ParagraphNode = __webpack_require__(40504);
 ;// ./src/components/version.ts
-/* harmony default export */ var version = ('3.1.188');
+/* harmony default export */ var version = ('3.1.190');
 // EXTERNAL MODULE: ./src/components/controls/poperTipText/PoperTipText.vue + 5 modules
 var PoperTipText = __webpack_require__(57221);
 ;// ./src/components/controls/poperTipText/index.ts
@@ -235412,7 +235485,6 @@ var HTMLconverter2 = /*#__PURE__*/function () {
         return tmp;
       } else {
         for (var i = 0; i < jnode.childNodes.length; i++) {
-          // console.log("index：", i);
           if (jnode.childNodes[i].nodeName.toLowerCase() == 'img') {
             var src = jnode.childNodes[i].src;
             if (src && src.toString().substring(src.length - 4, src.length) === '.svg') {
@@ -235423,17 +235495,18 @@ var HTMLconverter2 = /*#__PURE__*/function () {
           if (fun) {
             tmp.push.apply(tmp, (0,esm_toConsumableArray/* default */.A)(fun(jnode.childNodes[i], JSON.stringify(styleobj))));
           }
-          // tmp.push(...HTMLProcess.instance.newLink().Exec(jnode.childNodes[i], JSON.stringify(styleobj)));
-          if (jnode.childNodes[i].nodeName.toLowerCase() === 'p' && jnode.childNodes[i + 1] && jnode.childNodes[i + 1].nodeName.toLowerCase() !== 'p') {
-            var childNode = Object(jnode.childNodes[i]);
-            if (childNode.className && childNode.className === 'MsoNormal' && tmp[tmp.length - 1] instanceof ParagraphNode/* ParagraphNode */.f) {
-              tmp.splice(tmp.length - 1, 1);
+          if (jnode.childNodes[i].nodeName.toLowerCase() === 'p') {
+            if (jnode.childNodes[i + 1] && jnode.childNodes[i + 1].nodeName.toLowerCase() !== 'p') {
+              var childNode = Object(jnode.childNodes[i]);
+              if (childNode.className && childNode.className === 'MsoNormal' && tmp[tmp.length - 1] instanceof ParagraphNode/* ParagraphNode */.f) {
+                tmp.splice(tmp.length - 1, 1);
+              }
             }
-          }
-          if (jnode.childNodes[i].nodeName.toLowerCase() === 'p' && jnode.childNodes[i - 1] && jnode.childNodes[i - 1].nodeName.toLowerCase() !== 'p') {
-            var _childNode = Object(jnode.childNodes[i]);
-            if (_childNode.className && _childNode.className === 'MsoNormal' && tmp[0] instanceof ParagraphNode/* ParagraphNode */.f) {
-              tmp.splice(0, 1);
+            if (jnode.childNodes[i - 1] && jnode.childNodes[i - 1].nodeName.toLowerCase() !== 'p') {
+              var _childNode = Object(jnode.childNodes[i]);
+              if (_childNode.className && _childNode.className === 'MsoNormal' && tmp[0] instanceof ParagraphNode/* ParagraphNode */.f) {
+                tmp.splice(0, 1);
+              }
             }
           }
         }
@@ -235872,6 +235945,7 @@ var HTMLconverter2 = /*#__PURE__*/function () {
   }, {
     key: "TransHTMLTABLE",
     value: function TransHTMLTABLE(jnode, style) {
+      var _this2 = this;
       var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys */.O.instance().getFactory(this._hoEditorFactoryID);
       var pnode = hoEditorFactory.docTree.getParentNode(hoEditorFactory.docTree.curDomRange.normalize().startPath);
       if (pnode instanceof TableNode/* TableNode */.HA || pnode instanceof CellNode/* CellNode */.H) {
@@ -235888,20 +235962,50 @@ var HTMLconverter2 = /*#__PURE__*/function () {
       var rows = new Array();
       var irow = 0;
       var icol = 0;
+      var colSpanArr = new Array();
+      var rowSpanArr = new Array();
       for (var i = 0; i < tconstents.length; i++) {
-        var tr = jquery_default()(tconstents[i]).children();
-        irow += tr.length;
-        if (tr.length > 0) {
-          var td = jquery_default()(tr[0]).children();
-          for (var z = 0; z < td.length; z++) {
-            icol += parseInt(jquery_default()(td[z]).attr('colSpan') || '1');
+        var table = jquery_default()(tconstents[i]).children();
+        irow += table.length;
+        if (table.length > 0) {
+          for (var j = 0; j < table.length; j++) {
+            var trCol = 0;
+            var tr = jquery_default()(table[j]).children();
+            for (var z = 0; z < tr.length; z++) {
+              trCol += parseInt(jquery_default()(tr[z]).attr('colspan') || '1');
+            }
+            icol = Math.max(trCol, icol);
           }
         }
-        for (var j = 0; j < tr.length; j++) {
+        for (var _j = 0; _j < table.length; _j++) {
           var cells = new Array();
-          var _td = jquery_default()(tr[j]).children();
+          var _tr = jquery_default()(table[_j]).children();
           //icol = Math.max(td.length, icol);
-          cells.push.apply(cells, (0,esm_toConsumableArray/* default */.A)(_td));
+          for (var k = 0; k < icol; k++) {
+            if (_tr[k]) {
+              var nodeRowSpan = parseInt(jquery_default()(_tr[k]).attr('rowspan') || '1');
+              var nodeColSpan = parseInt(jquery_default()(_tr[k]).attr('colspan') || '1');
+              if (nodeRowSpan > 1) {
+                for (var r = _j + 1; r < _j + nodeRowSpan; r++) {
+                  rowSpanArr.push({
+                    rowCount: r,
+                    colCount: k
+                  });
+                }
+              }
+              if (nodeColSpan > 1) {
+                for (var c = k + 1; c < k + nodeColSpan; c++) {
+                  colSpanArr.push({
+                    rowCount: _j,
+                    colCount: c
+                  });
+                }
+              }
+            } else {
+              _tr[k] = undefined;
+            }
+          }
+          cells.push.apply(cells, (0,esm_toConsumableArray/* default */.A)(_tr));
           rows.push(cells);
         }
       }
@@ -235917,8 +236021,8 @@ var HTMLconverter2 = /*#__PURE__*/function () {
           for (var n = 0; n < icol; n++) {
             var item = rows[m][n];
             if (item) {
-              var rspan = parseInt(jquery_default()(item).attr('rowSpan') || '1');
-              var cspan = parseInt(jquery_default()(item).attr('colSpan') || '1');
+              var rspan = parseInt(jquery_default()(item).attr('rowspan') || '1');
+              var cspan = parseInt(jquery_default()(item).attr('colspan') || '1');
               if (cspan > 1) {
                 var _rows$m;
                 var tmp = new Array(cspan - 1);
@@ -235948,18 +236052,39 @@ var HTMLconverter2 = /*#__PURE__*/function () {
           if (r < rows.length && c < rows[r].length) return rows[r][c];else return undefined;
         };
         lntable.childNodes.splice(0, lntable.childNodes.length);
-        for (var s = 0; s < irow; s++) {
-          for (var k = 0; k < icol; k++) {
-            var cell = getitem(s, k);
+        var _loop = function _loop(s) {
+          var _loop2 = function _loop2(_k) {
+            var cell = getitem(s, _k);
+            if (!cell) {
+              var isMerge = false;
+              rowSpanArr.forEach(function (rowSpanItem) {
+                if (s == rowSpanItem.rowCount && _k == rowSpanItem.colCount) {
+                  isMerge = true;
+                }
+              });
+              colSpanArr.forEach(function (colSpanItem) {
+                if (s == colSpanItem.rowCount && _k == colSpanItem.colCount) {
+                  isMerge = true;
+                }
+              });
+              if (!isMerge) {
+                cell = jquery_default()(`<td class="X5 X6" style="border:1px solid #000000;" rowspan="1"><p style="text-align:left;"><br></p></td>`)[0];
+              }
+            }
             if (cell) {
-              this.copyCellNode(cell, lntable, s, k);
-              lntable.childNodes.push(lntable.rows[s][k]);
+              _this2.copyCellNode(cell, lntable, s, _k);
+              lntable.childNodes.push(lntable.rows[s][_k]);
             } else {
-              lntable.rows[s][k] = undefined;
+              lntable.rows[s][_k] = undefined;
             }
+          };
+          for (var _k = 0; _k < icol; _k++) {
+            _loop2(_k);
           }
+        };
+        for (var s = 0; s < irow; s++) {
+          _loop(s);
         }
-        //lntable.node2DrawNode();
         return [lntable];
       }
     }
@@ -236011,7 +236136,7 @@ var HTMLconverter2 = /*#__PURE__*/function () {
   }, {
     key: "TransHTMLText",
     value: function TransHTMLText(jnode, style) {
-      var _this2 = this;
+      var _this3 = this;
       var styleobj = this.mergestyle(jquery_default()(jnode).attr('style') || '', style);
       var tag = jnode.nodeName.toLowerCase();
       if (tag == 'b' || tag == 'strong') {
@@ -236084,7 +236209,7 @@ var HTMLconverter2 = /*#__PURE__*/function () {
               styleobj['vertical_align'] = '';
             }
             if (value.text != '') {
-              var _node2 = _this2.generateTextNode(value.text, styleobj);
+              var _node2 = _this3.generateTextNode(value.text, styleobj);
               if (_node2) {
                 tmp.push(_node2);
               }
@@ -236131,8 +236256,8 @@ var HTMLconverter2 = /*#__PURE__*/function () {
     value: function copyCellNode(jnode, table, r, c) {
       var node = table.rows[r][c];
       if (node) {
-        node.rowSpan = parseInt(jquery_default()(jnode).attr('rowSpan') || '1') || 1;
-        node.colSpan = parseInt(jquery_default()(jnode).attr('colSpan') || '1') || 1;
+        node.rowSpan = parseInt(jquery_default()(jnode).attr('rowspan') || '1') || 1;
+        node.colSpan = parseInt(jquery_default()(jnode).attr('colspan') || '1') || 1;
         var styleobject = this.mergestyle(jquery_default()(jnode).attr('style') || '', '');
         if (styleobject['mso_diagonal_down'] && styleobject['mso_diagonal_down'] != 'none') {
           node.crossLineType = CellNode/* CrossLineType */.l.ct02;
@@ -236862,7 +236987,6 @@ var StructureConvert = /*#__PURE__*/function () {
   }, {
     key: "htmlToNode",
     value: function htmlToNode(html) {
-      var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys */.O.instance().getFactory(this._hoEditorFactoryID);
       var rx = /<body[^>]*>([\s\S]+?)<\/body>/i;
       var r = rx.exec(html);
       var bodyHtml;
@@ -236872,6 +236996,7 @@ var StructureConvert = /*#__PURE__*/function () {
         bodyHtml = "<div>" + r[1] + "</div>";
       }
       var rtnArray = [];
+      var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys */.O.instance().getFactory(this._hoEditorFactoryID);
       if (bodyHtml) {
         var elementArr = jquery_default()(bodyHtml).children();
         for (var index = 0; index < elementArr.length; index++) {
@@ -237013,7 +237138,6 @@ var StructureConvert = /*#__PURE__*/function () {
           maxTr = i;
         }
       }
-      var paraNode = new ParagraphNode/* ParagraphNode */.f(this._hoEditorFactoryID, hoEditorFactory.docTree.mainNodes, null, hoEditorFactory.docTree.curParaNo);
       var tableProperty = new TableProperty/* TableProperty */.s8("");
       var tableNode = new TableNode/* TableNode */.HA(this._hoEditorFactoryID, hoEditorFactory.docTree.mainNodes, null, trs.length, colCount, tableProperty);
       for (var _i = 0; _i < trs.length; _i++) {
@@ -237953,9 +238077,7 @@ var StructureConvert = /*#__PURE__*/function () {
       var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys */.O.instance().getFactory(this._hoEditorFactoryID);
       var propertyJson = xx.docProperty;
       if (propertyJson) {
-        // const docProperty = new DocProperty(HOEditorFactorys.instance().getFactory(this._hoEditorFactoryID).docTree);
         var docProperty = hoEditorFactory.docTree.docProperty;
-        // docProperty.version = propertyJson["version"];
         if (docProperty) {
           docProperty.type = Number(propertyJson["type"] ? propertyJson["type"] : DocTree/* EmrType */.n8.etCaseHistory);
           docProperty.title = propertyJson["title"];
@@ -237966,7 +238088,6 @@ var StructureConvert = /*#__PURE__*/function () {
           docProperty.lastEditorID = propertyJson["lastEditorID"];
           docProperty.lastEditorName = propertyJson["lastEditorName"];
         }
-        //   hoEditorFactory.docTree.docProperty = docProperty;
       }
       var pageSettings = xx.pageSettings;
       if (pageSettings) {
@@ -238033,7 +238154,6 @@ var StructureConvert = /*#__PURE__*/function () {
       if (errors) {
         this._errors = errors.error;
       }
-      //let errors = [];
       if (this._errors.length === undefined) {
         errors = Array(this._errors);
       } else {
@@ -238054,7 +238174,6 @@ var StructureConvert = /*#__PURE__*/function () {
             tip[1] = data.end;
             tip[2] = /*#__PURE__*/(0,i18n/* i18nHelper */.p)("错误:",null,"错误:") + data.wrong + /*#__PURE__*/(0,i18n/* i18nHelper */.p)(",正确:",null,",正确:") + data.correct;
             tips.push(tip);
-            //tips.push("错误:" + data.wrong + ",正确:" + data.correct);
           }
           hoEditorFactory.drawTree.errorsMap.set(m, tips);
         }
@@ -238078,9 +238197,6 @@ var StructureConvert = /*#__PURE__*/function () {
       var styles = xx.styles;
       hoEditorFactory.docTree.styles = [];
       var defaultTextStyle = new TextStyle/* TextStyle */.xJ(this._hoEditorFactoryID);
-      // if (defaultTextStyle.combineStyle.size != Number((styles.defaultFont)["size"])) {
-      //   defaultTextStyle.size = Number((styles.defaultFont)["size"]);
-      // }
       hoEditorFactory.docTree.styles.push(defaultTextStyle); //先把默认的样式放进去
       var fontStyles = styles.font ? styles.font : styles.fontStyle;
       var paraStyles = styles.para ? styles.para : styles.paraStyle;
@@ -238135,8 +238251,6 @@ var StructureConvert = /*#__PURE__*/function () {
           if (!headerDocTree) {
             headerDocTree = new SubDocManger/* SubDocTree */.he(headerArray.pageIndex, headerArray.beginPath);
             hoEditorFactory.subDocManger.headerDocTree.push(headerDocTree);
-            // const array = new Array<BaseNode>();
-            // hoEditorFactory.docTree.headerNodes[hi] = array;
           }
           var headerNode = new SubDocManger/* SubDocTree */.he(headerArray.pageIndex, headerArray.beginPath);
           ;
@@ -238147,21 +238261,13 @@ var StructureConvert = /*#__PURE__*/function () {
               if (!header) {
                 continue;
               }
-              var node = hoEditorFactory.structureConvert.convertNode(header,
-              //headerNodes[hi],
-              headerDocTree.subDocNodes, null, headerNode.subDocNodes, undefined, isClearSign);
+              var node = hoEditorFactory.structureConvert.convertNode(header, headerDocTree.subDocNodes, null, headerNode.subDocNodes, undefined, isClearSign);
               if (node) {
                 node.rootPath = "header/" + hi.toString();
-                //   if (node instanceof BaseCombineNode) {
-                //     node.childNodes.forEach((value, key) => {
-                //       node.removeChild(value);
-                //     });
-                //   }
                 headerNode.subDocNodes.push(node);
                 if (hi > 0 && hj === 0 && node instanceof ParagraphNode/* ParagraphNode */.f) {
                   var arrNodes = new Array();
                   arrNodes.push(node);
-                  //node.rootNodes = arrNodes;
                   headerDocTree.subDocNodes = arrNodes;
                   var dHeader = new DrawHeader/* DrawHeader */.q(this._hoEditorFactoryID, node.rootPath, hi);
                   hoEditorFactory.drawPageTree.drawHeaders[hi] = dHeader;
@@ -238189,7 +238295,6 @@ var StructureConvert = /*#__PURE__*/function () {
           var footSubDocTree = hoEditorFactory.subDocManger.footerDocTree[fi];
           if (!footSubDocTree) {
             footSubDocTree = new SubDocManger/* SubDocTree */.he(footersArray[fi].pageIndex, footersArray[fi].beginPath);
-            // const array = new Array<BaseNode>();
             hoEditorFactory.subDocManger.footerDocTree.push(footSubDocTree);
           }
           var footerArray = footersArray[fi];
@@ -238201,21 +238306,13 @@ var StructureConvert = /*#__PURE__*/function () {
               if (!footer) {
                 continue;
               }
-              var _node2 = hoEditorFactory.structureConvert.convertNode(footer,
-              //footerNodes[fi],
-              footSubDocTree.subDocNodes, null, footerNode.subDocNodes, undefined, isClearSign);
+              var _node2 = hoEditorFactory.structureConvert.convertNode(footer, footSubDocTree.subDocNodes, null, footerNode.subDocNodes, undefined, isClearSign);
               if (_node2) {
                 _node2.rootPath = "footer/" + fi.toString();
-                // if (node instanceof BaseCombineNode) {
-                //   node.childNodes.forEach((value, key) => {
-                //     node.removeChild(value);
-                //   });
-                // }
                 footerNode.subDocNodes.push(_node2);
                 if (fi > 0 && fj === 0 && _node2 instanceof ParagraphNode/* ParagraphNode */.f) {
                   var _arrNodes = new Array();
                   _arrNodes.push(_node2);
-                  //node.rootNodes = arrNodes;
                   footSubDocTree.subDocNodes = _arrNodes;
                   var dFooter = new DrawFooter/* DrawFooter */.K(this._hoEditorFactoryID, _node2.rootPath, fi);
                   hoEditorFactory.drawPageTree.drawFooters[fi] = dFooter;
@@ -238223,12 +238320,6 @@ var StructureConvert = /*#__PURE__*/function () {
                   hoEditorFactory.drawTree.initAreaFirstNode(_arrNodes, hoEditorFactory.drawTree.footerDNodes[fi]);
                 }
               }
-              // pushChildNodes(
-              //   node,
-              //   footer,
-              //   hoEditorFactory.docTree.footerNodes[fi],
-              //   footerNode
-              // );
             }
           }
         }
@@ -238245,30 +238336,15 @@ var StructureConvert = /*#__PURE__*/function () {
         if (temp.delete && temp.delete == "1") {
           continue;
         }
-        if ([2, 10, 14, 19, 24, 40, 54, 65].includes(mi)) {
-          // console.time(`${mi}_${temp.name ? temp.name : '表格'}`);
-        }
         var _node3 = hoEditorFactory.structureConvert.convertNode(temp, hoEditorFactory.docTree.mainNodes, null, mainNodes, undefined, isClearSign);
-        if ([2, 10, 14, 19, 24, 40, 54, 65].includes(mi)) {
-          // console.timeEnd(`${mi}_${temp.name ? temp.name : '表格'}`);
-          // console.log(temp);
-        }
         if (_node3) {
-          // if (node instanceof BaseCombineNode && temp.childNode) {
-          //     node.childNodes.forEach((value, key) => {
-          //         node.removeChild(value);
-          //     });
-          // }
           mainNodes.push(_node3);
         }
-        //pushChildNodes(node, temp,hoEditorFactory.docTree.mainNodes, mainNodes);
       }
-      // console.timeEnd("mainArray");
       var rtn = new Map();
       rtn.set("header", headerNodes);
       rtn.set("footer", footerNodes);
       rtn.set("main", mainNodes);
-      // console.timeEnd("json2Doc");
       return rtn;
     }
   }, {
@@ -238365,7 +238441,6 @@ var StructureConvert = /*#__PURE__*/function () {
       temp.nodeType = BaseNode/* NodeType */.Z6[temp.nodeType];
       if (temp.nodeType == BaseNode/* NodeType */.Z6.ntTable) {
         if (isPaste && parentNode instanceof TextInputFieldNode/* TextInputFieldNode */.IM) {
-          var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys */.O.instance().getFactory(this._hoEditorFactoryID);
           message/* default */.A.warn(/*#__PURE__*/(0,i18n/* i18nHelper */.p)("不允许将表格粘贴到文本域",null,"不允许将表格粘贴到文本域"));
           return undefined;
         }
@@ -245865,24 +245940,6 @@ var VueController = /*#__PURE__*/function () {
           }
           hoEditorFactory.docController.parseNodeData(nodes);
         }
-        // const startPath = arrNodes[0].getNodePath();
-        // let endPath: string;
-        // if (area === "header") {
-        //   endPath = hoEditorFactory.docTree.getNodeLastPath(
-        //     hoEditorFactory.docTree.headerNodes[pageCount][hoEditorFactory.docTree.headerNodes[pageCount].length - 1]
-        //   );
-        // } else {
-        //   endPath = hoEditorFactory.docTree.getNodeLastPath(
-        //     hoEditorFactory.docTree.footerNodes[pageCount][hoEditorFactory.docTree.footerNodes[pageCount].length - 1]
-        //   );
-        // }
-        // const cgEvent = new NodeChangeEvent(
-        //   this._hoEditorFactoryID,
-        //   DocAction.daInsert,
-        //   startPath,
-        //   endPath
-        // );
-        // hoEditorFactory.docTree.change(cgEvent);
       } else {
         var mainNodes = hoEditorFactory.docTree.mainNodes;
         var lastNode = mainNodes[mainNodes.length - 1];
@@ -245906,10 +245963,10 @@ var VueController = /*#__PURE__*/function () {
                 nodes[0].printAsSinglePage = printAsSinglePage;
                 nodes[0].docId = docId && docId !== '' ? docId : hoEditorFactory.gernerateCode.generateID('DocId');
               }
-            } else if (mainNodes.length > 1 && lastNode instanceof ParagraphNode/* ParagraphNode */.f) {
-              nodes.splice(0, 1);
-              lastNode.printAsSinglePage = printAsSinglePage;
-              lastNode.docId = docId && docId !== '' ? docId : hoEditorFactory.gernerateCode.generateID('DocId');
+              // } else if (mainNodes.length > 1 && lastNode instanceof ParagraphNode) {
+              //     nodes.splice(0, 1);
+              //     lastNode.printAsSinglePage = printAsSinglePage;
+              //     lastNode.docId = docId && docId !== '' ? docId : hoEditorFactory.gernerateCode.generateID('DocId');
             } else {
               nodes[0].printAsSinglePage = printAsSinglePage;
               nodes[0].docId = docId && docId !== '' ? docId : hoEditorFactory.gernerateCode.generateID('DocId');
@@ -245922,10 +245979,10 @@ var VueController = /*#__PURE__*/function () {
         hoEditorFactory.docTree.curDomRange.setSamePath(nodePath);
         hoEditorFactory.docController.parseNodeData(nodes);
         var lastNextDays = hoEditorFactory.updateNextDaysRecordList.get("last");
-        // const isUpdate = hoEditorFactory.updateNextDaysRecordList.get("update");
         if (lastNextDays) {
           this.updateCellNextDays(lastNextDays.rowNo, lastNextDays.colNo, lastNextDays.tableId, '', true);
         }
+        setTimeout(function () {}, 1000);
       }
     }
     /**
@@ -252155,7 +252212,6 @@ var DomController = /*#__PURE__*/function () {
 
 
 
-
 
 
 var EditController = /*#__PURE__*/function () {
@@ -252655,6 +252711,8 @@ var EditController = /*#__PURE__*/function () {
       //hoEditorFactory.allowEditCellInForm = false;
       var curDomRange = hoEditorFactory.docTree.curDomRange.normalize(); //获取当前选中区域
       var drawPage = hoEditorFactory.drawTree.activePage;
+      var snode = curDomRange.npStart.node;
+      var enode = curDomRange.npEnd.node;
       if (drawPage) {
         var dNode = hoEditorFactory.drawTree.getDNodeByPath(curDomRange.endPath);
         var _curDomRange$inSameTa = curDomRange.inSameTable(),
@@ -252678,26 +252736,22 @@ var EditController = /*#__PURE__*/function () {
           return false;
         }
       }
-      if (hoEditorFactory.isUseForm) {
+      if (hoEditorFactory.isUseForm && enode) {
         var _enode$parentNode, _enode$parentNode2;
-        var snode = curDomRange.npStart.node;
-        var enode = curDomRange.npEnd.node;
         //const endPath = _curDomRange.normalize().endPath;
         //const node = hoEditorFactory.docTree.findNodePositionByPath(endPath).node;
-        if (enode && enode.nodeType == 0 && !((enode === null || enode === void 0 ? void 0 : enode.parentNode) instanceof TextInputFieldNode/* TextInputFieldNode */.IM)) {
+        if ((snode === null || snode === void 0 ? void 0 : snode.parentNode) == null || (snode === null || snode === void 0 ? void 0 : snode.parentNode) == null) {
           result = false;
         }
-        if ((enode === null || enode === void 0 ? void 0 : enode.parentNode) == null || (snode === null || snode === void 0 ? void 0 : snode.parentNode) == null) {
+        if (enode && enode.nodeType == 0 && !((enode === null || enode === void 0 ? void 0 : enode.parentNode) instanceof TextInputFieldNode/* TextInputFieldNode */.IM)) {
           result = false;
         }
-        // if (node instanceof TextNode && !(node?.parentNode instanceof TextInputFieldNode)) {
-        // 	result = false;
-        // }
         if (enode instanceof MarkNode/* MarkNode */.y && enode.MarkNodeType == 2 && (((_enode$parentNode = enode.parentNode) === null || _enode$parentNode === void 0 ? void 0 : _enode$parentNode.parentNode) == null || ((_enode$parentNode2 = enode.parentNode) === null || _enode$parentNode2 === void 0 ? void 0 : _enode$parentNode2.parentNode) instanceof CellNode/* CellNode */.H)) {
           result = false;
         }
         if (!hoEditorFactory.allowEditCellInForm) {
-          if ((enode === null || enode === void 0 ? void 0 : enode.parentNode) instanceof CellNode/* CellNode */.H && !(enode instanceof DateTimeNode/* DateTimeNode */.Y) && !(enode instanceof DownListNode/* DownListNode */.dS) && !(enode instanceof SignNode/* SignNode */.u)) {
+          var parentNode = hoEditorFactory.vueController.getParentCellNode(enode);
+          if (parentNode instanceof CellNode/* CellNode */.H && !(enode instanceof SignNode/* SignNode */.u)) {
             result = false;
           }
         }