hoeditor-web 3.0.9 → 3.0.11

package/lib/hoeditor.umd.js

@@ -3240,7 +3240,7 @@ function _extends(){return _extends=Object.assign?Object.assign.bind():function(
 
 /***/ }),
 
-/***/ 25867:
+/***/ 68120:
 /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -3252,7 +3252,7 @@ __webpack_require__.d(__webpack_exports__, {
   "default": function() { return /* binding */ ControlModal; }
 });
 
-;// 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/ControlModal.vue?vue&type=template&id=6295046e&
+;// 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/ControlModal.vue?vue&type=template&id=660636e7&
 var render = function render() {
   var _vm = this,
     _c = _vm._self._c;
@@ -3378,8 +3378,8 @@ var HOEditorFactorys = __webpack_require__(74089);
         'text-to-label': 'textDialog/TextToLabelDialog',
         date: 'dateDialog/DateDialog',
         select: 'selectDialog/SelectDialog',
-        'radio-box': 'radioCheckBox/RadioCheckbox',
-        'check-box': 'radioCheckBox/RadioCheckbox',
+        'RadioBox': 'radioCheckBox/RadioCheckbox',
+        'CheckBox': 'radioCheckBox/RadioCheckbox',
         table: 'table/TableProperty',
         'table-row': 'table/TableRowProperty',
         'table-col': 'table/TableColProperty',
@@ -12980,7 +12980,7 @@ var component = (0,componentNormalizer/* default */.Z)(
 
 /***/ }),
 
-/***/ 92638:
+/***/ 91377:
 /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -12992,7 +12992,7 @@ __webpack_require__.d(__webpack_exports__, {
   "default": function() { return /* binding */ RadioCheckbox; }
 });
 
-;// 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/radioCheckBox/RadioCheckbox.vue?vue&type=template&id=483f0e4a&
+;// 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/radioCheckBox/RadioCheckbox.vue?vue&type=template&id=00507f62&
 var render = function render() {
   var _vm = this,
     _c = _vm._self._c;
@@ -13389,7 +13389,7 @@ var render = function render() {
     staticClass: "label"
   }, [_vm._v("编号")]), _c('span', {
     staticClass: "readonly-value"
-  }, [_vm._v(_vm._s(_vm.radioCheckbox.id))])]), _c('li', {
+  }, [_vm._v(_vm._s(_vm.radioCheckBox.id))])]), _c('li', {
     staticClass: "control-item"
   }, [_c('span', {
     staticClass: "label"
@@ -13398,11 +13398,11 @@ var render = function render() {
       "placeholder": "内部标识符"
     },
     model: {
-      value: _vm.radioCheckbox.innerIdentifier,
+      value: _vm.radioCheckBox.innerIdentifier,
       callback: function callback($$v) {
-        _vm.$set(_vm.radioCheckbox, "innerIdentifier", $$v);
+        _vm.$set(_vm.radioCheckBox, "innerIdentifier", $$v);
       },
-      expression: "radioCheckbox.innerIdentifier"
+      expression: "radioCheckBox.innerIdentifier"
     }
   })], 1), _c('li', {
     staticClass: "control-item"
@@ -13413,11 +13413,11 @@ var render = function render() {
       "placeholder": "数据元标识符"
     },
     model: {
-      value: _vm.radioCheckbox.dataMetaIdentifier,
+      value: _vm.radioCheckBox.dataMetaIdentifier,
       callback: function callback($$v) {
-        _vm.$set(_vm.radioCheckbox, "dataMetaIdentifier", $$v);
+        _vm.$set(_vm.radioCheckBox, "dataMetaIdentifier", $$v);
       },
-      expression: "radioCheckbox.dataMetaIdentifier"
+      expression: "radioCheckBox.dataMetaIdentifier"
     }
   })], 1), _c('li', {
     staticClass: "control-item"
@@ -13428,11 +13428,11 @@ var render = function render() {
       "placeholder": "表示格式"
     },
     model: {
-      value: _vm.radioCheckbox.identifierFormat,
+      value: _vm.radioCheckBox.identifierFormat,
       callback: function callback($$v) {
-        _vm.$set(_vm.radioCheckbox, "identifierFormat", $$v);
+        _vm.$set(_vm.radioCheckBox, "identifierFormat", $$v);
       },
-      expression: "radioCheckbox.identifierFormat"
+      expression: "radioCheckBox.identifierFormat"
     }
   })], 1), _c('li', {
     staticClass: "control-item"
@@ -13444,11 +13444,11 @@ var render = function render() {
       "placeholder": "名称"
     },
     model: {
-      value: _vm.radioCheckbox.groupName,
+      value: _vm.radioCheckBox.groupName,
       callback: function callback($$v) {
-        _vm.$set(_vm.radioCheckbox, "groupName", $$v);
+        _vm.$set(_vm.radioCheckBox, "groupName", $$v);
       },
-      expression: "radioCheckbox.groupName"
+      expression: "radioCheckBox.groupName"
     }
   })], 1), _c('li', {
     staticClass: "control-item"
@@ -13460,11 +13460,11 @@ var render = function render() {
       "placeholder": "文本"
     },
     model: {
-      value: _vm.radioCheckbox.text,
+      value: _vm.radioCheckBox.text,
       callback: function callback($$v) {
-        _vm.$set(_vm.radioCheckbox, "text", $$v);
+        _vm.$set(_vm.radioCheckBox, "text", $$v);
       },
-      expression: "radioCheckbox.text"
+      expression: "radioCheckBox.text"
     }
   })], 1), _c('li', {
     staticClass: "control-item"
@@ -13476,61 +13476,61 @@ var render = function render() {
       "placeholder": "提示文本"
     },
     model: {
-      value: _vm.radioCheckbox.tipText,
+      value: _vm.radioCheckBox.tipText,
       callback: function callback($$v) {
-        _vm.$set(_vm.radioCheckbox, "tipText", $$v);
+        _vm.$set(_vm.radioCheckBox, "tipText", $$v);
       },
-      expression: "radioCheckbox.tipText"
+      expression: "radioCheckBox.tipText"
     }
   })], 1), _c('li', {
     staticClass: "control-item"
   }, [_c('a-checkbox', {
     model: {
-      value: _vm.radioCheckbox.isSelected,
+      value: _vm.radioCheckBox.isSelected,
       callback: function callback($$v) {
-        _vm.$set(_vm.radioCheckbox, "isSelected", $$v);
+        _vm.$set(_vm.radioCheckBox, "isSelected", $$v);
       },
-      expression: "radioCheckbox.isSelected"
+      expression: "radioCheckBox.isSelected"
     }
   }, [_vm._v("处于选择状态")]), _c('a-checkbox', {
     model: {
-      value: _vm.radioCheckbox.isAllowDelete,
+      value: _vm.radioCheckBox.isAllowDelete,
       callback: function callback($$v) {
-        _vm.$set(_vm.radioCheckbox, "isAllowDelete", $$v);
+        _vm.$set(_vm.radioCheckBox, "isAllowDelete", $$v);
       },
-      expression: "radioCheckbox.isAllowDelete"
+      expression: "radioCheckBox.isAllowDelete"
     }
   }, [_vm._v("可以删除")]), _c('a-checkbox', {
     model: {
-      value: _vm.radioCheckbox.boxAlign,
+      value: _vm.radioCheckBox.boxAlign,
       callback: function callback($$v) {
-        _vm.$set(_vm.radioCheckbox, "boxAlign", $$v);
+        _vm.$set(_vm.radioCheckBox, "boxAlign", $$v);
       },
-      expression: "radioCheckbox.boxAlign"
+      expression: "radioCheckBox.boxAlign"
     }
   }, [_vm._v("勾选框左对齐")]), _c('a-checkbox', {
     model: {
-      value: _vm.radioCheckbox.readType,
+      value: _vm.radioCheckBox.readType,
       callback: function callback($$v) {
-        _vm.$set(_vm.radioCheckbox, "readType", $$v);
+        _vm.$set(_vm.radioCheckBox, "readType", $$v);
       },
-      expression: "radioCheckbox.readType"
+      expression: "radioCheckBox.readType"
     }
   }, [_vm._v("自动回填")]), _c('a-checkbox', {
     model: {
-      value: _vm.radioCheckbox.isTransToText,
+      value: _vm.radioCheckBox.isTransToText,
       callback: function callback($$v) {
-        _vm.$set(_vm.radioCheckbox, "isTransToText", $$v);
+        _vm.$set(_vm.radioCheckBox, "isTransToText", $$v);
       },
-      expression: "radioCheckbox.isTransToText"
+      expression: "radioCheckBox.isTransToText"
     }
   }, [_vm._v("内容转文本")]), _c('a-checkbox', {
     model: {
-      value: _vm.radioCheckbox.isEditText,
+      value: _vm.radioCheckBox.isEditText,
       callback: function callback($$v) {
-        _vm.$set(_vm.radioCheckbox, "isEditText", $$v);
+        _vm.$set(_vm.radioCheckBox, "isEditText", $$v);
       },
-      expression: "radioCheckbox.isEditText"
+      expression: "radioCheckBox.isEditText"
     }
   }, [_vm._v("编辑文本")])], 1), _c('li', {
     staticClass: "control-item"
@@ -13542,11 +13542,11 @@ var render = function render() {
       "placeholder": "数值"
     },
     model: {
-      value: _vm.radioCheckbox.numericValue,
+      value: _vm.radioCheckBox.numericValue,
       callback: function callback($$v) {
-        _vm.$set(_vm.radioCheckbox, "numericValue", $$v);
+        _vm.$set(_vm.radioCheckBox, "numericValue", $$v);
       },
-      expression: "radioCheckbox.numericValue"
+      expression: "radioCheckBox.numericValue"
     }
   })], 1), _c('li', {
     staticClass: "control-item"
@@ -13558,11 +13558,11 @@ var render = function render() {
       "placeholder": "附加数据"
     },
     model: {
-      value: _vm.radioCheckbox.additionalData,
+      value: _vm.radioCheckBox.additionalData,
       callback: function callback($$v) {
-        _vm.$set(_vm.radioCheckbox, "additionalData", $$v);
+        _vm.$set(_vm.radioCheckBox, "additionalData", $$v);
       },
-      expression: "radioCheckbox.additionalData"
+      expression: "radioCheckBox.additionalData"
     }
   })], 1), _c('li', {
     staticClass: "control-item"
@@ -13574,11 +13574,11 @@ var render = function render() {
       "placeholder": "勾选级联对象"
     },
     model: {
-      value: _vm.radioCheckbox.checkCascadeObject,
+      value: _vm.radioCheckBox.checkCascadeObject,
       callback: function callback($$v) {
-        _vm.$set(_vm.radioCheckbox, "checkCascadeObject", $$v);
+        _vm.$set(_vm.radioCheckBox, "checkCascadeObject", $$v);
       },
-      expression: "radioCheckbox.checkCascadeObject"
+      expression: "radioCheckBox.checkCascadeObject"
     }
   })], 1), _c('li', {
     staticClass: "control-item"
@@ -13590,11 +13590,11 @@ var render = function render() {
       "placeholder": "不勾选级联对象"
     },
     model: {
-      value: _vm.radioCheckbox.unCheckCascadeObject,
+      value: _vm.radioCheckBox.unCheckCascadeObject,
       callback: function callback($$v) {
-        _vm.$set(_vm.radioCheckbox, "unCheckCascadeObject", $$v);
+        _vm.$set(_vm.radioCheckBox, "unCheckCascadeObject", $$v);
       },
-      expression: "radioCheckbox.unCheckCascadeObject"
+      expression: "radioCheckBox.unCheckCascadeObject"
     }
   })], 1), _c('li', {
     staticClass: "control-item"
@@ -13696,7 +13696,7 @@ var defaultBox = {
   isEditText: false
 };
 /* harmony default export */ var RadioCheckboxvue_type_script_lang_js_ = ({
-  name: 'RadioCheckbox',
+  name: 'RadioCheckBox',
   data: function data() {
     return {
       boxGroup: 1,
@@ -13704,7 +13704,7 @@ var defaultBox = {
       tableRadio: false,
       radioCheckBoxGroup: [],
       animationClassName: 'animation-in',
-      radioCheckbox: JSON.parse(JSON.stringify(defaultBox)),
+      radioCheckBox: JSON.parse(JSON.stringify(defaultBox)),
       dynamicTags: [],
       inputVisible: false,
       inputValue: '',
@@ -13743,18 +13743,18 @@ var defaultBox = {
     var _this = this;
     if (this.controlStatus === 'update') {
       var updateNode = this.getRadioCheckNode();
-      Object.keys(this.radioCheckbox).forEach(function (key) {
+      Object.keys(this.radioCheckBox).forEach(function (key) {
         if (key === 'readType') {
-          _this.radioCheckbox.readType = updateNode.readType == 1 ? true : false;
+          _this.radioCheckBox.readType = updateNode.readType == 1 ? true : false;
         } else {
-          _this.radioCheckbox[key] = updateNode[key];
+          _this.radioCheckBox[key] = updateNode[key];
         }
       });
       this.boxGroup = 0;
     } else {
-      this.radioCheckbox.id = this.controlType === 'RadioBox' ? this.vueController.generateID('RB') : this.vueController.generateID('CB');
-      this.radioCheckbox.controlStyle = this.controlType;
-      this.radioCheckbox.title = this.controlType === 'RadioBox' ? '单选框' : '复选框';
+      this.radioCheckBox.id = this.controlType === 'RadioBox' ? this.vueController.generateID('RB') : this.vueController.generateID('CB');
+      this.radioCheckBox.controlStyle = this.controlType;
+      this.radioCheckBox.title = this.controlType === 'RadioBox' ? '单选框' : '复选框';
     }
     if (this.boxGroup === 1) {
       this.addBox();
@@ -13800,7 +13800,7 @@ var defaultBox = {
     },
     addBox: function addBox() {
       var box = (0,objectSpread2/* default */.Z)({}, defaultBox);
-      box.id = this.controlType === 'radio-box' ? this.vueController.generateID('RB') : this.vueController.generateID('CB');
+      box.id = this.controlType === 'RadioBox' ? this.vueController.generateID('RB') : this.vueController.generateID('CB');
       box.groupName = this.groupName;
       this.radioCheckBoxGroup.push(box);
     },
@@ -13814,17 +13814,17 @@ var defaultBox = {
     sure: function sure() {
       var _this2 = this;
       if (this.boxGroup === 0) {
-        this.radioCheckbox.bandDataSource = JSON.stringify(this.dataSource);
-        this.radioCheckbox.readType ? this.radioCheckbox.readType = 1 : this.radioCheckbox.readType = 0;
+        this.radioCheckBox.bandDataSource = JSON.stringify(this.dataSource);
+        this.radioCheckBox.readType ? this.radioCheckBox.readType = 1 : this.radioCheckBox.readType = 0;
         if (this.controlStatus === 'add') {
-          this.vueController.insertRadioAndCheckBox(this.controlStatus, JSON.stringify(this.radioCheckbox));
+          this.vueController.insertRadioAndCheckBox(this.controlStatus, JSON.stringify(this.radioCheckBox));
         } else if (this.controlStatus === 'update') {
-          this.vueController.updateRadioAndCheckBox(JSON.stringify(this.radioCheckbox));
+          this.vueController.updateRadioAndCheckBox(JSON.stringify(this.radioCheckBox));
         }
       } else if (this.boxGroup === 1 && this.controlStatus === 'add') {
         this.radioCheckBoxGroup.forEach(function (v) {
           v.groupName = _this2.groupName;
-          v.controlStyle = _this2.controlType == "radio-box" ? 'RadioBox' : "CheckBox";
+          v.controlStyle = _this2.controlType == "RadioBox" ? 'RadioBox' : "CheckBox";
           if (v.id === _this2.tableRadio) v.isSelected = true;
           if (v.text == '') return; // 处理单复选文本值为空的情况
           _this2.vueController.insertRadioAndCheckBox('add', JSON.stringify(v));
@@ -13843,10 +13843,10 @@ var defaultBox = {
 });
 ;// CONCATENATED MODULE: ./src/components/controls/radioCheckBox/RadioCheckbox.vue?vue&type=script&lang=js&
  /* harmony default export */ var radioCheckBox_RadioCheckboxvue_type_script_lang_js_ = (RadioCheckboxvue_type_script_lang_js_); 
-;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/radioCheckBox/RadioCheckbox.vue?vue&type=style&index=0&id=483f0e4a&prod&lang=scss&
+;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/radioCheckBox/RadioCheckbox.vue?vue&type=style&index=0&id=00507f62&prod&lang=scss&
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./src/components/controls/radioCheckBox/RadioCheckbox.vue?vue&type=style&index=0&id=483f0e4a&prod&lang=scss&
+;// CONCATENATED MODULE: ./src/components/controls/radioCheckBox/RadioCheckbox.vue?vue&type=style&index=0&id=00507f62&prod&lang=scss&
 
 // EXTERNAL MODULE: ./node_modules/@vue/vue-loader-v15/lib/runtime/componentNormalizer.js
 var componentNormalizer = __webpack_require__(70713);
@@ -26538,7 +26538,7 @@ var getCellNode = function getCellNode(nodes) {
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   "EM": function() { return /* binding */ textParams; }
 /* harmony export */ });
-/* unused harmony exports dataSource, radioCheckbox */
+/* unused harmony exports dataSource, radioCheckBox */
 /* harmony import */ var _editor_dom_treeNode_TextInputFieldNode__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(90161);
 
 var dataSource = {
@@ -26550,7 +26550,7 @@ var dataSource = {
   autoUpdate: false,
   executeStatus: 0
 };
-var radioCheckbox = {
+var radioCheckBox = {
   id: "",
   title: "",
   groupName: "",
@@ -35327,8 +35327,13 @@ var DocController = /*#__PURE__*/function () {
       }
 
       if (!isError) {
+        var curDomRange = hoEditorFactory.docTree.curDomRange.normalize();
         if (hoEditorFactory.drawTree.paintStatus === _draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_27__/* .PaintState.psReview */ .Dh.psReview) {
-          path = hoEditorFactory.docTree.curDomRange.normalize().endPath;
+          path = curDomRange.endPath;
+        }
+        var npNode = curDomRange.npEnd.node;
+        if (npNode && npNode instanceof _treeNode_MarkNode__WEBPACK_IMPORTED_MODULE_46__/* .MarkNode */ .j && npNode.MarkNodeType == 1) {
+          path = npNode.parentNode.StartMarkNode.getNodePath();
         }
         hoEditorFactory.undoService.begin();
         // this.insertNodeByPath(textNode,this._curNodePosition.path);
@@ -42673,7 +42678,7 @@ var PageProperty = /*#__PURE__*/function () {
 /*
  * @Author: your name
  * @Date: 2020-12-24 16:01:16
- * @LastEditTime: 2022-12-12 14:49:39
+ * @LastEditTime: 2022-12-20 17:40:47
  * @LastEditors: liyanan 2441631434@qq.com
  * @Description: In User Settings Edit
  * @FilePath: \hoeditor-web\src\editor\dom\TableProperty.ts
@@ -62715,8 +62720,6 @@ __webpack_require__.d(__webpack_exports__, {
   "a": function() { return /* binding */ DrawLine; }
 });
 
-// EXTERNAL MODULE: ./node_modules/@babel/runtime/helpers/esm/slicedToArray.js + 3 modules
-var slicedToArray = __webpack_require__(27222);
 // EXTERNAL MODULE: ./node_modules/@babel/runtime/helpers/esm/classCallCheck.js
 var classCallCheck = __webpack_require__(70280);
 // EXTERNAL MODULE: ./node_modules/@babel/runtime/helpers/esm/createClass.js
@@ -62846,7 +62849,6 @@ var TextInputFieldNode = __webpack_require__(90161);
 
 
 
-
 
 
 var DrawLine = /*#__PURE__*/function (_DrawContainer) {
@@ -63132,10 +63134,7 @@ var DrawLine = /*#__PURE__*/function (_DrawContainer) {
     value: function adjustDHeight(dHeight) {
       if (this.paragraphNode.parentNode && this.paragraphNode.parentNode.nodeType === BaseNode/* NodeType.ntCell */.Jq.ntCell && this.paragraphNode.parentNode.table.tableProperty.isAutoChangeLine) {
         var cell = this.paragraphNode.parentNode;
-        var _cell$table$getCellIn = cell.table.getCellInfos(cell),
-          _cell$table$getCellIn2 = (0,slicedToArray/* default */.Z)(_cell$table$getCellIn, 2),
-          r = _cell$table$getCellIn2[0],
-          c = _cell$table$getCellIn2[1];
+        //const [r, c] = cell.table.getCellInfos(cell);
         if (cell.needPaintLineGrid() && dHeight, cell.table.tableProperty.autoLineHeightPx) {
           dHeight = Math.max(dHeight, cell.table.tableProperty.autoLineHeightPx - this.paragraphNode.combineParagraph.lineSpace - this.paragraphNode.combineParagraph.topMarginPixes);
         }
@@ -69066,7 +69065,7 @@ var ResizeDrawTableObj = /*#__PURE__*/function () {
       if (rect) {
         var dWidth = rect.width;
         var dHeight = rect.height;
-        if (0 < pos.x && pos.x < dWidth && (pos.y >= 0 || pos.y <= dHeight)) {
+        if (0 < pos.x && pos.x < dWidth && pos.y >= 0 && pos.y <= dHeight) {
           inYrange = true;
           // this._dObj.cursor = "s-resize";
           // this.setBoundsYMoveable(e.stageY, dWidth);
@@ -69350,7 +69349,7 @@ var DrawPageCell = /*#__PURE__*/function (_DrawArea) {
     // this._leftBorder = new createjs.Rectangle(dLeft, dTop, 2, dHeight);
     // this._rightBorder = new createjs.Rectangle(
     //   dLeft + dWidth - 2,
-    //   dTop,
+    //   dTop,canjustRowHeight
     //   2,
     //   dHeight
     // );
@@ -69387,7 +69386,7 @@ var DrawPageCell = /*#__PURE__*/function (_DrawArea) {
     //     gLineHeight;
     // }
     var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(_this._hoEditorFactoryID);
-    if (hoEditorFactory.drawTree.paintStatus === DrawTree/* PaintState.psEdit */.Dh.psEdit || hoEditorFactory.drawTree.paintStatus === DrawTree/* PaintState.psDesign */.Dh.psDesign) {
+    if (hoEditorFactory.drawTree.paintStatus === DrawTree/* PaintState.psEdit */.Dh.psEdit && (_this.cell.table.tableProperty.canAdjustRowHeight || _this.cell.table.tableProperty.canAdjustRowWidth) || hoEditorFactory.drawTree.paintStatus === DrawTree/* PaintState.psDesign */.Dh.psDesign) {
       _this._ResizeObj = new ResizeDrawTableObj(_this._hoEditorFactoryID, _this._cell, _this._touchArea, rowIndex, colIndex);
     }
     // this.paintBackground();
@@ -69561,7 +69560,7 @@ var DrawPageCell = /*#__PURE__*/function (_DrawArea) {
          * |0       1 |
          * | D     B  |
          * |3___C___2 |
-         *
+         *canjustRowHeight
          */
         switch (this._cell.cellProperty.obliqueSplitLine) {
           //02
@@ -70887,9 +70886,9 @@ var DrawPageTable = /*#__PURE__*/function (_DrawRect) {
     value: function paint(dTop, dParent, restHeight) {
       var totalHeight = 0;
       var aTop = dTop;
-      if (this.table.tableProperty.fixedOnePage) {
-        restHeight = Infinity;
-      }
+      // if (this.table.tableProperty.fixedOnePage) {
+      //   restHeight = Infinity;
+      // }
       var pageRestHeight = restHeight;
       var bStartRowFinished = true;
       var index = this._table.drawTable.drawPageTables.indexOf(this);
@@ -71505,9 +71504,9 @@ var DrawPageTable = /*#__PURE__*/function (_DrawRect) {
     key: "drawUpdate",
     value: function drawUpdate(prevdPageTable, dRestHeight) {
       var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_14__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this.table.hoEditorFactoryID);
-      if (this.table.tableProperty.fixedOnePage) {
-        dRestHeight = Infinity;
-      }
+      // if (this.table.tableProperty.fixedOnePage) {
+      //   dRestHeight = Infinity;
+      // }
       var pageRestHeight = dRestHeight;
       var rowTop = 0;
       var index = this._table.drawTable.drawPageTables.indexOf(this);
@@ -72414,7 +72413,7 @@ var DrawRect = /*#__PURE__*/function (_DrawContainer) {
 /*
  * @Author: your name
  * @Date: 2021-09-01 16:51:49
- * @LastEditTime: 2022-08-29 10:17:11
+ * @LastEditTime: 2023-01-01 14:53:26
  * @LastEditors: liyanan 2441631434@qq.com
  * @Description: In User Settings Edit
  * @FilePath: \hoeditor-web\src\editor\draw\drawNode\DrawSignNode.ts
@@ -72753,9 +72752,24 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
                 };
               } else {
                 _this2._dWidth = hitWidth * scale;
-                node.imgWidth = _this2._dWidth;
-                node.imgHeight = hoEditorFactory.signHeight;
-                bitmap.setTransform(0, -(hitHeight * scale + currentLineHeight) / 2, scale, scale);
+                //签名图片随单元格大小自适应
+                var width = _this2._dWidth;
+                if (node.parentNode instanceof _editor_dom_treeNode_CellNode__WEBPACK_IMPORTED_MODULE_6__/* .CellNode */ .D) {
+                  var cellWidth = node.parentNode.drawCell.dWidth;
+                  if (width > cellWidth - 5) {
+                    drawNode.dHeight = (cellWidth - 5) * drawNode.dHeight / width;
+                    scale = (cellWidth - 5) / width * scale;
+                    width = cellWidth - 5;
+                  }
+                  drawNode.dWidth = width;
+                  node.imgWidth = drawNode.dWidth;
+                  node.imgHeight = drawNode.dHeight;
+                  bitmap.setTransform(0, -(hitHeight * scale + currentLineHeight) / 2, scale, scale);
+                } else {
+                  node.imgWidth = _this2.dWidth;
+                  node.imgHeight = hoEditorFactory.signHeight;
+                  bitmap.setTransform(0, -(hitHeight * scale + currentLineHeight) / 2, scale, scale);
+                }
                 updateSign();
               }
             };
@@ -73143,6 +73157,10 @@ var DrawTable = /*#__PURE__*/function (_DrawRect) {
         } else {
           ret = false;
         }
+        var fixedOnePage = this.table.tableProperty.fixedOnePage;
+        if (fixedOnePage) {
+          return true;
+        }
       }
       return ret;
     }
@@ -76064,6 +76082,7 @@ var EditorController = /*#__PURE__*/function () {
           }
         } finally {
           el.value = '';
+          el.style.width = '0px';
           hoeditorfactory.drawTree.caret.cursor.className = 'ho-caret-animation';
         }
       }
@@ -186826,7 +186845,7 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
 /***/ (function(module, __unused_webpack_exports, __webpack_require__) {
 
 var map = {
-	"./ControlModal.vue": 25867,
+	"./ControlModal.vue": 68120,
 	"./barCode/BarCodes.vue": 98194,
 	"./colorPicker/HoColorPicker.vue": 91351,
 	"./colorPicker/HoColorPickers.vue": 84214,
@@ -186851,7 +186870,7 @@ var map = {
 	"./popers/Title.vue": 89987,
 	"./printstyle/PrintLineStyle.vue": 41889,
 	"./qrCode/QrCode.vue": 67124,
-	"./radioCheckBox/RadioCheckbox.vue": 92638,
+	"./radioCheckBox/RadioCheckbox.vue": 91377,
 	"./selectDialog/SelectDialog.vue": 26679,
 	"./sign/Sign.vue": 99163,
 	"./table/TableCellPoper.vue": 21277,
@@ -226891,7 +226910,7 @@ var SignNode = __webpack_require__(24701);
 // EXTERNAL MODULE: ./src/editor/dom/treeNode/ParagraphNode.ts
 var ParagraphNode = __webpack_require__(67945);
 ;// CONCATENATED MODULE: ./src/components/version.ts
-/* harmony default export */ var version = ('3.0.9');
+/* harmony default export */ var version = ('3.0.11');
 // EXTERNAL MODULE: ./src/components/controls/poperTipText/PoperTipText.vue + 5 modules
 var PoperTipText = __webpack_require__(15845);
 ;// CONCATENATED MODULE: ./src/components/controls/poperTipText/index.ts
@@ -228163,6 +228182,7 @@ var DrawPageTree = /*#__PURE__*/function () {
   }, {
     key: "paintDrawPageCell",
     value: function paintDrawPageCell(aDrawArea, dRoots, startLine, endLine) {
+      var fixedOnePage = aDrawArea.cell.table.tableProperty.fixedOnePage;
       var startUpdateLine = endLine;
       var drawArea = aDrawArea;
       var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID);
@@ -228201,9 +228221,17 @@ var DrawPageTree = /*#__PURE__*/function () {
         var dMaxHeight = mainArea.dHeight - drawArea.localToLocal(0, 0, mainArea).y;
         drawArea.maxHeight = dMaxHeight;
         var restHeight = Infinity;
+        var bIsFull = false;
         if (drawArea.allowAcrossPage && mainArea.allowAcrossPage) restHeight = drawArea.maxHeight - dTop;
+        if (dLine && fixedOnePage) {
+          //drawArea.allowAcrossPage = false;
+          restHeight = drawArea.maxHeight - dTop;
+          if (dLine.dHeight > restHeight) {
+            restHeight = 0;
+            bIsFull = true;
+          }
+        }
         var nextLine = startLine;
-        var bIsFull = false;
         while (nextLine <= endLine) {
           var dline = dRoots[nextLine];
           if (dline instanceof DrawTable/* DrawTable */.t && restHeight < hoEditorFactory.defaultLineHeight || dline instanceof DrawLine/* DrawLine */.a && restHeight < dline.dHeight) {
@@ -228273,8 +228301,8 @@ var DrawPageTree = /*#__PURE__*/function () {
               if (index > 0) {
                 prevPgTable = dPgTable.table.drawTable.drawPageTables[index - 1];
               }
-              var _restHeight = dPgTable.getMainRestHeight();
-              drawArea.drawPageTable.table.drawTable.drawUpdate(pArea, prevPgTable, dPgTable.y, _restHeight);
+              var restHeight1 = dPgTable.getMainRestHeight();
+              drawArea.drawPageTable.table.drawTable.drawUpdate(pArea, prevPgTable, dPgTable.y, restHeight1);
               break;
             }
             if (nextLine > startLine || nextLine === startLine && !drawArea.contains(_dobj2)) {
@@ -235624,11 +235652,13 @@ var VueController = /*#__PURE__*/function () {
           var nodes = [];
           var lines = text.split("\n");
           for (var i = 0; i < lines.length; i++) {
-            var textNode = new TextNode/* TextNode */.R(this._hoEditorFactoryID, npStart.roots, npStart.node.parentNode, BaseNode/* NodeType.ntText */.Jq.ntText, lines[i], hoEditorFactory.docTree.curStyleIndex);
-            nodes.push(textNode);
-            if (i < lines.length - 1) {
-              var paragraphNode = new ParagraphNode/* ParagraphNode */.C(this._hoEditorFactoryID, npStart.roots, npStart.node.parentNode, hoEditorFactory.docTree.curParaNo);
-              nodes.push(paragraphNode);
+            if (lines[i] != "") {
+              var textNode = new TextNode/* TextNode */.R(this._hoEditorFactoryID, npStart.roots, npStart.node.parentNode, BaseNode/* NodeType.ntText */.Jq.ntText, lines[i], hoEditorFactory.docTree.curStyleIndex);
+              nodes.push(textNode);
+              if (i < lines.length - 1) {
+                var paragraphNode = new ParagraphNode/* ParagraphNode */.C(this._hoEditorFactoryID, npStart.roots, npStart.node.parentNode, hoEditorFactory.docTree.curParaNo);
+                nodes.push(paragraphNode);
+              }
             }
           }
           hoEditorFactory.docController.parseNodeData(nodes);
@@ -245399,7 +245429,7 @@ var HoFooter_component = (0,componentNormalizer/* default */.Z)(
 
 /* harmony default export */ var HoFooter = (HoFooter_component.exports);
 // EXTERNAL MODULE: ./src/components/controls/ControlModal.vue + 3 modules
-var ControlModal = __webpack_require__(25867);
+var ControlModal = __webpack_require__(68120);
 // EXTERNAL MODULE: ./src/components/controls/findReplace/FindReplace.vue + 5 modules
 var FindReplace = __webpack_require__(25918);
 ;// CONCATENATED MODULE: ./src/components/controls/findReplace/index.ts
@@ -249255,8 +249285,8 @@ var ToolBarChild_component = (0,componentNormalizer/* default */.Z)(
 )
 
 /* harmony default export */ var ToolBarChild = (ToolBarChild_component.exports);
-;// 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/ToolControl.vue?vue&type=template&id=b0adf838&
-var ToolControlvue_type_template_id_b0adf838_render = function render() {
+;// 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/ToolControl.vue?vue&type=template&id=028bf828&
+var ToolControlvue_type_template_id_028bf828_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -249469,7 +249499,7 @@ var ToolControlvue_type_template_id_b0adf838_render = function render() {
     staticClass: "ho-emr-tool-item",
     on: {
       "click": function click($event) {
-        return _vm.createControl('radio-box');
+        return _vm.createControl('RadioBox');
       }
     }
   }, [_c('svg', {
@@ -249488,7 +249518,7 @@ var ToolControlvue_type_template_id_b0adf838_render = function render() {
     staticClass: "ho-emr-tool-item",
     on: {
       "click": function click($event) {
-        return _vm.createControl('check-box');
+        return _vm.createControl('CheckBox');
       }
     }
   }, [_c('svg', {
@@ -249555,7 +249585,7 @@ var ToolControlvue_type_template_id_b0adf838_render = function render() {
     }
   })], 1) : _vm._e()], 2);
 };
-var ToolControlvue_type_template_id_b0adf838_staticRenderFns = [];
+var ToolControlvue_type_template_id_028bf828_staticRenderFns = [];
 
 ;// 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/HoSpecialChars.vue?vue&type=template&id=79ce269a&
 var HoSpecialCharsvue_type_template_id_79ce269a_render = function render() {
@@ -250275,8 +250305,8 @@ var ajax = __webpack_require__(79969);
 ;
 var ToolControl_component = (0,componentNormalizer/* default */.Z)(
   insert_ToolControlvue_type_script_lang_js_,
-  ToolControlvue_type_template_id_b0adf838_render,
-  ToolControlvue_type_template_id_b0adf838_staticRenderFns,
+  ToolControlvue_type_template_id_028bf828_render,
+  ToolControlvue_type_template_id_028bf828_staticRenderFns,
   false,
   null,
   null,
@@ -252591,7 +252621,7 @@ var popper = __webpack_require__(95551);
           return _this5.toUpdateNodes('express', event);
         }
       }
-    }, ["\u533B\u5B66\u8868\u8FBE\u5F0F\u5C5E\u6027"])]), (((_this$hoEditorProvide7 = this.hoEditorProvider.rightNode) === null || _this$hoEditorProvide7 === void 0 ? void 0 : _this$hoEditorProvide7.type) === 'radio-box' || ((_this$hoEditorProvide8 = this.hoEditorProvider.rightNode) === null || _this$hoEditorProvide8 === void 0 ? void 0 : _this$hoEditorProvide8.type) === 'check-box') && ((_this$hoEditorProvide9 = this.hoEditorProvider.rightNode) === null || _this$hoEditorProvide9 === void 0 ? void 0 : _this$hoEditorProvide9.paintStatus) === 0 ? h("ul", {
+    }, ["\u533B\u5B66\u8868\u8FBE\u5F0F\u5C5E\u6027"])]), (((_this$hoEditorProvide7 = this.hoEditorProvider.rightNode) === null || _this$hoEditorProvide7 === void 0 ? void 0 : _this$hoEditorProvide7.type) === 'RadioBox' || ((_this$hoEditorProvide8 = this.hoEditorProvider.rightNode) === null || _this$hoEditorProvide8 === void 0 ? void 0 : _this$hoEditorProvide8.type) === 'CheckBox') && ((_this$hoEditorProvide9 = this.hoEditorProvider.rightNode) === null || _this$hoEditorProvide9 === void 0 ? void 0 : _this$hoEditorProvide9.paintStatus) === 0 && h("ul", {
       "class": "mouse-right-menu"
     }, [h("li", {
       "class": "mouse-menu-item mouse-right-menu-line"
@@ -252603,7 +252633,7 @@ var popper = __webpack_require__(95551);
           return _this5.toUpdateNodes((_this5$hoEditorProvid = _this5.hoEditorProvider.rightNode) === null || _this5$hoEditorProvid === void 0 ? void 0 : _this5$hoEditorProvid.type, event);
         }
       }
-    }, [((_this$hoEditorProvide10 = this.hoEditorProvider.rightNode) === null || _this$hoEditorProvide10 === void 0 ? void 0 : _this$hoEditorProvide10.type) === 'RadioBox' ? '单选框属性' : '复选框属性'])]) : null, ((_this$hoEditorProvide11 = this.hoEditorProvider.rightNode) === null || _this$hoEditorProvide11 === void 0 ? void 0 : _this$hoEditorProvide11.type) === 'date' && ((_this$hoEditorProvide12 = this.hoEditorProvider.rightNode) === null || _this$hoEditorProvide12 === void 0 ? void 0 : _this$hoEditorProvide12.paintStatus) === 0 && h("ul", {
+    }, [((_this$hoEditorProvide10 = this.hoEditorProvider.rightNode) === null || _this$hoEditorProvide10 === void 0 ? void 0 : _this$hoEditorProvide10.type) === 'RadioBox' ? '单选框属性' : '复选框属性'])]), ((_this$hoEditorProvide11 = this.hoEditorProvider.rightNode) === null || _this$hoEditorProvide11 === void 0 ? void 0 : _this$hoEditorProvide11.type) === 'date' && ((_this$hoEditorProvide12 = this.hoEditorProvider.rightNode) === null || _this$hoEditorProvide12 === void 0 ? void 0 : _this$hoEditorProvide12.paintStatus) === 0 && h("ul", {
       "class": "mouse-right-menu"
     }, [h("li", {
       "class": "mouse-menu-item mouse-right-menu-line"