hoeditor-web 3.1.16 → 3.1.17

package/lib/hoeditor.umd.js

@@ -59541,7 +59541,7 @@ var BandDataSource = /*#__PURE__*/function () {
   return BandDataSource;
 }();
 var RadioAndCheckBoxInstance = /*#__PURE__*/function () {
-  //关联元素id
+  //关联元素
   function RadioAndCheckBoxInstance() {
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_classCallCheck_js__WEBPACK_IMPORTED_MODULE_4__/* ["default"] */ .Z)(this, RadioAndCheckBoxInstance);
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_6__/* ["default"] */ .Z)(this, "id", void 0);
@@ -59577,6 +59577,8 @@ var RadioAndCheckBoxInstance = /*#__PURE__*/function () {
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_6__/* ["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)(this, "associatedElement", "");
+    //关联元素必填标识
+    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_6__/* ["default"] */ .Z)(this, "associatedId", "");
     RadioAndCheckBoxInstance.makeDefaultValue(this);
   }
   (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_5__/* ["default"] */ .Z)(RadioAndCheckBoxInstance, [{
@@ -59781,6 +59783,16 @@ var RadioAndCheckBoxInstance = /*#__PURE__*/function () {
         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;
     // }
@@ -59824,6 +59836,7 @@ var RadioAndCheckBoxInstance = /*#__PURE__*/function () {
       ret.isTransToText = false;
       ret.groupHasOptions = false;
       ret.associatedElement = "";
+      ret.associatedId = "";
       return ret;
     }
   }]);
@@ -60142,6 +60155,7 @@ var RadioAndCheckBoxNode = /*#__PURE__*/function (_ControlNode) {
       ret.IsTransToText = this.isTransToText != undefined ? this.isTransToText : ret.IsTransToText;
       ret.GroupHasOptions = this.groupHasOptions != undefined ? this.groupHasOptions : ret.GroupHasOptions;
       ret.AssociatedElement = this.associatedElement != undefined ? this.associatedElement : ret.AssociatedElement;
+      ret.AssociatedId = this.associatedId != undefined ? this.associatedId : ret.AssociatedId;
       return ret;
     }
     /**
@@ -60270,6 +60284,7 @@ var RadioAndCheckBoxNode = /*#__PURE__*/function (_ControlNode) {
           readType: this.readType,
           //bandDataSource: this.bandDataSource,
           associatedElement: this.associatedElement,
+          associatedId: this.associatedId,
           remark: this.remark
         };
       }
@@ -60337,6 +60352,9 @@ var RadioAndCheckBoxNode = /*#__PURE__*/function (_ControlNode) {
       if (this.associatedElement) {
         retObj.associatedElement = this.associatedElement;
       }
+      if (this.associatedId) {
+        retObj.associatedId = this.associatedId;
+      }
       if (this.remark) {
         retObj.remark = this.remark;
       }
@@ -61018,11 +61036,12 @@ var SignNode = /*#__PURE__*/function (_BaseNode) {
   (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_inherits_js__WEBPACK_IMPORTED_MODULE_4__/* ["default"] */ .Z)(SignNode, _BaseNode);
   var _super = (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createSuper_js__WEBPACK_IMPORTED_MODULE_5__/* ["default"] */ .Z)(SignNode);
   //其它属性{"isDisplayTitle":true,"title":"职称","isDisplayTime":true,"time":"签名日期","timePosition":"1"}
-  function SignNode(hoEditorFactoryID, rootNodes, pNode, nodeType, number, type, name, signType, signFormat, signor, signTime, signTimeFormat, imgSrc, imgWidth, imgHeight, customProperty, isTemplate, styleIndex, connectMode, isFront, allowEditSignTime, fingerPrintSrc, fingerPosition, attribute, connectChar, otherProperties) {
+  function SignNode(hoEditorFactoryID, rootNodes, pNode, nodeType, number, type, name, signType, signFormat, signor, signTime, signTimeFormat, imgSrc, imgWidth, imgHeight, customProperty, isTemplate, styleIndex, connectMode, isFront, allowEditSignTime, fingerPrintSrc, fingerPosition, attribute, connectChar, otherProperties, dataId) {
     var _this;
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_classCallCheck_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)(this, SignNode);
     _this = _super.call(this, hoEditorFactoryID, rootNodes, pNode, nodeType);
-    //private _id = "";//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_3__/* ["default"] */ .Z)(_this), "_dataId", "");
+    //dataId
     (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_3__/* ["default"] */ .Z)(_this), "_name", "");
     //签名名称
     (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_3__/* ["default"] */ .Z)(_this), "_signType", 0);
@@ -61082,6 +61101,11 @@ var SignNode = /*#__PURE__*/function (_BaseNode) {
     // if(attribute == 1) { // 患者签名修改 type == 3
     //     this._type = 3;
     // }
+    if (dataId) {
+      _this.dataId = dataId;
+    } else {
+      _this.dataId = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_17__/* .HOEditorFactorys */ .b.instance().getFactory(hoEditorFactoryID).gernerateCode.generateID("Sign");
+    }
     if (fingerPrintSrc) {
       _this._fingerPrintSrc = fingerPrintSrc;
     }
@@ -61144,6 +61168,16 @@ var SignNode = /*#__PURE__*/function (_BaseNode) {
   //     }
   // }
   (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z)(SignNode, [{
+    key: "dataId",
+    get: function get() {
+      return this._dataId;
+    },
+    set: function set(value) {
+      if (this._dataId !== value) {
+        this._dataId = value;
+      }
+    }
+  }, {
     key: "name",
     get: function get() {
       return this._name;
@@ -61470,7 +61504,7 @@ var SignNode = /*#__PURE__*/function (_BaseNode) {
         nodeType: _BaseNode__WEBPACK_IMPORTED_MODULE_18__/* .NodeType */ .Jq[this.nodeType],
         number: clearSign ? 0 : this.number,
         type: clearSign ? 0 : this.type,
-        //id: this.id,
+        dataId: this.dataId,
         name: this.name,
         signType: this.signType,
         signFormat: this.signFormat,
@@ -61509,7 +61543,11 @@ var SignNode = /*#__PURE__*/function (_BaseNode) {
     }
   }], [{
     key: "json2Node",
-    value: function json2Node(hoEditorFactoryID, json, rootNodes, pNode, isClearSign) {
+    value: function json2Node(hoEditorFactoryID, json, rootNodes, pNode, isClearSign, isPaste) {
+      if (isPaste) {
+        var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_17__/* .HOEditorFactorys */ .b.instance().getFactory(hoEditorFactoryID);
+        json.dataId = hoEditorFactory.gernerateCode.generateID("Sign");
+      }
       //const width = Number(json.width);
       var number = isClearSign ? 0 : Number(json.number);
       var type = isClearSign ? 0 : Number(json.type);
@@ -61521,7 +61559,7 @@ var SignNode = /*#__PURE__*/function (_BaseNode) {
       if ((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_typeof_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z)(json.fingerPrintSrc) == 'object') {
         json.fingerPrintSrc = '';
       }
-      var signNode = new SignNode(hoEditorFactoryID, rootNodes, pNode ? pNode : null, _BaseNode__WEBPACK_IMPORTED_MODULE_18__/* .NodeType */ .Jq.ntSign, number, type, json.name, json.signType ? Number(json.signType) : 0, json.signFormat ? json.signFormat : "签名医师", isClearSign ? "" : json.signor, isClearSign ? "" : json.signTime, json.signTimeFormat ? json.signTimeFormat : "yyyy-MM-dd HH:mm", isClearSign ? "" : json.imgSrc, imgWidth, imgHeight, isClearSign ? undefined : json.customProperty, isTemplate, json.styleIndex ? Number(json.styleIndex) : undefined, json.connectMode, json.isFront, json.allowEditSignTime, isClearSign ? "" : json.fingerPrintSrc, isClearSign ? 0 : json.fingerPosition, attribute, json.connectChar, json.otherProperties);
+      var signNode = new SignNode(hoEditorFactoryID, rootNodes, pNode ? pNode : null, _BaseNode__WEBPACK_IMPORTED_MODULE_18__/* .NodeType */ .Jq.ntSign, number, type, json.name, json.signType ? Number(json.signType) : 0, json.signFormat ? json.signFormat : "签名医师", isClearSign ? "" : json.signor, isClearSign ? "" : json.signTime, json.signTimeFormat ? json.signTimeFormat : "yyyy-MM-dd HH:mm", isClearSign ? "" : json.imgSrc, imgWidth, imgHeight, isClearSign ? undefined : json.customProperty, isTemplate, json.styleIndex ? Number(json.styleIndex) : undefined, json.connectMode, json.isFront, json.allowEditSignTime, isClearSign ? "" : json.fingerPrintSrc, isClearSign ? 0 : json.fingerPosition, attribute, json.connectChar, json.otherProperties, json.dataId);
       // if (json.id != "") {
       //     signNode.id = json.id;
       // }
@@ -85665,22 +85703,26 @@ var DrawTree = /*#__PURE__*/function () {
             }
           }
           //单复选带出关联元素
-          var deleteAssociatedEle = function deleteAssociatedEle(node) {
-            var changeEvent = new NodeChangeEvent/* NodeChangeEvent */.G(_this2._hoEditorFactoryID, DocTree/* DocAction */.gk.daDelete, nodePathCur, "");
-            changeEvent.oldEndPath = hoEditorFactory.docTree.getNodeLastPath(node);
+          var deleteAssociatedEle = function deleteAssociatedEle(node, tPath) {
+            var oldEndPath = hoEditorFactory.docTree.getNodeLastPath(node);
+            var changeEvent = new NodeChangeEvent/* NodeChangeEvent */.G(_this2._hoEditorFactoryID, DocTree/* DocAction */.gk.daDelete, tPath, "");
+            changeEvent.oldEndPath = oldEndPath;
+            changeEvent.oldDrawTreeLines = new SelectRange/* SelectRange */.E(_this2._hoEditorFactoryID).getRangeDrawTreeLines(nodePathCur, oldEndPath);
             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) {
+            var newpath = nodePathCur;
             if (this._onInsertNodeByID) {
               if (e.node.isSelected) {
-                this._onInsertNodeByID(nodePathCur, e.node.associatedId);
+                this._onInsertNodeByID(newpath, e.node.associatedId).then(function (res) {
+                  newpath = res;
+                });
               } else {
-                var _node2 = hoEditorFactory.vueController.getNodeByDataID("main", e.node.associatedId);
+                var _node2 = hoEditorFactory.vueController.getNodeByID("main", e.node.associatedId);
                 if (_node2) {
-                  deleteAssociatedEle(_node2);
+                  deleteAssociatedEle(_node2, newpath);
                 }
               }
             }
@@ -85690,11 +85732,12 @@ var DrawTree = /*#__PURE__*/function () {
                 _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);
+                  var val = _step3.value;
+                  if (val.associatedId && val.controlStyle === "RadioBox" && val.groupName === groupName && groupName !== "") {
+                    var _node3 = hoEditorFactory.vueController.getNodeByID("main", val.associatedId);
                     if (_node3) {
-                      deleteAssociatedEle(_node3);
+                      var bpath = val.getNodePath();
+                      deleteAssociatedEle(_node3, bpath);
                       break;
                     }
                   }
@@ -217851,7 +217894,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.16');
+/* harmony default export */ var version = ('3.1.17');
 // EXTERNAL MODULE: ./src/components/controls/poperTipText/PoperTipText.vue + 5 modules
 var PoperTipText = __webpack_require__(50987);
 ;// CONCATENATED MODULE: ./src/components/controls/poperTipText/index.ts
@@ -223462,7 +223505,7 @@ var StructureConvert = /*#__PURE__*/function () {
       } else if (temp.nodeType == BaseNode/* NodeType */.Jq.ntLabel) {
         return LabelNode/* LabelNode */.P.json2Node(this._hoEditorFactoryID, temp, rootNodes, parentNode);
       } else if (temp.nodeType == BaseNode/* NodeType */.Jq.ntSign) {
-        return SignNode/* SignNode */.N.json2Node(this._hoEditorFactoryID, temp, rootNodes, parentNode, isClearSign);
+        return SignNode/* SignNode */.N.json2Node(this._hoEditorFactoryID, temp, rootNodes, parentNode, isClearSign, isPaste);
       } else if (temp.nodeType == BaseNode/* NodeType */.Jq.ntGestation) {
         return GestationNode/* GestationNode */.G.json2Node(this._hoEditorFactoryID, temp, rootNodes, parentNode);
       } else if (temp.nodeType == BaseNode/* NodeType */.Jq.ntRareChar) {
@@ -227605,7 +227648,7 @@ var VueController = /*#__PURE__*/function () {
       var iteratesNodes = function iteratesNodes(nodes) {
         for (var i = 0; i < nodes.length; i++) {
           var anode = nodes[i];
-          if (anode instanceof ControlNode/* ControlNode */.w || anode instanceof TextInputFieldNode/* TextInputFieldNode */.re) {
+          if (anode instanceof ControlNode/* ControlNode */.w || anode instanceof TextInputFieldNode/* TextInputFieldNode */.re || anode instanceof SignNode/* SignNode */.N) {
             if (anode.dataId === dataid) {
               node = anode;
               break;
@@ -230211,10 +230254,16 @@ var VueController = /*#__PURE__*/function () {
         document.body.removeChild(document.querySelector('#hoDownLoadImageBtn'));
       }, 300);
     }
+    //type=1：根据dataid定位元素  type=其它：根据id定位元素
   }, {
     key: "moveCaretToElement",
-    value: function moveCaretToElement(scope, id) {
-      var node = this.getNodeByID(scope, id);
+    value: function moveCaretToElement(scope, id, type) {
+      var node;
+      if (type == 1) {
+        node = this.getNodeByDataID(scope, id);
+      } else {
+        node = this.getNodeByID(scope, id);
+      }
       if (node) {
         var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this._hoEditorFactoryID);
         var oldRange = hoEditorFactory.docTree.curDomRange;
@@ -230231,10 +230280,12 @@ var VueController = /*#__PURE__*/function () {
           }
         }
         hoEditorFactory.drawTree.moveCaretToPath(topath);
-        var newRange = new DomRange/* DomRange */.a(this.hoEditorFactoryID, spath, epath);
-        hoEditorFactory.docTree.curDomRange = newRange;
-        var selectChangeEvent = new SelectionChangeEvent/* SelectionChangeEvent */.r(oldRange, newRange);
-        hoEditorFactory.docTree.selectChange(selectChangeEvent);
+        if (type !== 1) {
+          var newRange = new DomRange/* DomRange */.a(this.hoEditorFactoryID, spath, epath);
+          hoEditorFactory.docTree.curDomRange = newRange;
+          var selectChangeEvent = new SelectionChangeEvent/* SelectionChangeEvent */.r(oldRange, newRange);
+          hoEditorFactory.docTree.selectChange(selectChangeEvent);
+        }
       }
     }
     /**
@@ -232853,8 +232904,8 @@ var BaseController = /*#__PURE__*/function () {
 /*
  * @Author: your name
  * @Date: 2021-07-31 09:22:55
- * @LastEditTime: 2021-12-01 16:17:13
- * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2023-10-11 16:29:33
+ * @LastEditors: liyanan 2441631434@qq.com
  * @Description: In User Settings Edit
  * @FilePath: \hoeditor-web\src\editor\externalCall\DomController.ts
  */
@@ -233217,6 +233268,7 @@ var DomController = /*#__PURE__*/function () {
     value: function registOnNodeInsertByID(func) {
       var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this._hoEditorFactoryID);
       hoEditorFactory.docController.onInsertNodeByID = func;
+      hoEditorFactory.drawTree.onInsertNodeByID = func;
     }
   }, {
     key: "delCurPage",