hoeditor-web 3.0.46 → 3.0.48

package/lib/hoeditor.umd.js

@@ -8877,7 +8877,7 @@ var component = (0,componentNormalizer/* default */.Z)(
 
 /***/ }),
 
-/***/ 16512:
+/***/ 79321:
 /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -8897,7 +8897,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=4e689c5a&
+;// 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=92e6f80e&
 
 
 
@@ -9285,7 +9285,7 @@ var render = function render() {
 };
 var staticRenderFns = [];
 
-;// CONCATENATED MODULE: ./src/components/controls/poperSelect/PoperSelect.vue?vue&type=template&id=4e689c5a&
+;// CONCATENATED MODULE: ./src/components/controls/poperSelect/PoperSelect.vue?vue&type=template&id=92e6f80e&
 
 // EXTERNAL MODULE: ./node_modules/@babel/runtime/helpers/esm/toConsumableArray.js + 3 modules
 var toConsumableArray = __webpack_require__(61748);
@@ -11456,6 +11456,9 @@ var type = __webpack_require__(41542);
           _this.selectedId = v.id;
         }
       });
+      this.selectedList = this.selectedList.filter(function (v) {
+        return v;
+      });
       this.currentListNameText = currentPoperNode.name;
       if (this.poperSelectList && this.poperSelectList.length >= 20) this.isCanSearch = true;
       this.currentList = (0,toConsumableArray/* default */.Z)(this.poperSelectList);
@@ -12035,10 +12038,10 @@ var type = __webpack_require__(41542);
 });
 ;// 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-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.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=4e689c5a&prod&lang=scss&
+;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.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=92e6f80e&prod&lang=scss&
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./src/components/controls/poperSelect/PoperSelect.vue?vue&type=style&index=0&id=4e689c5a&prod&lang=scss&
+;// CONCATENATED MODULE: ./src/components/controls/poperSelect/PoperSelect.vue?vue&type=style&index=0&id=92e6f80e&prod&lang=scss&
 
 // EXTERNAL MODULE: ./node_modules/@vue/vue-loader-v15/lib/runtime/componentNormalizer.js
 var componentNormalizer = __webpack_require__(70713);
@@ -195781,7 +195784,7 @@ var map = {
 	"./pageInfoes/PageInfoes.vue": 17481,
 	"./paragraph/ParagraphDialog.vue": 54949,
 	"./poperSelect/PoperMark.vue": 71472,
-	"./poperSelect/PoperSelect.vue": 16512,
+	"./poperSelect/PoperSelect.vue": 79321,
 	"./poperTipText/PoperTipText.vue": 15845,
 	"./popers/Poper.vue": 57937,
 	"./popers/Title.vue": 89987,
@@ -232311,6 +232314,10 @@ var DrawConfig = __webpack_require__(37616);
 var DrawHeader = __webpack_require__(5328);
 // EXTERNAL MODULE: ./src/editor/draw/drawArea/DrawFooter.ts
 var DrawFooter = __webpack_require__(114);
+// EXTERNAL MODULE: ./src/editor/draw/drawNode/DrawPageCell.ts + 1 modules
+var DrawPageCell = __webpack_require__(59105);
+// EXTERNAL MODULE: ./src/editor/draw/drawNode/DrawTable.ts
+var DrawTable = __webpack_require__(74298);
 ;// CONCATENATED MODULE: ./src/editor/draw/DrawSelectLevel.ts
 
 
@@ -232340,6 +232347,8 @@ var DrawFooter = __webpack_require__(114);
 
 
 
+
+
 
 
 
@@ -232477,12 +232486,15 @@ var DrawSelectLevel = /*#__PURE__*/function () {
             pos.y = 0;
           } else {
             //NOTE:指定位置到行下面  对表格有问题
-            // const pt = marea.globalToLocal(aevent.stageX, aevent.stageY);
-            // const line = marea.getDlineByPos(marea.drawLines, pt.x, pt.y);
-            // if (line) {
-            //   const lasty = line.dHeight + line.y + marea.dTop;
-            //   pos.y = pos.y >= lasty ? lasty : line.y + marea.dTop;
-            // }
+            var pt = marea.globalToLocal(aevent.stageX, aevent.stageY);
+            if (pt.y > 0 && pt.y < marea.dHeight) {
+              var startPos = hoEditorFactory.drawTree.getStagePosition(dPage, dPage.activeDrawRect, aevent.stageX, aevent.stageY);
+              if (startPos && startPos.dline) {
+                if (!(startPos.dline.parent instanceof DrawPageCell/* DrawPageCell */.k || startPos.dline instanceof DrawTable/* DrawTable */.t)) {
+                  pos.y = pos.y - (pt.y - startPos.dline.y) + startPos.dline.dHeight;
+                }
+              }
+            }
           }
           hoEditorFactory.printStatus.drawPrintCaret.Position = [dPage.pageIndex, pos.y];
         }
@@ -233709,7 +233721,7 @@ var DrawPage = __webpack_require__(72722);
 // 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__(16512);
+var PoperSelect = __webpack_require__(79321);
 // EXTERNAL MODULE: ./src/components/controls/poperSelect/PoperMark.vue + 5 modules
 var PoperMark = __webpack_require__(71472);
 ;// CONCATENATED MODULE: ./src/components/controls/poperSelect/index.ts
@@ -235410,7 +235422,7 @@ var ParagraphNode = __webpack_require__(67945);
 // EXTERNAL MODULE: ./src/editor/dom/treeNode/MarkNode.ts
 var MarkNode = __webpack_require__(57727);
 ;// CONCATENATED MODULE: ./src/components/version.ts
-/* harmony default export */ var version = ('3.0.46');
+/* harmony default export */ var version = ('3.0.48');
 // EXTERNAL MODULE: ./src/components/controls/poperTipText/PoperTipText.vue + 5 modules
 var PoperTipText = __webpack_require__(15845);
 ;// CONCATENATED MODULE: ./src/components/controls/poperTipText/index.ts
@@ -236159,12 +236171,8 @@ var es_error_cause = __webpack_require__(21703);
 var DrawPageMainDoc = __webpack_require__(77441);
 // EXTERNAL MODULE: ./src/editor/draw/DrawLine.ts + 1 modules
 var DrawLine = __webpack_require__(96635);
-// EXTERNAL MODULE: ./src/editor/draw/drawNode/DrawPageCell.ts + 1 modules
-var DrawPageCell = __webpack_require__(59105);
 // EXTERNAL MODULE: ./src/editor/draw/drawNode/DrawPageTable.ts
 var DrawPageTable = __webpack_require__(15694);
-// EXTERNAL MODULE: ./src/editor/draw/drawNode/DrawTable.ts
-var DrawTable = __webpack_require__(74298);
 // EXTERNAL MODULE: ./src/editor/dom/treeNode/TableNode.ts
 var TableNode = __webpack_require__(5010);
 ;// CONCATENATED MODULE: ./src/editor/draw/drawTree/DrawPageTree.ts
@@ -242705,7 +242713,6 @@ var comment = __webpack_require__(32980);
 
 
 
-
 
 
 var VueController = /*#__PURE__*/function () {
@@ -244710,9 +244717,28 @@ var VueController = /*#__PURE__*/function () {
     key: "setReviewLevelColor",
     value: function setReviewLevelColor(option) {
       var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID);
-      var opt = new Option_Option(this.hoEditorFactoryID);
-      opt.setReviewLevelColor(option.reviewLev1Color, option.reviewLev2Color, option.reviewLev3Color, option.fieldColor, option.dateTimeColor, option.downListColor, option.downListColor2, option.signColor, option.labelColor);
-      hoEditorFactory.option = opt;
+      // const opt = new Option(this.hoEditorFactoryID);
+      // console.log({ ...option });
+      // opt.setReviewLevelColor(
+      //     option.reviewLev1Color ? option.reviewLev1Color : hoEditorFactory.option.reviewLev1Color,
+      //     option.reviewLev2Color ? option.reviewLev2Color : hoEditorFactory.option.reviewLev2Color,
+      //     option.reviewLev3Color ? option.reviewLev3Color : hoEditorFactory.option.reviewLev3Color,
+      //     option.fieldColor ? option.fieldColor : hoEditorFactory.option.fieldColor,
+      //     option.dateTimeColor ? option.dateTimeColor : hoEditorFactory.option.dateTimeColor,
+      //     option.downListColor ? option.downListColor : hoEditorFactory.option.downListColor,
+      //     option.downListColor2 ? option.downListColor2 : hoEditorFactory.option.downListColor2,
+      //     option.signColor ? option.signColor : hoEditorFactory.option.signColor,
+      //     option.labelColor ? option.labelColor : hoEditorFactory.option.labelColor
+      // );
+      // hoEditorFactory.option = opt;
+      if ((0,type/* isObject */.Kn)(option)) {
+        for (var key in option) {
+          var value = option[key];
+          if (value) {
+            hoEditorFactory.option[key] = value;
+          }
+        }
+      }
     }
     /**
      * 当前用户登录信息
@@ -245822,20 +245848,22 @@ var VueController = /*#__PURE__*/function () {
         if (printAsSinglePage) {
           if (nodes.length > 1 && nodes[0] instanceof ParagraphNode/* ParagraphNode */.C && nodes[1] instanceof TableNode/* TableNode */.Fh) {
             if (nodes[1].tableProperty.fixedOnePage) {
-              nodes.splice(0, 1);
               if (lastNode instanceof ParagraphNode/* ParagraphNode */.C) {
+                nodes.splice(0, 1);
                 lastNode.printAsSinglePage = printAsSinglePage;
                 lastNode.docId = docId && docId !== '' ? docId : hoEditorFactory.gernerateCode.generateID('DocId');
+              } else {
+                nodes[0].printAsSinglePage = printAsSinglePage;
+                nodes[0].docId = docId && docId !== '' ? docId : hoEditorFactory.gernerateCode.generateID('DocId');
               }
+            } else if (mainNodes.length > 1 && lastNode instanceof ParagraphNode/* ParagraphNode */.C) {
+              nodes.splice(0, 1);
+              lastNode.printAsSinglePage = printAsSinglePage;
+              lastNode.docId = docId && docId !== '' ? docId : hoEditorFactory.gernerateCode.generateID('DocId');
             } else {
               nodes[0].printAsSinglePage = printAsSinglePage;
               nodes[0].docId = docId && docId !== '' ? docId : hoEditorFactory.gernerateCode.generateID('DocId');
             }
-            // if (mainNodes.length > 1 && lastNode instanceof ParagraphNode) {
-            //     nodes.splice(0, 1);
-            //     lastNode.printAsSinglePage = printAsSinglePage;
-            //     lastNode.docId = docId && docId !== '' ? docId : hoEditorFactory.gernerateCode.generateID('DocId');
-            // }
           } else {
             nodes[0].printAsSinglePage = printAsSinglePage;
             nodes[0].docId = docId && docId !== '' ? docId : hoEditorFactory.gernerateCode.generateID('DocId');
@@ -256539,8 +256567,8 @@ var HoDocs_component = (0,componentNormalizer/* default */.Z)(
 )
 
 /* harmony default export */ var HoDocs = (HoDocs_component.exports);
-;// 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/toolbar/ToolBar.vue?vue&type=template&id=7f1a29a4&
-var ToolBarvue_type_template_id_7f1a29a4_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/toolbar/ToolBar.vue?vue&type=template&id=1aaee2f0&
+var ToolBarvue_type_template_id_1aaee2f0_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -256773,7 +256801,7 @@ var ToolBarvue_type_template_id_7f1a29a4_render = function render() {
     }, [_vm._v(_vm._s(item.title))]);
   }), 1)], 1) : _vm._e()], 1);
 };
-var ToolBarvue_type_template_id_7f1a29a4_staticRenderFns = [];
+var ToolBarvue_type_template_id_1aaee2f0_staticRenderFns = [];
 
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.map.js
 var es_array_map = __webpack_require__(21249);
@@ -261928,6 +261956,7 @@ var ToolTable_component = (0,componentNormalizer/* default */.Z)(
       if (commentList.length == 0) {
         return;
       }
+      var userInfo = this.vueController.getUserInfoes();
       var candeleteList = [];
       commentList.forEach(function (comment) {
         if (comment.userID == userInfo.id) {
@@ -261987,10 +262016,10 @@ var ToolTable_component = (0,componentNormalizer/* default */.Z)(
 });
 ;// CONCATENATED MODULE: ./src/components/toolbar/ToolBar.vue?vue&type=script&lang=js&
  /* harmony default export */ var toolbar_ToolBarvue_type_script_lang_js_ = (ToolBarvue_type_script_lang_js_); 
-;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/toolbar/ToolBar.vue?vue&type=style&index=0&id=7f1a29a4&prod&lang=scss&
+;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/toolbar/ToolBar.vue?vue&type=style&index=0&id=1aaee2f0&prod&lang=scss&
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./src/components/toolbar/ToolBar.vue?vue&type=style&index=0&id=7f1a29a4&prod&lang=scss&
+;// CONCATENATED MODULE: ./src/components/toolbar/ToolBar.vue?vue&type=style&index=0&id=1aaee2f0&prod&lang=scss&
 
 ;// CONCATENATED MODULE: ./src/components/toolbar/ToolBar.vue
 
@@ -262003,8 +262032,8 @@ var ToolTable_component = (0,componentNormalizer/* default */.Z)(
 
 var ToolBar_component = (0,componentNormalizer/* default */.Z)(
   toolbar_ToolBarvue_type_script_lang_js_,
-  ToolBarvue_type_template_id_7f1a29a4_render,
-  ToolBarvue_type_template_id_7f1a29a4_staticRenderFns,
+  ToolBarvue_type_template_id_1aaee2f0_render,
+  ToolBarvue_type_template_id_1aaee2f0_staticRenderFns,
   false,
   null,
   null,