hoeditor-web 3.1.102 → 3.1.104

package/lib/hoeditor.umd.js

@@ -13854,7 +13854,7 @@ var component = (0,componentNormalizer/* default */.Z)(
 
 /***/ }),
 
-/***/ 30939:
+/***/ 17983:
 /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -13868,7 +13868,7 @@ __webpack_require__.d(__webpack_exports__, {
 
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.function.name.js
 var es_function_name = __webpack_require__(68309);
-;// 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/radioCheckBox/RadioCheckbox.vue?vue&type=template&id=19e7dc64&
+;// 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/radioCheckBox/RadioCheckbox.vue?vue&type=template&id=72345796&
 
 var render = function render() {
   var _vm = this,
@@ -14004,7 +14004,9 @@ var render = function render() {
       "height": "300px"
     },
     attrs: {
-      "row-key": "id",
+      "rowKey": function rowKey(record, index) {
+        return index;
+      },
       "scroll": {
         y: 270
       },
@@ -14626,7 +14628,7 @@ var render = function render() {
 };
 var staticRenderFns = [];
 
-;// CONCATENATED MODULE: ./src/components/controls/radioCheckBox/RadioCheckbox.vue?vue&type=template&id=19e7dc64&
+;// CONCATENATED MODULE: ./src/components/controls/radioCheckBox/RadioCheckbox.vue?vue&type=template&id=72345796&
 
 // EXTERNAL MODULE: ./node_modules/@babel/runtime/helpers/esm/defineProperty.js
 var defineProperty = __webpack_require__(78255);
@@ -14722,8 +14724,11 @@ var defaultBox = {
       inputValue: '',
       saveTagInput: null,
       nodeList: []
+      // customPropertys: {}, // 自定义属性
+      // customPropertyValue: new Object(),
     };
   },
+
   inject: {
     hoEditorProvider: {
       default: function _default() {
@@ -14775,11 +14780,13 @@ var defaultBox = {
             value[key] = v[key];
           }
         });
-        if (v.customProperty) {
-          _this.radioCheckBox.customProperty = v.customProperty;
-        }
         _this.radioCheckBoxGroup.push(value);
       });
+      // if (isObject(updateNode.customProperty)) {
+      //     this.customPropertys = updateNode.valueList[0].customProperty;
+      // } else {
+      //     this.customPropertys = new Object();
+      // }
       this.boxGroup = 1;
       this.addBox();
     } else {
@@ -14790,11 +14797,18 @@ var defaultBox = {
           _this.radioCheckBox[key] = updateNode.value[key];
         }
       });
-      if (updateNode.customProperty) {
-        this.radioCheckBox.customProperty = updateNode.customProperty;
-      }
+      // if (isObject(updateNode.customProperty)) {
+      //     this.customPropertys = updateNode.customProperty;
+      // } else {
+      //     this.customPropertys = new Object();
+      // }
       this.boxGroup = 0;
     }
+    // let property = new Object();
+    // Object.keys(this.customPropertys).forEach((key) => {
+    //     property[key] = this.customPropertys[key];
+    // });
+    // this.customPropertyValue = { ...property };
   } else {
     this.radioCheckBox.id = this.controlType === 'RadioBox' ? this.vueController.generateID('RB') : this.vueController.generateID('CB');
     this.radioCheckBox.controlStyle = this.controlType;
@@ -14948,10 +14962,10 @@ var defaultBox = {
 }), _name$data$inject$pro);
 ;// CONCATENATED MODULE: ./src/components/controls/radioCheckBox/RadioCheckbox.vue?vue&type=script&lang=js&
  /* harmony default export */ var radioCheckBox_RadioCheckboxvue_type_script_lang_js_ = (RadioCheckboxvue_type_script_lang_js_); 
-;// CONCATENATED MODULE: ./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/controls/radioCheckBox/RadioCheckbox.vue?vue&type=style&index=0&id=19e7dc64&prod&lang=less&
+;// CONCATENATED MODULE: ./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/controls/radioCheckBox/RadioCheckbox.vue?vue&type=style&index=0&id=72345796&prod&lang=less&
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./src/components/controls/radioCheckBox/RadioCheckbox.vue?vue&type=style&index=0&id=19e7dc64&prod&lang=less&
+;// CONCATENATED MODULE: ./src/components/controls/radioCheckBox/RadioCheckbox.vue?vue&type=style&index=0&id=72345796&prod&lang=less&
 
 // EXTERNAL MODULE: ./node_modules/@vue/vue-loader-v15/lib/runtime/componentNormalizer.js
 var componentNormalizer = __webpack_require__(70713);
@@ -49977,7 +49991,7 @@ var CellNode = /*#__PURE__*/function (_RectNode) {
             if (node.text !== "") {
               nodeJson = node.node2Json(undefined, isCopy);
             }
-          } else if (node instanceof _DateTimeNode__WEBPACK_IMPORTED_MODULE_31__/* .DateTimeNode */ .Z || node instanceof _QrcodeNode__WEBPACK_IMPORTED_MODULE_39__/* .QrcodeNode */ .d || node instanceof _ControlNode__WEBPACK_IMPORTED_MODULE_30__/* .ControlNode */ .w && node.readType === 1) {
+          } else if (node instanceof _DateTimeNode__WEBPACK_IMPORTED_MODULE_31__/* .DateTimeNode */ .Z || node instanceof _QrcodeNode__WEBPACK_IMPORTED_MODULE_39__/* .QrcodeNode */ .d) {
             nodeJson = node.node2Json(undefined, isCopy, undefined, clearSign);
           } else {
             nodeJson = node.node2Json(undefined, isCopy);
@@ -63777,7 +63791,7 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
 /*
  * @Author: your name
  * @Date: 2020-11-03 15:17:54
- * @LastEditTime: 2024-04-05 21:38:57
+ * @LastEditTime: 2024-04-06 23:29:29
  * @LastEditors: liyanan 2441631434@qq.com
  * @Description: In User Settings Edit
  * @FilePath: \hoeditor-web\src\editor\dom\treeNode\TextInputFieldNode.ts
@@ -65462,33 +65476,6 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
     value: function node2Json(range, isCopy, type, clearSign) {
       var childArray = new Array();
       if (!range) {
-        // let mark = true;
-        // for (let m = 0; m < this.childNodes.length; m++) {
-        //     const anode = this.childNodes[m];
-        //     if (anode instanceof ControlNode || anode instanceof TextInputFieldNode || anode instanceof SignNode || anode instanceof QrcodeNode) {
-        //         mark = false;
-        //         break;
-        //     }
-        // }
-        // if (clearSign && mark && this.readType === 1) {
-        //     this.text = "";
-        //     this._childNodes.splice(1, this._childNodes.length - 2);
-        //     this._childNodes2.splice(1, this._childNodes2.length - 2);
-        //     const markNode = new MarkNode(
-        //         this.hoEditorFactoryID,
-        //         this.rootNodes,
-        //         this,
-        //         NodeType.ntMark,
-        //         this.labelText,
-        //         this.StartMarkNode.styleIndex,
-        //         MarkNodeType.mtContent
-        //     );
-        //     this._childNodes.splice(1, 0, markNode);
-        //     this._childNodes2.splice(1, 0, markNode);
-        //     for (let n = 0; n < this.childNodes.length; n++) {
-        //         childArray.push(this.childNodes[n].node2Json(undefined, isCopy));
-        //     }
-        // } else {
         for (var i = 0; i < this.childNodes.length; i++) {
           var node = this.childNodes[i];
           if (!(node instanceof _MarkNode__WEBPACK_IMPORTED_MODULE_47__/* .MarkNode */ .j && node.text.substr(0, 1) !== 'C')) {
@@ -65507,7 +65494,7 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
                 if (node.text !== '') {
                   childArray.push(node.node2Json(undefined, isCopy));
                 }
-              } else if (node instanceof _DateTimeNode__WEBPACK_IMPORTED_MODULE_44__/* .DateTimeNode */ .Z || node instanceof _QrcodeNode__WEBPACK_IMPORTED_MODULE_58__/* .QrcodeNode */ .d || node instanceof _ControlNode__WEBPACK_IMPORTED_MODULE_43__/* .ControlNode */ .w && node.readType === 1) {
+              } else if (node instanceof _DateTimeNode__WEBPACK_IMPORTED_MODULE_44__/* .DateTimeNode */ .Z || node instanceof _QrcodeNode__WEBPACK_IMPORTED_MODULE_58__/* .QrcodeNode */ .d) {
                 childArray.push(node.node2Json(undefined, isCopy, undefined, clearSign));
               } else {
                 childArray.push(node.node2Json(undefined, isCopy));
@@ -65517,63 +65504,6 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
             childArray.push(node.node2Json(undefined, isCopy));
           }
         }
-        //}
-        // let mark = true;
-        // for (let m = 0; m < this.childNodes.length; m++) {
-        //     const anode = this.childNodes[m];
-        //     if (anode instanceof ControlNode || anode instanceof TextInputFieldNode || anode instanceof SignNode || anode instanceof QrcodeNode) {
-        //         mark = false;
-        //         break;
-        //     }
-        // }
-        // if (clearSign && mark && this.readType === 1) {
-        //     this.text = "";
-        //     this._childNodes.splice(1, this._childNodes.length - 2);
-        //     this._childNodes2.splice(1, this._childNodes2.length - 2);
-        //     const markNode = new MarkNode(
-        //         this.hoEditorFactoryID,
-        //         this.rootNodes,
-        //         this,
-        //         NodeType.ntMark,
-        //         this.labelText,
-        //         this.StartMarkNode.styleIndex,
-        //         MarkNodeType.mtContent
-        //     );
-        //     this._childNodes.splice(1, 0, markNode);
-        //     this._childNodes2.splice(1, 0, markNode);
-        //     for (let n = 0; n < this.childNodes.length; n++) {
-        //         childArray.push(this.childNodes[n].node2Json(undefined, isCopy));
-        //     }
-        // } else {
-        for (var _i = 0; _i < this.childNodes.length; _i++) {
-          var _node = this.childNodes[_i];
-          if (!(_node instanceof _MarkNode__WEBPACK_IMPORTED_MODULE_47__/* .MarkNode */ .j && _node.text.substr(0, 1) !== 'C')) {
-            if (_node instanceof TextInputFieldNode) {
-              childArray.push(_node.node2Json(undefined, isCopy, type, clearSign));
-            } else if (_node instanceof _SignNode__WEBPACK_IMPORTED_MODULE_54__/* .SignNode */ .N) {
-              if (clearSign) {
-                if (_node.isTemplate) {
-                  childArray.push(_node.node2Json(undefined, isCopy, undefined, clearSign));
-                }
-              } else {
-                childArray.push(_node.node2Json(undefined, isCopy));
-              }
-            } else {
-              if (_node instanceof _TextNode__WEBPACK_IMPORTED_MODULE_57__/* .TextNode */ .R) {
-                if (_node.text !== '') {
-                  childArray.push(_node.node2Json(undefined, isCopy));
-                }
-              } else if (_node instanceof _DateTimeNode__WEBPACK_IMPORTED_MODULE_44__/* .DateTimeNode */ .Z || _node instanceof _QrcodeNode__WEBPACK_IMPORTED_MODULE_58__/* .QrcodeNode */ .d || _node instanceof _ControlNode__WEBPACK_IMPORTED_MODULE_43__/* .ControlNode */ .w && _node.readType === 1) {
-                childArray.push(_node.node2Json(undefined, isCopy, undefined, clearSign));
-              } else {
-                childArray.push(_node.node2Json(undefined, isCopy));
-              }
-            }
-          } else {
-            childArray.push(_node.node2Json(undefined, isCopy));
-          }
-        }
-        //}
         // if (childArray.length > 0) {
         //   if (childArray[0].MarkNode && childArray[0].MarkNode.type === 0) {
         //     if (!childArray[childArray.length - 1].MarkNode) {
@@ -65611,17 +65541,17 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
         if (rec.from == this.range().from) {
           canCopy = true;
         }
-        for (var _i2 = 0; _i2 < this.childNodes.length; _i2++) {
-          var _node2 = this.childNodes[_i2];
+        for (var _i = 0; _i < this.childNodes.length; _i++) {
+          var _node = this.childNodes[_i];
           if (!canCopy) {
-            canCopy = _node2.checkPath(rec.from);
+            canCopy = _node.checkPath(rec.from);
           }
           if (canCopy) {
-            if (!(_node2 instanceof _MarkNode__WEBPACK_IMPORTED_MODULE_47__/* .MarkNode */ .j && _node2.text.substr(0, 1) === 'C')) {
-              childArray.push(_node2.node2Json(rec, isCopy));
+            if (!(_node instanceof _MarkNode__WEBPACK_IMPORTED_MODULE_47__/* .MarkNode */ .j && _node.text.substr(0, 1) === 'C')) {
+              childArray.push(_node.node2Json(rec, isCopy));
             }
           }
-          if (_node2.checkPath(rec.to)) {
+          if (_node.checkPath(rec.to)) {
             break;
           }
         }
@@ -65943,45 +65873,45 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
             }
           } else {
             //单个对象
-            var _node3 = hoEditorFactory.structureConvert.convertNode(item, rootNodes, temp, undefined, undefined, isClearSign);
-            if (_node3) {
-              if (_node3 instanceof _TextNode__WEBPACK_IMPORTED_MODULE_57__/* .TextNode */ .R) {
-                if (_node3.text.length > (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_toConsumableArray_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)(_node3.text).length) {
+            var _node2 = hoEditorFactory.structureConvert.convertNode(item, rootNodes, temp, undefined, undefined, isClearSign);
+            if (_node2) {
+              if (_node2 instanceof _TextNode__WEBPACK_IMPORTED_MODULE_57__/* .TextNode */ .R) {
+                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_59__/* .RareCharNode */ .Q(temp.hoEditorFactoryID, _node3.rootNodes, _node3.parentNode, _BaseNode__WEBPACK_IMPORTED_MODULE_42__/* .NodeType */ .Jq.ntRareChar, _node3.text, _node3.styleIndex);
+                  var _rareCharNode = new _RareCharNode__WEBPACK_IMPORTED_MODULE_59__/* .RareCharNode */ .Q(temp.hoEditorFactoryID, _node2.rootNodes, _node2.parentNode, _BaseNode__WEBPACK_IMPORTED_MODULE_42__/* .NodeType */ .Jq.ntRareChar, _node2.text, _node2.styleIndex);
                   nodes.push(_rareCharNode);
                 } else {
-                  if (_node3.text !== '' && _node3.text !== '‌‌' && _node3.text !== '‌‌‌‌' && _node3.text !== '‌‌‌‌‌' && _node3.text !== '‌‌‌' && _node3.text !== '‌') {
-                    nodes.push(_node3);
+                  if (_node2.text !== '' && _node2.text !== '‌‌' && _node2.text !== '‌‌‌‌' && _node2.text !== '‌‌‌‌‌' && _node2.text !== '‌‌‌' && _node2.text !== '‌') {
+                    nodes.push(_node2);
                   }
-                  if (_node3.errorIndex != undefined) {
-                    hoEditorFactory.structureConvert._errTextNodes.push(_node3);
+                  if (_node2.errorIndex != undefined) {
+                    hoEditorFactory.structureConvert._errTextNodes.push(_node2);
                     isErrorValid = true;
                   }
                 }
               } else {
                 //nodes.push(node);
                 if (isClearSign) {
-                  if (_node3 instanceof _SignNode__WEBPACK_IMPORTED_MODULE_54__/* .SignNode */ .N) {
-                    if (_node3.isTemplate && !(_node3.number == 0 && _node3.type == 0 && _node3.name == '')) {
-                      nodes.push(_node3);
+                  if (_node2 instanceof _SignNode__WEBPACK_IMPORTED_MODULE_54__/* .SignNode */ .N) {
+                    if (_node2.isTemplate && !(_node2.number == 0 && _node2.type == 0 && _node2.name == '')) {
+                      nodes.push(_node2);
                     }
                   } else {
-                    nodes.push(_node3);
+                    nodes.push(_node2);
                   }
                 } else {
-                  if (_node3 instanceof _SignNode__WEBPACK_IMPORTED_MODULE_54__/* .SignNode */ .N) {
-                    if (!(_node3.number == 0 && _node3.type == 0 && _node3.name == '')) {
-                      nodes.push(_node3);
+                  if (_node2 instanceof _SignNode__WEBPACK_IMPORTED_MODULE_54__/* .SignNode */ .N) {
+                    if (!(_node2.number == 0 && _node2.type == 0 && _node2.name == '')) {
+                      nodes.push(_node2);
                     }
                   } else {
-                    nodes.push(_node3);
+                    nodes.push(_node2);
                   }
                 }
               }
             }
-            if (_node3 instanceof _MarkNode__WEBPACK_IMPORTED_MODULE_47__/* .MarkNode */ .j && _node3.MarkNodeType === _MarkNode__WEBPACK_IMPORTED_MODULE_47__/* .MarkNodeType */ .q.mtEnd && _node3.text.substring(0, 1) === 'C') {
-              hoEditorFactory.structureConvert._markNodes.push(_node3);
+            if (_node2 instanceof _MarkNode__WEBPACK_IMPORTED_MODULE_47__/* .MarkNode */ .j && _node2.MarkNodeType === _MarkNode__WEBPACK_IMPORTED_MODULE_47__/* .MarkNodeType */ .q.mtEnd && _node2.text.substring(0, 1) === 'C') {
+              hoEditorFactory.structureConvert._markNodes.push(_node2);
             }
             // if (node instanceof SignNode &&
             //     ((node.imgSrc != "" && ((hoEditorFactory.superiorSigns.length > 0 && hoEditorFactory.superiorSigns.includes((node.customProperty as any).bce01)) || hoEditorFactory.forbidEditBeforeSign))
@@ -66178,14 +66108,14 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
                     }
                   }
                   if (textArr.length > 1) {
-                    for (var _i3 = 1; _i3 < textArr.length; _i3++) {
+                    for (var _i2 = 1; _i2 < textArr.length; _i2++) {
                       var paragraNode = new _ParagraphNode__WEBPACK_IMPORTED_MODULE_50__/* .ParagraphNode */ .C(hoEditorFactoryID, rootNodes, temp, 0);
                       paragraNode.styleIndex = styleIndex;
                       temp.childNodes.splice(temp.childNodes.length - 1, 0, paragraNode);
-                      if (textArr[_i3] !== '') {
-                        if (textArr[_i3].indexOf('<上标>') >= 0 || textArr[_i3].indexOf('<下标>') >= 0) {
+                      if (textArr[_i2] !== '') {
+                        if (textArr[_i2].indexOf('<上标>') >= 0 || textArr[_i2].indexOf('<下标>') >= 0) {
                           result = [];
-                          var resultArr1 = getText(textArr[_i3]);
+                          var resultArr1 = getText(textArr[_i2]);
                           for (var _k = 0; _k < resultArr1.length; _k++) {
                             if (resultArr1[_k].text != '') {
                               var _newStyleIndex = styleIndex;
@@ -66200,7 +66130,7 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
                             }
                           }
                         } else {
-                          var _textNode2 = new _TextNode__WEBPACK_IMPORTED_MODULE_57__/* .TextNode */ .R(hoEditorFactoryID, rootNodes, temp, _BaseNode__WEBPACK_IMPORTED_MODULE_42__/* .NodeType */ .Jq.ntText, textArr[_i3], styleIndex);
+                          var _textNode2 = new _TextNode__WEBPACK_IMPORTED_MODULE_57__/* .TextNode */ .R(hoEditorFactoryID, rootNodes, temp, _BaseNode__WEBPACK_IMPORTED_MODULE_42__/* .NodeType */ .Jq.ntText, textArr[_i2], styleIndex);
                           temp.childNodes.splice(temp.childNodes.length - 1, 0, _textNode2);
                         }
                       }
@@ -66212,9 +66142,9 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
                 }
                 if (expressArr.length > 0) {
                   //每遍历一个表达式 先插入表达式 再将表达式后的文本插进去
-                  for (var _i4 = 0; _i4 < expressArr.length; _i4++) {
-                    var sIndex = expressArr[_i4].sIndex;
-                    var eIndex = expressArr[_i4].eIndex;
+                  for (var _i3 = 0; _i3 < expressArr.length; _i3++) {
+                    var sIndex = expressArr[_i3].sIndex;
+                    var eIndex = expressArr[_i3].eIndex;
                     var expressJson = temp.text.substring(sIndex + 16, eIndex);
                     var expressObj = JSON.parse(expressJson);
                     var expressStyle = _MenstrualHistoryNode__WEBPACK_IMPORTED_MODULE_49__/* .ExpressStyle */ .e[expressObj.expressStyle];
@@ -66240,8 +66170,8 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
                     }
                     temp.childNodes.splice(temp.childNodes.length - 1, 0, medicalExpressNode);
                     var behindText = ''; //表达式后的文本串
-                    if (_i4 < expressArr.length - 1) {
-                      behindText = temp.text.substring(eIndex + 17, expressArr[_i4 + 1].sIndex);
+                    if (_i3 < expressArr.length - 1) {
+                      behindText = temp.text.substring(eIndex + 17, expressArr[_i3 + 1].sIndex);
                     } else {
                       behindText = temp.text.substring(eIndex + 17, temp.text.length);
                     }
@@ -93203,8 +93133,10 @@ var dateFormat = function dateFormat(date, format) {
           var newDates = new Date();
           stringDate = "".concat(newDates.getFullYear(), "/").concat(newDates.getMonth() + 1, "/").concat(newDates.getDate(), " ") + stringDate;
         }
-      } else if (format && format.includes('MM') && !format.includes('yyyy')) {
-        stringDate = new Date().getFullYear() + '/' + stringDate;
+      } else if (format && format.includes('MM') && !format.toLocaleLowerCase().includes('yyyy')) {
+        if (stringDate.split("/")[1] == '29') {
+          stringDate = '2024/' + stringDate;
+        }
       }
       _date = toDate(stringDate);
     }
@@ -93222,7 +93154,7 @@ var dateFormat = function dateFormat(date, format) {
   if (minutes.length === 1) minutes = "0".concat(minutes);
   var seconds = "".concat(_date.getSeconds());
   if (seconds.length === 1) seconds = "0".concat(seconds);
-  return (format || 'yyyy-MM-dd HH:mm:ss').replace(/yyyy/g, year).replace(/MM/g, month).replace(/dd|DD/g, day).replace(/HH|hh/g, hours).replace(/mm/g, minutes).replace(/ss/g, seconds);
+  return (format || 'yyyy-MM-dd HH:mm:ss').replace(/yyyy|YYYY/g, year).replace(/MM/g, month).replace(/dd|DD/g, day).replace(/HH|hh/g, hours).replace(/mm/g, minutes).replace(/ss/g, seconds);
 };
 /**
  * 弹窗拖动
@@ -166784,7 +166716,7 @@ var map = {
 	"./popers/Title.vue": 31276,
 	"./printstyle/PrintLineStyle.vue": 51484,
 	"./qrCode/QrCode.vue": 59805,
-	"./radioCheckBox/RadioCheckbox.vue": 30939,
+	"./radioCheckBox/RadioCheckbox.vue": 17983,
 	"./selectDialog/SelectDialog.vue": 32497,
 	"./sign/Sign.vue": 67218,
 	"./table/TableCellPoper.vue": 97628,
@@ -204107,7 +204039,7 @@ Input.install = function (Vue) {
 
 
 /* harmony default export */ var antd = ([es_button, input, input_number, es_checkbox, date_picker, time_picker, es_radio, es_select, es_tabs, es_dropdown, es_menu, es_upload, tooltip, table, popover, es_icon/* default */.Z, config_provider]);
-;// 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/HoDocs.vue?vue&type=template&id=45b99f15&
+;// 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/HoDocs.vue?vue&type=template&id=40b25c35&
 var render = function render() {
   var _vm = this,
     _c = _vm._self._c;
@@ -204234,8 +204166,8 @@ var es_string_match = __webpack_require__(4723);
 var es_number_constructor = __webpack_require__(9653);
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.json.stringify.js
 var es_json_stringify = __webpack_require__(38862);
-;// 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/HoDoc.vue?vue&type=template&id=28aecebc&
-var HoDocvue_type_template_id_28aecebc_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/HoDoc.vue?vue&type=template&id=6187b845&
+var HoDocvue_type_template_id_6187b845_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -204436,7 +204368,7 @@ var HoDocvue_type_template_id_28aecebc_render = function render() {
     }
   }, [_vm._v("v " + _vm._s(_vm.version))])])])], 1);
 };
-var HoDocvue_type_template_id_28aecebc_staticRenderFns = [];
+var HoDocvue_type_template_id_6187b845_staticRenderFns = [];
 
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.filter.js
 var es_array_filter = __webpack_require__(57327);
@@ -207437,7 +207369,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.102');
+/* harmony default export */ var version = ('3.1.104');
 // EXTERNAL MODULE: ./src/components/controls/poperTipText/PoperTipText.vue + 5 modules
 var PoperTipText = __webpack_require__(50987);
 ;// CONCATENATED MODULE: ./src/components/controls/poperTipText/index.ts
@@ -208039,6 +207971,7 @@ var defaultHeight = Math.floor(1122 * scaleXY) % 2 === 1 ? Math.floor(1122 * sca
       var _this5 = this;
       this.selectMarkStyle.display = 'none';
       var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this.hoEditorProvider.activeDocId);
+      if (this.isCanEdit(hoEditorFactory)) return;
       var paintStatus = hoEditorFactory.drawTree.paintStatus;
       var node = hoEditorFactory.vueController.getNodeByDataID('main', this.selectMarkStyle.dataid);
       setTimeout(function () {
@@ -208067,6 +208000,7 @@ var defaultHeight = Math.floor(1122 * scaleXY) % 2 === 1 ? Math.floor(1122 * sca
       return parentNode;
     },
     createSelectMark: function createSelectMark(node, paintStatus, pageIndex) {
+      if (this.isCanEdit()) return;
       var parentNode = this.getRootNode(node);
       if (parentNode) {
         var _parentNode$downListP;
@@ -208103,6 +208037,7 @@ var defaultHeight = Math.floor(1122 * scaleXY) % 2 === 1 ? Math.floor(1122 * sca
     },
     createDownListProper: function createDownListProper(node, paintStatus, pageIndex) {
       var _this6 = this;
+      if (this.isCanEdit()) return;
       if (paintStatus === 0) {
         this.hoEditorProvider.setControlProperty('select', 'update', '');
         return;
@@ -208133,6 +208068,7 @@ var defaultHeight = Math.floor(1122 * scaleXY) % 2 === 1 ? Math.floor(1122 * sca
     },
     createInputProper: function createInputProper(node, parentNode, paintStatus, pageIndex) {
       var _this7 = this;
+      if (this.isCanEdit()) return;
       if (paintStatus === 0) {
         this.hoEditorProvider.setControlProperty('text', 'update', '');
         this.hoEditorProvider.setUpdateNodeValue(this.getCurrentSelectNode());
@@ -208320,15 +208256,30 @@ var defaultHeight = Math.floor(1122 * scaleXY) % 2 === 1 ? Math.floor(1122 * sca
         this.poperPos = (0,objectSpread2/* default */.Z)({}, pos);
       }
     },
+    isCanEdit: function isCanEdit(hoEditorFactory) {
+      if (!hoEditorFactory) {
+        hoEditorFactory = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this.hoEditorId);
+      }
+      if (hoEditorFactory.drawTree.paintStatus === DrawTree/* PaintState */.Dh.psEdit && (hoEditorFactory.forbidEditBeforeSign || hoEditorFactory.lockContent)) {
+        var endPos = hoEditorFactory.drawTree.selectRange.spEnd;
+        var node = hoEditorFactory.drawTree.getDNodeByPath(endPos.path);
+        var dline = hoEditorFactory.drawTree.getDrawLineByDNode(node);
+        var stagePt = dline.localToGlobal(node.x, node.y);
+        var result = hoEditorFactory.vueController.isCanEdit(endPos.page.pageIndex, stagePt.x, stagePt.y);
+        return !result;
+      }
+      return false;
+    },
     /**
      * 鼠标右键 打开右键菜单 并计算弹出位置
      * 先关闭一次 再延迟打开 触发弹出层动画
      */
     mouseRightClickEvent: function mouseRightClickEvent(e) {
       var _this8 = this;
-      this.$nextTick(function () {
+      setTimeout(function () {
         var _hoEditorFactory$docT;
         var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(_this8.hoEditorId);
+        if (_this8.isCanEdit(hoEditorFactory)) return;
         var rightPosition = {
           clientX: e.clientX || e.pageX,
           clientY: e.clientY || e.pageY
@@ -208381,7 +208332,7 @@ var defaultHeight = Math.floor(1122 * scaleXY) % 2 === 1 ? Math.floor(1122 * sca
         }
         hoEditorFactory.drawTree.selectRange.beginRangeSelect = false;
         _this8.$emit('rightClickEventIn', rightPosition);
-      });
+      }, 0);
     },
     hoCopy: function hoCopy(e) {
       var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this.hoEditorId);
@@ -208434,10 +208385,10 @@ var defaultHeight = Math.floor(1122 * scaleXY) % 2 === 1 ? Math.floor(1122 * sca
 });
 ;// CONCATENATED MODULE: ./src/components/HoDoc.vue?vue&type=script&lang=js&
  /* harmony default export */ var components_HoDocvue_type_script_lang_js_ = (HoDocvue_type_script_lang_js_); 
-;// CONCATENATED MODULE: ./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=28aecebc&prod&lang=less&
+;// CONCATENATED MODULE: ./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=6187b845&prod&lang=less&
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./src/components/HoDoc.vue?vue&type=style&index=0&id=28aecebc&prod&lang=less&
+;// CONCATENATED MODULE: ./src/components/HoDoc.vue?vue&type=style&index=0&id=6187b845&prod&lang=less&
 
 ;// CONCATENATED MODULE: ./src/components/HoDoc.vue
 
@@ -208450,8 +208401,8 @@ var defaultHeight = Math.floor(1122 * scaleXY) % 2 === 1 ? Math.floor(1122 * sca
 
 var HoDoc_component = (0,componentNormalizer/* default */.Z)(
   components_HoDocvue_type_script_lang_js_,
-  HoDocvue_type_template_id_28aecebc_render,
-  HoDocvue_type_template_id_28aecebc_staticRenderFns,
+  HoDocvue_type_template_id_6187b845_render,
+  HoDocvue_type_template_id_6187b845_staticRenderFns,
   false,
   null,
   null,
@@ -217424,12 +217375,13 @@ var VueController = /*#__PURE__*/function () {
       //         }
       //     }
       // }
+      var scaleXY = DrawConfig/* DrawConfig */.f.instance().scale;
       var drawPage = hoEditorFactory.drawTree.drawPages[pageIndex];
       for (var j = 0; j < drawPage.selectContainer.children.length; j++) {
         var child = drawPage.selectContainer.children[j];
         if (child.name && child.name.includes("mask")) {
           var bounds = child.getBounds();
-          if (stageY > bounds.y && stageY < bounds.y + bounds.height) {
+          if (stageY > bounds.y * scaleXY && stageY < bounds.y * scaleXY + bounds.height * scaleXY) {
             return false;
           }
         }
@@ -224855,6 +224807,16 @@ var EditController = /*#__PURE__*/function () {
       //hoEditorFactory.isUseForm = true;
       //hoEditorFactory.allowEditCellInForm = false;
       var curDomRange = hoEditorFactory.docTree.curDomRange.normalize(); //获取当前选中区域
+      var drawPage = hoEditorFactory.drawTree.activePage;
+      if (drawPage) {
+        var dNode = hoEditorFactory.drawTree.getDNodeByPath(curDomRange.endPath);
+        var dline = hoEditorFactory.drawTree.getDrawLineByDNode(dNode);
+        var stagePt = dline.localToGlobal(dNode.x, dNode.y);
+        result = hoEditorFactory.vueController.isCanEdit(drawPage.pageIndex, stagePt.x, stagePt.y);
+        if (!result) {
+          return false;
+        }
+      }
       if (hoEditorFactory.isUseForm) {
         var _enode$parentNode, _enode$parentNode2;
         var snode = curDomRange.npStart.node;
@@ -224937,6 +224899,7 @@ var EditController = /*#__PURE__*/function () {
 
 
 
+
 var ElementController = /*#__PURE__*/function () {
   function ElementController(hoEditorFactoryID) {
     (0,esm_classCallCheck/* default */.Z)(this, ElementController);
@@ -225074,6 +225037,9 @@ var ElementController = /*#__PURE__*/function () {
     key: "updateDateTimeText",
     value: function updateDateTimeText(node, text) {
       if (node.text === text) return;
+      if (text) {
+        text = (0,plugins_util/* dateFormat */.vc)(text, node.controlStyle);
+      }
       var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this._hoEditorFactoryID);
       if (hoEditorFactory.drawTree.paintStatus === DrawTree/* PaintState */.Dh.psReadOnly) {
         return;
@@ -237792,11 +237758,11 @@ var commondata = __webpack_require__(76285);
     'hoEditorProvider.controlType': {
       deep: true,
       handler: function handler(newValue, oldValue) {
-        if (newValue === '' && ['text', 'date', 'comment', 'paragraph'].includes(oldValue)) {
+        if (newValue === '' && ['text', 'date', 'comment', 'paragraph', 'RadioBox', 'CheckBox'].includes(oldValue)) {
           this.$emit('closeTextModal');
           this.hoEditorProvider.customPropertyValue = {};
         }
-        if (['text', 'date'].includes(newValue)) {
+        if (['text', 'date', 'RadioBox', 'CheckBox'].includes(newValue)) {
           if ((0,type/* isObject */.Kn)(this.hoEditorProvider.customPropertyValue)) {
             this.$emit('openTextModal', (0,objectSpread2/* default */.Z)({}, this.hoEditorProvider.customPropertyValue));
           }
@@ -238529,10 +238495,10 @@ var commondata = __webpack_require__(76285);
 });
 ;// CONCATENATED MODULE: ./src/components/HoDocs.vue?vue&type=script&lang=js&
  /* harmony default export */ var components_HoDocsvue_type_script_lang_js_ = (HoDocsvue_type_script_lang_js_); 
-;// CONCATENATED MODULE: ./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/HoDocs.vue?vue&type=style&index=0&id=45b99f15&prod&lang=less&media=print&
+;// CONCATENATED MODULE: ./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/HoDocs.vue?vue&type=style&index=0&id=40b25c35&prod&lang=less&media=print&
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./src/components/HoDocs.vue?vue&type=style&index=0&id=45b99f15&prod&lang=less&media=print&
+;// CONCATENATED MODULE: ./src/components/HoDocs.vue?vue&type=style&index=0&id=40b25c35&prod&lang=less&media=print&
 
 ;// CONCATENATED MODULE: ./src/components/HoDocs.vue
 
@@ -245428,18 +245394,15 @@ var HoRightMenu_component = (0,componentNormalizer/* default */.Z)(
       }
       if (node instanceof TextInputFieldNode/* TextInputFieldNode */.re) {
         this.rightType = 'text';
-        // this.dataSource = node.bandDataSource;
         if ((0,type/* isObject */.Kn)(node.customProperty)) this.customPropertyValue = (0,objectSpread2/* default */.Z)({}, node.customProperty);
       } else if (node instanceof MarkNode/* MarkNode */.j && node.parentNode instanceof TextInputFieldNode/* TextInputFieldNode */.re) {
         var parentNode = node.parentNode;
         this.rightType = 'text';
-        // this.dataSource = parentNode.bandDataSource;
         if ((0,type/* isObject */.Kn)(parentNode.customProperty)) this.customPropertyValue = (0,objectSpread2/* default */.Z)({}, parentNode.customProperty);
       } else if (node instanceof TextNode/* TextNode */.R) {
         var _parentNode = node.parentNode;
         if (_parentNode instanceof TextInputFieldNode/* TextInputFieldNode */.re) {
           this.rightType = 'text';
-          // this.dataSource = parentNode.bandDataSource;
           if ((0,type/* isObject */.Kn)(_parentNode.customProperty)) this.customPropertyValue = (0,objectSpread2/* default */.Z)({}, _parentNode.customProperty);
         } else if (_parentNode instanceof CellNode/* CellNode */.D) {
           this.rightTypeIsTable = true;
@@ -245454,23 +245417,13 @@ var HoRightMenu_component = (0,componentNormalizer/* default */.Z)(
         if ((0,type/* isObject */.Kn)(node.customProperty)) this.customPropertyValue = (0,objectSpread2/* default */.Z)({}, node.customProperty);
       } else if (node instanceof DownListNode/* DownListNode */.yF) {
         this.rightType = 'select';
-        // if (isObject(node.customProperty)) this.customPropertyValue = { ...node.customProperty };
       } else if (node instanceof BarcodeNode/* BarcodeNode */.T) {
         this.rightType = 'barcode';
       } else if (node instanceof QrcodeNode/* QrcodeNode */.d) {
         this.rightType = 'qrcode';
-        // this.dataSource = {
-        //     dataSourceEnabled: node.dataSourceEnabled,
-        //     dataSource: node.dataSource,
-        //     format: node.format,
-        //     visitPath: node.visitPath,
-        //     isReadOnly: node.isReadOnly,
-        //     autoUpdate: node.autoUpdate,
-        //     executeStatus: Number(node.execState),
-        // };
       } else if (node instanceof RadioAndCheckBoxNode/* RadioAndCheckBoxNode */.Yh) {
         this.rightType = node.controlStyle;
-        // this.dataSource = node.bandDataSource;
+        if ((0,type/* isObject */.Kn)(node.customProperty)) this.customPropertyValue = (0,objectSpread2/* default */.Z)({}, node.customProperty);
       } else if (node instanceof ImageNode/* ImageNode */.H) {
         if (!node.isBackFill) {
           this.rightType = 'edit-image';
@@ -245815,7 +245768,7 @@ var rarewords = __webpack_require__(43903);
 
 
 
-var CLICK = 'click';
+var CLICK = 'mousedown';
 var captureInstances = Object.create(null);
 var nonCaptureInstances = Object.create(null);
 var captureEventHandlers = Object.create(null);