hoeditor-web 3.1.62 → 3.1.63

package/lib/hoeditor.umd.js

@@ -44825,6 +44825,7 @@ var DocController = /*#__PURE__*/function () {
       if (parentNode instanceof _treeNode_CellNode__WEBPACK_IMPORTED_MODULE_58__/* .CellNode */ .D) {
         this.signLockCheck(parentNode);
       }
+      this.drawMask(signNode);
     }
     /**
      * 更新签名
@@ -44868,6 +44869,7 @@ var DocController = /*#__PURE__*/function () {
         if (node.parentNode instanceof _treeNode_CellNode__WEBPACK_IMPORTED_MODULE_58__/* .CellNode */ .D) {
           this.signLockCheck(node.parentNode);
         }
+        this.drawMask(node);
       } else {
         //第二次更新签名
         if (node.connectMode === '换行') {
@@ -44891,6 +44893,26 @@ var DocController = /*#__PURE__*/function () {
         hoEditorFactory.undoService.commit();
       }
     }
+  }, {
+    key: "drawMask",
+    value: function drawMask(node) {
+      var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_78__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID);
+      if (hoEditorFactory.forbidEditBeforeSign) {
+        if (hoEditorFactory.structureConvert._superiorSign.length === 0) {
+          hoEditorFactory.structureConvert._superiorSign[0] = node;
+          hoEditorFactory.vueController.hiddenMask(false);
+        } else {
+          var sign1 = hoEditorFactory.structureConvert._superiorSign[0];
+          var path1 = sign1.getNodePath();
+          var path2 = node.getNodePath();
+          var result = _NodePosition__WEBPACK_IMPORTED_MODULE_84__/* .NodePosition */ .F.treePathCompare(path1, path2);
+          if (result < 0) {
+            hoEditorFactory.structureConvert._superiorSign[0] = node;
+            hoEditorFactory.vueController.hiddenMask(false);
+          }
+        }
+      }
+    }
     /**
      * 修改空签名
      * @param node 签名节点
@@ -55117,12 +55139,12 @@ var DateTimeNode = /*#__PURE__*/function (_ControlNode) {
       this.transType(json);
       if (isPaste) {
         var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_22__/* .HOEditorFactorys */ .b.instance().getFactory(hoEditorFactoryID);
-        // if (hoEditorFactory.vueController.getNodeByDataID("all", json.dataId)) {
-        //   //json.id = hoEditorFactory.gernerateCode.generateID("DT");
-        //   json.dataId = hoEditorFactory.gernerateCode.generateID("DateTime");
-        // }
-        json.dataId = hoEditorFactory.gernerateCode.generateID("DateTime");
+        if (hoEditorFactory.vueController.getNodeByDataID("all", json.dataId)) {
+          json.dataId = hoEditorFactory.gernerateCode.generateID("DateTime");
+        }
+        //json.dataId = hoEditorFactory.gernerateCode.generateID("DateTime");
       }
+
       json.readType = json.readType ? Number(json.readType) : -1;
       json.isSynchro = !json.isSynchro ? false : json.isSynchro;
       json.isAllowDelete = !json.isAllowDelete ? false : json.isAllowDelete;
@@ -55996,12 +56018,12 @@ var DownListNode = /*#__PURE__*/function (_ControlNode) {
       this.transType(json);
       if (isPaste) {
         var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_23__/* .HOEditorFactorys */ .b.instance().getFactory(hoEditorFactoryID);
-        // if (hoEditorFactory.vueController.getNodeByDataID("all", json.dataId)) {
-        //   //json.id = hoEditorFactory.gernerateCode.generateID("DL");
-        //   json.dataId = hoEditorFactory.gernerateCode.generateID("DownList");
-        // }
-        json.dataId = hoEditorFactory.gernerateCode.generateID("DownList");
+        if (hoEditorFactory.vueController.getNodeByDataID("all", json.dataId)) {
+          json.dataId = hoEditorFactory.gernerateCode.generateID("DownList");
+        }
+        //json.dataId = hoEditorFactory.gernerateCode.generateID("DownList");
       }
+
       json.isAllowDelete = !json.isAllowDelete ? false : json.isAllowDelete;
       json.isReadOnly = !json.isReadOnly ? false : json.isReadOnly;
       json.mutexSelect = !json.mutexSelect ? false : json.mutexSelect;
@@ -61941,14 +61963,15 @@ var RadioAndCheckBoxNode = /*#__PURE__*/function (_ControlNode) {
         //let name = "";
         //if (json.controlStyle === "RadioBox") name = "RB";
         //if (json.controlStyle === "CheckBox") name = "CB";
-        // hoEditorFactory.docTree.radioAndCheckBoxsMap.forEach((value, key) => {
-        //   if (value.dataId === json.dataId) {
-        //     //json.id = hoEditorFactory.gernerateCode.generateID(name);
-        //     json.dataId = hoEditorFactory.gernerateCode.generateID(json.controlStyle);
-        //   }
-        // });
-        json.dataId = hoEditorFactory.gernerateCode.generateID(json.controlStyle);
+        hoEditorFactory.docTree.radioAndCheckBoxsMap.forEach(function (value, key) {
+          if (value.dataId === json.dataId) {
+            //json.id = hoEditorFactory.gernerateCode.generateID(name);
+            json.dataId = hoEditorFactory.gernerateCode.generateID(json.controlStyle);
+          }
+        });
+        //json.dataId = hoEditorFactory.gernerateCode.generateID(json.controlStyle);
       }
+
       json.isAllowDelete = !json.isAllowDelete ? false : json.isAllowDelete;
       json.isSelected = !json.isSelected ? false : json.isSelected.text != undefined ? json.isSelected.text : json.isSelected;
       json.boxAlign = json.boxAlign === undefined ? true : json.boxAlign;
@@ -69567,12 +69590,12 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
       delete json.nodeType;
       this.transType(json);
       if (isPaste) {
-        // if (hoEditorFactory.vueController.getNodeByDataID('all', json.dataId)) {
-        //     //json.id = hoEditorFactory.gernerateCode.generateID("TF");
-        //     json.dataId = hoEditorFactory.gernerateCode.generateID('Field');
-        // }
-        json.dataId = hoEditorFactory.gernerateCode.generateID('Field');
+        if (hoEditorFactory.vueController.getNodeByDataID('all', json.dataId)) {
+          json.dataId = hoEditorFactory.gernerateCode.generateID('Field');
+        }
+        //json.dataId = hoEditorFactory.gernerateCode.generateID('Field');
       }
+
       json.canModifyContent = json.canModifyContent === undefined ? true : json.canModifyContent;
       json.isAllowDelete = !json.isAllowDelete ? false : json.isAllowDelete;
       json.enableGlobalColor = !json.enableGlobalColor ? false : json.enableGlobalColor;
@@ -77945,7 +77968,12 @@ var DrawPageCell = /*#__PURE__*/function (_DrawArea) {
           prevDocHeight += toparr[_r][1];
         }
         if (drawTreeHeight > this._cell.drawCell.docHeight) {
-          valignTop = pageHeight - Math.max(0, this._cell.drawCell.docHeight - restRowHeight - innerBottom - prevDocHeight);
+          //valignTop = pageHeight - Math.max(0, (this._cell.drawCell.docHeight - restRowHeight - innerBottom - prevDocHeight));
+          if (this._cell.drawCell.docHeight <= 13) {
+            valignTop = pageHeight - Math.max(0, this._cell.drawCell.docHeight - restRowHeight - innerBottom - prevDocHeight) - 5;
+          } else {
+            valignTop = pageHeight - Math.max(0, this._cell.drawCell.docHeight - restRowHeight - innerBottom - prevDocHeight);
+          }
         }
       }
       return [valignTop, toparr];
@@ -219729,7 +219757,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.62');
+/* harmony default export */ var version = ('3.1.63');
 // EXTERNAL MODULE: ./src/components/controls/poperTipText/PoperTipText.vue + 5 modules
 var PoperTipText = __webpack_require__(50987);
 ;// CONCATENATED MODULE: ./src/components/controls/poperTipText/index.ts
@@ -226808,8 +226836,8 @@ var commonParamList = new Map();
 
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.from.js
 var es_array_from = __webpack_require__(91038);
-;// 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/common/history/index.vue?vue&type=template&id=2ca49858&
-var historyvue_type_template_id_2ca49858_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/common/history/index.vue?vue&type=template&id=6ee36d74&
+var historyvue_type_template_id_6ee36d74_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -226839,7 +226867,7 @@ var historyvue_type_template_id_2ca49858_render = function render() {
     slot: "title"
   }, [_vm._v(" 修改后：" + _vm._s(_vm.afterContent) + " ")]), _vm._v(" 修改后：" + _vm._s(_vm.afterContent) + " ")], 2) : [_vm._v(" 修改后：" + _vm._s(_vm.afterContent) + " ")]], 2)])]);
 };
-var historyvue_type_template_id_2ca49858_staticRenderFns = [];
+var historyvue_type_template_id_6ee36d74_staticRenderFns = [];
 
 ;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/common/history/index.vue?vue&type=script&lang=js&
 
@@ -226886,7 +226914,7 @@ var historyvue_type_template_id_2ca49858_staticRenderFns = [];
       var hoCommentItemList = Array.from(document.querySelectorAll('.ho-comment-item'));
       hoCommentItemList.forEach(function (element) {
         if (element.id === _this.id) {
-          _this.selected = true;
+          // this.selected = true;
           element.style.border = '1px dashed #F00';
         } else {
           element.style.border = '1px dashed #aaa';
@@ -226930,10 +226958,10 @@ var historyvue_type_template_id_2ca49858_staticRenderFns = [];
 });
 ;// CONCATENATED MODULE: ./src/components/common/history/index.vue?vue&type=script&lang=js&
  /* harmony default export */ var common_historyvue_type_script_lang_js_ = (historyvue_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/common/history/index.vue?vue&type=style&index=0&id=2ca49858&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/common/history/index.vue?vue&type=style&index=0&id=6ee36d74&prod&lang=less&
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./src/components/common/history/index.vue?vue&type=style&index=0&id=2ca49858&prod&lang=less&
+;// CONCATENATED MODULE: ./src/components/common/history/index.vue?vue&type=style&index=0&id=6ee36d74&prod&lang=less&
 
 ;// CONCATENATED MODULE: ./src/components/common/history/index.vue
 
@@ -226946,8 +226974,8 @@ var historyvue_type_template_id_2ca49858_staticRenderFns = [];
 
 var history_component = (0,componentNormalizer/* default */.Z)(
   common_historyvue_type_script_lang_js_,
-  historyvue_type_template_id_2ca49858_render,
-  historyvue_type_template_id_2ca49858_staticRenderFns,
+  historyvue_type_template_id_6ee36d74_render,
+  historyvue_type_template_id_6ee36d74_staticRenderFns,
   false,
   null,
   null,