hoeditor-web 3.1.209 → 3.1.210

package/lib/hoeditor.umd.js

@@ -117699,7 +117699,6 @@ class DocController {
     const node = nodePosition.node;
     if (node) {
       let curStyleIndex = hoEditorFactory.docTree.curStyleIndex;
-      const curParaNo = hoEditorFactory.docTree.curParaNo;
       let curTextStyle = hoEditorFactory.docTree.styles[curStyleIndex];
       if (curTextStyle.combineStyle.font != "himalaya") {
         curStyleIndex = curTextStyle.changeStyleString('fontFormat', "himalaya");
@@ -120916,10 +120915,11 @@ class DocController {
       const prePath = hoEditorFactory.docTree.getNodeLastPath(domRange.npEnd.node.previousLeaf());
       hoEditorFactory.undoService.add(new _undoRedo_NodeDeleteUndoUnit__WEBPACK_IMPORTED_MODULE_27__/* .NodeDeleteUndoUnit */ .s(this._hoEditorFactoryID, domRange.npEnd.node, startPath, 'update'));
       startPath = prePath;
+    } else {
+      const tableFormula = new _treeNode_TableFormula__WEBPACK_IMPORTED_MODULE_61__/* .TableFormula */ .d(this._hoEditorFactoryID, domRange.npStart.roots, pNode, _treeNode_BaseNode__WEBPACK_IMPORTED_MODULE_15__/* .NodeType */ .Z6.ntTableFormula, formulaStr, hoEditorFactory.docTree.curStyleIndex, isHideZero, formulaType, '', formulaProperty);
+      hoEditorFactory.undoService.add(new _undoRedo_NodeInsertUndoUnit__WEBPACK_IMPORTED_MODULE_16__/* .NodeInsertUndoUnit */ .Q(this._hoEditorFactoryID, startPath, tableFormula));
+      hoEditorFactory.undoService.commit();
     }
-    const tableFormula = new _treeNode_TableFormula__WEBPACK_IMPORTED_MODULE_61__/* .TableFormula */ .d(this._hoEditorFactoryID, domRange.npStart.roots, pNode, _treeNode_BaseNode__WEBPACK_IMPORTED_MODULE_15__/* .NodeType */ .Z6.ntTableFormula, formulaStr, hoEditorFactory.docTree.curStyleIndex, isHideZero, formulaType, '', formulaProperty);
-    hoEditorFactory.undoService.add(new _undoRedo_NodeInsertUndoUnit__WEBPACK_IMPORTED_MODULE_16__/* .NodeInsertUndoUnit */ .Q(this._hoEditorFactoryID, startPath, tableFormula));
-    hoEditorFactory.undoService.commit();
   }
   // /**
   //  * 设置审阅级别颜色和元素颜色
@@ -154585,41 +154585,49 @@ class DrawTableFormularChart extends _DrawCombineNode__WEBPACK_IMPORTED_MODULE_1
   getCell(table, arr) {
     const [startRow, startCol] = this.dNode.getRowColByCellAdress(arr[0]);
     const [endRow, endCol] = this.dNode.getRowColByCellAdress(arr[1]);
-    const list = [];
     let notAllowEdit = false;
-    if (startRow >= 0 && startCol >= 0 && endRow >= 0 && endCol >= 0) {
-      if (startRow === endRow || startCol === endCol) {
-        for (let r = startRow; r <= endRow; r++) {
-          for (let c = startCol; c <= endCol; c++) {
-            const cell = table.rows[r][c];
-            if (cell) {
-              notAllowEdit = cell.cellProperty.notAllowEdit || false;
-              let text = cell.getCellText();
-              if (notAllowEdit) {
-                list.push(text);
-              } else {
-                if (this.formularProperty && text) {
-                  if (text > this.formularProperty.max) {
-                    var _cell$drawCell$drawPa;
-                    text = '';
-                    (_cell$drawCell$drawPa = cell.drawCell.drawPageCells[0]) === null || _cell$drawCell$drawPa === void 0 || _cell$drawCell$drawPa.paintBackColor(true);
-                    ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_14__/* ["default"] */ .A.error(`曲线图设置的最大值为${this.formularProperty.max}`);
-                  } else if (text < this.formularProperty.min) {
-                    var _cell$drawCell$drawPa2;
-                    text = '';
-                    (_cell$drawCell$drawPa2 = cell.drawCell.drawPageCells[0]) === null || _cell$drawCell$drawPa2 === void 0 || _cell$drawCell$drawPa2.paintBackColor(true);
-                    ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_14__/* ["default"] */ .A.error(`曲线图设置的最小值为${this.formularProperty.min}`);
-                  } else {
-                    var _cell$drawCell$drawPa3;
-                    (_cell$drawCell$drawPa3 = cell.drawCell.drawPageCells[0]) === null || _cell$drawCell$drawPa3 === void 0 || _cell$drawCell$drawPa3.paintBackColor(false);
+    const list = [];
+    if (this.formularProperty) {
+      let messageList = [];
+      if (startRow >= 0 && startCol >= 0 && endRow >= 0 && endCol >= 0) {
+        if (startRow === endRow || startCol === endCol) {
+          for (let r = startRow; r <= endRow; r++) {
+            for (let c = startCol; c <= endCol; c++) {
+              const cell = table.rows[r][c];
+              if (cell) {
+                notAllowEdit = cell.cellProperty.notAllowEdit || false;
+                let text = cell.getCellText();
+                if (notAllowEdit) {
+                  list.push(text);
+                } else {
+                  text = text.replace(/\+|-/g, '');
+                  if (text) {
+                    if (text > this.formularProperty.max) {
+                      var _cell$drawCell$drawPa;
+                      text = '';
+                      (_cell$drawCell$drawPa = cell.drawCell.drawPageCells[0]) === null || _cell$drawCell$drawPa === void 0 || _cell$drawCell$drawPa.paintBackColor(true);
+                      messageList.push(`【${r}行 ${c} 列】`);
+                    } else if (text < this.formularProperty.min) {
+                      var _cell$drawCell$drawPa2;
+                      text = '';
+                      messageList.push(`【${r}行 ${c} 列】`);
+                      (_cell$drawCell$drawPa2 = cell.drawCell.drawPageCells[0]) === null || _cell$drawCell$drawPa2 === void 0 || _cell$drawCell$drawPa2.paintBackColor(true);
+                    } else {
+                      var _cell$drawCell$drawPa3;
+                      (_cell$drawCell$drawPa3 = cell.drawCell.drawPageCells[0]) === null || _cell$drawCell$drawPa3 === void 0 || _cell$drawCell$drawPa3.paintBackColor(false);
+                    }
                   }
+                  list.push(text);
                 }
-                list.push(text.replace(/\+|-/g, ''));
               }
             }
           }
         }
       }
+      if (messageList.length > 0) {
+        ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_14__/* ["default"] */ .A.destroy();
+        ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_14__/* ["default"] */ .A.error(`以下单元格的值超出曲线图设置的范围【${this.formularProperty.min}~${this.formularProperty.max}】：${messageList.join('、')}`);
+      }
     }
     return {
       notAllowEdit,
@@ -220045,9 +220053,9 @@ var entry_lib_web_dom_collections_iterator = __webpack_require__(62953);
 var build_entry_lib_objectSpread2 = __webpack_require__(33217);
 // EXTERNAL MODULE: ./src/i18n/index.ts + 1 modules
 var entry_lib_i18n = __webpack_require__(49850);
-;// ./node_modules/babel-loader/lib/index.js??ruleSet[1].rules[3].use[0]!./node_modules/unplugin/dist/webpack/loaders/transform.js?unpluginName=vite-plugin-i18n-helper!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[5]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/HoDoc.vue?vue&type=template&id=030c30c6
+;// ./node_modules/babel-loader/lib/index.js??ruleSet[1].rules[3].use[0]!./node_modules/unplugin/dist/webpack/loaders/transform.js?unpluginName=vite-plugin-i18n-helper!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[5]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/HoDoc.vue?vue&type=template&id=14a6cdbd
 
-var entry_lib_HoDocvue_type_template_id_030c30c6_render = function render() {
+var entry_lib_HoDocvue_type_template_id_14a6cdbd_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -220246,9 +220254,9 @@ var entry_lib_HoDocvue_type_template_id_030c30c6_render = function render() {
     }
   }, [_vm._v("v " + _vm._s(_vm.version))])])], 2)], 1);
 };
-var entry_lib_HoDocvue_type_template_id_030c30c6_staticRenderFns = [];
+var entry_lib_HoDocvue_type_template_id_14a6cdbd_staticRenderFns = [];
 
-;// ./src/components/HoDoc.vue?vue&type=template&id=030c30c6
+;// ./src/components/HoDoc.vue?vue&type=template&id=14a6cdbd
 
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.sort.js
 var entry_lib_es_array_sort = __webpack_require__(26910);
@@ -223094,7 +223102,7 @@ var entry_lib_TextNode = __webpack_require__(32083);
 // EXTERNAL MODULE: ./src/editor/dom/treeNode/ParagraphNode.ts
 var entry_lib_ParagraphNode = __webpack_require__(40504);
 ;// ./src/components/version.ts
-/* harmony default export */ var entry_lib_version = ('3.1.209');
+/* harmony default export */ var entry_lib_version = ('3.1.210');
 // EXTERNAL MODULE: ./src/components/controls/poperTipText/PoperTipText.vue + 5 modules
 var entry_lib_PoperTipText = __webpack_require__(89316);
 ;// ./src/components/controls/poperTipText/index.ts
@@ -223614,6 +223622,7 @@ const entry_lib_defaultHeight = Math.floor(1122 * entry_lib_scaleXY) % 2 === 1 ?
           if (Number(parentNode.inputFieldType) === 0 && (customProperty.additionsEditor == 'true' || customProperty.additionsEditor == true)) {
             if (node instanceof entry_lib_DateTimeNode/* DateTimeNode */.Y) {
               if (node.isReadOnly && node.text.replace(/\s*/g, '') !== '') {
+                this.$message.error('元素属性设置只读，无法编辑');
                 return false;
               }
               this.computedPoperPosition(node, pageIndex);
@@ -223642,7 +223651,7 @@ const entry_lib_defaultHeight = Math.floor(1122 * entry_lib_scaleXY) % 2 === 1 ?
       }
       const [isInTable, tableNode] = hoEditorFactory.vueController.getDomRange().inSameTable();
       if (paintStatus == entry_lib_DrawTree/* PaintState */.ak.psEdit && isInTable && !(node instanceof entry_lib_SignNode/* SignNode */.u)) {
-        const result = hoEditorFactory.editController.canIsEdit(hoEditorFactory);
+        const result = hoEditorFactory.editController.canIsEdit(hoEditorFactory, 'dblclick');
         if (!result) return;
       }
       if (node instanceof entry_lib_SignNode/* SignNode */.u) {
@@ -223689,6 +223698,7 @@ const entry_lib_defaultHeight = Math.floor(1122 * entry_lib_scaleXY) % 2 === 1 ?
             return;
           }
           if (node.isReadOnly && node.text.replace(/\s*/g, '') !== '') {
+            this.$message.error('元素属性设置只读，无法编辑');
             return false;
           }
           this.computedPoperPosition(node, pageIndex);
@@ -223828,6 +223838,7 @@ const entry_lib_defaultHeight = Math.floor(1122 * entry_lib_scaleXY) % 2 === 1 ?
         return;
       }
       if (node.isReadOnly && node.text.replace(/\s*/g, '') !== '') {
+        this.$message.error('元素属性设置只读，无法编辑');
         return;
       }
       const callback = list => {
@@ -224171,10 +224182,10 @@ const entry_lib_defaultHeight = Math.floor(1122 * entry_lib_scaleXY) % 2 === 1 ?
 
 /* harmony default export */ var entry_lib_components_HoDocvue_type_script_lang_js = (entry_lib_HoDocvue_type_script_lang_js);
 
-;// ./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=030c30c6&prod&lang=less
+;// ./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=14a6cdbd&prod&lang=less
 // extracted by mini-css-extract-plugin
 
-;// ./src/components/HoDoc.vue?vue&type=style&index=0&id=030c30c6&prod&lang=less
+;// ./src/components/HoDoc.vue?vue&type=style&index=0&id=14a6cdbd&prod&lang=less
 
 ;// ./src/components/HoDoc.vue
 
@@ -224187,8 +224198,8 @@ const entry_lib_defaultHeight = Math.floor(1122 * entry_lib_scaleXY) % 2 === 1 ?
 
 var entry_lib_HoDoc_component = (0,entry_lib_componentNormalizer/* default */.A)(
   entry_lib_components_HoDocvue_type_script_lang_js,
-  entry_lib_HoDocvue_type_template_id_030c30c6_render,
-  entry_lib_HoDocvue_type_template_id_030c30c6_staticRenderFns,
+  entry_lib_HoDocvue_type_template_id_14a6cdbd_render,
+  entry_lib_HoDocvue_type_template_id_14a6cdbd_staticRenderFns,
   false,
   null,
   null,
@@ -228887,7 +228898,6 @@ class entry_lib_StructureConvert {
       count: 0
     });
     // console.time("openJson2Doc");
-
     if (nodes) {
       const insertNode = (array, prevNode) => {
         const firstNode = array[0];
@@ -235754,7 +235764,6 @@ class entry_lib_VueController {
       if (lastNextDays) {
         this.updateCellNextDays(lastNextDays.rowNo, lastNextDays.colNo, lastNextDays.tableId, '', true);
       }
-      setTimeout(() => {}, 1000);
     }
   }
   /**
@@ -235769,6 +235778,11 @@ class entry_lib_VueController {
     let updateCount = 1;
     let nextCellText = false;
     const currentCellNode = (_tableNodeMap$get = tableNodeMap.get(tableId)) === null || _tableNodeMap$get === void 0 ? void 0 : _tableNodeMap$get.rows[rowNo][colNo];
+    const lastNode = currentCellNode === null || currentCellNode === void 0 ? void 0 : currentCellNode.childNodes[currentCellNode.childNodes.length - 1];
+    if (lastNode && lastNode.styleIndex !== undefined) {
+      // 自动更新日期时候 样式变更为最后一个日期单元格内容样式
+      hoEditorFactory.docTree.curStyleIndex = lastNode.styleIndex;
+    }
     let currentText = (currentCellNode === null || currentCellNode === void 0 ? void 0 : currentCellNode.getCellText()) || '';
     if (currentCellNode && (currentText.replace(/ /g, '') == '' || isAddNewPage && currentText.replace(/ /g, '') != '')) {
       const currentStyle = currentCellNode.cellProperty.dateTimeProperty.inputStyle.replace(/dd/g, 'DD').replace(/yyyy/g, 'YYYY');
@@ -241752,8 +241766,8 @@ class entry_lib_EditController {
       }
     }
     if (hoEditorFactory.isUseForm) {
-      // 无选区 只判断结束节点 有选区需要判断首尾节点
-      if (curDomRange.startPath == curDomRange.endPath) {
+      // 无选区 只判断结束节点 有选区需要判断首尾节点 || 双击元素弹窗只判断结束节点 避免双击选区起始节点选到段落不能编辑
+      if (curDomRange.startPath == curDomRange.endPath || curDomRange.startPath != curDomRange.endPath && source == 'dblclick') {
         result = this.isEdit(hoEditorFactory, enode, curDomRange);
       } else {
         let sResult = this.isEdit(hoEditorFactory, snode, curDomRange);
@@ -258955,9 +258969,9 @@ var entry_lib_HoToolBar_component = (0,entry_lib_componentNormalizer/* default *
 )
 
 /* harmony default export */ var entry_lib_HoToolBar = (entry_lib_HoToolBar_component.exports);
-;// ./node_modules/babel-loader/lib/index.js??ruleSet[1].rules[3].use[0]!./node_modules/unplugin/dist/webpack/loaders/transform.js?unpluginName=vite-plugin-i18n-helper!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[5]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/toolbar/HoRightMenu.vue?vue&type=template&id=c072f7c2
+;// ./node_modules/babel-loader/lib/index.js??ruleSet[1].rules[3].use[0]!./node_modules/unplugin/dist/webpack/loaders/transform.js?unpluginName=vite-plugin-i18n-helper!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[5]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/toolbar/HoRightMenu.vue?vue&type=template&id=35b02cd4
 
-var entry_lib_HoRightMenuvue_type_template_id_c072f7c2_render = function render() {
+var entry_lib_HoRightMenuvue_type_template_id_35b02cd4_render = function render() {
   var _vm$hoEditorProvider$, _vm$hoEditorProvider$2, _vm$hoEditorProvider$3, _vm$hoEditorProvider$4, _vm$hoEditorProvider$5, _vm$hoEditorProvider$6, _vm$hoEditorProvider$7, _vm$hoEditorProvider$8, _vm$hoEditorProvider$10, _vm$hoEditorProvider$11, _vm$hoEditorProvider$12, _vm$hoEditorProvider$13, _vm$hoEditorProvider$14, _vm$hoEditorProvider$15, _vm$hoEditorProvider$16, _vm$hoEditorProvider$17, _vm$hoEditorProvider$18, _vm$hoEditorProvider$19, _vm$hoEditorProvider$20, _vm$hoEditorProvider$21, _vm$hoEditorProvider$22, _vm$hoEditorProvider$23, _vm$hoEditorProvider$24, _vm$hoEditorProvider$25, _vm$hoEditorProvider$26, _vm$hoEditorProvider$27;
   var _vm = this,
     _c = _vm._self._c;
@@ -259290,9 +259304,9 @@ var entry_lib_HoRightMenuvue_type_template_id_c072f7c2_render = function render(
     }
   }, [_vm._v("v " + _vm._s(_vm.versions))])])])], 2);
 };
-var entry_lib_HoRightMenuvue_type_template_id_c072f7c2_staticRenderFns = [];
+var entry_lib_HoRightMenuvue_type_template_id_35b02cd4_staticRenderFns = [];
 
-;// ./src/components/toolbar/HoRightMenu.vue?vue&type=template&id=c072f7c2
+;// ./src/components/toolbar/HoRightMenu.vue?vue&type=template&id=35b02cd4
 
 ;// ./node_modules/babel-loader/lib/index.js??ruleSet[1].rules[3].use[0]!./node_modules/unplugin/dist/webpack/loaders/transform.js?unpluginName=vite-plugin-i18n-helper!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[5]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/toolbar/TableFeatures.vue?vue&type=template&id=5bcdf497
 
@@ -260106,13 +260120,11 @@ var entry_lib_popper = __webpack_require__(98234);
     async getClipboardContents() {
       try {
         const clipboardItems = await navigator.clipboard.read();
-        // console.log(clipboardItems)
         let htmls = "";
         for (const clipboardItem of clipboardItems) {
           for (const type of clipboardItem.types) {
             if (type === 'text/html') {
               const blob = await clipboardItem.getType(type);
-              // console.log(type, blob, '---------');
               const reader = new FileReader();
               reader.readAsText(blob, 'UTF-8');
               reader.onload = e => {
@@ -260374,8 +260386,8 @@ var entry_lib_popper = __webpack_require__(98234);
 ;
 var entry_lib_HoRightMenu_component = (0,entry_lib_componentNormalizer/* default */.A)(
   entry_lib_toolbar_HoRightMenuvue_type_script_lang_js,
-  entry_lib_HoRightMenuvue_type_template_id_c072f7c2_render,
-  entry_lib_HoRightMenuvue_type_template_id_c072f7c2_staticRenderFns,
+  entry_lib_HoRightMenuvue_type_template_id_35b02cd4_render,
+  entry_lib_HoRightMenuvue_type_template_id_35b02cd4_staticRenderFns,
   false,
   null,
   null,