hoeditor-web 3.1.0 → 3.1.2

package/lib/hoeditor.umd.js

@@ -20085,7 +20085,7 @@ var component = (0,componentNormalizer/* default */.Z)(
 
 /***/ }),
 
-/***/ 67050:
+/***/ 89305:
 /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -20097,7 +20097,7 @@ __webpack_require__.d(__webpack_exports__, {
   "default": function() { return /* binding */ TableProperty; }
 });
 
-;// 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/TableProperty.vue?vue&type=template&id=da43d26c&
+;// 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/TableProperty.vue?vue&type=template&id=2d378d27&
 var render = function render() {
   var _vm = this,
     _c = _vm._self._c;
@@ -20121,12 +20121,6 @@ var render = function render() {
     staticClass: "control-item"
   }, [_c('span', {
     staticClass: "label"
-  }, [_vm._v("编号")]), _c('span', {
-    staticClass: "readonly-value"
-  }, [_vm._v(_vm._s(_vm.id))])]), _c('li', {
-    staticClass: "control-item"
-  }, [_c('span', {
-    staticClass: "label"
   }, [_vm._v("自定义属性")]), _c('a-button', {
     on: {
       "click": _vm.openCustomsModal
@@ -20288,7 +20282,19 @@ var render = function render() {
       },
       expression: "isUsePopEdit"
     }
-  }, [_vm._v("启用表单形式编辑表格")])], 1)])])]), _c('footer', {
+  }, [_vm._v("启用表单形式编辑表格")])], 1), _c('div', {
+    staticStyle: {
+      "width": "100%"
+    }
+  }, [_c('a-checkbox', {
+    model: {
+      value: _vm.isSignLock,
+      callback: function callback($$v) {
+        _vm.isSignLock = $$v;
+      },
+      expression: "isSignLock"
+    }
+  }, [_vm._v("签名完成后锁定表格")])], 1)])])]), _c('footer', {
     staticClass: "ho-modal-footer"
   }, [_c('a-button', {
     attrs: {
@@ -20357,8 +20363,7 @@ var CellNode = __webpack_require__(68598);
   },
   data: function data() {
     return {
-      id: '',
-      // 编号
+      //id: '', // 编号
       canAdjustRowHeight: false,
       //用户可调整行高
       canAdjustRowWidth: false,
@@ -20386,10 +20391,11 @@ var CellNode = __webpack_require__(68598);
       rowHeightMm: 0,
       // 当前光标所在行行高
       isUsePopEdit: false,
-      endPath: ''
+      endPath: '',
+      isSignLock: false
     };
   },
-  inject: ["hoEditorProvider"],
+  inject: ['hoEditorProvider'],
   computed: {
     customProperties: function customProperties() {
       return this.hoEditorProvider.getCustomsValue().filter(function (v) {
@@ -20403,7 +20409,7 @@ var CellNode = __webpack_require__(68598);
     this.endPath = hoEditorFactory.docTree.curDomRange.normalize().endPath;
     var tableNode = this.getTableNodes();
     if (tableNode) {
-      this.id = tableNode.tableProperty.id ? tableNode.tableProperty.id : this.vueController.generateID('TB');
+      //this.id = tableNode.tableProperty.id ? tableNode.tableProperty.id : this.vueController.generateID('TB');
       this.canAdjustRowHeight = tableNode.tableProperty.canAdjustRowHeight;
       this.canAdjustRowWidth = tableNode.tableProperty.canAdjustRowWidth;
       this.canAddRow = tableNode.tableProperty.canAddRow;
@@ -20417,6 +20423,7 @@ var CellNode = __webpack_require__(68598);
       this.fixedOnePage = tableNode.tableProperty.fixedOnePage;
       this.autoLineHeight = tableNode.tableProperty.autoLineHeight;
       this.isUsePopEdit = tableNode.tableProperty.isUsePopEdit;
+      this.isSignLock = tableNode.tableProperty.isSignLock;
     }
   },
   methods: {
@@ -20473,7 +20480,8 @@ var CellNode = __webpack_require__(68598);
         isAutoChangeLine: this.isAutoChangeLine,
         fixedOnePage: this.fixedOnePage,
         autoLineHeight: this.autoLineHeight,
-        isUsePopEdit: this.isUsePopEdit
+        isUsePopEdit: this.isUsePopEdit,
+        isSignLock: this.isSignLock
       };
       var tableNode = this.getTableNodes();
       this.vueController.tableProperty(JSON.stringify(params), tableNode);
@@ -20488,10 +20496,10 @@ var CellNode = __webpack_require__(68598);
 });
 ;// CONCATENATED MODULE: ./src/components/controls/table/TableProperty.vue?vue&type=script&lang=js&
  /* harmony default export */ var table_TablePropertyvue_type_script_lang_js_ = (TablePropertyvue_type_script_lang_js_); 
-;// 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/TableProperty.vue?vue&type=style&index=0&id=da43d26c&prod&lang=less&
+;// 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/TableProperty.vue?vue&type=style&index=0&id=2d378d27&prod&lang=less&
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./src/components/controls/table/TableProperty.vue?vue&type=style&index=0&id=da43d26c&prod&lang=less&
+;// CONCATENATED MODULE: ./src/components/controls/table/TableProperty.vue?vue&type=style&index=0&id=2d378d27&prod&lang=less&
 
 // EXTERNAL MODULE: ./node_modules/@vue/vue-loader-v15/lib/runtime/componentNormalizer.js
 var componentNormalizer = __webpack_require__(70713);
@@ -20519,7 +20527,7 @@ var component = (0,componentNormalizer/* default */.Z)(
 
 /***/ }),
 
-/***/ 26521:
+/***/ 70872:
 /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -20531,7 +20539,7 @@ __webpack_require__.d(__webpack_exports__, {
   "default": function() { return /* binding */ TableRowProperty; }
 });
 
-;// 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/TableRowProperty.vue?vue&type=template&id=44bc640d&
+;// 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/TableRowProperty.vue?vue&type=template&id=cd52f7dc&
 var render = function render() {
   var _vm = this,
     _c = _vm._self._c;
@@ -20708,6 +20716,8 @@ var staticRenderFns = [];
 
 // EXTERNAL MODULE: ./node_modules/@babel/runtime/helpers/esm/toConsumableArray.js + 3 modules
 var toConsumableArray = __webpack_require__(61748);
+// EXTERNAL MODULE: ./node_modules/@babel/runtime/helpers/esm/defineProperty.js
+var defineProperty = __webpack_require__(78255);
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.filter.js
 var es_array_filter = __webpack_require__(57327);
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.object.to-string.js
@@ -20749,6 +20759,7 @@ var TableNode = __webpack_require__(5010);
 
 
 
+
 /* harmony default export */ var TableRowPropertyvue_type_script_lang_js_ = ({
   name: 'TableRowPoperty',
   props: {
@@ -20760,8 +20771,8 @@ var TableNode = __webpack_require__(5010);
     }
   },
   data: function data() {
-    return {
-      id: '',
+    return (0,defineProperty/* default */.Z)({
+      //id: '',
       defaultRowProperty: {
         rowHeight: 0,
         isSpecifyHeight: false,
@@ -20802,7 +20813,7 @@ var TableNode = __webpack_require__(5010);
       paramsChange: [],
       rowInfos: null,
       rowProperty: null
-    };
+    }, "newLineWithCellContent", false);
   },
   inject: ['hoEditorProvider'],
   computed: {
@@ -20833,7 +20844,7 @@ var TableNode = __webpack_require__(5010);
       }
       if (this.rowProperty !== null && rowInfos !== null) {
         var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this.hoEditorFactoryId);
-        this.id = this.rowProperty.id ? this.rowProperty.id : this.vueController.generateID('TB');
+        //this.id = this.rowProperty.id ? this.rowProperty.id : this.vueController.generateID('TB');
         this.isSpecifyHeight = this.rowProperty.isSpecifyHeight;
         this.rowHeight = this.rowProperty.rowHeight;
         this.isLockRowHeight = this.rowProperty.isLockRowHeight;
@@ -20845,6 +20856,7 @@ var TableNode = __webpack_require__(5010);
         this.tabKeyInsNewLine = this.rowProperty.tabKeyInsNewLine;
         this.rowHeightMm = (hoEditorFactory.unitConvert.pxConversionMm(rowInfos.rowHeight, false) / 10).toFixed(2);
         this.newLineWithCellContent = this.rowProperty.newLineWithCellContent;
+        //console.log(this.rowProperty.newLineWithCellContent, this.newLineWithCellContent, '2222222222222222');
       }
     },
     getCellNodes: function getCellNodes() {
@@ -20899,7 +20911,7 @@ var TableNode = __webpack_require__(5010);
     sure: function sure() {
       var _this = this;
       var params = {
-        id: this.id,
+        //id: this.id,
         customProperties: this.customProperties,
         // dataSource: this.dataSource,
         isSpecifyHeight: this.isSpecifyHeight,
@@ -20939,10 +20951,10 @@ var TableNode = __webpack_require__(5010);
 });
 ;// CONCATENATED MODULE: ./src/components/controls/table/TableRowProperty.vue?vue&type=script&lang=js&
  /* harmony default export */ var table_TableRowPropertyvue_type_script_lang_js_ = (TableRowPropertyvue_type_script_lang_js_); 
-;// 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/TableRowProperty.vue?vue&type=style&index=0&id=44bc640d&prod&lang=less&
+;// 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/TableRowProperty.vue?vue&type=style&index=0&id=cd52f7dc&prod&lang=less&
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./src/components/controls/table/TableRowProperty.vue?vue&type=style&index=0&id=44bc640d&prod&lang=less&
+;// CONCATENATED MODULE: ./src/components/controls/table/TableRowProperty.vue?vue&type=style&index=0&id=cd52f7dc&prod&lang=less&
 
 // EXTERNAL MODULE: ./node_modules/@vue/vue-loader-v15/lib/runtime/componentNormalizer.js
 var componentNormalizer = __webpack_require__(70713);
@@ -45564,16 +45576,32 @@ var DocTree = /*#__PURE__*/function () {
   }, {
     key: "getParentNode",
     value: function getParentNode(startPath) {
-      var parentNode = null;
+      var pNode = null;
       var np = this.findNodePositionByPath(startPath);
       if (!(np && np.node)) {
         throw _events_Exception__WEBPACK_IMPORTED_MODULE_42__/* .Exception */ .P.NodeNotFound();
       }
-      parentNode = np.node.parentNode;
-      if (parentNode && parentNode.last() == np.node && parentNode instanceof _treeNode_TextInputFieldNode__WEBPACK_IMPORTED_MODULE_36__/* .TextInputFieldNode */ .re) {
-        parentNode = parentNode.parentNode;
+      pNode = np.node.parentNode;
+      if (pNode instanceof _treeNode_CellNode__WEBPACK_IMPORTED_MODULE_43__/* .CellNode */ .D) {
+        return pNode;
       }
-      return parentNode;
+      do {
+        if (pNode && pNode.parentNode) {
+          pNode = pNode.parentNode;
+          if (pNode instanceof _treeNode_CellNode__WEBPACK_IMPORTED_MODULE_43__/* .CellNode */ .D) {
+            return pNode;
+          }
+        }
+      } while (pNode && pNode.parentNode);
+      // parentNode = np.node.parentNode;
+      // if (
+      //   parentNode &&
+      //   parentNode.last() == np.node &&
+      //   parentNode instanceof TextInputFieldNode
+      // ) {
+      //   parentNode = parentNode.parentNode;
+      // }
+      return pNode;
     }
   }, {
     key: "marksDisappears",
@@ -47367,13 +47395,13 @@ var PageProperty = /*#__PURE__*/function () {
 /*
  * @Author: your name
  * @Date: 2020-12-24 16:01:16
- * @LastEditTime: 2023-08-04 14:39:49
+ * @LastEditTime: 2023-08-21 15:18:03
  * @LastEditors: liyanan 2441631434@qq.com
  * @Description: In User Settings Edit
  * @FilePath: \hoeditor-web\src\editor\dom\TableProperty.ts
  */
 var TableProperty = /*#__PURE__*/function () {
-  //是否启用表单弹框编辑
+  //签名后是否锁定
   function TableProperty(objectValues) {
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_classCallCheck_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)(this, TableProperty);
     //private _id!: string; //编号
@@ -47404,6 +47432,8 @@ var TableProperty = /*#__PURE__*/function () {
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_3__/* ["default"] */ .Z)(this, "_fixedOnePage", false);
     //表格固定在一页
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_3__/* ["default"] */ .Z)(this, "_isUsePopEdit", false);
+    //是否启用表单弹框编辑
+    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_3__/* ["default"] */ .Z)(this, "_isSignLock", false);
     if (objectValues !== "") {
       var valuesObj = eval('(' + objectValues + ')');
       var assignvalue = function assignvalue(target, source) {
@@ -47548,6 +47578,14 @@ var TableProperty = /*#__PURE__*/function () {
     set: function set(value) {
       this._isUsePopEdit = value;
     }
+  }, {
+    key: "isSignLock",
+    get: function get() {
+      return this._isSignLock;
+    },
+    set: function set(value) {
+      this._isSignLock = value;
+    }
   }]);
   return TableProperty;
 }();
@@ -64239,7 +64277,8 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
             isAutoChangeLine: this.tableProperty.isAutoChangeLine,
             autoLineHeight: this.tableProperty.autoLineHeight,
             fixedOnePage: this.tableProperty.fixedOnePage,
-            isUsePopEdit: this.tableProperty.isUsePopEdit
+            isUsePopEdit: this.tableProperty.isUsePopEdit,
+            isSignLock: this.tableProperty.isSignLock
           };
         }
       }
@@ -64484,7 +64523,8 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
         isAutoChangeLine: this.tableProperty.isAutoChangeLine,
         autoLineHeight: this.tableProperty.autoLineHeight,
         fixedOnePage: this.tableProperty.fixedOnePage,
-        isUsePopEdit: this.tableProperty.isUsePopEdit
+        isUsePopEdit: this.tableProperty.isUsePopEdit,
+        isSignLock: this.tableProperty.isSignLock
       };
       var retJson = {
         nodeType: _BaseNode__WEBPACK_IMPORTED_MODULE_28__/* .NodeType */ .Jq[this.nodeType],
@@ -65164,6 +65204,7 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
       tableProperty.isAutoChangeLine = tableProperty["isAutoChangeLine"] || false;
       tableProperty.autoLineHeight = tableProperty["autoLineHeight"] || 0.53;
       tableProperty.autoLineHeightPx = _editor_utils_UnitConvert__WEBPACK_IMPORTED_MODULE_40__/* .UnitConvert */ .P.instance.mmConversionPx(parseFloat(tableProperty.autoLineHeight) * 10, false);
+      tableProperty.isSignLock = tableProperty["isSignLock"] || false;
       // console.log("json2node", 1);
       var tableNode = new TableNode(hoEditorFactoryID, rootNodes, pNode ? pNode : null, Number(json.rowCount), Number(json.colCount), tableProperty);
       // console.log("json2node", 2);
@@ -65431,7 +65472,7 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
 /* harmony export */ });
 /* unused harmony exports SpecialFormat, BandDataSource */
 /* harmony import */ var ant_design_vue_es_message_style__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(94310);
-/* harmony import */ var ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_63__ = __webpack_require__(40735);
+/* harmony import */ var ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_62__ = __webpack_require__(40735);
 /* harmony import */ var D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_toConsumableArray_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(61748);
 /* harmony import */ var D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_regeneratorRuntime_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(80543);
 /* harmony import */ var D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_asyncToGenerator_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(81448);
@@ -65511,7 +65552,6 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
 /* harmony import */ var _TextNode__WEBPACK_IMPORTED_MODULE_59__ = __webpack_require__(27198);
 /* harmony import */ var _QrcodeNode__WEBPACK_IMPORTED_MODULE_60__ = __webpack_require__(12659);
 /* harmony import */ var _RareCharNode__WEBPACK_IMPORTED_MODULE_61__ = __webpack_require__(34910);
-/* harmony import */ var _editor_events_SelectionChangeEvent__WEBPACK_IMPORTED_MODULE_62__ = __webpack_require__(931);
 
 
 
@@ -65547,7 +65587,7 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
 /*
  * @Author: your name
  * @Date: 2020-11-03 15:17:54
- * @LastEditTime: 2023-07-21 15:20:11
+ * @LastEditTime: 2023-08-22 16:38:21
  * @LastEditors: liyanan 2441631434@qq.com
  * @Description: In User Settings Edit
  * @FilePath: \hoeditor-web\src\editor\dom\treeNode\TextInputFieldNode.ts
@@ -65581,7 +65621,6 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
 
 
 
-
 
 
 var ReadOnlyStatus;
@@ -66766,7 +66805,7 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
     key: "setFieldText",
     value: function () {
       var _setFieldText = (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_asyncToGenerator_js__WEBPACK_IMPORTED_MODULE_3__/* ["default"] */ .Z)( /*#__PURE__*/(0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_regeneratorRuntime_js__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z)().mark(function _callee2(text, customProperty, keyValue, value) {
-        var oldValue, hoEditorFactory, oldRange, startPath, endPath, aRange, anodes, i, anode, selectChangeEvent, markNode;
+        var oldValue, hoEditorFactory, startPath, endPath, aRange, anodes, i, anode, markNode;
         return (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_regeneratorRuntime_js__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z)().wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
@@ -66788,7 +66827,6 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
               oldValue = this._canModifyContent.valueOf();
               this._canModifyContent = true;
               hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_38__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID);
-              oldRange = hoEditorFactory.docTree.curDomRange.clone();
               startPath = this.StartMarkNode.getNodePath();
               endPath = hoEditorFactory.docTree.getNodeLastPath(this.childNodes[this.childNodes.length - 2]);
               aRange = new _DomRange__WEBPACK_IMPORTED_MODULE_41__/* .DomRange */ .a(this._hoEditorFactoryID, startPath, endPath).normalize();
@@ -66802,14 +66840,10 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
                 }
                 hoEditorFactory.docController.deleteRange(aRange, true, 'update');
               } else {
-                if (oldRange.startPath !== aRange.startPath || oldRange.endPath !== aRange.endPath) {
-                  selectChangeEvent = new _editor_events_SelectionChangeEvent__WEBPACK_IMPORTED_MODULE_62__/* .SelectionChangeEvent */ .r(oldRange, aRange);
-                  hoEditorFactory.docTree.selectChange(selectChangeEvent);
-                  hoEditorFactory.docTree.curDomRange = aRange;
-                }
+                hoEditorFactory.docTree.curDomRange.setSamePath(startPath);
               }
               if (!(text === '')) {
-                _context2.next = 24;
+                _context2.next = 23;
                 break;
               }
               this._childNodes.splice(1, this._childNodes.length - 2);
@@ -66824,11 +66858,11 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
               this._canModifyContent = oldValue;
               this.update(0);
               return _context2.abrupt("return");
-            case 24:
+            case 23:
               hoEditorFactory.docController.insertPlainTextAfterPath(startPath, text, oldValue);
               //this._canModifyContent = await oldValue;
               //this.update(0);
-            case 25:
+            case 24:
             case "end":
               return _context2.stop();
           }
@@ -67096,7 +67130,7 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
         return (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_get_js__WEBPACK_IMPORTED_MODULE_6__/* ["default"] */ .Z)((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_getPrototypeOf_js__WEBPACK_IMPORTED_MODULE_7__/* ["default"] */ .Z)(TextInputFieldNode.prototype), "delete", this).call(this);
       } else {
         if (operType !== 'update') {
-          ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_63__/* ["default"] */ .Z.warn('文本域已设置为不允许删除。请先右键元素属性设置成允许删除,再进行删除操作。');
+          ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_62__/* ["default"] */ .Z.warn('文本域已设置为不允许删除。请先右键元素属性设置成允许删除,再进行删除操作。');
         } else {
           return (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_get_js__WEBPACK_IMPORTED_MODULE_6__/* ["default"] */ .Z)((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_getPrototypeOf_js__WEBPACK_IMPORTED_MODULE_7__/* ["default"] */ .Z)(TextInputFieldNode.prototype), "delete", this).call(this);
         }
@@ -67519,7 +67553,7 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
                     }
                   } else {
                     if (node instanceof _SignNode__WEBPACK_IMPORTED_MODULE_56__/* .SignNode */ .N) {
-                      if (!(node.number == 0 && node.type == 0 && node.name == '')) {
+                      if (!(node.number == 0 && node.type == 0 && node.name == "")) {
                         nodes.push(node);
                       }
                     } else {
@@ -67631,7 +67665,7 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
         var childFields = [];
         for (var c = 0; c < temp.childNodes.length; c++) {
           var childNode = temp.childNodes[c];
-          if (childNode instanceof TextInputFieldNode) {
+          if (childNode instanceof TextInputFieldNode || childNode instanceof _SignNode__WEBPACK_IMPORTED_MODULE_56__/* .SignNode */ .N) {
             childFields.push(childNode);
           }
         }
@@ -105456,7 +105490,8 @@ request.overrideMimeType("text/plain; charset=x-user-defined");if(sync===false){
  *
  * @name html
  * @module
- */(function(jsPDFAPI){function loadHtml2Canvas(){// return function () {
+ */(function(jsPDFAPI){function loadHtml2Canvas(){// 自定义修改 去除不需要的html转canvas方法和html2canvas依赖 ---  处理问题: html2canvas依赖canvas插件 容易卡在下载超时和安装失败
+// return function () {
 //   if (globalObject["html2canvas"]) {
 //     return Promise.resolve(globalObject["html2canvas"]);
 //   }
@@ -176654,8 +176689,8 @@ var map = {
 	"./table/TableForm.vue": 79036,
 	"./table/TableFormTree.vue": 84804,
 	"./table/TableFormula.vue": 58585,
-	"./table/TableProperty.vue": 67050,
-	"./table/TableRowProperty.vue": 26521,
+	"./table/TableProperty.vue": 89305,
+	"./table/TableRowProperty.vue": 70872,
 	"./textDialog/TextDialog.vue": 75476,
 	"./textDialog/TextToLabelDialog.vue": 2355,
 	"./textDialog/VerifyTip.vue": 47284,
@@ -214094,8 +214129,8 @@ var es_string_match = __webpack_require__(4723);
 var es_number_constructor = __webpack_require__(9653);
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.json.stringify.js
 var es_json_stringify = __webpack_require__(38862);
-;// 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/HoDoc.vue?vue&type=template&id=7686253b&
-var HoDocvue_type_template_id_7686253b_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/HoDoc.vue?vue&type=template&id=0e4bf394&
+var HoDocvue_type_template_id_0e4bf394_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -214243,7 +214278,7 @@ var HoDocvue_type_template_id_7686253b_render = function render() {
     }
   }, [_vm._v("v " + _vm._s(_vm.version))])])])], 1);
 };
-var HoDocvue_type_template_id_7686253b_staticRenderFns = [];
+var HoDocvue_type_template_id_0e4bf394_staticRenderFns = [];
 
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.filter.js
 var es_array_filter = __webpack_require__(57327);
@@ -217243,7 +217278,7 @@ var TextNode = __webpack_require__(27198);
 // 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.1.0');
+/* harmony default export */ var version = ('3.1.2');
 // EXTERNAL MODULE: ./src/components/controls/poperTipText/PoperTipText.vue + 5 modules
 var PoperTipText = __webpack_require__(50987);
 ;// CONCATENATED MODULE: ./src/components/controls/poperTipText/index.ts
@@ -217778,8 +217813,8 @@ var defaultHeight = Math.floor(1122 * scaleXY) % 2 === 1 ? Math.floor(1122 * sca
           var allowMultiSelected = ((_parentNode$downListP3 = _parentNode.downListProperty) === null || _parentNode$downListP3 === void 0 ? void 0 : _parentNode$downListP3.allowMultiSelected) || false;
           if (text != node.parentNode.name && text !== '' && !allowMultiSelected && lists.length > 0) {
             if (lists.filter(function (v) {
-              return v.text.split('<元素>')[0].includes(text);
-            }).length === 0) {
+              return v.text.includes('<元素>');
+            }).length > 0) {
               return;
             }
           }
@@ -217992,10 +218027,10 @@ var defaultHeight = Math.floor(1122 * scaleXY) % 2 === 1 ? Math.floor(1122 * sca
 });
 ;// CONCATENATED MODULE: ./src/components/HoDoc.vue?vue&type=script&lang=js&
  /* harmony default export */ var components_HoDocvue_type_script_lang_js_ = (HoDocvue_type_script_lang_js_); 
-;// 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/HoDoc.vue?vue&type=style&index=0&id=7686253b&prod&lang=less&
+;// 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/HoDoc.vue?vue&type=style&index=0&id=0e4bf394&prod&lang=less&
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./src/components/HoDoc.vue?vue&type=style&index=0&id=7686253b&prod&lang=less&
+;// CONCATENATED MODULE: ./src/components/HoDoc.vue?vue&type=style&index=0&id=0e4bf394&prod&lang=less&
 
 ;// CONCATENATED MODULE: ./src/components/HoDoc.vue
 
@@ -218008,8 +218043,8 @@ var defaultHeight = Math.floor(1122 * scaleXY) % 2 === 1 ? Math.floor(1122 * sca
 
 var HoDoc_component = (0,componentNormalizer/* default */.Z)(
   components_HoDocvue_type_script_lang_js_,
-  HoDocvue_type_template_id_7686253b_render,
-  HoDocvue_type_template_id_7686253b_staticRenderFns,
+  HoDocvue_type_template_id_0e4bf394_render,
+  HoDocvue_type_template_id_0e4bf394_staticRenderFns,
   false,
   null,
   null,
@@ -220216,27 +220251,53 @@ var HTMLconverter2 = /*#__PURE__*/function () {
       if (jsondata['text_align']) {
         var textAlign = jsondata['text_align'];
         textAlign = textAlign.trim();
-        tmp.align = textAlign == 'center' ? Paragraph/* Align */.xM.alcenter : textAlign == 'left' ? Paragraph/* Align */.xM.alleft : textAlign == 'right' ? Paragraph/* Align */.xM.alright : textAlign == 'justify' ? Paragraph/* Align */.xM.alSpaceEqually : tmp.align;
+        if (textAlign == 'center') {
+          tmp.align = Paragraph/* Align */.xM.alcenter;
+        } else if (textAlign == 'left') {
+          tmp.align = Paragraph/* Align */.xM.alleft;
+        } else if (textAlign == 'right') {
+          tmp.align = Paragraph/* Align */.xM.alright;
+        } else {
+          tmp.align = Paragraph/* Align */.xM.alSpaceEqually;
+        }
+        //tmp.align = textAlign == 'center' ? Align.alcenter : (textAlign == 'left' ? Align.alleft : (textAlign == 'right' ? Align.alright : (textAlign == 'justify' ? Align.alSpaceEqually : tmp.combineStyle.align)));
       }
+
       if (jsondata['line_height']) {
         var lineHeight = jsondata['line_height'];
         tmp.lineSpace = Number(lineHeight.substr(0, lineHeight.indexOf('%'))) / 100;
       }
-      if (jsondata['mso_para_margin_left']) {
-        var marginLeft = jsondata['mso_para_margin_left'];
-        var match = marginLeft.match(/^(.*)gd$/);
-        if (match && match[1]) {
-          tmp.leftMargin = Number(match[1]);
-        }
-      }
-      if (jsondata['text_indent']) {
-        //TODO:行首缩进
-        var _marginLeft = jsondata['text_indent'];
-        var _match = _marginLeft.match(/^(.*)gd$/);
-        if (_match && _match[1]) {
-          tmp.leftMargin = Number(_match[1]);
-        }
-      }
+      // if (jsondata['mso_para_margin_left']) {
+      //     const marginLeft = jsondata['mso_para_margin_left'];
+      //     let match = marginLeft.match(/^(.*)gd$/);
+      //     if (!match) {
+      //         match = match(/^(.*)(px|pt)$/);
+      //     }
+      //     if (match && match[1]) {
+      //         tmp.leftMargin = Number(match[1]);
+      //     }
+      // }
+      // if (jsondata['margin_left']) {
+      //     const marginLeft = jsondata['margin_left'];
+      //     let match = marginLeft.match(/^(.*)gd$/);
+      //     if (!match) {
+      //         match = marginLeft.match(/^(.*)(px|pt)$/);
+      //     }
+      //     if (match && match[1]) {
+      //         tmp.leftMargin = Number(match[1]);
+      //     }
+      // }
+      // if (jsondata['text_indent']) {
+      //     //TODO:行首缩进
+      //     const marginLeft = jsondata['text_indent'];
+      //     let match = marginLeft.match(/^(.*)gd$/);
+      //     if (!match) {
+      //         match = marginLeft.match(/^(.*)(px|pt)$/);
+      //     }
+      //     if (match && match[1]) {
+      //         tmp.leftMargin = Number(match[1]);
+      //     }
+      // }
       // tmp.align = parseInt(jsondata['font-size']) || tmp.size;
       // tmp.lineSpace = ;
       // tmp.leftMarginPixes=
@@ -220293,9 +220354,19 @@ var HTMLconverter2 = /*#__PURE__*/function () {
       //         // var myFile = dataURLtoFile(data, 'testimgtestimgtestimg');
       //         console.log(data);
       //     });
-      var width = styleobj.width ? styleobj.width.replace('px', '') : 20;
-      var height = styleobj.height ? styleobj.height.replace('px', '') : 20;
-      var node = new ImageNode/* ImageNode */.H(this._hoEditorFactoryID, HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this._hoEditorFactoryID).docTree.activeNodes, null, BaseNode/* NodeType */.Jq.ntImage, HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this._hoEditorFactoryID).gernerateCode.generateID('IMG'), jquery_default()(jnode).attr('src') || '', Number(width), Number(height));
+      var width = jquery_default()(jnode).attr('width');
+      var height = jquery_default()(jnode).attr('height');
+      if (!width && styleobj.width) {
+        width = styleobj.width.replace('px', '');
+      }
+      if (!height && styleobj.height) {
+        height = styleobj.height.replace('px', '');
+      }
+      if (!width) width = '20';
+      if (!height) height = '20';
+      var node = new ImageNode/* ImageNode */.H(this._hoEditorFactoryID, HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this._hoEditorFactoryID).docTree.activeNodes, null, BaseNode/* NodeType */.Jq.ntImage, HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this._hoEditorFactoryID).gernerateCode.generateID('IMG'), src,
+      //$(jnode).attr('src') || '',
+      Number(width), Number(height));
       return [node];
     }
   }, {
@@ -220316,6 +220387,7 @@ var HTMLconverter2 = /*#__PURE__*/function () {
       tableProperty.isUsePopEdit = tableProperty['isUsePopEdit'] || false;
       tableProperty.isAutoChangeLine = tableProperty['isAutoChangeLine'] || false;
       tableProperty.autoLineHeight = tableProperty['autoLineHeight'] || 0.53;
+      tableProperty.isSignLock = tableProperty['isSignLock'] || false;
       return tableProperty;
     }
   }, {
@@ -230787,7 +230859,8 @@ var VueController = /*#__PURE__*/function () {
             isAutoChangeLine: node.tableProperty.isAutoChangeLine,
             autoLineHeight: node.tableProperty.autoLineHeight,
             fixedOnePage: node.tableProperty.fixedOnePage,
-            isUsePopEdit: node.tableProperty.isUsePopEdit
+            isUsePopEdit: node.tableProperty.isUsePopEdit,
+            isSignLock: node.tableProperty.isSignLock
           };
           var defaultRowProp = {
             customProperties: '',
@@ -231835,6 +231908,19 @@ var VueController = /*#__PURE__*/function () {
       }
       return boxs;
     }
+  }, {
+    key: "importWordFile",
+    value: function importWordFile(fileStr) {
+      var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this._hoEditorFactoryID);
+      hoEditorFactory.docController.initBlankDoc();
+      hoEditorFactory.drawTree.inViewPages = [0];
+      hoEditorFactory.undoService.stack = [];
+      fileStr = fileStr.replace(/[\u0000-\u0008\u000b\u000c\u000e-\u001f\ud800-\udfff\ufffe\uffff]/g, "");
+      var nodes = hoEditorFactory.structureNode.Parse(StructureNode/* ClipboardType */.Y6.ctHTML, fileStr);
+      hoEditorFactory.docTree.curDomRange.setSamePath("main/0");
+      hoEditorFactory.drawTree.moveCaretToPath("main/0");
+      hoEditorFactory.docController.parseNodeData(nodes);
+    }
   }]);
   return VueController;
 }();
@@ -232437,6 +232523,7 @@ var DomController = /*#__PURE__*/function () {
 
 
 
+
 
 
 var EditController = /*#__PURE__*/function () {
@@ -232930,15 +233017,15 @@ var EditController = /*#__PURE__*/function () {
     key: "canIsEdit",
     value: function canIsEdit(hoEditorFactory) {
       var result = true;
-      // hoEditorFactory.isUseForm = true;
-      // hoEditorFactory.allowEditCellInForm = false;
+      //hoEditorFactory.isUseForm = true;
+      //hoEditorFactory.allowEditCellInForm = false;
+      var curDomRange = hoEditorFactory.docTree.curDomRange.normalize(); //获取当前选中区域
       if (hoEditorFactory.isUseForm) {
         var _enode$parentNode, _enode$parentNode2;
-        var curDomRange = hoEditorFactory.docTree.curDomRange.normalize(); //获取当前选中区域
-        //const endPath = _curDomRange.normalize().endPath;
-        //const node = hoEditorFactory.docTree.findNodePositionByPath(endPath).node;
         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 */.re)) {
           result = false;
         }
@@ -232957,6 +233044,22 @@ var EditController = /*#__PURE__*/function () {
           }
         }
       }
+      if (result && hoEditorFactory.drawTree.paintStatus !== DrawTree/* PaintState */.Dh.psDesign) {
+        var pNode = hoEditorFactory.docTree.getParentNode(curDomRange.startPath);
+        if (pNode && pNode instanceof CellNode/* CellNode */.D && pNode.table.tableProperty.isSignLock) {
+          for (var i = 0; i < pNode.table.childNodes.length; i++) {
+            var cell = pNode.table.childNodes[i];
+            for (var j = 1; j < cell.childNodes.length; j++) {
+              var anode = cell.childNodes[j];
+              if (anode instanceof SignNode/* SignNode */.N && anode.imgSrc != "") {
+                message/* default */.Z.destroy();
+                message/* default */.Z.error("已签名，不允许修改编辑。");
+                return false;
+              }
+            }
+          }
+        }
+      }
       if (!result) {
         message/* default */.Z.destroy();
         message/* default */.Z.error("表单状态元素外不可编辑");