hoeditor-web 3.1.156 → 3.1.157

package/lib/hoeditor.umd.js

@@ -22932,7 +22932,7 @@ var component = (0,componentNormalizer/* default */.Z)(
 
 /***/ }),
 
-/***/ 68035:
+/***/ 52023:
 /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -22944,7 +22944,7 @@ __webpack_require__.d(__webpack_exports__, {
   "default": function() { return /* binding */ TextBorderDialog; }
 });
 
-;// 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/textDialog/TextBorderDialog.vue?vue&type=template&id=59e28661&
+;// 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/textDialog/TextBorderDialog.vue?vue&type=template&id=726226fa&
 var render = function render() {
   var _vm = this,
     _c = _vm._self._c;
@@ -22972,7 +22972,7 @@ var render = function render() {
     ref: "textBorderInput",
     attrs: {
       "size": "small",
-      "placeholder": "内部标识符"
+      "placeholder": "文本内容"
     },
     model: {
       value: _vm.text,
@@ -23029,7 +23029,8 @@ var TextBorderNode = __webpack_require__(11596);
   data: function data() {
     return {
       animationClassNames: 'control-modal-contents label-to-text-modal animation-in',
-      text: ''
+      text: '',
+      endPath: ''
     };
   },
   props: {
@@ -23044,6 +23045,10 @@ var TextBorderNode = __webpack_require__(11596);
     }
   },
   inject: ['hoEditorProvider'],
+  created: function created() {
+    var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this.hoEditorFactoryId);
+    this.endPath = hoEditorFactory.docTree.curDomRange.normalize().endPath;
+  },
   mounted: function mounted() {
     var node = this.getTextBorderNode();
     if (node) {
@@ -23053,10 +23058,9 @@ var TextBorderNode = __webpack_require__(11596);
   },
   methods: {
     getTextBorderNode: function getTextBorderNode() {
-      var node = this.hoEditorProvider.getUpdateNode();
-      var hoEditor = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this.hoEditorProvider.activeDocId);
-      var currentDomRange = hoEditor.vueController.getDomRange();
-      if (!(currentDomRange !== null && currentDomRange !== void 0 && currentDomRange.isEmpty) && node instanceof TextBorderNode/* TextBorderNode */.D) {
+      var _this$vueController$f;
+      var node = (_this$vueController$f = this.vueController.findNodebyPath(this.endPath)) === null || _this$vueController$f === void 0 ? void 0 : _this$vueController$f.node;
+      if (node instanceof TextBorderNode/* TextBorderNode */.D) {
         return node;
       }
       return null;
@@ -23102,10 +23106,10 @@ var TextBorderNode = __webpack_require__(11596);
 });
 ;// CONCATENATED MODULE: ./src/components/controls/textDialog/TextBorderDialog.vue?vue&type=script&lang=js&
  /* harmony default export */ var textDialog_TextBorderDialogvue_type_script_lang_js_ = (TextBorderDialogvue_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/textDialog/TextBorderDialog.vue?vue&type=style&index=0&id=59e28661&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/textDialog/TextBorderDialog.vue?vue&type=style&index=0&id=726226fa&prod&lang=less&
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./src/components/controls/textDialog/TextBorderDialog.vue?vue&type=style&index=0&id=59e28661&prod&lang=less&
+;// CONCATENATED MODULE: ./src/components/controls/textDialog/TextBorderDialog.vue?vue&type=style&index=0&id=726226fa&prod&lang=less&
 
 // EXTERNAL MODULE: ./node_modules/@vue/vue-loader-v15/lib/runtime/componentNormalizer.js
 var componentNormalizer = __webpack_require__(70713);
@@ -65034,13 +65038,10 @@ var DrawTextBorderNode = /*#__PURE__*/function (_DrawCombineNode) {
     (0,defineProperty/* default */.Z)((0,assertThisInitialized/* default */.Z)(_this), "_text", void 0);
     (0,defineProperty/* default */.Z)((0,assertThisInitialized/* default */.Z)(_this), "_dStyleKey", void 0);
     (0,defineProperty/* default */.Z)((0,assertThisInitialized/* default */.Z)(_this), "_dText", void 0);
-    (0,defineProperty/* default */.Z)((0,assertThisInitialized/* default */.Z)(_this), "_bitMap", void 0);
     (0,defineProperty/* default */.Z)((0,assertThisInitialized/* default */.Z)(_this), "_textStyle", void 0);
-    (0,defineProperty/* default */.Z)((0,assertThisInitialized/* default */.Z)(_this), "_charCount", void 0);
     (0,defineProperty/* default */.Z)((0,assertThisInitialized/* default */.Z)(_this), "_bd", void 0);
     _this._textStyle = textStyle;
     _this._text = text;
-    _this._charCount = _this._text.length;
     _this._dStyleKey = node.dStyleKey;
     _this._dText = new createjs.Text(text, _this._dStyleKey, node.dColor);
     _this.dWidth = _this._dText.getMeasuredWidth();
@@ -65061,7 +65062,6 @@ var DrawTextBorderNode = /*#__PURE__*/function (_DrawCombineNode) {
   }, {
     key: "drawRareChar",
     value: function drawRareChar() {
-      this._charCount = this._text.length;
       this.dWidth = this._dText.getMeasuredWidth();
       if (!this._bd) this._bd = new createjs.Shape();
       this._bd.graphics.clear();
@@ -65072,19 +65072,19 @@ var DrawTextBorderNode = /*#__PURE__*/function (_DrawCombineNode) {
         var currentWidthwidth = dText.getMeasuredWidth();
         dText.textBaseline = 'alphabetic';
         dText.textAlign = 'left';
-        var maxHeight = this.dHeight - 2;
-        var maxWidth = Math.max(currentWidthwidth, maxHeight);
+        var maxHeight = this.dHeight;
+        var maxWidth = Math.max(currentWidthwidth, maxHeight * 1.25);
         var rect = dText.getBounds().clone();
         if (rect) {
           dText.x = leftWidth + maxWidth * 0.25;
-          dText.y = -2;
+          dText.y = 0;
         }
         this.addChild(dText);
         this._bd.graphics.beginStroke(this._textStyle.color).drawRect(leftWidth,
         //x
         -maxHeight,
         //y
-        currentWidthwidth + maxWidth * 0.5, maxHeight);
+        currentWidthwidth + maxWidth * 0.5, maxHeight * 1.25);
         leftWidth = leftWidth + dText.getMeasuredWidth();
         if (i < this._text.length - 1) {
           leftWidth += maxWidth;
@@ -65248,7 +65248,7 @@ var TextBorderNode = /*#__PURE__*/function (_ControlNode) {
     key: "json2Node",
     value: function json2Node(hoEditorFactoryID, json, rootNodes, pNode) {
       var styleIndex = Number(json.styleIndex);
-      return new TextBorderNode(hoEditorFactoryID, rootNodes, pNode ? pNode : null, BaseNode/* NodeType */.Jq.ntRareChar, json.text, styleIndex);
+      return new TextBorderNode(hoEditorFactoryID, rootNodes, pNode ? pNode : null, BaseNode/* NodeType */.Jq.ntTextBorder, json.text, styleIndex);
     }
   }]);
   return TextBorderNode;
@@ -95828,6 +95828,8 @@ var NodeConvert = /*#__PURE__*/function () {
               paragraphText += item.text;
             } else if (item.nodeType == _dom_treeNode_BaseNode__WEBPACK_IMPORTED_MODULE_19__/* .NodeType */ .Jq[_dom_treeNode_BaseNode__WEBPACK_IMPORTED_MODULE_19__/* .NodeType */ .Jq.ntRareChar]) {
               paragraphText += item.text;
+            } else if (item.nodeType == _dom_treeNode_BaseNode__WEBPACK_IMPORTED_MODULE_19__/* .NodeType */ .Jq[_dom_treeNode_BaseNode__WEBPACK_IMPORTED_MODULE_19__/* .NodeType */ .Jq.ntTextBorder]) {
+              paragraphText += item.text;
             } else if (item.nodeType == _dom_treeNode_BaseNode__WEBPACK_IMPORTED_MODULE_19__/* .NodeType */ .Jq[_dom_treeNode_BaseNode__WEBPACK_IMPORTED_MODULE_19__/* .NodeType */ .Jq.ntSpecialChar]) {
               paragraphText += item.text;
             } else if (item.nodeType == _dom_treeNode_BaseNode__WEBPACK_IMPORTED_MODULE_19__/* .NodeType */ .Jq[_dom_treeNode_BaseNode__WEBPACK_IMPORTED_MODULE_19__/* .NodeType */ .Jq.ntField]) {
@@ -170260,7 +170262,7 @@ var map = {
 	"./table/TableFormula.vue": 80199,
 	"./table/TableProperty.vue": 98800,
 	"./table/TableRowProperty.vue": 55631,
-	"./textDialog/TextBorderDialog.vue": 68035,
+	"./textDialog/TextBorderDialog.vue": 52023,
 	"./textDialog/TextDialog.vue": 61911,
 	"./textDialog/TextToLabelDialog.vue": 2355,
 	"./textDialog/VerifyTip.vue": 74618,
@@ -207699,8 +207701,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=57443432&
-var HoDocvue_type_template_id_57443432_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=3b58cf3f&
+var HoDocvue_type_template_id_3b58cf3f_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -207901,7 +207903,7 @@ var HoDocvue_type_template_id_57443432_render = function render() {
     }
   }, [_vm._v("v " + _vm._s(_vm.version))])])])], 1);
 };
-var HoDocvue_type_template_id_57443432_staticRenderFns = [];
+var HoDocvue_type_template_id_3b58cf3f_staticRenderFns = [];
 
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.filter.js
 var es_array_filter = __webpack_require__(57327);
@@ -210892,7 +210894,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.156');
+/* harmony default export */ var version = ('3.1.157');
 // EXTERNAL MODULE: ./src/components/controls/poperTipText/PoperTipText.vue + 5 modules
 var PoperTipText = __webpack_require__(84531);
 ;// CONCATENATED MODULE: ./src/components/controls/poperTipText/index.ts
@@ -211423,7 +211425,7 @@ var defaultHeight = Math.floor(1122 * scaleXY) % 2 === 1 ? Math.floor(1122 * sca
         return;
       } else if (node instanceof TextBorderNode/* TextBorderNode */.D) {
         this.hoEditorProvider.setControlProperty('text-border', 'update', '');
-        this.hoEditorProvider.setUpdateNodeValue(node);
+        // this.hoEditorProvider.setUpdateNodeValue(node);
         return;
       } else {
         if (paintStatus === DrawTree/* PaintState */.Dh.psReview) {
@@ -211938,10 +211940,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=57443432&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=3b58cf3f&prod&lang=less&
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./src/components/HoDoc.vue?vue&type=style&index=0&id=57443432&prod&lang=less&
+;// CONCATENATED MODULE: ./src/components/HoDoc.vue?vue&type=style&index=0&id=3b58cf3f&prod&lang=less&
 
 ;// CONCATENATED MODULE: ./src/components/HoDoc.vue
 
@@ -211954,8 +211956,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_57443432_render,
-  HoDocvue_type_template_id_57443432_staticRenderFns,
+  HoDocvue_type_template_id_3b58cf3f_render,
+  HoDocvue_type_template_id_3b58cf3f_staticRenderFns,
   false,
   null,
   null,
@@ -217755,6 +217757,9 @@ var TOHTMLConverter = /*#__PURE__*/function () {
     this.convert.set(BaseNode/* NodeType */.Jq[BaseNode/* NodeType */.Jq.ntLabel], function (val) {
       return _this.TransText(val);
     });
+    this.convert.set(BaseNode/* NodeType */.Jq[BaseNode/* NodeType */.Jq.ntTextBorder], function (val) {
+      return _this.TransText(val);
+    });
     this.convert.set(BaseNode/* NodeType */.Jq[BaseNode/* NodeType */.Jq.ntSign], function (val) {
       return _this.TransText(val);
     });
@@ -217868,20 +217873,17 @@ var TOHTMLConverter = /*#__PURE__*/function () {
       var str = "";
       if (jnode.nodeType == BaseNode/* NodeType */.Jq[BaseNode/* NodeType */.Jq.ntText]) {
         str += jnode.text;
-      }
-      if (jnode.nodeType == BaseNode/* NodeType */.Jq[BaseNode/* NodeType */.Jq.ntLabel]) {
+      } else if (jnode.nodeType == BaseNode/* NodeType */.Jq[BaseNode/* NodeType */.Jq.ntLabel]) {
         str += jnode.text;
-      }
-      if (jnode.nodeType == BaseNode/* NodeType */.Jq[BaseNode/* NodeType */.Jq.ntRareChar]) {
+      } else if (jnode.nodeType == BaseNode/* NodeType */.Jq[BaseNode/* NodeType */.Jq.ntTextBorder]) {
         str += jnode.text;
-      }
-      if (jnode.nodeType == BaseNode/* NodeType */.Jq[BaseNode/* NodeType */.Jq.ntSpecialChar]) {
+      } else if (jnode.nodeType == BaseNode/* NodeType */.Jq[BaseNode/* NodeType */.Jq.ntRareChar]) {
         str += jnode.text;
-      }
-      if (jnode.nodeType == BaseNode/* NodeType */.Jq[BaseNode/* NodeType */.Jq.ntControl]) {
+      } else if (jnode.nodeType == BaseNode/* NodeType */.Jq[BaseNode/* NodeType */.Jq.ntSpecialChar]) {
         str += jnode.text;
-      }
-      if (jnode.nodeType == BaseNode/* NodeType */.Jq[BaseNode/* NodeType */.Jq.ntSign]) {
+      } else if (jnode.nodeType == BaseNode/* NodeType */.Jq[BaseNode/* NodeType */.Jq.ntControl]) {
+        str += jnode.text;
+      } else if (jnode.nodeType == BaseNode/* NodeType */.Jq[BaseNode/* NodeType */.Jq.ntSign]) {
         if (jnode.type == "2") {
           str += jnode.imgSrc;
         }