hoeditor-web 3.1.158 → 3.1.159

package/lib/hoeditor.umd.js

@@ -17134,7 +17134,7 @@ var component = (0,componentNormalizer/* default */.Z)(
 
 /***/ }),
 
-/***/ 97628:
+/***/ 19363:
 /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -17154,7 +17154,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/table/TableCellPoper.vue?vue&type=template&id=bcd755a2&
+;// 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/TableCellPoper.vue?vue&type=template&id=7a33549e&
 
 
 
@@ -17420,7 +17420,7 @@ var render = function render() {
 };
 var staticRenderFns = [];
 
-;// CONCATENATED MODULE: ./src/components/controls/table/TableCellPoper.vue?vue&type=template&id=bcd755a2&
+;// CONCATENATED MODULE: ./src/components/controls/table/TableCellPoper.vue?vue&type=template&id=7a33549e&
 
 // EXTERNAL MODULE: ./node_modules/@babel/runtime/helpers/esm/toConsumableArray.js + 3 modules
 var toConsumableArray = __webpack_require__(61748);
@@ -17804,21 +17804,10 @@ var popper = __webpack_require__(95551);
           this.isCanSearch = true;
         }
         var _height = this.poperList.length * 36 + 72;
-        // if (this.isAllowMultiSelect) height += 36;
         if (this.isCanSearch) _height += 28;
-        // if (height < 360) {
-        // let posStyle = this.computedPoperPosition(height, this.poperPos);
-        // delete posStyle['height'];
-        // this.posStyle = posStyle;
-        // } else {
-        // let posStyle = this.computedPoperPosition(360, this.poperPos);
-        // delete posStyle['height'];
-        // this.posStyle = posStyle;
-        // }
       }
     },
     getTime: function getTime(val) {
-      this.date = val.value;
       if (val.type == 'dblclick') {
         this.sureDate();
       }
@@ -17930,10 +17919,10 @@ var popper = __webpack_require__(95551);
 });
 ;// CONCATENATED MODULE: ./src/components/controls/table/TableCellPoper.vue?vue&type=script&lang=js&
  /* harmony default export */ var table_TableCellPopervue_type_script_lang_js_ = (TableCellPopervue_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/TableCellPoper.vue?vue&type=style&index=0&id=bcd755a2&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/TableCellPoper.vue?vue&type=style&index=0&id=7a33549e&prod&lang=less&
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./src/components/controls/table/TableCellPoper.vue?vue&type=style&index=0&id=bcd755a2&prod&lang=less&
+;// CONCATENATED MODULE: ./src/components/controls/table/TableCellPoper.vue?vue&type=style&index=0&id=7a33549e&prod&lang=less&
 
 // EXTERNAL MODULE: ./node_modules/@vue/vue-loader-v15/lib/runtime/componentNormalizer.js
 var componentNormalizer = __webpack_require__(70713);
@@ -70641,33 +70630,8 @@ var DrawLine = /*#__PURE__*/function (_DrawContainer) {
     _this._dBaseY = 0;
     _this._docHeight = hoEditorFactory.defaultLineHeight;
     _this._dHeight = _this._docHeight;
-    // const shape = new createjs.Shape();
-    // shape.x = 0;
-    // shape.y = 0;
-    // shape.graphics
-    //   .clear()
-    //   .beginFill("#FFEE90")
-    //   .drawRect(
-    //     0,
-    //     0,
-    //     this._dWidth,
-    //     this._dHeight + this.paragraphNode.combineParagraph.lineSpace
-    //   );
-    // shape.alpha = 0.5;
-    // // const y = this._dTop;
-    // // this.removeAllChildren();
-    // this.addChildAt(shape, 0);
-    // this.setBounds(x,y,width,gLineHeight);
     return _this;
   }
-  // public appendItem(ditem: DrawLineNode){
-  //   this.addChild(ditem);
-  //   const rect= ditem.getBounds();
-  //   this._actualWidth=this._actualWidth+rect.width+g_CharSpace;
-  //   if (this._height<rect.height) {x
-  //     this._height=rect.height;
-  //   }
-  // }
   (0,createClass/* default */.Z)(DrawLine, [{
     key: "dWidth",
     get: function get() {
@@ -70911,17 +70875,11 @@ var DrawLine = /*#__PURE__*/function (_DrawContainer) {
       var iCount = 0; //文本节点数量
       //FIXME:去掉左边距后真实的宽度,后续还要去掉margin的的left right
       var lwidth = this._dWidth;
-      // this.paragraphNode.getParagraphLeftWidth()[1] - this.paragraphNode.combineParagraph.leftMarginPixes
-      // - this.paragraphNode.combineParagraph.rightMarginPixes;
-      // if (this.paragraphNode.parentNode instanceof TextInputFieldNode)
-      //this.x = this.paragraphNode.getParagraphLeftWidth()[0] + this.paragraphNode.combineParagraph.leftMarginPixes;
-      //else this.x = this.paragraphNode.combineParagraph.leftMarginPixes
       //文字摆放开始位置
       //this.paragraphNode.combineParagraph.leftMarginPixes;
       //字间距，分散对齐:计算宽度时候使用默认字间距
       var charspace = this._paragraphNode.combineParagraph.charSpace;
       var spacing = 0;
-      var imageHeight = 0;
       var maxFontHeight = 0;
       //1.返回dWidth并计算actualWidth（实际需要占用的宽度）,dHeight
       for (var i = 0; i < this.drawItems.length; i++) {
@@ -70947,21 +70905,14 @@ var DrawLine = /*#__PURE__*/function (_DrawContainer) {
           dWidth = this.drawItems[i].dWidth;
           iCount += 1;
           spacing = charspace;
-          // if (dItem instanceof DrawImageNode || dItem instanceof DrawBarcodeNode || dItem instanceof DrawQrcodeNode) {
-          //   imageHeight = Math.max(imageHeight, dItem.dHeight);
-          // }
         }
-
         dHeight = Math.max(this.drawItems[i].dHeight, dHeight);
         if (this._drawItems[0] instanceof DrawCombineNode/* DrawCombineNode */.o && this._drawItems[0].node instanceof SeparateCharNode/* SeparateCharNode */.O) {
-          //dHeight = 2;
           dHeight = this._drawItems[0].node.width;
         }
         if (!(this.drawItems[i] instanceof DrawMarkNode/* DrawMarkNode */.I) && !(this._drawItems[i] instanceof DrawTextNode/* DrawTextNode */.v)) {
           iCount++;
         }
-        // if (((this.drawItems[i] as unknown) as DrawInfos).dHeight > dHeight)
-        // dHeight = ((this.drawItems[i] as unknown) as DrawInfos).dHeight;
         if (actualWidth + dWidth > lwidth && actualWidth > 0) {
           if (this.drawItems[i] instanceof DrawTextNode/* DrawTextNode */.v && UnitConvert/* UnitConvert */.P.isPuctuation(this._drawItems[i].text)) {} else {
             var nextLine = this._paragraphNode.getNextDline(this);
@@ -70970,7 +70921,6 @@ var DrawLine = /*#__PURE__*/function (_DrawContainer) {
             for (var n = i; n < this.drawItems.length; n++) {
               var ditem = this.drawItems[n];
               if (ditem) {
-                // this._islastline = false;
                 this.removeChild(ditem);
                 nextLine.addChild(ditem);
               }
@@ -70982,10 +70932,6 @@ var DrawLine = /*#__PURE__*/function (_DrawContainer) {
         }
         this._charCount = iCount;
         actualWidth += dWidth + spacing; //charspace;
-        // if (imageHeight === dHeight) {
-        //   this._isImgHeightForMax = true;
-        // }
-        // this._actualWidth+=this.children[i]
       }
 
       this._maxFontHeight = maxFontHeight;
@@ -70998,111 +70944,6 @@ var DrawLine = /*#__PURE__*/function (_DrawContainer) {
       this._charSpace = this._paragraphNode.combineParagraph.charSpace;
       this.dWidth = this._dWidth;
       this.dHeight = this._dHeight;
-      // if (restWidth > 0&& this.drawItems.length>1) {
-      //   this._charSpace = restWidth / this.drawItems.length - 1;
-      // }
-      // this.setBounds(this._dLeft, this._dTop, this._dWidth, this._dHeight);
-      // const shape = new createjs.Shape();
-      // shape.x = 0;
-      // shape.y = 0;
-      // shape.graphics
-      //   .clear()
-      //   .beginFill("#FFEE90")
-      //   .drawRect(
-      //     0,
-      //     0,
-      //     this._dWidth,
-      //     this._dHeight + this.paragraphNode.combineParagraph.lineSpace
-      //   );
-      // shape.alpha = 0.5;
-      // const y = this._dTop;
-      // this.removeAllChildren();
-      // this.uncache();
-      // // this.addChildAt(shape, 0);
-      // //2.计算起始位置
-      // switch (this._paragraphNode.combineParagraph.align) {
-      //   case Align.alleft: {
-      //     break;
-      //   }
-      //   case Align.alright: {
-      //     usedWidth += lwidth - this.actualWidth;
-      //     break;
-      //   }
-      //   case Align.alcenter: {
-      //     usedWidth += (lwidth - this.actualWidth) / 2;
-      //     break;
-      //   }
-      //   case Align.alSpaceEqually: {
-      //     //更新字间距,目标是让字的宽度相同
-      //     if (iCount > 1) {
-      //       spacing = (lwidth - this.actualWidth) / (iCount - 1);
-      //     }
-      //     // if (this.drawItems.length > 1) {
-      //     //   spacing = (lwidth - this.actualWidth) / (this.drawItems.length - 1);
-      //     // }
-      //     this.charSpace += spacing;
-      //     usedWidth += 0;
-      //     break;
-      //   }
-      // }
-      // /**
-      //  * 返回字间距
-      //  * @param index 字序号
-      //  */
-      // const spaceEqu = (dline: DrawLine, index: number): number => {
-      //   if (dline.drawItems[index] instanceof DrawMarkNode) {
-      //     return 0;
-      //   }
-      //   if (dline._paragraphNode.combineParagraph.align != Align.alSpaceEqually)
-      //     return dline.charSpace;
-      //   if (isLastLine) return gCharSpace;
-      //   //oldcharspace;
-      //   else return dline.charSpace;
-      // };
-      // //3.放置
-      // //DONE:行高
-      // this._dHeight = this.paragraphNode.combineParagraph.lineSpace * dHeight;
-      // ((this as unknown) as DrawInfos).dHeight = this._dHeight;
-      // const bottompos = dHeight + (this._dHeight - dHeight) / 2;
-      // for (let j = 0; j < this.drawItems.length; j++) {
-      //   if (this.drawItems[j] instanceof DrawContainer) {
-      //     //更新绘制实例
-      //     const charSpace = spaceEqu(this, j);
-      //     const tmp = new DrawChangeEvent(charSpace, dHeight, dBaseY);
-      //     // tmp.space = spaceEqu(j);
-      //     // tmp.height = dHeight;
-      //     // tmp.baseY = dBaseY;
-      //     (this.drawItems[j] as DrawContainer).refresh(tmp);
-      //     const dwidth = ((this.drawItems[j] as unknown) as DrawInfos).dWidth;
-      //     //((this.drawItems[j] as unknown) as DrawInfos).dHeight = this._dHeight;
-      //     this.drawItems[j].x = usedWidth; // + 1;
-      //     this.drawItems[j].y = bottompos;
-      //     usedWidth +=
-      //       ((this.drawItems[j] as unknown) as DrawInfos).dWidth + charSpace;
-      //     // this._charSpace;
-      //   }
-      // }
-      // //4.前一个字符需要在下一个字符的上层,处理斜体被遮盖的问题
-      // let level = 0;
-      // for (let j = this.drawItems.length - 1; j > -1; j--) {
-      //   this.addChildAt(this.drawItems[j], level);
-      //   if (this.drawItems[j] instanceof DrawMarkNode) {
-      //     this.addChildAt(this.drawItems[j], this.numChildren);
-      //   }
-      //   level++;
-      // }
-      // if (
-      //   this._paragraphNode.hoEditorFactory.drawTree.paintStatus !==
-      //     PaintState.psPreview &&
-      //   this._paragraphNode.hoEditorFactory.drawTree.paintStatus !==
-      //     PaintState.psPrint
-      // )
-      //   this.cache(
-      //     0,
-      //     0,
-      //     this._dWidth,
-      //     this._dHeight //+ lineSpace * 2 + 1
-      //   );
     }
   }, {
     key: "updateLineStyle",
@@ -71223,14 +71064,6 @@ var DrawLine = /*#__PURE__*/function (_DrawContainer) {
           //更新绘制实例
           var charSpace = spaceEqu(this, j);
           var tmp = new DrawChangeEvent(charSpace, dHeight, this._dBaseY);
-          // tmp.space = spaceEqu(j);
-          // tmp.height = dHeight;
-          // tmp.baseY = dBaseY;
-          // if (this.drawItems[j] instanceof DrawDownListNode) {
-          //   const drawItem = this.drawItems[j] as DrawDownListNode;
-          //   const dText = new DrawSimpleText(drawItem.text, drawItem.textStyle.getStyleKey(), drawItem.textStyle.color);
-          //   (this.drawItems[j] as DrawDownListNode).dWidth = dText.getMeasuredWidth() + (dText.text.length - 1) * charSpace;
-          // }
           this.drawItems[j].refresh(tmp);
           var dwidth = this.drawItems[j].dWidth;
           //((this.drawItems[j] as unknown) as DrawInfos).dHeight = this._dHeight;
@@ -73927,6 +73760,7 @@ var DrawPageMainDoc = /*#__PURE__*/function (_DrawArea) {
       this._dWidth = this._maxWidth;
       this._dHeight = this._maxHeight;
       this._docHeight = 0;
+
       //检测边框变化情况，如有变化则重绘
     }
   }]);
@@ -170203,7 +170037,7 @@ var map = {
 	"./selectDialog/SelectDialog.vue": 73791,
 	"./sign/Sign.vue": 67218,
 	"./specialChars/HoSpecialChars.vue": 75058,
-	"./table/TableCellPoper.vue": 97628,
+	"./table/TableCellPoper.vue": 19363,
 	"./table/TableCellPoper1.vue": 44645,
 	"./table/TableCellProperty.vue": 90546,
 	"./table/TableColProperty.vue": 16154,
@@ -209447,7 +209281,7 @@ var PoperMark = __webpack_require__(20734);
 
 
 // EXTERNAL MODULE: ./src/components/controls/table/TableCellPoper.vue + 6 modules
-var TableCellPoper = __webpack_require__(97628);
+var TableCellPoper = __webpack_require__(19363);
 // EXTERNAL MODULE: ./src/editor/dom/treeNode/DateTimeNode.ts
 var DateTimeNode = __webpack_require__(92501);
 // EXTERNAL MODULE: ./src/editor/dom/treeNode/DownListNode.ts
@@ -210844,7 +210678,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.158');
+/* harmony default export */ var version = ('3.1.159');
 // EXTERNAL MODULE: ./src/components/controls/poperTipText/PoperTipText.vue + 5 modules
 var PoperTipText = __webpack_require__(84531);
 ;// CONCATENATED MODULE: ./src/components/controls/poperTipText/index.ts
@@ -214100,8 +213934,8 @@ var HTMLconverter2 = /*#__PURE__*/function () {
     key: "HTMLStyleToCombineStyle",
     value: function HTMLStyleToCombineStyle(jsondata) {
       //NOTE:DomElement中的style中的样式后面的部分
-      var hoeditorfactory = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this._hoEditorFactoryID);
-      var tmp = hoeditorfactory.docTree.styles[0].clone(); // new TextStyle();
+      var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this._hoEditorFactoryID);
+      var tmp = hoEditorFactory.docTree.styles[0].clone(); // new TextStyle();
       if (jsondata['font_size']) {
         tmp.size = Number(jsondata['font_size']) || tmp.combineStyle.size;
         var str = jsondata['font_size'];
@@ -214112,7 +213946,7 @@ var HTMLconverter2 = /*#__PURE__*/function () {
             //size = Math.round(hoeditorfactory.unitConvert.pxConversionMm(size, true) );
             size = size / 96 * 72;
           }
-          size = hoeditorfactory.unitConvert.getCorrectFontSize(size);
+          size = hoEditorFactory.unitConvert.getCorrectFontSize(size);
           tmp.size = size;
         }
       }
@@ -214289,7 +214123,8 @@ var HTMLconverter2 = /*#__PURE__*/function () {
       }
       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,
+      var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this._hoEditorFactoryID);
+      var node = new ImageNode/* ImageNode */.H(this._hoEditorFactoryID, hoEditorFactory.docTree.activeNodes, null, BaseNode/* NodeType */.Jq.ntImage, hoEditorFactory.gernerateCode.generateID('IMG'), src,
       //$(jnode).attr('src') || '',
       Number(width), Number(height));
       return [node];
@@ -214478,7 +214313,8 @@ var HTMLconverter2 = /*#__PURE__*/function () {
   }, {
     key: "TransHTMLTABLE",
     value: function TransHTMLTABLE(jnode, style) {
-      var pnode = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this._hoEditorFactoryID).docTree.getParentNode(HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this._hoEditorFactoryID).docTree.curDomRange.normalize().startPath);
+      var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this._hoEditorFactoryID);
+      var pnode = hoEditorFactory.docTree.getParentNode(hoEditorFactory.docTree.curDomRange.normalize().startPath);
       if (pnode instanceof TableNode/* TableNode */.Fh || pnode instanceof CellNode/* CellNode */.D) {
         message/* default */.Z.warn('不能在表格中插入表格');
         return [];
@@ -214511,7 +214347,7 @@ var HTMLconverter2 = /*#__PURE__*/function () {
         }
       }
       //2.创建表格节点
-      var lntable = new TableNode/* TableNode */.Fh(this._hoEditorFactoryID, HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this._hoEditorFactoryID).docTree.activeNodes, pnode, irow, icol, this.generateTableProperty(jnode));
+      var lntable = new TableNode/* TableNode */.Fh(this._hoEditorFactoryID, hoEditorFactory.docTree.activeNodes, pnode, irow, icol, this.generateTableProperty(jnode));
       //3.设置表格属性
       //this.SetTableProperty(jnode, lntable)
       //4:生成表格内容
@@ -214595,7 +214431,7 @@ var HTMLconverter2 = /*#__PURE__*/function () {
       var textstyle = this.HTMLStyleToParsStyle(styleobj);
       if (textstyle.lineSpace === 0) textstyle.lineSpace = undefined;
       var index = hoEditorFactory.docTree.styleCompare(textstyle);
-      var node = new ParagraphNode/* ParagraphNode */.C(this._hoEditorFactoryID, hoEditorFactory.docTree.activeNodes, hoEditorFactory.docTree.getParentNode(HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this._hoEditorFactoryID).docTree.curDomRange.normalize().startPath), index
+      var node = new ParagraphNode/* ParagraphNode */.C(this._hoEditorFactoryID, hoEditorFactory.docTree.activeNodes, hoEditorFactory.docTree.getParentNode(hoEditorFactory.docTree.curDomRange.normalize().startPath), index
       //hoEditorFactory.docTree.curParaNo
       );
 
@@ -214723,7 +214559,7 @@ var HTMLconverter2 = /*#__PURE__*/function () {
       }
       var textstyle = this.HTMLStyleToCombineStyle(style);
       var styleindex = hoEditorFactory.docTree.styleCompare(textstyle);
-      var node = new TextNode/* TextNode */.R(this._hoEditorFactoryID, hoEditorFactory.docTree.activeNodes, hoEditorFactory.docTree.getParentNode(HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this._hoEditorFactoryID).docTree.curDomRange.normalize().startPath), BaseNode/* NodeType */.Jq.ntText, text, styleindex);
+      var node = new TextNode/* TextNode */.R(this._hoEditorFactoryID, hoEditorFactory.docTree.activeNodes, hoEditorFactory.docTree.getParentNode(hoEditorFactory.docTree.curDomRange.normalize().startPath), BaseNode/* NodeType */.Jq.ntText, text, styleindex);
       return node;
     }
     /**