hoeditor-web 3.1.8 → 3.1.9

package/lib/hoeditor.umd.js

@@ -43367,14 +43367,6 @@ var DocController = /*#__PURE__*/function () {
       var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_78__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID);
       var startPath = domRange.startPath;
       var parentNode = hoEditorFactory.docTree.getParentNode(startPath);
-      // if (type == 1 && imgSrc != "" && imgWidth > 0 && parentNode instanceof CellNode) {
-      //   const cellWidth = parentNode.drawCell.dWidth;
-      //   //const cellHeight = parentNode.drawCell.dHeight;
-      //   if (cellWidth < imgWidth) {
-      //     //imgHeight = ((cellWidth - 10) / imgWidth) * cellHeight;
-      //     imgWidth = cellWidth;
-      //   }
-      // }
       var signNode = new _treeNode_SignNode__WEBPACK_IMPORTED_MODULE_85__/* .SignNode */ .N(this._hoEditorFactoryID, domRange.npStart.roots, parentNode, _treeNode_BaseNode__WEBPACK_IMPORTED_MODULE_25__/* .NodeType */ .Jq.ntSign, 1, type, name, 0, "医师签名", signor, signTime, signTimeFormat, imgSrc, imgWidth, imgHeight, customProperty, false, hoEditorFactory.docTree.curStyleIndex, undefined, undefined, undefined, fingerPrintSrc, fingerPosition);
       //插入该表达式节点
       hoEditorFactory.undoService.begin();
@@ -61018,16 +61010,16 @@ var SignNode = /*#__PURE__*/function (_BaseNode) {
       _this._styleIndex = hoEditorFactory.docTree.curStyleIndex;
     }
     _this._connectMode = connectMode;
-    if (isFront !== undefined) {
+    // if (isFront !== undefined) {
+    //     this._isFront = isFront;
+    // }
+    // if (allowEditSignTime !== undefined) {
+    //     this._allowEditSignTime = allowEditSignTime;
+    // }
+    if (signType === 1 && type !== 1) {
       _this._isFront = isFront;
-    }
-    if (allowEditSignTime !== undefined) {
       _this._allowEditSignTime = allowEditSignTime;
     }
-    // if (signType === 1 && type !== 1) {
-    //     this._isFront = isFront as boolean;
-    //     this._allowEditSignTime = allowEditSignTime as boolean;
-    // }
     _this._otherProperties = new Object();
     _this._customProperty = new Object();
     var assignvalue = function assignvalue(target, source) {
@@ -78428,7 +78420,7 @@ var DrawRect = /*#__PURE__*/function (_DrawContainer) {
 /*
  * @Author: your name
  * @Date: 2021-09-01 16:51:49
- * @LastEditTime: 2023-09-05 16:39:23
+ * @LastEditTime: 2023-09-07 15:16:20
  * @LastEditors: liyanan 2441631434@qq.com
  * @Description: In User Settings Edit
  * @FilePath: \hoeditor-web\src\editor\draw\drawNode\DrawSignNode.ts
@@ -78930,14 +78922,11 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
           bitmap.setBounds(0, 0, drawNode.dWidth, drawNode.dHeight);
           if (_this3.number === 1) {
             bitmap.x = 0;
-            _this3.addChildAt(bitmap, 0);
           } else {
             if (isFront) {
               bitmap.x = 0;
-              _this3.addChildAt(bitmap, 0);
             } else {
               bitmap.x = _this3._drawText.getMeasuredWidth();
-              _this3.addChild(bitmap);
             }
           }
           if (_this3.attribute === 2 && _this3.abi02 !== "") {
@@ -78997,6 +78986,12 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
                 }
                 _this3.addChild(_this3._drawDate);
               }
+            } else {
+              if (bitmap.x === 0) {
+                _this3.addChildAt(bitmap, 0);
+              } else {
+                _this3.addChild(bitmap);
+              }
             }
           }
           var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_12__/* .HOEditorFactorys */ .b.instance().getFactory(drawNode.node.hoEditorFactoryID);
@@ -79075,6 +79070,9 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
               } else {
                 bitmap.setTransform(bitmap.x, -drawNode.dHeight, width / hitWidth, drawNode.dHeight / hitHeight);
               }
+              // if (isFront) {
+              //     this.drawConnectChar(isFront);
+              // }
               var hitArea = new createjs.Shape();
               hitArea.graphics.beginFill('#000').drawRect(0, 0, drawNode.dWidth, drawNode.dHeight); //这里是图片大小
               bitmap.hitArea = hitArea;
@@ -79089,7 +79087,23 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
                   }
                 }
                 hoEditorFactory.drawPageTree.updateDrawPage(dArea.index);
+                //重绘 处理图片多人签名显示重叠
+                // if (isFront) {
+                //     if (this.node.parentNode instanceof CellNode) {
+                //         this.node.parentNode.drawCell.needUpdate = true;
+                //         this.node.parentNode.table.update();
+                //     } else {
+                //         const path = (this.node.previousLeaf() as BaseNode).getNodePath();
+                //         const bpath = this.node.getNodePath();
+                //         const changeEvent = new NodeChangeEvent(this._hoEditorFactoryID, DocAction.daUndoInsert, path, bpath);
+                //         changeEvent.oldEndPath = path;
+                //         changeEvent.afterChangePath = bpath;
+                //         changeEvent.oldDrawTreeLines = new SelectRange(this._hoEditorFactoryID).getRangeDrawTreeLines(path, bpath);
+                //         hoEditorFactory.docTree.change(changeEvent);
+                //     }
+                // }
               }
+
               hoEditorFactory.loadImageCount--;
             };
             if (_this3.imgSrc.includes("data:image/jpeg") || _this3.imgSrc.includes("data:image/jpg") || _this3.imgSrc.includes(".jpg") || _this3.imgSrc.includes(".jpeg")) {
@@ -79143,8 +79157,12 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
               _this3.addChild(aText);
             }
           }
+          // if (isFront) {
+          //     this.drawConnectChar(isFront);
+          // }
         }
       };
+
       if (this.number === 0) {
         var drawText1 = new createjs.Text(this.signName, this.textStyle, '#838586');
         drawText1.textBaseline = 'alphabetic';
@@ -79160,11 +79178,11 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
       } else {
         var isFront = this.node.isFront;
         if (isFront) {
-          drawSign(isFront);
-          this.drawConnectChar(isFront);
+          drawSign(true);
+          this.drawConnectChar(true);
         } else {
-          this.drawConnectChar(isFront);
-          drawSign(isFront);
+          this.drawConnectChar(false);
+          drawSign(false);
         }
       }
     }
@@ -79176,9 +79194,11 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
       if (connectMode === '/') {
         if (this.type === 1) {
           if (isFront) {
-            line.graphics.beginStroke('#000000').moveTo(this.dWidth - this._drawText.getMeasuredWidth(), 0).lineTo(this.dWidth, -this.dHeight);
+            line.graphics.clear().beginStroke('#000000').moveTo(this.dWidth - this._drawText.getMeasuredWidth(), 0).lineTo(this.dWidth, -this.dHeight);
+            this.addChild(line);
           } else {
-            line.graphics.beginStroke('#000000').moveTo(0, 0).lineTo(this._drawText.getMeasuredWidth(), -this.dHeight);
+            line.graphics.clear().beginStroke('#000000').moveTo(0, 0).lineTo(this._drawText.getMeasuredWidth(), -this.dHeight);
+            this.addChildAt(line);
           }
         } else {
           var signArr = this.imgSrc.split('\n');
@@ -79190,12 +79210,13 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
             }
           }
           if (isFront) {
-            line.graphics.beginStroke('#000000').moveTo(this.dWidth - this._drawText.getMeasuredWidth(), 2).lineTo(this.dWidth, -theHeight - 2);
+            line.graphics.beginStroke('#000000').clear().moveTo(this.dWidth - this._drawText.getMeasuredWidth(), 2).lineTo(this.dWidth, -theHeight - 2);
+            this.addChild(line);
           } else {
-            line.graphics.beginStroke('#000000').moveTo(0, 2).lineTo(this._drawText.getMeasuredWidth(), -theHeight - 2);
+            line.graphics.beginStroke('#000000').clear().moveTo(0, 2).lineTo(this._drawText.getMeasuredWidth(), -theHeight - 2);
+            this.addChildAt(line);
           }
         }
-        this.addChildAt(line);
       } else if (connectMode === '换行') {
         return;
       } else {
@@ -214423,8 +214444,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=57fcb250&
-var HoDocvue_type_template_id_57fcb250_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=9bd6cea8&
+var HoDocvue_type_template_id_9bd6cea8_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -214572,7 +214593,7 @@ var HoDocvue_type_template_id_57fcb250_render = function render() {
     }
   }, [_vm._v("v " + _vm._s(_vm.version))])])])], 1);
 };
-var HoDocvue_type_template_id_57fcb250_staticRenderFns = [];
+var HoDocvue_type_template_id_9bd6cea8_staticRenderFns = [];
 
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.filter.js
 var es_array_filter = __webpack_require__(57327);
@@ -217572,7 +217593,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.8');
+/* harmony default export */ var version = ('3.1.9');
 // EXTERNAL MODULE: ./src/components/controls/poperTipText/PoperTipText.vue + 5 modules
 var PoperTipText = __webpack_require__(50987);
 ;// CONCATENATED MODULE: ./src/components/controls/poperTipText/index.ts
@@ -218113,7 +218134,10 @@ var defaultHeight = Math.floor(1122 * scaleXY) % 2 === 1 ? Math.floor(1122 * sca
           var text = node.text.replace(/ /g, '');
           var lists = (_parentNode$downListP = _parentNode.downListProperty) !== null && _parentNode$downListP !== void 0 && _parentNode$downListP.listItems ? JSON.parse((_parentNode$downListP2 = _parentNode.downListProperty) === null || _parentNode$downListP2 === void 0 ? void 0 : _parentNode$downListP2.listItems) : [];
           var allowMultiSelected = ((_parentNode$downListP3 = _parentNode.downListProperty) === null || _parentNode$downListP3 === void 0 ? void 0 : _parentNode$downListP3.allowMultiSelected) || false;
-          if (text != node.parentNode.name && text !== '' && !allowMultiSelected && lists.length > 0) {
+          var childs = _parentNode.childNodes.filter(function (v) {
+            return v.nodeType != 5 && v.nodeType != 2;
+          });
+          if (childs.length > 0 && text != _parentNode.name && text !== '' && !allowMultiSelected && lists.length > 0) {
             if (lists.filter(function (v) {
               return v.text.includes('<元素>');
             }).length > 0) {
@@ -218329,10 +218353,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=57fcb250&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=9bd6cea8&prod&lang=less&
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./src/components/HoDoc.vue?vue&type=style&index=0&id=57fcb250&prod&lang=less&
+;// CONCATENATED MODULE: ./src/components/HoDoc.vue?vue&type=style&index=0&id=9bd6cea8&prod&lang=less&
 
 ;// CONCATENATED MODULE: ./src/components/HoDoc.vue
 
@@ -218345,8 +218369,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_57fcb250_render,
-  HoDocvue_type_template_id_57fcb250_staticRenderFns,
+  HoDocvue_type_template_id_9bd6cea8_render,
+  HoDocvue_type_template_id_9bd6cea8_staticRenderFns,
   false,
   null,
   null,
@@ -220756,7 +220780,7 @@ var HTMLconverter2 = /*#__PURE__*/function () {
         var widthNum = 0;
         var width = jquery_default()(td).css('width');
         if (width == '0px' || width == '0pt' || width == '0') {
-          width = jquery_default()(td).attr('width') || '30';
+          width = '30px';
         }
         if (width) {
           if (width.indexOf('pt') >= 0) {
@@ -220806,6 +220830,22 @@ var HTMLconverter2 = /*#__PURE__*/function () {
         var colInfo = new TableNode/* ColInfos */.ZE(tableNode, width, colProperty);
         colInfos.push(colInfo);
       }
+      var isResetColWidth = true;
+      var c1Width = colInfos[0].colWidth;
+      for (var c = 1; c < colInfos.length; c++) {
+        if (colInfos[c].colWidth !== c1Width) {
+          isResetColWidth = false;
+          break;
+        }
+      }
+      if (isResetColWidth) {
+        for (var ci = 0; ci < colInfos.length; ci++) {
+          var parentWidth = tableNode.getParentWidth();
+          //整个页面宽度减掉边框占位宽度 除以  列数
+          var aWidth = Math.floor((parentWidth - tableNode.borderWidth * 2) / colInfos.length);
+          colInfos[ci].colWidth = aWidth;
+        }
+      }
       //console.log(maxtr)
       //if (!maxtr)
       //throw new Error('表格中没有发现列');
@@ -232294,17 +232334,43 @@ var VueController = /*#__PURE__*/function () {
     }
   }, {
     key: "importWordFile",
-    value: function importWordFile(fileStr) {
-      var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this._hoEditorFactoryID);
-      hoEditorFactory.docController.initBlankDoc();
-      hoEditorFactory.drawTree.inViewPages = [0];
-      hoEditorFactory.undoService.stack = [];
-      fileStr = fileStr.replace(/[\u0000-\u0008\u000b\u000c\u000e-\u001f\ud800-\udfff\ufffe\uffff]/g, "");
-      var nodes = hoEditorFactory.structureNode.Parse(StructureNode/* ClipboardType */.Y6.ctHTML, fileStr);
-      hoEditorFactory.docTree.curDomRange.setSamePath("main/0");
-      hoEditorFactory.drawTree.moveCaretToPath("main/0");
-      hoEditorFactory.docController.parseNodeData(nodes);
-    }
+    value: function () {
+      var _importWordFile = (0,asyncToGenerator/* default */.Z)( /*#__PURE__*/(0,regeneratorRuntime/* default */.Z)().mark(function _callee10(fileStr) {
+        var hoEditorFactory, _curDomRange, startPath, endPath, changingEvent, nodes;
+        return (0,regeneratorRuntime/* default */.Z)().wrap(function _callee10$(_context11) {
+          while (1) switch (_context11.prev = _context11.next) {
+            case 0:
+              hoEditorFactory = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this._hoEditorFactoryID);
+              hoEditorFactory.isThrowError = false;
+              _curDomRange = hoEditorFactory.docTree.curDomRange; //获取当前选中区域
+              startPath = _curDomRange.normalize().startPath;
+              endPath = _curDomRange.normalize().endPath;
+              changingEvent = new NodeChangingEvent/* NodeChangingEvent */.Q(DocTree/* DocAction */.gk.daInsert, startPath, endPath, NodeChangingEvent/* OperType */.y.openLocalFiles);
+              if (!hoEditorFactory.docTree.changing(changingEvent)) {
+                _context11.next = 14;
+                break;
+              }
+              _context11.next = 9;
+              return hoEditorFactory.docController.initBlankDoc();
+            case 9:
+              hoEditorFactory.drawTree.inViewPages = [0];
+              hoEditorFactory.openXmled = true;
+              fileStr = fileStr.replace(/[\u0000-\u0008\u000b\u000c\u000e-\u001f\ud800-\udfff\ufffe\uffff]/g, "");
+              nodes = hoEditorFactory.structureNode.Parse(StructureNode/* ClipboardType */.Y6.ctHTML, fileStr);
+              hoEditorFactory.docController.parseNodeData(nodes);
+            case 14:
+              hoEditorFactory.undoService.stack = [];
+            case 15:
+            case "end":
+              return _context11.stop();
+          }
+        }, _callee10, this);
+      }));
+      function importWordFile(_x25) {
+        return _importWordFile.apply(this, arguments);
+      }
+      return importWordFile;
+    }()
   }, {
     key: "canIsEdit",
     value: function canIsEdit() {
@@ -232912,6 +232978,8 @@ var DomController = /*#__PURE__*/function () {
 
 
 
+
+
 
 
 
@@ -233406,6 +233474,9 @@ var EditController = /*#__PURE__*/function () {
     key: "canIsEdit",
     value: function canIsEdit(hoEditorFactory) {
       var result = true;
+      if (hoEditorFactory.drawTree.paintStatus === DrawTree/* PaintState */.Dh.psDesign) {
+        return result;
+      }
       //hoEditorFactory.isUseForm = true;
       //hoEditorFactory.allowEditCellInForm = false;
       var curDomRange = hoEditorFactory.docTree.curDomRange.normalize(); //获取当前选中区域
@@ -233428,12 +233499,12 @@ var EditController = /*#__PURE__*/function () {
           result = false;
         }
         if (!hoEditorFactory.allowEditCellInForm) {
-          if ((enode === null || enode === void 0 ? void 0 : enode.parentNode) instanceof CellNode/* CellNode */.D) {
+          if ((enode === null || enode === void 0 ? void 0 : enode.parentNode) instanceof CellNode/* CellNode */.D && !(enode instanceof DateTimeNode/* DateTimeNode */.Z) && !(enode instanceof DownListNode/* DownListNode */.yF) && !(enode instanceof SignNode/* SignNode */.N)) {
             result = false;
           }
         }
       }
-      if (result && hoEditorFactory.drawTree.paintStatus !== DrawTree/* PaintState */.Dh.psDesign) {
+      if (result) {
         var pNode = hoEditorFactory.docTree.getFinalParentNode(curDomRange.startPath);
         if (pNode && pNode instanceof CellNode/* CellNode */.D) {
           if (pNode.table.tableProperty.isSignLock && pNode.table.tableProperty.isLock) {