hoeditor-web 2.0.52 → 2.0.53

package/lib/hoeditor.common.js

@@ -62712,7 +62712,7 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
                 //if(nodes.length == 0) return;
 
                 if (!(hoEditorFactory.drawTree.paintStatus !== _draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_15__/* .PaintState.psDesign */ .Dh.psDesign && !this._isForceDelete)) {
-                  _context.next = 30;
+                  _context.next = 33;
                   break;
                 }
 
@@ -62720,19 +62720,29 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
 
               case 13:
                 if (!(n < nodes.length)) {
-                  _context.next = 30;
+                  _context.next = 33;
                   break;
                 }
 
                 node = nodes[n];
 
+                if (!(node instanceof _dom_treeNode_MarkNode__WEBPACK_IMPORTED_MODULE_21__/* .MarkNode */ .j && node.parentNode instanceof _dom_treeNode_TextInputFieldNode__WEBPACK_IMPORTED_MODULE_20__/* .TextInputFieldNode */ .re && node.MarkNodeType === 1 && !node.parentNode.isAllowDelete)) {
+                  _context.next = 18;
+                  break;
+                }
+
+                element_ui_lib_message_box__WEBPACK_IMPORTED_MODULE_1___default().alert("元素已设置为不允许删除。请先右键元素属性设置成允许删除,再进行删除操作。", "系统提示");
+
+                return _context.abrupt("return", 0);
+
+              case 18:
                 if (!(node instanceof _dom_treeNode_ControlNode__WEBPACK_IMPORTED_MODULE_28__/* .ControlNode */ .w || node instanceof _dom_treeNode_TextInputFieldNode__WEBPACK_IMPORTED_MODULE_20__/* .TextInputFieldNode */ .re)) {
-                  _context.next = 24;
+                  _context.next = 27;
                   break;
                 }
 
                 if (node.isAllowDelete) {
-                  _context.next = 24;
+                  _context.next = 27;
                   break;
                 }
 
@@ -62758,9 +62768,9 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
 
                 return _context.abrupt("return", 0);
 
-              case 24:
+              case 27:
                 if (!(node instanceof _dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_33__/* .SignNode */ .N && node.isTemplate && node.number === 0)) {
-                  _context.next = 27;
+                  _context.next = 30;
                   break;
                 }
 
@@ -62768,16 +62778,16 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
 
                 return _context.abrupt("return", 0);
 
-              case 27:
+              case 30:
                 n++;
                 _context.next = 13;
                 break;
 
-              case 30:
+              case 33:
                 pnode = (_currRange$npEnd$node = currRange.npEnd.node) === null || _currRange$npEnd$node === void 0 ? void 0 : _currRange$npEnd$node.parentNode;
 
                 if (!(pnode && pnode instanceof _dom_treeNode_TextInputFieldNode__WEBPACK_IMPORTED_MODULE_20__/* .TextInputFieldNode */ .re && currRange.npEnd.path != hoEditorFactory.docTree.getNodeLastPath(pnode))) {
-                  _context.next = 36;
+                  _context.next = 39;
                   break;
                 }
 
@@ -62790,24 +62800,24 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
                 });
 
                 if (_res[0]) {
-                  _context.next = 36;
+                  _context.next = 39;
                   break;
                 }
 
                 return _context.abrupt("return");
 
-              case 36:
+              case 39:
                 changeEvent = new _events_NodeChangeEvent__WEBPACK_IMPORTED_MODULE_14__/* .NodeChangeEvent */ .G(this._hoEditorFactoryID, _editor_dom_DocTree__WEBPACK_IMPORTED_MODULE_12__/* .DocAction.daUndoInsert */ .gk.daUndoInsert, currRange.startPath, ""); //FIXME:deleteRange函数完成后调用这个
                 // hoEditorFactory.docTree.deleteRange(arange.startPath, arange.endPath);
 
                 if (currRange.npStart.node && currRange.npEnd.node) {
-                  _context.next = 39;
+                  _context.next = 42;
                   break;
                 }
 
                 throw _events_Exception__WEBPACK_IMPORTED_MODULE_22__/* .Exception.NodeNotFound */ .P.NodeNotFound();
 
-              case 39:
+              case 42:
                 // const [startPath, endPath] = DomRange.skipStartEndTablePath(
                 //   this._hoEditorFactory,
                 //   currRange.startPath,
@@ -62820,33 +62830,33 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
                 res = this.deleteRange(currRange.endPath, currRange.startPath);
 
                 if (!(res == 1)) {
-                  _context.next = 51;
+                  _context.next = 54;
                   break;
                 }
 
                 changeEvent.beforeChangePath = startPath;
                 changeEvent.afterChangePath = this._tmp.start;
-                _context.next = 49;
+                _context.next = 52;
                 return hoEditorFactory.docTree.change(changeEvent);
 
-              case 49:
+              case 52:
                 cgEvent = new _events_SelectionChangeEvent__WEBPACK_IMPORTED_MODULE_18__/* .SelectionChangeEvent */ .r(hoEditorFactory.docTree.curDomRange, new _dom_DomRange__WEBPACK_IMPORTED_MODULE_16__/* .DomRange */ .a(this._hoEditorFactoryID, this._tmp.start, this._tmp.start));
                 hoEditorFactory.docTree.selectChange(cgEvent);
 
-              case 51:
+              case 54:
                 hoEditorFactory.docTree.curDomRange.setSamePath(this._tmp.start);
                 hoEditorFactory.drawTree.moveCaretToPath(this._tmp.start);
                 aNode = currRange.npStart.node;
 
                 if (!(aNode && pnode)) {
-                  _context.next = 57;
+                  _context.next = 60;
                   break;
                 }
 
-                _context.next = 57;
+                _context.next = 60;
                 return this.ParentRepaint(pnode);
 
-              case 57:
+              case 60:
               case "end":
                 return _context.stop();
             }
@@ -206681,7 +206691,7 @@ var SignNode = __webpack_require__(34450);
 // EXTERNAL MODULE: ./src/editor/dom/treeNode/ParagraphNode.ts
 var ParagraphNode = __webpack_require__(14208);
 ;// CONCATENATED MODULE: ./src/components/version.ts
-/* harmony default export */ var version = ('2.0.52');
+/* harmony default export */ var version = ('2.0.53');
 ;// CONCATENATED MODULE: ./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/poperTipText/PoperTipText.vue?vue&type=template&id=3fa4e4d3&scoped=true&
 var PoperTipTextvue_type_template_id_3fa4e4d3_scoped_true_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{directives:[{name:"show",rawName:"v-show",value:(_vm.isShow),expression:"isShow"},{name:"click-outside",rawName:"v-click-outside",value:(_vm.handleClose),expression:"handleClose"}],ref:"poperTextNode",staticClass:"poper-text-modal animation-in",style:(_vm.posStyle),on:{"mouseenter":_vm.mouseEnter,"mouseleave":_vm.mouseLeave}},_vm._l((_vm.poperText),function(text){return _c('div',{key:text + Math.random(0, 1),staticClass:"poper-text"},[_vm._v(" "+_vm._s(text)+" ")])}),0)}
 var PoperTipTextvue_type_template_id_3fa4e4d3_scoped_true_staticRenderFns = []
@@ -209593,6 +209603,14 @@ var HTMLconverter2 = /*#__PURE__*/function () {
         return tmp;
       } else {
         for (var i = 0; i < jnode.childNodes.length; i++) {
+          if (jnode.childNodes[i].nodeName.toLowerCase() == "img") {
+            var src = jnode.childNodes[i].src;
+
+            if (src && src.toString().substring(src.length - 4, src.length) === ".svg") {
+              continue;
+            }
+          }
+
           var fun = this.convert.get(jnode.childNodes[i].nodeName.toLowerCase());
 
           if (fun) {
@@ -209853,7 +209871,7 @@ var HTMLconverter2 = /*#__PURE__*/function () {
 
       var width = styleobj.width ? styleobj.width.replace("px", "") : 20;
       var height = styleobj.height ? styleobj.height.replace("px", "") : 20;
-      var node = new ImageNode/* ImageNode */.H(this._hoEditorFactoryID, HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID).docTree.activeNodes, null, BaseNode/* NodeType.ntImage */.Jq.ntImage, HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID).gernerateCode.generateID("IMG"), jquery_default()(jnode).attr("src") || "", width, height);
+      var node = new ImageNode/* ImageNode */.H(this._hoEditorFactoryID, HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID).docTree.activeNodes, null, BaseNode/* NodeType.ntImage */.Jq.ntImage, HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID).gernerateCode.generateID("IMG"), jquery_default()(jnode).attr("src") || "", Number(width), Number(height));
       return [node];
     }
   }, {
@@ -210067,7 +210085,8 @@ 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.instance */.b.instance().getFactory(this._hoEditorFactoryID).docTree.curDomRange.normalize().startPath), index);
+      var node = new ParagraphNode/* ParagraphNode */.C(this._hoEditorFactoryID, hoEditorFactory.docTree.activeNodes, hoEditorFactory.docTree.getParentNode(HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID).docTree.curDomRange.normalize().startPath), index //hoEditorFactory.docTree.curParaNo
+      );
       tmp.push(node);
 
       if (jnode.childNodes.length == 0) {
@@ -213253,7 +213272,7 @@ var NodeConvert = /*#__PURE__*/function () {
           if (!uidArr[i]) continue;
 
           if (i > 0) {
-            var paraNode = new ParagraphNode/* ParagraphNode */.C(this._hoEditorFactoryID, hoEditorFactory.docTree.mainNodes, null, 0);
+            var paraNode = new ParagraphNode/* ParagraphNode */.C(this._hoEditorFactoryID, hoEditorFactory.docTree.mainNodes, null, hoEditorFactory.docTree.curParaNo);
             nodes.push(paraNode);
           }
 
@@ -221232,6 +221251,10 @@ var EditController = /*#__PURE__*/function () {
         for (var n = 0; n < nodes.length; n++) {
           var node = nodes[n];
           if (node instanceof ParagraphNode/* ParagraphNode */.C || node instanceof TextNode/* TextNode */.R || node instanceof MarkNode/* MarkNode */.j || node instanceof ControlNode/* ControlNode */.w) node.styleIndex = hoeditorfactory.docTree.curStyleIndex;
+
+          if (node instanceof ParagraphNode/* ParagraphNode */.C) {
+            node.paraNo = hoeditorfactory.docTree.curParaNo;
+          }
         }
       }