hoeditor-web 3.1.80 → 3.1.82

package/lib/hoeditor.umd.js

@@ -24691,7 +24691,7 @@ var component = (0,componentNormalizer/* default */.Z)(
 
 /***/ }),
 
-/***/ 86559:
+/***/ 46812:
 /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -24705,7 +24705,7 @@ __webpack_require__.d(__webpack_exports__, {
 
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.function.name.js
 var es_function_name = __webpack_require__(68309);
-;// 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/upload/HoFabric.vue?vue&type=template&id=515347a9&
+;// 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/upload/HoFabric.vue?vue&type=template&id=2b5766cd&
 
 var render = function render() {
   var _vm = this,
@@ -24845,6 +24845,9 @@ var render = function render() {
       },
       "placeholder": "请选择"
     },
+    on: {
+      "change": _vm.fabricFontSizeChange
+    },
     model: {
       value: _vm.fontSize,
       callback: function callback($$v) {
@@ -25008,7 +25011,7 @@ var render = function render() {
 };
 var staticRenderFns = [];
 
-;// CONCATENATED MODULE: ./src/components/controls/upload/HoFabric.vue?vue&type=template&id=515347a9&
+;// CONCATENATED MODULE: ./src/components/controls/upload/HoFabric.vue?vue&type=template&id=2b5766cd&
 
 // EXTERNAL MODULE: ./node_modules/ant-design-vue/es/message/style/index.js + 1 modules
 var style = __webpack_require__(94310);
@@ -25658,6 +25661,8 @@ var HoFabricConfig = __webpack_require__(3573);
       //修改自由绘画画笔颜色
       this.borderColor = val;
       this.canvasObj.freeDrawingBrush.color = this.borderColor;
+      var config = HoFabricConfig/* HoFabricConfig */.G.instance();
+      config.borderColor = String(val);
     },
     lineWidthPicker: function lineWidthPicker(_ref) {
       var key = _ref.key;
@@ -25720,6 +25725,10 @@ var HoFabricConfig = __webpack_require__(3573);
         this.vueController.updateImageSrc(updateNode, src, JSON.stringify(this.canvasObj.toJSON()));
         this.handleClose();
       }
+    },
+    fabricFontSizeChange: function fabricFontSizeChange(value) {
+      var config = HoFabricConfig/* HoFabricConfig */.G.instance();
+      config.fontSize = String(value);
     }
   },
   created: function created() {
@@ -25811,10 +25820,10 @@ var HoFabricConfig = __webpack_require__(3573);
 });
 ;// CONCATENATED MODULE: ./src/components/controls/upload/HoFabric.vue?vue&type=script&lang=js&
  /* harmony default export */ var upload_HoFabricvue_type_script_lang_js_ = (HoFabricvue_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/upload/HoFabric.vue?vue&type=style&index=0&id=515347a9&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/upload/HoFabric.vue?vue&type=style&index=0&id=2b5766cd&prod&lang=less&
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./src/components/controls/upload/HoFabric.vue?vue&type=style&index=0&id=515347a9&prod&lang=less&
+;// CONCATENATED MODULE: ./src/components/controls/upload/HoFabric.vue?vue&type=style&index=0&id=2b5766cd&prod&lang=less&
 
 // EXTERNAL MODULE: ./node_modules/@vue/vue-loader-v15/lib/runtime/componentNormalizer.js
 var componentNormalizer = __webpack_require__(70713);
@@ -25842,7 +25851,7 @@ var component = (0,componentNormalizer/* default */.Z)(
 
 /***/ }),
 
-/***/ 12625:
+/***/ 18096:
 /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -25856,7 +25865,7 @@ __webpack_require__.d(__webpack_exports__, {
 
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.number.to-fixed.js
 var es_number_to_fixed = __webpack_require__(56977);
-;// 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/upload/UploadImageDialog.vue?vue&type=template&id=208f3ae6&
+;// 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/upload/UploadImageDialog.vue?vue&type=template&id=4a954966&
 
 var render = function render() {
   var _vm = this,
@@ -26113,7 +26122,7 @@ var render = function render() {
 };
 var staticRenderFns = [];
 
-;// CONCATENATED MODULE: ./src/components/controls/upload/UploadImageDialog.vue?vue&type=template&id=208f3ae6&
+;// CONCATENATED MODULE: ./src/components/controls/upload/UploadImageDialog.vue?vue&type=template&id=4a954966&
 
 // EXTERNAL MODULE: ./node_modules/ant-design-vue/es/message/style/index.js + 1 modules
 var style = __webpack_require__(94310);
@@ -26384,10 +26393,10 @@ var util = __webpack_require__(62783);
 });
 ;// CONCATENATED MODULE: ./src/components/controls/upload/UploadImageDialog.vue?vue&type=script&lang=js&
  /* harmony default export */ var upload_UploadImageDialogvue_type_script_lang_js_ = (UploadImageDialogvue_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/upload/UploadImageDialog.vue?vue&type=style&index=0&id=208f3ae6&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/upload/UploadImageDialog.vue?vue&type=style&index=0&id=4a954966&prod&lang=less&
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./src/components/controls/upload/UploadImageDialog.vue?vue&type=style&index=0&id=208f3ae6&prod&lang=less&
+;// CONCATENATED MODULE: ./src/components/controls/upload/UploadImageDialog.vue?vue&type=style&index=0&id=4a954966&prod&lang=less&
 
 // EXTERNAL MODULE: ./node_modules/@vue/vue-loader-v15/lib/runtime/componentNormalizer.js
 var componentNormalizer = __webpack_require__(70713);
@@ -166575,8 +166584,8 @@ var map = {
 	"./textDialog/TextToLabelDialog.vue": 2355,
 	"./textDialog/VerifyTip.vue": 74618,
 	"./upload/CanvasImageDialog.vue": 40061,
-	"./upload/HoFabric.vue": 86559,
-	"./upload/UploadImageDialog.vue": 12625,
+	"./upload/HoFabric.vue": 46812,
+	"./upload/UploadImageDialog.vue": 18096,
 	"./upload/hoFabricRight.vue": 94185,
 	"./verifyTip/VerifyTip.vue": 23664
 };
@@ -207202,7 +207211,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.80');
+/* harmony default export */ var version = ('3.1.82');
 // EXTERNAL MODULE: ./src/components/controls/poperTipText/PoperTipText.vue + 5 modules
 var PoperTipText = __webpack_require__(50987);
 ;// CONCATENATED MODULE: ./src/components/controls/poperTipText/index.ts
@@ -217180,9 +217189,9 @@ var VueController = /*#__PURE__*/function () {
      */
   }, {
     key: "insertText",
-    value: function insertText(text) {
+    value: function insertText(text, isAppentText) {
       var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this._hoEditorFactoryID);
-      if (hoEditorFactory.drawTree.paintStatus === DrawTree/* PaintState */.Dh.psReadOnly) {
+      if (!isAppentText && hoEditorFactory.drawTree.paintStatus === DrawTree/* PaintState */.Dh.psReadOnly) {
         return;
       }
       var result = hoEditorFactory.editController.canIsEdit(hoEditorFactory);
@@ -220343,7 +220352,11 @@ var VueController = /*#__PURE__*/function () {
       return [caret.pageIndex + 1, caret.stageX * 0.75, caret.stageY * 0.75 + 40];
     }
     /**
-     * @param type bottom:页左下角坐标点(0,0) top:页左上角坐标点(0,0)
+     * @param 获取光标所在位置(用于签名元素)
+     * @param page 页数
+     * @param 单位px,pt,mm坐标xy page()
+     * @param 签名元素四点坐标 ptTop(上) ptRight(右) ptBottom(下) ptLeft(左)
+     * @param type bottom:页左下角坐标点(0,0)↑→  top:页左上角坐标点(0,0)↓→
      */
   }, {
     key: "getPosition3",
@@ -220352,17 +220365,18 @@ var VueController = /*#__PURE__*/function () {
       var curDomRange = hoEditorFactory.docTree.curDomRange.normalize();
       var node = curDomRange.npEnd.node;
       var caret = hoEditorFactory.drawTree.caret;
+      var x = caret.stageX;
       var y = hoEditorFactory.pageProperty.heightPixes - caret.stageY;
-      // if(type == 'top') {
-      //     y = caret.stageY
-      // }
+      if (type == 'top') {
+        y = caret.stageY;
+      }
       var result = {
         page: caret.pageIndex + 1,
-        pxX: caret.stageX,
+        pxX: x,
         pxY: y,
-        mmX: hoEditorFactory.unitConvert.pxConversionMm(caret.stageX, true),
+        mmX: hoEditorFactory.unitConvert.pxConversionMm(x, true),
         mmY: hoEditorFactory.unitConvert.pxConversionMm(y, true),
-        ptX: hoEditorFactory.unitConvert.pxToPt(caret.stageX),
+        ptX: hoEditorFactory.unitConvert.pxToPt(x),
         ptY: hoEditorFactory.unitConvert.pxToPt(y),
         ptTop: 0,
         ptRight: 0,
@@ -220376,24 +220390,13 @@ var VueController = /*#__PURE__*/function () {
           ptLeft: result.ptX
         });
         if (node.number == 0) {
-          // if(type == 'top') {
-          //     result.ptTop = result.ptY;
-          //     result.ptBottom = hoEditorFactory.unitConvert.pxToPt(y + drawNode.dHeight);
-          // } else {
           result.ptTop = result.ptY;
           result.ptBottom = hoEditorFactory.unitConvert.pxToPt(y - drawNode.dHeight);
-          // }
         } else {
-          // if(type == 'top') {
-          //     result.ptTop = hoEditorFactory.unitConvert.pxToPt(y + drawNode.dHeight);
-          //     result.ptBottom = hoEditorFactory.unitConvert.pxToPt(y + drawNode.dHeight * 2);
-          // } else {
           result.ptTop = hoEditorFactory.unitConvert.pxToPt(y - drawNode.dHeight);
           result.ptBottom = hoEditorFactory.unitConvert.pxToPt(y - drawNode.dHeight * 2);
-          // }
         }
       }
-
       return result;
     }
     /**