hoeditor-web 3.1.39 → 3.1.41

package/lib/hoeditor.umd.js

@@ -8380,7 +8380,7 @@ var component = (0,componentNormalizer/* default */.Z)(
 
 /***/ }),
 
-/***/ 63161:
+/***/ 88359:
 /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -8396,7 +8396,7 @@ __webpack_require__.d(__webpack_exports__, {
 var es_array_includes = __webpack_require__(26699);
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.string.includes.js
 var es_string_includes = __webpack_require__(32023);
-;// 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/listsource/ListSource.vue?vue&type=template&id=72495abc&scoped=true&
+;// 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/listsource/ListSource.vue?vue&type=template&id=4206f5fa&scoped=true&
 
 
 var render = function render() {
@@ -8699,7 +8699,7 @@ var render = function render() {
 };
 var staticRenderFns = [];
 
-;// CONCATENATED MODULE: ./src/components/controls/listsource/ListSource.vue?vue&type=template&id=72495abc&scoped=true&
+;// CONCATENATED MODULE: ./src/components/controls/listsource/ListSource.vue?vue&type=template&id=4206f5fa&scoped=true&
 
 // EXTERNAL MODULE: ./node_modules/@babel/runtime/helpers/esm/toConsumableArray.js + 3 modules
 var toConsumableArray = __webpack_require__(61748);
@@ -8875,12 +8875,12 @@ var appendToBody = __webpack_require__(95677);
       }
     },
     inputCheckboxChange: function inputCheckboxChange(index) {
-      this.listValue = (0,toConsumableArray/* default */.Z)(this.listValue.map(function (v, key) {
-        if (key != index) {
-          v.input = false;
-        }
-        return v;
-      }));
+      //   this.listValue = [...this.listValue.map((v, key) => {
+      //     if(key != index) {
+      //         v.input = false;
+      //     }
+      //     return v;
+      //   })]
     },
     defaultCheckboxChange: function defaultCheckboxChange(index) {
       this.listValue = (0,toConsumableArray/* default */.Z)(this.listValue.map(function (v, key) {
@@ -8970,10 +8970,10 @@ var appendToBody = __webpack_require__(95677);
 });
 ;// CONCATENATED MODULE: ./src/components/controls/listsource/ListSource.vue?vue&type=script&lang=js&
  /* harmony default export */ var listsource_ListSourcevue_type_script_lang_js_ = (ListSourcevue_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/listsource/ListSource.vue?vue&type=style&index=0&id=72495abc&prod&lang=less&scoped=true&
+;// 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/listsource/ListSource.vue?vue&type=style&index=0&id=4206f5fa&prod&lang=less&scoped=true&
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./src/components/controls/listsource/ListSource.vue?vue&type=style&index=0&id=72495abc&prod&lang=less&scoped=true&
+;// CONCATENATED MODULE: ./src/components/controls/listsource/ListSource.vue?vue&type=style&index=0&id=4206f5fa&prod&lang=less&scoped=true&
 
 // EXTERNAL MODULE: ./node_modules/@vue/vue-loader-v15/lib/runtime/componentNormalizer.js
 var componentNormalizer = __webpack_require__(70713);
@@ -8992,7 +8992,7 @@ var component = (0,componentNormalizer/* default */.Z)(
   staticRenderFns,
   false,
   null,
-  "72495abc",
+  "4206f5fa",
   null
   
 )
@@ -9491,7 +9491,7 @@ var component = (0,componentNormalizer/* default */.Z)(
 
 /***/ }),
 
-/***/ 28758:
+/***/ 22156:
 /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -9511,7 +9511,7 @@ var es_string_includes = __webpack_require__(32023);
 var es_regexp_exec = __webpack_require__(74916);
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.string.replace.js
 var es_string_replace = __webpack_require__(15306);
-;// 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/poperSelect/PoperSelect.vue?vue&type=template&id=6d315cb7&
+;// 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/poperSelect/PoperSelect.vue?vue&type=template&id=6682ee5d&
 
 
 
@@ -9908,7 +9908,7 @@ var render = function render() {
 };
 var staticRenderFns = [];
 
-;// CONCATENATED MODULE: ./src/components/controls/poperSelect/PoperSelect.vue?vue&type=template&id=6d315cb7&
+;// CONCATENATED MODULE: ./src/components/controls/poperSelect/PoperSelect.vue?vue&type=template&id=6682ee5d&
 
 // EXTERNAL MODULE: ./node_modules/@babel/runtime/helpers/esm/toConsumableArray.js + 3 modules
 var toConsumableArray = __webpack_require__(61748);
@@ -12681,13 +12681,14 @@ var columns = [{
         if (text == this.textParam.name) {
           text = '';
         }
-        if (isAutoInput) {
-          // 支持输入情况下，清空选项内容，默认显示以文本域名称
-          text = '';
-        }
         if (prefixText) {
           // 设置前缀时回填文本内容
           text = prefixText;
+        } else if (isAutoInput) {
+          // 支持输入情况下，清空选项内容，默认显示以文本域名称
+          text = '';
+        } else if (text == '' && !isAutoInput && !prefixText && value) {
+          text = value;
         }
         this.textParam.text = text;
         this.textParam.keyValue = keyValue;
@@ -12762,10 +12763,10 @@ var columns = [{
 });
 ;// CONCATENATED MODULE: ./src/components/controls/poperSelect/PoperSelect.vue?vue&type=script&lang=js&
  /* harmony default export */ var poperSelect_PoperSelectvue_type_script_lang_js_ = (PoperSelectvue_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/poperSelect/PoperSelect.vue?vue&type=style&index=0&id=6d315cb7&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/poperSelect/PoperSelect.vue?vue&type=style&index=0&id=6682ee5d&prod&lang=less&
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./src/components/controls/poperSelect/PoperSelect.vue?vue&type=style&index=0&id=6d315cb7&prod&lang=less&
+;// CONCATENATED MODULE: ./src/components/controls/poperSelect/PoperSelect.vue?vue&type=style&index=0&id=6682ee5d&prod&lang=less&
 
 // EXTERNAL MODULE: ./node_modules/@vue/vue-loader-v15/lib/runtime/componentNormalizer.js
 var componentNormalizer = __webpack_require__(70713);
@@ -31561,8 +31562,8 @@ var Caret = /*#__PURE__*/function () {
     key: "setStagePosition",
     value: function setStagePosition(stageX, stageY) {
       // console.log("光标在文档中的坐标（默认Y轴从上往下）：", stageX, stageY);
-      this._stageX = stageX;
-      this._stageY = stageY;
+      this._stageX = stageX * _draw_DrawConfig__WEBPACK_IMPORTED_MODULE_4__/* .DrawConfig */ .f.instance().scale;
+      this._stageY = stageY * _draw_DrawConfig__WEBPACK_IMPORTED_MODULE_4__/* .DrawConfig */ .f.instance().scale;
     }
     /**
      * @author xyl
@@ -31575,16 +31576,16 @@ var Caret = /*#__PURE__*/function () {
     value: function moveTo(pageIndex, x, y) {
       var _this = this;
       this.div_cursor.className = "";
-      this.x = x;
-      this.y = y;
+      this.x = x * _draw_DrawConfig__WEBPACK_IMPORTED_MODULE_4__/* .DrawConfig */ .f.instance().scaleXY;
+      this.y = y * _draw_DrawConfig__WEBPACK_IMPORTED_MODULE_4__/* .DrawConfig */ .f.instance().scaleXY;
       if (this._aiInfo) {
-        this._aiInfo.x = x;
-        this._aiInfo.y = y;
+        this._aiInfo.x = x * _draw_DrawConfig__WEBPACK_IMPORTED_MODULE_4__/* .DrawConfig */ .f.instance().scaleXY;
+        this._aiInfo.y = y * _draw_DrawConfig__WEBPACK_IMPORTED_MODULE_4__/* .DrawConfig */ .f.instance().scaleXY;
         this._aiInfo.pageIndex = pageIndex;
         this._aiInfo.height = this._height;
       }
-      this.div_cursor.style.left = x + "px";
-      this.div_cursor.style.top = y + "px";
+      this.div_cursor.style.left = x * _draw_DrawConfig__WEBPACK_IMPORTED_MODULE_4__/* .DrawConfig */ .f.instance().scaleXY + "px";
+      this.div_cursor.style.top = y * _draw_DrawConfig__WEBPACK_IMPORTED_MODULE_4__/* .DrawConfig */ .f.instance().scaleXY + "px";
       this.div_cursor.style.opacity = "1";
       // this.div_cursor.style.width = "0.1px";
       setTimeout(function () {
@@ -47726,7 +47727,7 @@ var PageProperty = /*#__PURE__*/function () {
         this._widthPixes = hoEditorFactory.unitConvert.mmConversionPx(this._widthMm, true);
         this._commentWidthPixes = hoEditorFactory.unitConvert.mmConversionPx(this._commentWidthMm, true);
         this._rightMarginPixes = hoEditorFactory.unitConvert.mmConversionPx(this._rightMarginMm, true);
-        var scaleXY = Math.max(_draw_DrawConfig__WEBPACK_IMPORTED_MODULE_12__/* .DrawConfig */ .f.instance().scaleXY, _draw_DrawConfig__WEBPACK_IMPORTED_MODULE_12__/* .DrawConfig */ .f.instance().transformScale);
+        var scaleXY = _draw_DrawConfig__WEBPACK_IMPORTED_MODULE_12__/* .DrawConfig */ .f.instance().scale;
         var width = Math.floor(this._widthPixes * scaleXY) % 2 === 1 ? Math.floor(this._widthPixes * scaleXY) + 1 : Math.floor(this._widthPixes * scaleXY);
         this._canvasParams.width = width;
         this._canvasParams.commentWidth = this._commentWidthPixes;
@@ -47744,7 +47745,7 @@ var PageProperty = /*#__PURE__*/function () {
         this._widthPixes = hoeditorfacotry.unitConvert.mmConversionPx(this._widthMm, true);
         hoeditorfacotry.drawTree.updateDrawTreeFirstLine();
       }
-      var scaleXY = Math.max(_draw_DrawConfig__WEBPACK_IMPORTED_MODULE_12__/* .DrawConfig */ .f.instance().scaleXY, _draw_DrawConfig__WEBPACK_IMPORTED_MODULE_12__/* .DrawConfig */ .f.instance().transformScale);
+      var scaleXY = _draw_DrawConfig__WEBPACK_IMPORTED_MODULE_12__/* .DrawConfig */ .f.instance().scale;
       var width = Math.floor(this._widthPixes * scaleXY) % 2 === 1 ? Math.floor(this._widthPixes * scaleXY) + 1 : Math.floor(this._widthPixes * scaleXY);
       this._canvasParams.width = width;
     }
@@ -47758,7 +47759,7 @@ var PageProperty = /*#__PURE__*/function () {
         this._heightMm = value;
         this._heightPixes = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_11__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID).unitConvert.mmConversionPx(this._heightMm, false);
       }
-      var scaleXY = Math.max(_draw_DrawConfig__WEBPACK_IMPORTED_MODULE_12__/* .DrawConfig */ .f.instance().scaleXY, _draw_DrawConfig__WEBPACK_IMPORTED_MODULE_12__/* .DrawConfig */ .f.instance().transformScale);
+      var scaleXY = _draw_DrawConfig__WEBPACK_IMPORTED_MODULE_12__/* .DrawConfig */ .f.instance().scale;
       var height = Math.floor(this._heightPixes * scaleXY) % 2 === 1 ? Math.floor(this._heightPixes * scaleXY) + 1 : Math.floor(this._heightPixes * scaleXY);
       this._canvasParams.height = height;
     }
@@ -69800,6 +69801,18 @@ var DrawConfig = /*#__PURE__*/function () {
     set: function set(scale) {
       this._transformScale = scale;
     }
+  }, {
+    key: "scale",
+    get: function get() {
+      // return Math.max(this._scaleXY, this._transformScale);
+      if (this._scaleXY !== 1) {
+        return this._scaleXY;
+      } else if (this._transformScale !== 1) {
+        return this._transformScale;
+      } else {
+        return 1;
+      }
+    }
   }], [{
     key: "instance",
     value: function instance() {
@@ -83002,6 +83015,8 @@ var DrawContainer = __webpack_require__(47535);
 var Caret = __webpack_require__(35279);
 // EXTERNAL MODULE: ./src/HOEditorFactorys.ts
 var HOEditorFactorys = __webpack_require__(74089);
+// EXTERNAL MODULE: ./src/editor/draw/DrawConfig.ts
+var DrawConfig = __webpack_require__(37616);
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.number.constructor.js
 var es_number_constructor = __webpack_require__(9653);
 // EXTERNAL MODULE: ./src/editor/events/NodeChangingEvent.ts
@@ -83471,6 +83486,7 @@ var EditorController = /*#__PURE__*/function () {
 
 
 
+
 var Editor = /*#__PURE__*/function () {
   function Editor(hoEditorFactoryID) {
     (0,classCallCheck/* default */.Z)(this, Editor);
@@ -83548,8 +83564,8 @@ var Editor = /*#__PURE__*/function () {
     key: "moveTo",
     value: function moveTo(pageIndex, x, y) {
       this.setPage(pageIndex);
-      this.input.style.left = x + 'px';
-      this.input.style.top = y + 'px';
+      this.input.style.left = x * DrawConfig/* DrawConfig */.f.instance().scaleXY + 'px';
+      this.input.style.top = y * DrawConfig/* DrawConfig */.f.instance().scaleXY + 'px';
       this.input.focus();
     }
   }]);
@@ -84208,8 +84224,6 @@ var DrawPageMainDoc = __webpack_require__(77441);
 var DrawTextNode = __webpack_require__(24492);
 // EXTERNAL MODULE: ./src/editor/dom/treeNode/TableFormula.ts
 var TableFormula = __webpack_require__(90832);
-// EXTERNAL MODULE: ./src/editor/draw/DrawConfig.ts
-var DrawConfig = __webpack_require__(37616);
 // EXTERNAL MODULE: ./src/editor/draw/drawNode/DrawSignNode.ts
 var DrawSignNode = __webpack_require__(75638);
 // EXTERNAL MODULE: ./src/editor/dom/TableProperty.ts
@@ -84282,7 +84296,6 @@ var JumpButtonNode = __webpack_require__(330);
 
 
 
-
 
 
 //当前的显示状态，psDesign为设计状态，psEdit为正常编辑状态 psPreview为打印预览态态  psPrint 正在打印状态, psReview审阅状态
@@ -86605,16 +86618,15 @@ var DrawTree = /*#__PURE__*/function () {
             var pos = dline.localToLocal(dright, 0, dPage.drawDocContainer);
             this._caret.height = dline.dHeight + dline.paragraphNode.combineParagraph.lineSpace;
             if (dPage && dPage.drawSelectLevel) {
-              var scaleXY = DrawConfig/* DrawConfig */.f.instance().scaleXY;
               if (this.selectRange.isEmpty || hoEditorFactory.docController.findContent !== "") {
-                this._editor.moveTo(dPage.pageIndex, pos.x * scaleXY, pos.y * scaleXY);
+                this._editor.moveTo(dPage.pageIndex, pos.x, pos.y);
               }
               if (dNode instanceof DrawSignNode/* DrawSignNode */.V) {
-                this._caret.setStagePosition((pos.x - dNode.dWidth) * scaleXY, pos.y * scaleXY);
+                this._caret.setStagePosition(pos.x - dNode.dWidth, pos.y);
               } else {
-                this._caret.setStagePosition(pos.x * scaleXY, pos.y * scaleXY);
+                this._caret.setStagePosition(pos.x, pos.y);
               }
-              this._caret.moveTo(dPage.pageIndex, pos.x * scaleXY, pos.y * scaleXY);
+              this._caret.moveTo(dPage.pageIndex, pos.x, pos.y);
             }
             return;
           }
@@ -86660,7 +86672,7 @@ var DrawTree = /*#__PURE__*/function () {
     value: function moveEditTo(pageIndex, x, y) {
       var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this._hoEditorFactoryID);
       if (this.selectRange.beginRangeSelect === undefined || this.selectRange.isEmpty || hoEditorFactory.docController.findContent !== "") {
-        this._editor.moveTo(pageIndex, x * DrawConfig/* DrawConfig */.f.instance().scaleXY, y * DrawConfig/* DrawConfig */.f.instance().scaleXY);
+        this._editor.moveTo(pageIndex, x, y);
       }
     }
   }, {
@@ -86695,8 +86707,8 @@ var DrawTree = /*#__PURE__*/function () {
         this._caret.height = dLine.dHeight + dLine.paragraphNode.combineParagraph.lineSpace;
         // 只读模式
         if (this._paintStatus !== PaintState.psReadOnly) {
-          this._caret.setStagePosition(dest.x * DrawConfig/* DrawConfig */.f.instance().scaleXY, dest.y * DrawConfig/* DrawConfig */.f.instance().scaleXY);
-          this._caret.moveTo(dPage.pageIndex, dest.x * DrawConfig/* DrawConfig */.f.instance().scaleXY, dest.y * DrawConfig/* DrawConfig */.f.instance().scaleXY);
+          this._caret.setStagePosition(dest.x, dest.y);
+          this._caret.moveTo(dPage.pageIndex, dest.x, dest.y);
         }
         this.moveEditTo(dPage.pageIndex, dest.x, dest.y);
       } else {
@@ -86730,11 +86742,11 @@ var DrawTree = /*#__PURE__*/function () {
           // }
           if (this._paintStatus !== PaintState.psReadOnly) {
             if (dNode instanceof DrawSignNode/* DrawSignNode */.V) {
-              this._caret.setStagePosition((_dest.x - dNode.dWidth) * DrawConfig/* DrawConfig */.f.instance().scaleXY, _dest.y * DrawConfig/* DrawConfig */.f.instance().scaleXY);
+              this._caret.setStagePosition(_dest.x - dNode.dWidth, _dest.y);
             } else {
-              this._caret.setStagePosition(_dest.x * DrawConfig/* DrawConfig */.f.instance().scaleXY, _dest.y * DrawConfig/* DrawConfig */.f.instance().scaleXY);
+              this._caret.setStagePosition(_dest.x, _dest.y);
             }
-            this._caret.moveTo(dPage.pageIndex, _dest.x * DrawConfig/* DrawConfig */.f.instance().scaleXY, _dest.y * DrawConfig/* DrawConfig */.f.instance().scaleXY);
+            this._caret.moveTo(dPage.pageIndex, _dest.x, _dest.y);
           }
           this.moveEditTo(dPage.pageIndex, _dest.x, _dest.y);
         }
@@ -177975,12 +177987,12 @@ var map = {
 	"./findReplace/FindReplace.vue": 98064,
 	"./gestation/Gestation.vue": 20329,
 	"./hoprint/HoPrint.vue": 79228,
-	"./listsource/ListSource.vue": 63161,
+	"./listsource/ListSource.vue": 88359,
 	"./localHistory/LocalHistory.vue": 60797,
 	"./pageInfoes/PageInfoes.vue": 99749,
 	"./paragraph/ParagraphDialog.vue": 58874,
 	"./poperSelect/PoperMark.vue": 20734,
-	"./poperSelect/PoperSelect.vue": 28758,
+	"./poperSelect/PoperSelect.vue": 22156,
 	"./poperTipText/PoperTipText.vue": 50987,
 	"./popers/Poper.vue": 57937,
 	"./popers/Title.vue": 85516,
@@ -215435,8 +215447,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=145d8080&
-var HoDocvue_type_template_id_145d8080_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=454bbda9&
+var HoDocvue_type_template_id_454bbda9_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -215511,16 +215523,28 @@ var HoDocvue_type_template_id_145d8080_render = function render() {
       }, {
         key: "hoAddSelectMark",
         fn: function fn() {
-          return [_c('a-icon', {
+          return [_c('svg', {
             staticClass: "ho-select-mark-icon",
             style: _vm.selectMarkStyle,
             attrs: {
-              "type": "down-square"
+              "viewBox": "0 0 1024 1024",
+              "version": "1.1",
+              "xmlns": "http://www.w3.org/2000/svg",
+              "width": "16",
+              "height": "16"
             },
             on: {
               "click": _vm.selectMarkClick
             }
-          })];
+          }, [_c('path', {
+            attrs: {
+              "d": "M896 0H128a128 128 0 0 0-128 128v768a128 128 0 0 0 128 128h768a128 128 0 0 0 128-128V128a128 128 0 0 0-128-128z m64 896a64 64 0 0 1-64 64H128a64 64 0 0 1-64-64V128a64 64 0 0 1 64-64h768a64 64 0 0 1 64 64z"
+            }
+          }), _c('path', {
+            attrs: {
+              "d": "M535.04 609.28a32.64 32.64 0 0 1-45.44 0l-256-256-45.44 45.44 256 256a95.36 95.36 0 0 0 135.68 0l256-256-44.8-44.8z"
+            }
+          })])];
         },
         proxy: true
       }], null, true)
@@ -215607,7 +215631,7 @@ var HoDocvue_type_template_id_145d8080_render = function render() {
     }
   }, [_vm._v("v " + _vm._s(_vm.version))])])])], 1);
 };
-var HoDocvue_type_template_id_145d8080_staticRenderFns = [];
+var HoDocvue_type_template_id_454bbda9_staticRenderFns = [];
 
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.filter.js
 var es_array_filter = __webpack_require__(57327);
@@ -215837,8 +215861,8 @@ var DrawSelectLevel = /*#__PURE__*/function () {
         this._selectCanvas.width = hoEditorFactory.pageProperty.canvasParams.width;
         this._selectCanvas.height = hoEditorFactory.pageProperty.canvasParams.height; //   if (hoEditorFactory.drawTree.paintStatus === PaintState.psReview) {
         this._selectStage = new createjs.Stage(this._selectCanvas);
-        this._selectStage.scaleX = Math.max(DrawConfig/* DrawConfig */.f.instance().scaleXY, DrawConfig/* DrawConfig */.f.instance().transformScale);
-        this._selectStage.scaleY = Math.max(DrawConfig/* DrawConfig */.f.instance().scaleXY, DrawConfig/* DrawConfig */.f.instance().transformScale);
+        this._selectStage.scaleX = DrawConfig/* DrawConfig */.f.instance().scale;
+        this._selectStage.scaleY = DrawConfig/* DrawConfig */.f.instance().scale;
         var dPage = hoEditorFactory.drawTree.drawPages[this._pageIndex];
         if ((_dPage$drawDomLevel = dPage.drawDomLevel) !== null && _dPage$drawDomLevel !== void 0 && _dPage$drawDomLevel.stage) this._selectStage.nextStage = (_dPage$drawDomLevel2 = dPage.drawDomLevel) === null || _dPage$drawDomLevel2 === void 0 ? void 0 : _dPage$drawDomLevel2.stage;
         dPage.setEnableMouseOver(5);
@@ -216480,8 +216504,8 @@ var DrawDomLevel = /*#__PURE__*/function () {
         this._domCanvas.width = hoeditorfactory.pageProperty.canvasParams.width;
         this._domCanvas.height = hoeditorfactory.pageProperty.canvasParams.height;
         this._domStage = new createjs.Stage(this._domCanvas);
-        this._domStage.scaleX = Math.max(DrawConfig/* DrawConfig */.f.instance().scaleXY, DrawConfig/* DrawConfig */.f.instance().transformScale);
-        this._domStage.scaleY = Math.max(DrawConfig/* DrawConfig */.f.instance().scaleXY, DrawConfig/* DrawConfig */.f.instance().transformScale);
+        this._domStage.scaleX = DrawConfig/* DrawConfig */.f.instance().scale;
+        this._domStage.scaleY = DrawConfig/* DrawConfig */.f.instance().scale;
         var dPage = hoeditorfactory.drawTree.drawPages[this._pageIndex];
         var keys = (0,esm_toConsumableArray/* default */.Z)(hoeditorfactory.drawPageTree.needUpdateMainDocInfo.keys()).sort(function (a, b) {
           if (a > b) {
@@ -216609,7 +216633,7 @@ var DrawDomLevel = /*#__PURE__*/function () {
     value: function getDrawPlaceByPos(x, y) {
       var hoeditorfactory = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this._hoEditorFactoryID);
       var dPage = hoeditorfactory.drawTree.drawPages[this._pageIndex];
-      var adjy = y / Math.max(DrawConfig/* DrawConfig */.f.instance().scaleXY, DrawConfig/* DrawConfig */.f.instance().transformScale);
+      var adjy = y / DrawConfig/* DrawConfig */.f.instance().scale;
       if (adjy >= 0 && adjy <= this._mainDocTop) {
         return dPage.drawHeader;
       } else if (adjy > this._mainDocTop && adjy < this._footerTop) {
@@ -217207,7 +217231,7 @@ var HoToPage_component = (0,componentNormalizer/* default */.Z)(
 // EXTERNAL MODULE: ./src/plugins/util.ts
 var plugins_util = __webpack_require__(62783);
 // EXTERNAL MODULE: ./src/components/controls/poperSelect/PoperSelect.vue + 9 modules
-var PoperSelect = __webpack_require__(28758);
+var PoperSelect = __webpack_require__(22156);
 // EXTERNAL MODULE: ./src/components/controls/poperSelect/PoperMark.vue + 5 modules
 var PoperMark = __webpack_require__(20734);
 ;// CONCATENATED MODULE: ./src/components/controls/poperSelect/index.ts
@@ -218612,7 +218636,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.39');
+/* harmony default export */ var version = ('3.1.41');
 // EXTERNAL MODULE: ./src/components/controls/poperTipText/PoperTipText.vue + 5 modules
 var PoperTipText = __webpack_require__(50987);
 ;// CONCATENATED MODULE: ./src/components/controls/poperTipText/index.ts
@@ -218660,7 +218684,7 @@ var ImageNode = __webpack_require__(97186);
 
 
 
-var scaleXY = Math.max(DrawConfig/* DrawConfig */.f.instance().scaleXY, DrawConfig/* DrawConfig */.f.instance().transformScale);
+var scaleXY = DrawConfig/* DrawConfig */.f.instance().scale;
 var defaultWidth = Math.floor(793 * scaleXY) % 2 === 1 ? Math.floor(793 * scaleXY) + 1 : Math.floor(793 * scaleXY);
 var defaultHeight = Math.floor(1122 * scaleXY) % 2 === 1 ? Math.floor(1122 * scaleXY) + 1 : Math.floor(1122 * scaleXY);
 /* harmony default export */ var HoDocvue_type_script_lang_js_ = ({
@@ -218962,9 +218986,9 @@ var defaultHeight = Math.floor(1122 * scaleXY) % 2 === 1 ? Math.floor(1122 * sca
         this.hoEditorProvider.autoSelectElementId = '';
         this.isAutoPoper = false;
       }
-      if (this.selectMarkStyle.display == 'block') {
-        this.updateSelectMark();
-      }
+      //   if (this.selectMarkStyle.display == 'block') {
+      //     this.updateSelectMark();
+      //   }
     },
     /**
      * 鼠标click事件
@@ -219025,9 +219049,9 @@ var defaultHeight = Math.floor(1122 * scaleXY) % 2 === 1 ? Math.floor(1122 * sca
                 nodeType: node.parentNode.nodeType,
                 type: 'TextInputFieldNode'
               });
-              // this.$nextTick(() => {
-              //     this.createSelectMark(node, hoEditorFactory.drawTree.paintStatus, pageIndex);
-              // })
+              //   this.$nextTick(() => {
+              //       this.createSelectMark(node, hoEditorFactory.drawTree.paintStatus, pageIndex);
+              //   })
             }
           }
         } else if (e.clickType === 'rightClick') {
@@ -219176,7 +219200,7 @@ var defaultHeight = Math.floor(1122 * scaleXY) % 2 === 1 ? Math.floor(1122 * sca
     },
     updateSelectMark: function updateSelectMark() {
       var _this6 = this;
-      this.selectMarkStyle.display = 'none';
+      //   this.selectMarkStyle.display = 'none';
       var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this.hoEditorProvider.activeDocId);
       var paintStatus = hoEditorFactory.drawTree.paintStatus;
       var node = hoEditorFactory.vueController.getNodeByDataID('main', this.selectMarkStyle.dataid);
@@ -219192,12 +219216,12 @@ var defaultHeight = Math.floor(1122 * scaleXY) % 2 === 1 ? Math.floor(1122 * sca
         parentNode = node.parentNode;
       }
       var index = 5;
-      var flag = true;
-      while (flag && index >= 0) {
+      var flag = false;
+      while (!flag && index >= 0) {
         var currentNode = parentNode.parentNode;
         index--;
         flag = parentNode.parentNode instanceof TextInputFieldNode/* TextInputFieldNode */.re && parentNode.parentNode.inputFieldType == 1 && parentNode.parentNode.downListProperty.listItems.includes("<元素>");
-        if (flag) {
+        if (!flag) {
           parentNode = parentNode.parentNode;
         }
       }
@@ -219398,7 +219422,7 @@ var defaultHeight = Math.floor(1122 * scaleXY) % 2 === 1 ? Math.floor(1122 * sca
       var nodePos = node.drawNodes[0];
       var drawLine = hoEditorFactory.drawTree.getDrawLineByDNode(nodePos);
       var docPos = drawLine.localToGlobal(nodePos.x, nodePos.y === 0 ? drawLine.dHeight : nodePos.y);
-      var scaleXY = Math.max(DrawConfig/* DrawConfig */.f.instance().scaleXY, DrawConfig/* DrawConfig */.f.instance().transformScale);
+      var scaleXY = DrawConfig/* DrawConfig */.f.instance().scale;
       var pos = {
         x: docPos.x / scaleXY,
         // 目标元素所在行的 x
@@ -219501,10 +219525,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=145d8080&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=454bbda9&prod&lang=less&
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./src/components/HoDoc.vue?vue&type=style&index=0&id=145d8080&prod&lang=less&
+;// CONCATENATED MODULE: ./src/components/HoDoc.vue?vue&type=style&index=0&id=454bbda9&prod&lang=less&
 
 ;// CONCATENATED MODULE: ./src/components/HoDoc.vue
 
@@ -219517,8 +219541,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_145d8080_render,
-  HoDocvue_type_template_id_145d8080_staticRenderFns,
+  HoDocvue_type_template_id_454bbda9_render,
+  HoDocvue_type_template_id_454bbda9_staticRenderFns,
   false,
   null,
   null,
@@ -231397,12 +231421,12 @@ var VueController = /*#__PURE__*/function () {
           if (anode instanceof ControlNode/* ControlNode */.w || anode instanceof TextInputFieldNode/* TextInputFieldNode */.re) {
             for (var m = 0, len = items.length - 1; m <= len; m++) {
               var item = items[m];
-              if (item.text !== '' && item.name === anode.name && anode.text.indexOf(item.text) !== -1) {
+              if (item.text !== '' && (item.name === anode.name || item.id === anode.id || item.dataId === anode.dataId) && anode.text.indexOf(item.text) !== -1) {
                 var range = _this4.search(anode, item.text);
                 if (range.length > 0) {
                   selectRangeArr = selectRangeArr.concat(range);
                 }
-              } else if (item.text === '' && item.name === anode.name) {
+              } else if (item.text === '' && (item.name === anode.name || item.id === anode.id || item.dataId === anode.dataId)) {
                 var _range = _this4.search(anode, anode.text);
                 if (_range.length > 0) {
                   selectRangeArr = selectRangeArr.concat(_range);