hoeditor-web 3.1.12 → 3.1.14

package/lib/hoeditor.umd.js

@@ -42605,8 +42605,11 @@ var DocController = /*#__PURE__*/function () {
       var startPath = domRange.startPath;
       var endPath = domRange.endPath;
       var ePNode = hoEditorFactory.docTree.getParentNode(endPath); //结束节点的父节点
-      var eStyleIndex = domRange.npEnd.node instanceof _treeNode_TextNode__WEBPACK_IMPORTED_MODULE_28__/* .TextNode */ .R ? domRange.npEnd.node.styleIndex : 0;
-      var endNode = new _treeNode_MarkNode__WEBPACK_IMPORTED_MODULE_48__/* .MarkNode */ .j(this._hoEditorFactoryID, domRange.npStart.roots, ePNode, _treeNode_BaseNode__WEBPACK_IMPORTED_MODULE_25__/* .NodeType */ .Jq.ntMark, commentID, eStyleIndex, _treeNode_MarkNode__WEBPACK_IMPORTED_MODULE_48__/* .MarkNodeType */ .q.mtEnd);
+      // const eStyleIndex =
+      //   domRange.npEnd.node instanceof TextNode
+      //     ? domRange.npEnd.node.styleIndex
+      //     : 0;
+      var endNode = new _treeNode_MarkNode__WEBPACK_IMPORTED_MODULE_48__/* .MarkNode */ .j(this._hoEditorFactoryID, domRange.npStart.roots, ePNode, _treeNode_BaseNode__WEBPACK_IMPORTED_MODULE_25__/* .NodeType */ .Jq.ntMark, commentID, 0, _treeNode_MarkNode__WEBPACK_IMPORTED_MODULE_48__/* .MarkNodeType */ .q.mtEnd);
       endNode.MarkNodeType = _treeNode_MarkNode__WEBPACK_IMPORTED_MODULE_48__/* .MarkNodeType */ .q.mtEnd;
       endNode.isReadOnly = true;
       hoEditorFactory.undoService.begin();
@@ -59790,7 +59793,7 @@ var RadioAndCheckBoxInstance = /*#__PURE__*/function () {
 var RadioAndCheckBoxNode = /*#__PURE__*/function (_ControlNode) {
   (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_inherits_js__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z)(RadioAndCheckBoxNode, _ControlNode);
   var _super = (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createSuper_js__WEBPACK_IMPORTED_MODULE_3__/* ["default"] */ .Z)(RadioAndCheckBoxNode);
-  //关联元素id
+  //关联带出元素
   function RadioAndCheckBoxNode(hoEditorFactoryID, rootNodes, pNode, nodeType, valuesObject, styleIndex //, backColor: string
   ) {
     var _this;
@@ -59817,6 +59820,8 @@ var RadioAndCheckBoxNode = /*#__PURE__*/function (_ControlNode) {
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_6__/* ["default"] */ .Z)((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)(_this), "_groupHasOptions", false);
     //同组保存时必须有选项不能全部为空
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_6__/* ["default"] */ .Z)((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)(_this), "_associatedElement", "");
+    //关联元素id
+    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_6__/* ["default"] */ .Z)((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)(_this), "_associatedId", "");
     _this._styleIndex = styleIndex;
     //const valuesObj = eval("(" + valuesObject + ")");
     _this.setValuesObject(valuesObject);
@@ -60022,6 +60027,16 @@ var RadioAndCheckBoxNode = /*#__PURE__*/function (_ControlNode) {
         this._associatedElement = value;
       }
     }
+  }, {
+    key: "associatedId",
+    get: function get() {
+      return this._associatedId;
+    },
+    set: function set(value) {
+      if (this._associatedId !== value) {
+        this._associatedId = value;
+      }
+    }
     // get bandDataSource(): BandDataSource {
     //   return this._bandDataSource;
     // }
@@ -67851,7 +67866,7 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
               // };
               if (node) {
                 if (node instanceof _TextNode__WEBPACK_IMPORTED_MODULE_59__/* .TextNode */ .R) {
-                  if (temp.innerIdentifier == "name" && node.text.length > (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_toConsumableArray_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)(node.text).length) {
+                  if (node.text.length > (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_toConsumableArray_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)(node.text).length) {
                     //特殊处理生僻字
                     var rareCharNode = new _RareCharNode__WEBPACK_IMPORTED_MODULE_61__/* .RareCharNode */ .Q(temp.hoEditorFactoryID, node.rootNodes, node.parentNode, _BaseNode__WEBPACK_IMPORTED_MODULE_44__/* .NodeType */ .Jq.ntRareChar, node.text, node.styleIndex);
                     nodes.push(rareCharNode);
@@ -67896,7 +67911,7 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
             var _node2 = hoEditorFactory.structureConvert.convertNode(item, rootNodes, temp, undefined, undefined, isClearSign);
             if (_node2) {
               if (_node2 instanceof _TextNode__WEBPACK_IMPORTED_MODULE_59__/* .TextNode */ .R) {
-                if (temp.innerIdentifier == "name" && _node2.text.length > (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_toConsumableArray_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)(_node2.text).length) {
+                if (_node2.text.length > (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_toConsumableArray_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)(_node2.text).length) {
                   //特殊处理生僻字
                   var _rareCharNode = new _RareCharNode__WEBPACK_IMPORTED_MODULE_61__/* .RareCharNode */ .Q(temp.hoEditorFactoryID, _node2.rootNodes, _node2.parentNode, _BaseNode__WEBPACK_IMPORTED_MODULE_44__/* .NodeType */ .Jq.ntRareChar, _node2.text, _node2.styleIndex);
                   nodes.push(_rareCharNode);
@@ -68116,7 +68131,7 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
                     }
                   } else {
                     if (textArr[0] != "") {
-                      if (temp.innerIdentifier == "name" && temp.text.length > (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_toConsumableArray_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)(temp.text).length) {
+                      if (temp.text.length > (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_toConsumableArray_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)(temp.text).length) {
                         var rareCharNode = new _RareCharNode__WEBPACK_IMPORTED_MODULE_61__/* .RareCharNode */ .Q(temp.hoEditorFactoryID, rootNodes, temp, _BaseNode__WEBPACK_IMPORTED_MODULE_44__/* .NodeType */ .Jq.ntRareChar, textArr[0], styleIndex);
                         temp.childNodes.splice(temp.childNodes.length - 1, 0, rareCharNode);
                       } else {
@@ -78505,7 +78520,7 @@ var DrawRect = /*#__PURE__*/function (_DrawContainer) {
 /*
  * @Author: your name
  * @Date: 2021-09-01 16:51:49
- * @LastEditTime: 2023-09-07 15:16:20
+ * @LastEditTime: 2023-09-21 15:01:26
  * @LastEditors: liyanan 2441631434@qq.com
  * @Description: In User Settings Edit
  * @FilePath: \hoeditor-web\src\editor\draw\drawNode\DrawSignNode.ts
@@ -79295,10 +79310,10 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
             }
           }
           if (isFront) {
-            line.graphics.beginStroke('#000000').clear().moveTo(this.dWidth - this._drawText.getMeasuredWidth(), 2).lineTo(this.dWidth, -theHeight - 2);
+            line.graphics.clear().beginStroke('#000000').moveTo(this.dWidth - this._drawText.getMeasuredWidth(), 2).lineTo(this.dWidth, -theHeight - 2);
             this.addChild(line);
           } else {
-            line.graphics.beginStroke('#000000').clear().moveTo(0, 2).lineTo(this._drawText.getMeasuredWidth(), -theHeight - 2);
+            line.graphics.clear().beginStroke('#000000').moveTo(0, 2).lineTo(this._drawText.getMeasuredWidth(), -theHeight - 2);
             this.addChildAt(line);
           }
         }
@@ -83600,6 +83615,7 @@ var DrawTree = /*#__PURE__*/function () {
     (0,defineProperty/* default */.Z)(this, "_pageCountNodes", void 0);
     (0,defineProperty/* default */.Z)(this, "_errorsMap", void 0);
     //错别字提示
+    (0,defineProperty/* default */.Z)(this, "_onInsertNodeByID", void 0);
     (0,defineProperty/* default */.Z)(this, "_formularNodes", void 0);
     this._hoEditorFactoryID = hoEditorFactoryID;
     var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this._hoEditorFactoryID);
@@ -83629,6 +83645,7 @@ var DrawTree = /*#__PURE__*/function () {
     this._pageCountNodes = new Map();
     this._formularNodes = new Map();
     this._errorsMap = new Map();
+    this._onInsertNodeByID = null;
     // this._drawPageMarks = new Array<DrawPageMarkNode>();
     // this._nodeMouseOverHandler = new Array<NodeMouseOverHandler>();
     // this._nodeMouseOutHandler = new Array<NodeMouseOutHandler>();
@@ -83784,6 +83801,14 @@ var DrawTree = /*#__PURE__*/function () {
     * Getter formularNodes
     * @return {Map<string, TableFormula>}
     */
+  }, {
+    key: "onInsertNodeByID",
+    get: function get() {
+      return this._onInsertNodeByID;
+    },
+    set: function set(onInsertNodeByID) {
+      this._onInsertNodeByID = onInsertNodeByID;
+    }
   }, {
     key: "formularNodes",
     get: function get() {
@@ -85562,7 +85587,7 @@ var DrawTree = /*#__PURE__*/function () {
           hoEditorFactory.docController.insertRadioAndCheckBox("update", newDomRangeCur, nodeObjectStr, aNode.styleIndex
           //aNode.backColor
           );
-
+          //单复选关联元素必填标记
           if (e.node.associatedElement) {
             var node = hoEditorFactory.vueController.getNodeByDataID("main", e.node.associatedElement);
             if (node && node instanceof TextInputFieldNode/* TextInputFieldNode */.re) {
@@ -85574,6 +85599,70 @@ var DrawTree = /*#__PURE__*/function () {
                 node.update(0);
               }
             }
+          } else {
+            if (e.node.controlStyle === "RadioBox" && e.node.isSelected) {
+              var _iterator2 = (0,createForOfIteratorHelper/* default */.Z)(hoEditorFactory.docTree.radioAndCheckBoxsMap.values()),
+                _step2;
+              try {
+                for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+                  var value = _step2.value;
+                  if (value.associatedElement && value.controlStyle === "RadioBox" && value.groupName === groupName && groupName !== "") {
+                    var _node = hoEditorFactory.vueController.getNodeByDataID("main", value.associatedElement);
+                    if (_node && _node instanceof TextInputFieldNode/* TextInputFieldNode */.re) {
+                      _node.customProperty.must = false;
+                      _node.update(0);
+                      break;
+                    }
+                  }
+                }
+              } catch (err) {
+                _iterator2.e(err);
+              } finally {
+                _iterator2.f();
+              }
+            }
+          }
+          //单复选带出关联元素
+          var deleteAssociatedEle = function deleteAssociatedEle(node) {
+            var changeEvent = new NodeChangeEvent/* NodeChangeEvent */.G(_this2._hoEditorFactoryID, DocTree/* DocAction */.gk.daDelete, nodePathCur, "");
+            changeEvent.oldEndPath = hoEditorFactory.docTree.getNodeLastPath(node);
+            hoEditorFactory.docTree.deleteNode(node, "update");
+            changeEvent.oldDrawTreeLines = new SelectRange/* SelectRange */.E(_this2._hoEditorFactoryID).getRangeDrawTreeLines(nodePathCur, changeEvent.oldEndPath);
+            changeEvent.afterChangePath = nodePathCur;
+            hoEditorFactory.docTree.change(changeEvent);
+          };
+          if (e.node.associatedId) {
+            if (this._onInsertNodeByID) {
+              if (e.node.isSelected) {
+                this._onInsertNodeByID(nodePathCur, e.node.associatedId);
+              } else {
+                var _node2 = hoEditorFactory.vueController.getNodeByDataID("main", e.node.associatedId);
+                if (_node2) {
+                  deleteAssociatedEle(_node2);
+                }
+              }
+            }
+          } else {
+            if (e.node.controlStyle === "RadioBox" && e.node.isSelected) {
+              var _iterator3 = (0,createForOfIteratorHelper/* default */.Z)(hoEditorFactory.docTree.radioAndCheckBoxsMap.values()),
+                _step3;
+              try {
+                for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+                  var _value = _step3.value;
+                  if (_value.associatedId && _value.controlStyle === "RadioBox" && _value.groupName === groupName && groupName !== "") {
+                    var _node3 = hoEditorFactory.vueController.getNodeByDataID("main", _value.associatedId);
+                    if (_node3) {
+                      deleteAssociatedEle(_node3);
+                      break;
+                    }
+                  }
+                }
+              } catch (err) {
+                _iterator3.e(err);
+              } finally {
+                _iterator3.f();
+              }
+            }
           }
         }
       }
@@ -85698,12 +85787,12 @@ var DrawTree = /*#__PURE__*/function () {
             selectStart = "".concat(_dNode.node.getNodePath(), "/").concat(childIndex);
           }
         } else if ((0,IDrawInfos/* instanceOfIDrawInfos */.r)(_dNode)) {
-          var _node = _dNode.node;
-          var _dindex = _node.drawNodes.indexOf(_dNode);
-          if (_node.hasChildPath()) {
-            selectStart = "".concat(_node.getNodePath(), "/").concat(_dindex);
+          var _node4 = _dNode.node;
+          var _dindex = _node4.drawNodes.indexOf(_dNode);
+          if (_node4.hasChildPath()) {
+            selectStart = "".concat(_node4.getNodePath(), "/").concat(_dindex);
           } else {
-            selectStart = "".concat(_node.getNodePath());
+            selectStart = "".concat(_node4.getNodePath());
           }
         }
       }
@@ -217691,7 +217780,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.12');
+/* harmony default export */ var version = ('3.1.14');
 // EXTERNAL MODULE: ./src/components/controls/poperTipText/PoperTipText.vue + 5 modules
 var PoperTipText = __webpack_require__(50987);
 ;// CONCATENATED MODULE: ./src/components/controls/poperTipText/index.ts
@@ -232337,7 +232426,18 @@ var VueController = /*#__PURE__*/function () {
         }
       }
       if (table) {
-        var rowCellNum = table.rows[0].length;
+        var rowIndex = this.getTableTitleMaxRowIndex(table);
+        if (rowIndex === -1) {
+          rowIndex = 0;
+        }
+        var rowCellNum = 0;
+        for (var r = 0; r <= rowIndex; r++) {
+          for (var c = 0; c < table.colCount; c++) {
+            if (table.rows[r][c]) {
+              rowCellNum++;
+            }
+          }
+        }
         for (var _k4 = rowCellNum; _k4 < table.childNodes.length; _k4++) {
           var cell = table.childNodes[_k4];
           if (cell.childNodes.length > 1) {
@@ -232347,8 +232447,8 @@ var VueController = /*#__PURE__*/function () {
         }
         if (table.childNodes.length - rowCellNum < data.length) {
           var needCellNum = data.length - (table.childNodes.length - rowCellNum);
-          var needRows = Number((needCellNum / rowCellNum).toFixed());
-          var remainder = needCellNum % rowCellNum;
+          var needRows = Number((needCellNum / table.colCount).toFixed());
+          var remainder = needCellNum % table.colCount;
           if (remainder > 0) {
             needRows++;
           }