hoeditor-web 2.0.63 → 2.0.66

package/lib/hoeditor.common.js

@@ -11668,6 +11668,8 @@ var Print = /*#__PURE__*/function () {
 
                 PDF === null || PDF === void 0 ? void 0 : PDF.addPage();
                 ctx = PDF === null || PDF === void 0 ? void 0 : PDF.context2d;
+                ctx.posX = svg2pdfOptions.x;
+                ctx.posY = svg2pdfOptions.y;
                 window.printBlack = hoEditorFactory.printBlack;
 
                 if (hoEditorFactory.isFixedPrintToA4 == '2' && format) {
@@ -11676,11 +11678,11 @@ var Print = /*#__PURE__*/function () {
                     ctx.translate(0, 1122 / 2); // 由于旋转是默认以左上角为中心 所以需要先移动位置 改变起始点
 
                     ctx.rotate(270 * Math.PI / 180); // 旋转 context2d
+                    // ctx.posX = 0;
+                    // ctx.posY = 1122 / 2;
                   }
                 }
 
-                ctx.posX = svg2pdfOptions.x;
-                ctx.posY = svg2pdfOptions.y;
                 ctx && ((_cpage$drawDomLevel = cpage.drawDomLevel) === null || _cpage$drawDomLevel === void 0 ? void 0 : (_cpage$drawDomLevel$s = _cpage$drawDomLevel.stage) === null || _cpage$drawDomLevel$s === void 0 ? void 0 : _cpage$drawDomLevel$s.draw(ctx));
                 ctx = null;
                 _context3.next = 57;
@@ -22241,7 +22243,7 @@ var CellProperty = /*#__PURE__*/function () {
 /*
  * @Author: your name
  * @Date: 2021-01-20 10:18:55
- * @LastEditTime: 2022-05-20 18:56:55
+ * @LastEditTime: 2022-07-08 13:55:38
  * @LastEditors: liyanan 2441631434@qq.com
  * @Description: In User Settings Edit
  * @FilePath: \hoeditor-web\src\editor\dom\domNode\Comment.ts
@@ -27271,7 +27273,7 @@ var DateTimeNode = /*#__PURE__*/function (_ControlNode) {
 /* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_inherits_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(99640);
 /* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createSuper_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(28214);
 /* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_classCallCheck_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(35671);
-/* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_19__ = __webpack_require__(22342);
+/* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_22__ = __webpack_require__(22342);
 /* harmony import */ var core_js_modules_es_function_name_js__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(68309);
 /* harmony import */ var core_js_modules_es_function_name_js__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_function_name_js__WEBPACK_IMPORTED_MODULE_4__);
 /* harmony import */ var core_js_modules_es_object_to_string_js__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(41539);
@@ -27284,16 +27286,25 @@ var DateTimeNode = /*#__PURE__*/function (_ControlNode) {
 /* harmony import */ var core_js_modules_es_number_constructor_js__WEBPACK_IMPORTED_MODULE_8___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_number_constructor_js__WEBPACK_IMPORTED_MODULE_8__);
 /* harmony import */ var core_js_modules_es_array_splice_js__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(40561);
 /* harmony import */ var core_js_modules_es_array_splice_js__WEBPACK_IMPORTED_MODULE_9___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_splice_js__WEBPACK_IMPORTED_MODULE_9__);
-/* harmony import */ var core_js_modules_es_json_stringify_js__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(38862);
-/* harmony import */ var core_js_modules_es_json_stringify_js__WEBPACK_IMPORTED_MODULE_10___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_json_stringify_js__WEBPACK_IMPORTED_MODULE_10__);
-/* harmony import */ var _editor_draw_drawNode_DrawDownListNode__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(63756);
-/* harmony import */ var _editor_draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(98199);
-/* harmony import */ var _editor_draw_SelectRange__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(1470);
-/* harmony import */ var _editor_events_NodeChangeEvent__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(34534);
-/* harmony import */ var _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(41005);
-/* harmony import */ var _DocTree__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(23375);
-/* harmony import */ var _BaseNode__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(50369);
-/* harmony import */ var _ControlNode__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(8395);
+/* harmony import */ var core_js_modules_es_string_ends_with_js__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(27852);
+/* harmony import */ var core_js_modules_es_string_ends_with_js__WEBPACK_IMPORTED_MODULE_10___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_string_ends_with_js__WEBPACK_IMPORTED_MODULE_10__);
+/* harmony import */ var core_js_modules_es_regexp_exec_js__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(74916);
+/* harmony import */ var core_js_modules_es_regexp_exec_js__WEBPACK_IMPORTED_MODULE_11___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_regexp_exec_js__WEBPACK_IMPORTED_MODULE_11__);
+/* harmony import */ var core_js_modules_es_string_split_js__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(23123);
+/* harmony import */ var core_js_modules_es_string_split_js__WEBPACK_IMPORTED_MODULE_12___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_string_split_js__WEBPACK_IMPORTED_MODULE_12__);
+/* harmony import */ var core_js_modules_es_json_stringify_js__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(38862);
+/* harmony import */ var core_js_modules_es_json_stringify_js__WEBPACK_IMPORTED_MODULE_13___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_json_stringify_js__WEBPACK_IMPORTED_MODULE_13__);
+/* harmony import */ var _editor_draw_drawNode_DrawDownListNode__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(63756);
+/* harmony import */ var _editor_draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(98199);
+/* harmony import */ var _editor_draw_SelectRange__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(1470);
+/* harmony import */ var _editor_events_NodeChangeEvent__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(34534);
+/* harmony import */ var _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(41005);
+/* harmony import */ var _DocTree__WEBPACK_IMPORTED_MODULE_19__ = __webpack_require__(23375);
+/* harmony import */ var _BaseNode__WEBPACK_IMPORTED_MODULE_20__ = __webpack_require__(50369);
+/* harmony import */ var _ControlNode__WEBPACK_IMPORTED_MODULE_21__ = __webpack_require__(8395);
+
+
+
 
 
 
@@ -27342,7 +27353,7 @@ var BandDataSource = /*#__PURE__*/function () {
     this.execState = ""; //执行状态
   }
 
-  (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_19__/* ["default"] */ .Z)(BandDataSource, [{
+  (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_22__/* ["default"] */ .Z)(BandDataSource, [{
     key: "DataSourceEnabled",
     get: function get() {
       return this.dataSourceEnabled;
@@ -27431,7 +27442,7 @@ var DownListNodeInstance = /*#__PURE__*/function () {
     this.allowMultiSelect = false;
   }
 
-  (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_19__/* ["default"] */ .Z)(DownListNodeInstance, [{
+  (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_22__/* ["default"] */ .Z)(DownListNodeInstance, [{
     key: "Id",
     get: function get() {
       return this.id;
@@ -27567,7 +27578,7 @@ var DownListNode = /*#__PURE__*/function (_ControlNode) {
     //   this._id = valuesObj["id"];
     // }
 
-    _this._type = _ControlNode__WEBPACK_IMPORTED_MODULE_18__/* .ControlType.ctDownList */ .C.ctDownList; // if (valuesObj["name"] !== undefined) {
+    _this._type = _ControlNode__WEBPACK_IMPORTED_MODULE_21__/* .ControlType.ctDownList */ .C.ctDownList; // if (valuesObj["name"] !== undefined) {
     //   this._name = valuesObj["name"];
     // }
     // if (valuesObj["title"] !== undefined) {
@@ -27640,7 +27651,7 @@ var DownListNode = /*#__PURE__*/function (_ControlNode) {
     _this.setValuesObject(valuesObject);
 
     if (!_this.dataId) {
-      _this.dataId = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_15__/* .HOEditorFactorys.instance */ .b.instance().getFactory(hoEditorFactoryID).gernerateCode.generateID("DownList");
+      _this.dataId = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_18__/* .HOEditorFactorys.instance */ .b.instance().getFactory(hoEditorFactoryID).gernerateCode.generateID("DownList");
     }
 
     if (_this._text === "") {
@@ -27661,7 +27672,7 @@ var DownListNode = /*#__PURE__*/function (_ControlNode) {
     return _this;
   }
 
-  (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_19__/* ["default"] */ .Z)(DownListNode, [{
+  (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_22__/* ["default"] */ .Z)(DownListNode, [{
     key: "setValuesObject",
     value: function setValuesObject(valuesObject) {
       var valuesObj = eval("(" + valuesObject + ")");
@@ -27798,12 +27809,12 @@ var DownListNode = /*#__PURE__*/function (_ControlNode) {
   }, {
     key: "setDownListText",
     value: function setDownListText(text) {
-      var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_15__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
+      var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_18__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
       var sPath = hoEditorFactory.docTree.getNodeLastPath(this.previousLeaf());
       var ePath = hoEditorFactory.docTree.getNodeLastPath(this);
-      var changeEvent = new _editor_events_NodeChangeEvent__WEBPACK_IMPORTED_MODULE_14__/* .NodeChangeEvent */ .G(this.hoEditorFactoryID, _DocTree__WEBPACK_IMPORTED_MODULE_16__/* .DocAction.daModifyStyle */ .gk.daModifyStyle, sPath, ePath);
+      var changeEvent = new _editor_events_NodeChangeEvent__WEBPACK_IMPORTED_MODULE_17__/* .NodeChangeEvent */ .G(this.hoEditorFactoryID, _DocTree__WEBPACK_IMPORTED_MODULE_19__/* .DocAction.daModifyStyle */ .gk.daModifyStyle, sPath, ePath);
       changeEvent.oldEndPath = ePath;
-      changeEvent.oldDrawLines = new _editor_draw_SelectRange__WEBPACK_IMPORTED_MODULE_13__/* .SelectRange */ .E(this.hoEditorFactoryID).getRangeDrawLines(sPath, ePath, true);
+      changeEvent.oldDrawLines = new _editor_draw_SelectRange__WEBPACK_IMPORTED_MODULE_16__/* .SelectRange */ .E(this.hoEditorFactoryID).getRangeDrawLines(sPath, ePath, true);
       this._text = text;
 
       if (this._text === "") {
@@ -27825,7 +27836,7 @@ var DownListNode = /*#__PURE__*/function (_ControlNode) {
     value: function node2DrawNodeRange(startIndex, endIndex) {
       // const cbStyle = HOEditorFactorys.instance().getFactory(this._hoEditorFactoryID).docTree.styles[this._styleIndex === -1 ? 0 : this._styleIndex]
       //   .combineStyle;
-      var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_15__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
+      var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_18__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
       var textStyle = hoEditorFactory.docTree.styles[this._styleIndex];
       var cbStyle;
 
@@ -27842,7 +27853,7 @@ var DownListNode = /*#__PURE__*/function (_ControlNode) {
       }
 
       var dHeight = cbStyle.getFontHeightByFontSize(cbStyle.size);
-      var dNode = new _editor_draw_drawNode_DrawDownListNode__WEBPACK_IMPORTED_MODULE_11__/* .DrawDownListNode */ .I(this._hoEditorFactoryID, this._rootPath, this, dHeight, cbStyle);
+      var dNode = new _editor_draw_drawNode_DrawDownListNode__WEBPACK_IMPORTED_MODULE_14__/* .DrawDownListNode */ .I(this._hoEditorFactoryID, this._rootPath, this, dHeight, cbStyle);
 
       this._drawNodes.push(dNode);
     }
@@ -27870,10 +27881,10 @@ var DownListNode = /*#__PURE__*/function (_ControlNode) {
         return dline;
       }
 
-      var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_15__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
+      var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_18__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
       var isDisPlay = true;
 
-      if (hoEditorFactory.drawTree.paintStatus === _editor_draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_12__/* .PaintState.psPreview */ .Dh.psPreview || hoEditorFactory.drawTree.paintStatus === _editor_draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_12__/* .PaintState.psPrint */ .Dh.psPrint) {
+      if (hoEditorFactory.drawTree.paintStatus === _editor_draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_15__/* .PaintState.psPreview */ .Dh.psPreview || hoEditorFactory.drawTree.paintStatus === _editor_draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_15__/* .PaintState.psPrint */ .Dh.psPrint) {
         isDisPlay = false;
       }
 
@@ -27891,7 +27902,50 @@ var DownListNode = /*#__PURE__*/function (_ControlNode) {
         var color = hoEditorFactory.option.getColorByLevel(120);
 
         if (this.keyValue !== "") {
-          color = hoEditorFactory.option.getColorByLevel(12);
+          if (hoEditorFactory.isSameColorWithEmptyVlaue) {
+            var isDefault = false;
+
+            if (this._allowMultiSelect) {
+              var defaultValues = "";
+
+              for (var _i = 0; _i < this.downListContent.length; _i++) {
+                var item1 = this.downListContent[_i];
+
+                if (item1.default) {
+                  defaultValues += item1.id + ",";
+                }
+              }
+
+              if (defaultValues.endsWith(',')) {
+                defaultValues = defaultValues.substring(0, defaultValues.length - 1);
+              }
+
+              var keyValue = this.keyValue;
+
+              if (keyValue.endsWith(',')) {
+                keyValue = keyValue.substring(0, keyValue.length - 1);
+              }
+
+              if (defaultValues === keyValue) {
+                isDefault = true;
+              }
+            } else {
+              for (var j = 0; j < this.downListContent.length; j++) {
+                var item2 = this.downListContent[j];
+
+                if (item2.id === this.keyValue.split(',')[0] && item2.default) {
+                  isDefault = true;
+                  break;
+                }
+              }
+            }
+
+            if (!isDefault) {
+              color = hoEditorFactory.option.getColorByLevel(12);
+            }
+          } else {
+            color = hoEditorFactory.option.getColorByLevel(12);
+          }
         }
 
         var backColor = new createjs.Shape();
@@ -27903,9 +27957,9 @@ var DownListNode = /*#__PURE__*/function (_ControlNode) {
         if (this.keyValue === "") {
           drawNode.alpha = 0;
         } else {
-          for (var _i = drawNode.children.length - 1; _i >= 0; _i--) {
-            if (drawNode.children[_i].name === "backColor") {
-              drawNode.children.splice(_i, 1);
+          for (var _i2 = drawNode.children.length - 1; _i2 >= 0; _i2--) {
+            if (drawNode.children[_i2].name === "backColor") {
+              drawNode.children.splice(_i2, 1);
             }
           }
         }
@@ -27923,9 +27977,9 @@ var DownListNode = /*#__PURE__*/function (_ControlNode) {
       var downLists = {
         item: this.downListContent
       };
-      var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_15__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
+      var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_18__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
       var retObj = {
-        nodeType: _BaseNode__WEBPACK_IMPORTED_MODULE_17__/* .NodeType */ .Jq[_BaseNode__WEBPACK_IMPORTED_MODULE_17__/* .NodeType.ntControl */ .Jq.ntControl],
+        nodeType: _BaseNode__WEBPACK_IMPORTED_MODULE_20__/* .NodeType */ .Jq[_BaseNode__WEBPACK_IMPORTED_MODULE_20__/* .NodeType.ntControl */ .Jq.ntControl],
         type: "ctDownList",
         //id: type === "copy" ? hoEditorFactory.gernerateCode.generateID("DL") : this.id,
         id: this.id,
@@ -27936,7 +27990,7 @@ var DownListNode = /*#__PURE__*/function (_ControlNode) {
         identifierFormat: this.identifierFormat,
         isSynchro: this.isSynchro,
         name: this.name,
-        text: this.text,
+        text: this.keyValue == "" ? "" : this.text,
         keyValue: this.keyValue,
         title: this.title,
         styleIndex: this.styleIndex,
@@ -27973,7 +28027,7 @@ var DownListNode = /*#__PURE__*/function (_ControlNode) {
       this.transType(json);
 
       if (isPaste) {
-        var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_15__/* .HOEditorFactorys.instance */ .b.instance().getFactory(hoEditorFactoryID);
+        var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_18__/* .HOEditorFactorys.instance */ .b.instance().getFactory(hoEditorFactoryID);
 
         if (hoEditorFactory.vueController.getNodeByDataID("all", json.dataId)) {
           //json.id = hoEditorFactory.gernerateCode.generateID("DL");
@@ -27985,7 +28039,7 @@ var DownListNode = /*#__PURE__*/function (_ControlNode) {
       json.isReadOnly = !json.isReadOnly ? false : json.isReadOnly;
       json.mutexSelect = !json.mutexSelect ? false : json.mutexSelect;
       json.allowMultiSelect = !json.allowMultiSelect ? false : json.allowMultiSelect;
-      json.type = parseInt(_ControlNode__WEBPACK_IMPORTED_MODULE_18__/* .ControlType */ .C[json.type]);
+      json.type = parseInt(_ControlNode__WEBPACK_IMPORTED_MODULE_21__/* .ControlType */ .C[json.type]);
       json.isSynchro = !json.isSynchro ? false : json.isSynchro;
       json.readType = json.readType ? Number(json.readType) : -1;
       var downListContent = [];
@@ -27994,12 +28048,12 @@ var DownListNode = /*#__PURE__*/function (_ControlNode) {
         downListContent.push(json.downLists.item[i]);
       }
 
-      return new DownListNode(hoEditorFactoryID, rootNodes, pNode ? pNode : null, _BaseNode__WEBPACK_IMPORTED_MODULE_17__/* .NodeType.ntControl */ .Jq.ntControl, JSON.stringify(json), downListContent, Number(json.styleIndex));
+      return new DownListNode(hoEditorFactoryID, rootNodes, pNode ? pNode : null, _BaseNode__WEBPACK_IMPORTED_MODULE_20__/* .NodeType.ntControl */ .Jq.ntControl, JSON.stringify(json), downListContent, Number(json.styleIndex));
     }
   }]);
 
   return DownListNode;
-}(_ControlNode__WEBPACK_IMPORTED_MODULE_18__/* .ControlNode */ .w);
+}(_ControlNode__WEBPACK_IMPORTED_MODULE_21__/* .ControlNode */ .w);
 
 /***/ }),
 
@@ -44495,15 +44549,24 @@ var DrawArea = /*#__PURE__*/function (_DrawRect) {
     }
   }, {
     key: "removeComment",
-    value: function removeComment(comment) {
-      for (var i = this.children.length - 1; i >= 0; i--) {
-        var child = this.children[i];
+    value: function removeComment(comment, isRecord) {
+      if (isRecord) {
+        for (var i = this.children.length - 1; i >= 0; i--) {
+          var child = this.children[i];
 
-        if (child.name === comment.id) {
-          this.children.splice(i, 1);
+          if (child.name && child.name === "record" + comment.id) {
+            this.children.splice(i, 1);
+          }
         }
-      } //this.stage.update();
+      } else {
+        for (var _i = this.children.length - 1; _i >= 0; _i--) {
+          var _child = this.children[_i];
 
+          if (_child.name && _child.name === comment.id) {
+            this.children.splice(_i, 1);
+          }
+        }
+      }
 
       _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_17__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID).drawPageTree.updateDrawPage(this.index);
     }
@@ -44615,12 +44678,12 @@ var DrawArea = /*#__PURE__*/function (_DrawRect) {
         var minValue = getStagePos(bottomComments[0])[1];
         var _tempComment = bottomComments[0];
 
-        for (var _i = 1; _i < bottomComments.length; _i++) {
-          var _stageY2 = getStagePos(bottomComments[_i])[1];
+        for (var _i2 = 1; _i2 < bottomComments.length; _i2++) {
+          var _stageY2 = getStagePos(bottomComments[_i2])[1];
 
           if (_stageY2 < minValue) {
             minValue = _stageY2;
-            _tempComment = bottomComments[_i];
+            _tempComment = bottomComments[_i2];
           }
         }
 
@@ -44765,13 +44828,14 @@ var DrawArea = /*#__PURE__*/function (_DrawRect) {
     value: function repaintRecored(comments, comment, nPath, spX, spY) {
       var _this5 = this;
 
+      var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_17__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
       var topComments = new Array();
       var bottomComments = new Array();
       var tempArr = new Array();
 
       var getStagePos = function getStagePos(comment) {
         var endDrawNode = comment.eNode.drawNodes[0];
-        var dline = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_17__/* .HOEditorFactorys.instance */ .b.instance().getFactory(_this5._hoEditorFactoryID).drawTree.getDrawLineByDNode(endDrawNode); // 末尾标记节点所在行
+        var dline = hoEditorFactory.drawTree.getDrawLineByDNode(endDrawNode); // 末尾标记节点所在行
 
         var stagePos = dline.localToGlobal(endDrawNode.x, endDrawNode.y); // 末尾标记节点的stage坐标
 
@@ -44784,7 +44848,11 @@ var DrawArea = /*#__PURE__*/function (_DrawRect) {
       var commentY = spY;
       comments.forEach(function (value) {
         if (value.id !== comment.id) {
-          tempArr.push(value);
+          var area = hoEditorFactory.drawPageTree.getMainRootArea(value.eNode.drawNodes[0]);
+
+          if (area && area.index == _this5.index) {
+            tempArr.push(value);
+          }
         }
       });
       tempArr.forEach(function (value) {
@@ -44843,7 +44911,7 @@ var DrawArea = /*#__PURE__*/function (_DrawRect) {
             commentY = nodeY;
           }
 
-          _this5.removeComment(commentObj);
+          _this5.removeComment(commentObj, true);
 
           _this5.drawEditRecords(commentObj, nodeX, nodeY, commentY);
 
@@ -44867,12 +44935,12 @@ var DrawArea = /*#__PURE__*/function (_DrawRect) {
         var minValue = getStagePos(bottomComments[0])[1];
         var _tempComment3 = bottomComments[0];
 
-        for (var _i2 = 1; _i2 < bottomComments.length; _i2++) {
-          var _stageY4 = getStagePos(bottomComments[_i2])[1];
+        for (var _i3 = 1; _i3 < bottomComments.length; _i3++) {
+          var _stageY4 = getStagePos(bottomComments[_i3])[1];
 
           if (_stageY4 < minValue) {
             minValue = _stageY4;
-            _tempComment3 = bottomComments[_i2];
+            _tempComment3 = bottomComments[_i3];
           }
         }
 
@@ -52942,6 +53010,8 @@ var createSuper = __webpack_require__(28214);
 var es_regexp_exec = __webpack_require__(74916);
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.string.split.js
 var es_string_split = __webpack_require__(23123);
+// EXTERNAL MODULE: ./node_modules/core-js/modules/es.string.ends-with.js
+var es_string_ends_with = __webpack_require__(27852);
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.string.italics.js
 var es_string_italics = __webpack_require__(58734);
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.string.bold.js
@@ -53391,6 +53461,7 @@ var GestationNode = __webpack_require__(74873);
 
 
 
+
  // import {DrawNode} from "./DrawSimpleNode"
 
 
@@ -53612,17 +53683,68 @@ var DrawTextNode = /*#__PURE__*/function (_DrawCombineNode) {
 
       if (hoEditorFactory.drawTree.paintStatus !== DrawTree/* PaintState.psPreview */.Dh.psPreview && hoEditorFactory.drawTree.paintStatus !== DrawTree/* PaintState.psPrint */.Dh.psPrint) {
         if (this.node.parentNode instanceof TextInputFieldNode/* TextInputFieldNode */.re) {
-          if (this.node.parentNode.inputFieldType === 0) {
+          var parentNode = this.node.parentNode;
+
+          if (parentNode.inputFieldType === 0) {
             if (backColor === hoEditorFactory.pageProperty.backColor) {
               backColor = hoEditorFactory.option.getColorByLevel(10);
             }
           } else {
-            if (this.node.parentNode.keyValue == "") {
+            if (parentNode.keyValue == "") {
               backColor = hoEditorFactory.option.getColorByLevel(120);
             } else {
-              backColor = hoEditorFactory.option.getColorByLevel(12);
+              var downListProperty = parentNode.downListProperty;
+
+              if (hoEditorFactory.isSameColorWithEmptyVlaue && downListProperty.listItems) {
+                var isDefault = false;
+                var listItems = JSON.parse(downListProperty.listItems);
+
+                if (downListProperty.allowMultiSelected) {
+                  var defaultValues = "";
+
+                  for (var i = 0; i < listItems.length; i++) {
+                    var item1 = listItems[i];
+
+                    if (item1.default) {
+                      defaultValues += item1.id + ",";
+                    }
+                  }
+
+                  if (defaultValues.endsWith(',')) {
+                    defaultValues = defaultValues.substring(0, defaultValues.length - 1);
+                  }
+
+                  var keyValue = parentNode.keyValue;
+
+                  if (keyValue.endsWith(',')) {
+                    keyValue = keyValue.substring(0, keyValue.length - 1);
+                  }
+
+                  if (defaultValues === keyValue) {
+                    isDefault = true;
+                  }
+                } else {
+                  for (var j = 0; j < listItems.length; j++) {
+                    var item2 = listItems[j];
+
+                    if (item2.id === parentNode.keyValue.split(',')[0] && item2.default) {
+                      isDefault = true;
+                      break;
+                    }
+                  }
+                }
+
+                if (isDefault) {
+                  backColor = hoEditorFactory.option.getColorByLevel(120);
+                } else {
+                  backColor = hoEditorFactory.option.getColorByLevel(12);
+                }
+              } else {
+                backColor = hoEditorFactory.option.getColorByLevel(12);
+              }
             }
-          }
+          } //hoEditorFactory.isEnabledGlobalColor = true;
+
 
           if (hoEditorFactory.isEnabledGlobalColor) {
             if (!(this.node instanceof MarkNode/* MarkNode */.j) && this.node.parentNode.inputFieldType === 0) {
@@ -63122,7 +63244,7 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
                 //if(nodes.length == 0) return;
 
                 if (!(hoEditorFactory.drawTree.paintStatus !== _draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_17__/* .PaintState.psDesign */ .Dh.psDesign && !this._isForceDelete)) {
-                  _context.next = 33;
+                  _context.next = 34;
                   break;
                 }
 
@@ -63130,7 +63252,7 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
 
               case 13:
                 if (!(n < nodes.length)) {
-                  _context.next = 33;
+                  _context.next = 34;
                   break;
                 }
 
@@ -63146,13 +63268,17 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
                 return _context.abrupt("return", 0);
 
               case 18:
+                if (nodes.length === 1 && nodes[0] instanceof _dom_treeNode_TextInputFieldNode__WEBPACK_IMPORTED_MODULE_22__/* .TextInputFieldNode */ .re && nodes[0].childNodes[1] instanceof _dom_treeNode_MarkNode__WEBPACK_IMPORTED_MODULE_23__/* .MarkNode */ .j) {
+                  hoEditorFactory.docTree.curDomRange.setSamePath(this._endPath);
+                }
+
                 if (!(node instanceof _dom_treeNode_ControlNode__WEBPACK_IMPORTED_MODULE_30__/* .ControlNode */ .w || node instanceof _dom_treeNode_TextInputFieldNode__WEBPACK_IMPORTED_MODULE_22__/* .TextInputFieldNode */ .re)) {
-                  _context.next = 27;
+                  _context.next = 28;
                   break;
                 }
 
                 if (node.isAllowDelete) {
-                  _context.next = 27;
+                  _context.next = 28;
                   break;
                 }
 
@@ -63178,9 +63304,9 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
 
                 return _context.abrupt("return", 0);
 
-              case 27:
+              case 28:
                 if (!(node instanceof _dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_35__/* .SignNode */ .N && node.isTemplate && node.number === 0)) {
-                  _context.next = 30;
+                  _context.next = 31;
                   break;
                 }
 
@@ -63188,16 +63314,16 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
 
                 return _context.abrupt("return", 0);
 
-              case 30:
+              case 31:
                 n++;
                 _context.next = 13;
                 break;
 
-              case 33:
+              case 34:
                 pnode = (_currRange$npEnd$node = currRange.npEnd.node) === null || _currRange$npEnd$node === void 0 ? void 0 : _currRange$npEnd$node.parentNode;
 
                 if (!(pnode && pnode instanceof _dom_treeNode_TextInputFieldNode__WEBPACK_IMPORTED_MODULE_22__/* .TextInputFieldNode */ .re && currRange.npEnd.path != hoEditorFactory.docTree.getNodeLastPath(pnode))) {
-                  _context.next = 39;
+                  _context.next = 40;
                   break;
                 }
 
@@ -63210,24 +63336,24 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
                 });
 
                 if (_res[0]) {
-                  _context.next = 39;
+                  _context.next = 40;
                   break;
                 }
 
                 return _context.abrupt("return");
 
-              case 39:
+              case 40:
                 changeEvent = new _events_NodeChangeEvent__WEBPACK_IMPORTED_MODULE_16__/* .NodeChangeEvent */ .G(this._hoEditorFactoryID, _editor_dom_DocTree__WEBPACK_IMPORTED_MODULE_14__/* .DocAction.daUndoInsert */ .gk.daUndoInsert, currRange.startPath, ""); //FIXME:deleteRange函数完成后调用这个
                 // hoEditorFactory.docTree.deleteRange(arange.startPath, arange.endPath);
 
                 if (currRange.npStart.node && currRange.npEnd.node) {
-                  _context.next = 42;
+                  _context.next = 43;
                   break;
                 }
 
                 throw _events_Exception__WEBPACK_IMPORTED_MODULE_24__/* .Exception.NodeNotFound */ .P.NodeNotFound();
 
-              case 42:
+              case 43:
                 // const [startPath, endPath] = DomRange.skipStartEndTablePath(
                 //   this._hoEditorFactory,
                 //   currRange.startPath,
@@ -63240,33 +63366,33 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
                 res = this.deleteRange(currRange.endPath, currRange.startPath);
 
                 if (!(res == 1)) {
-                  _context.next = 54;
+                  _context.next = 55;
                   break;
                 }
 
                 changeEvent.beforeChangePath = startPath;
                 changeEvent.afterChangePath = this._tmp.start;
-                _context.next = 52;
+                _context.next = 53;
                 return hoEditorFactory.docTree.change(changeEvent);
 
-              case 52:
+              case 53:
                 cgEvent = new _events_SelectionChangeEvent__WEBPACK_IMPORTED_MODULE_20__/* .SelectionChangeEvent */ .r(hoEditorFactory.docTree.curDomRange, new _dom_DomRange__WEBPACK_IMPORTED_MODULE_18__/* .DomRange */ .a(this._hoEditorFactoryID, this._tmp.start, this._tmp.start));
                 hoEditorFactory.docTree.selectChange(cgEvent);
 
-              case 54:
+              case 55:
                 hoEditorFactory.docTree.curDomRange.setSamePath(this._tmp.start);
                 hoEditorFactory.drawTree.moveCaretToPath(this._tmp.start);
                 aNode = currRange.npStart.node;
 
                 if (!(aNode && pnode)) {
-                  _context.next = 60;
+                  _context.next = 61;
                   break;
                 }
 
-                _context.next = 60;
+                _context.next = 61;
                 return this.ParentRepaint(pnode);
 
-              case 60:
+              case 61:
               case "end":
                 return _context.stop();
             }
@@ -99547,7 +99673,8 @@ if(element.nodeName==="IMG"&&element.hasAttribute("src")){var src=""+element.get
 if(src.indexOf("data:image/")===0){return atob(unescape(src).split("base64,").pop());}//it is probably an url, try to load it
 var tmpImageData=jsPDFAPI.loadFile(src,true);if(tmpImageData!==undefined){return tmpImageData;}}if(element.nodeName==="CANVAS"){if(element.width===0||element.height===0){throw new Error("Given canvas must have data. Canvas width: "+element.width+", height: "+element.height);}var mimeType;switch(format){case"PNG":mimeType="image/png";break;case"WEBP":mimeType="image/webp";break;case"JPEG":case"JPG":default:mimeType="image/jpeg";break;}return atob(element.toDataURL(mimeType,1.0).split("base64,").pop());}};var checkImagesForAlias=function checkImagesForAlias(alias){var images=this.internal.collections[namespace+"images"];if(images){for(var e in images){if(alias===images[e].alias){return images[e];}}}};var determineWidthAndHeight=function determineWidthAndHeight(width,height,image){if(!width&&!height){width=-96;height=-96;}if(width<0){width=-1*image.width*72/width/this.internal.scaleFactor;}if(height<0){height=-1*image.height*72/height/this.internal.scaleFactor;}if(width===0){width=height*image.width/image.height;}if(height===0){height=width*image.height/image.width;}return[width,height];};var writeImageToPDF=function writeImageToPDF(x,y,width,height,image,rotation){var dims=determineWidthAndHeight.call(this,width,height,image),coord=this.internal.getCoordinateString,vcoord=this.internal.getVerticalCoordinateString;var images=getImages.call(this);width=dims[0];height=dims[1];images[image.index]=image;if(rotation){rotation*=Math.PI/180;var c=Math.cos(rotation);var s=Math.sin(rotation);//like in pdf Reference do it 4 digits instead of 2
 var f4=function f4(number){return number.toFixed(4);};var rotationTransformationMatrix=[f4(c),f4(s),f4(s*-1),f4(c),0,0,"cm"];}this.internal.write("q");//Save graphics state
-if(rotation){this.internal.write([1,"0","0",1,coord(x),vcoord(y+height),"cm"].join(" "));//Translate
+if(rotation){// 自定义修改 修复图片旋转后位置错误问题 水平方向增加自身宽度 减去的 18px 来源未知   垂直方向减去自身高度
+x+=Number(coord(width));y-=height;console.log(width,height,coord(width),coord(height));this.internal.write([1,"0","0",1,coord(x),vcoord(y+height),"cm"].join(" "));//Translate
 this.internal.write(rotationTransformationMatrix.join(" "));//Rotate
 this.internal.write([coord(width),"0","0",coord(height),"0","0","cm"].join(" "));//Scale
 }else{this.internal.write([coord(width),"0","0",coord(height),coord(x),vcoord(y+height),"cm"].join(" "));//Translate and Scale
@@ -99657,7 +99784,7 @@ out+=String.fromCharCode.apply(null,buf.subarray(i,i+ARRAY_APPLY_BATCH));}return
    *
    * @returns jsPDF
    */jsPDFAPI.addImage=function(){// 自定义修改 处理签名图片打印
-var imageData,format,x,y,w,h,alias,compression,rotation,posX,posY;imageData=arguments[0];if(typeof arguments[1]==="number"){format=UNKNOWN;x=arguments[1];y=arguments[2];w=arguments[3];h=arguments[4];alias=arguments[5];compression=arguments[6];rotation=arguments[7];posX=arguments[8];posY=arguments[9];}else{format=arguments[1];x=arguments[2];y=arguments[3];w=arguments[4];h=arguments[5];alias=arguments[6];compression=arguments[7];rotation=arguments[8];posX=arguments[9];posY=arguments[10];}if((0,esm_typeof/* default */.Z)(imageData)==="object"&&!isDOMElement(imageData)&&"imageData"in imageData){var options=imageData;imageData=options.imageData;format=options.format||format||UNKNOWN;x=options.x||x||0;y=options.y||y||0;w=options.w||options.width||w;h=options.h||options.height||h;alias=options.alias||alias;compression=options.compression||compression;rotation=options.rotation||options.angle||rotation;}//If compression is not explicitly set, determine if we should use compression
+var imageData,format,x,y,w,h,alias,compression,rotation,posX,posY;imageData=arguments[0];if(typeof arguments[1]==="number"){format=UNKNOWN;x=arguments[1];y=arguments[2];w=arguments[3];h=arguments[4];alias=arguments[5];compression=arguments[6];rotation=arguments[7];posX=arguments[8];posY=arguments[9];}else{format=arguments[1];x=arguments[2];y=arguments[3];w=arguments[4];h=arguments[5];alias=arguments[6];compression=arguments[7];rotation=arguments[8];posX=arguments[9];posY=arguments[10];}console.log(rotation);if((0,esm_typeof/* default */.Z)(imageData)==="object"&&!isDOMElement(imageData)&&"imageData"in imageData){var options=imageData;imageData=options.imageData;format=options.format||format||UNKNOWN;x=options.x||x||0;y=options.y||y||0;w=options.w||options.width||w;h=options.h||options.height||h;alias=options.alias||alias;compression=options.compression||compression;rotation=options.rotation||options.angle||rotation;}//If compression is not explicitly set, determine if we should use compression
 var filter=this.internal.getFilters();if(compression===undefined&&filter.indexOf("FlateEncode")!==-1){compression="SLOW";}// 自定义修改 调整 addImage 方法的 compression值压缩图片
 compression='SLOW';if(isNaN(x)||isNaN(y)){throw new Error("Invalid coordinates passed to jsPDF.addImage");}// if(posX) x += posX;
 // if(posY) y += posY;
@@ -100458,7 +100585,8 @@ a=isNaN(a)?1:a;b=isNaN(b)?0:b;c=isNaN(c)?0:c;d=isNaN(d)?1:d;e=isNaN(e)?0:e;f=isN
    * @param height {Number} Optional. The height of the image to use (stretch or reduce the image)
    */Context2D.prototype.drawImage=function(img,sx,sy,swidth,sheight,x,y,width,height){var imageProperties=this.pdf.getImageProperties(img);var factorX=1;var factorY=1;var clipFactorX=1;var clipFactorY=1;if(typeof swidth!=="undefined"&&typeof width!=="undefined"){clipFactorX=width/swidth;clipFactorY=height/sheight;factorX=imageProperties.width/swidth*width/swidth;factorY=imageProperties.height/sheight*height/sheight;}//is sx and sy are set and x and y not, set x and y with values of sx and sy
 if(typeof x==="undefined"){x=sx;y=sy;sx=0;sy=0;}if(typeof swidth!=="undefined"&&typeof width==="undefined"){width=swidth;height=sheight;}if(typeof swidth==="undefined"&&typeof width==="undefined"){width=imageProperties.width;height=imageProperties.height;}var decomposedTransformationMatrix=this.ctx.transform.decompose();// console.log("transform.decompose",decomposedTransformationMatrix.scale);
-var angle=rad2deg(decomposedTransformationMatrix.rotate.shx);var matrix=new Matrix();matrix=matrix.multiply(decomposedTransformationMatrix.translate);matrix=matrix.multiply(decomposedTransformationMatrix.skew);matrix=matrix.multiply(decomposedTransformationMatrix.scale);if(!swidth){swidth=width;}if(!sheight){sheight=height;}var xRect;// 自定义修改 处理签名图片打印和普通图片打印
+// 自定义修改 修复图片旋转角度错误问题
+var angle=rad2deg(decomposedTransformationMatrix.rotate.rotation);var matrix=new Matrix();matrix=matrix.multiply(decomposedTransformationMatrix.translate);matrix=matrix.multiply(decomposedTransformationMatrix.skew);matrix=matrix.multiply(decomposedTransformationMatrix.scale);if(!swidth){swidth=width;}if(!sheight){sheight=height;}var xRect;// 自定义修改 处理签名图片打印和普通图片打印
 if(img.nodeName&&img.nodeName=="CANVAS"){xRect=matrix.applyToRectangle(new Rectangle(x+this.posX-sx*clipFactorX,y+this.posY-sy*clipFactorY,swidth*factorX,sheight*factorY));}else{xRect=matrix.applyToRectangle(new Rectangle(x-sx*clipFactorX,y-sy*clipFactorY,swidth*factorX,sheight*factorY));}var pageArray=getPagesByPath.call(this,xRect);var pages=[];for(var ii=0;ii<pageArray.length;ii+=1){if(pages.indexOf(pageArray[ii])===-1){pages.push(pageArray[ii]);}}sortPages(pages);var clipPath;if(this.autoPaging){var min=pages[0];var max=pages[pages.length-1];for(var i=min;i<max+1;i++){this.pdf.setPage(i);var pageWidthMinusMargins=this.pdf.internal.pageSize.width-this.margin[3]-this.margin[1];var topMargin=i===1?this.posY+this.margin[0]:this.margin[0];var firstPageHeight=this.pdf.internal.pageSize.height-this.posY-this.margin[0]-this.margin[2];var pageHeightMinusMargins=this.pdf.internal.pageSize.height-this.margin[0]-this.margin[2];var previousPageHeightSum=i===1?0:firstPageHeight+(i-2)*pageHeightMinusMargins;if(this.ctx.clip_path.length!==0){var tmpPaths=this.path;clipPath=JSON.parse(JSON.stringify(this.ctx.clip_path));this.path=pathPositionRedo(clipPath,this.posX+this.margin[3],-previousPageHeightSum+topMargin+this.ctx.prevPageLastElemOffset);drawPaths.call(this,"fill",true);this.path=tmpPaths;}var tmpRect=JSON.parse(JSON.stringify(xRect));tmpRect=pathPositionRedo([tmpRect],this.posX+this.margin[3],-previousPageHeightSum+topMargin+this.ctx.prevPageLastElemOffset)[0];var needsClipping=(i>min||i<max)&&hasMargins.call(this);if(needsClipping){this.pdf.saveGraphicsState();this.pdf.rect(this.margin[3],this.margin[0],pageWidthMinusMargins,pageHeightMinusMargins,null).clip().discardPath();}this.pdf.addImage(img,"JPEG",tmpRect.x,tmpRect.y,tmpRect.w,tmpRect.h,null,null,angle);if(needsClipping){this.pdf.restoreGraphicsState();}}}else{if(img.nodeName&&img.nodeName=="CANVAS"){// 自定义修改
 this.pdf.addImage(img.toDataURL("image/png"),'',xRect.x,xRect.y,xRect.w,xRect.h);}else{// 自定义修改
 this.pdf.addImage(img,"JPEG",xRect.x+this.posX,xRect.y+this.posY,xRect.w,xRect.h,null,null,angle,this.posX,this.posY);}}};var getPagesByPath=function getPagesByPath(path,pageWrapX,pageWrapY){var result=[];pageWrapX=pageWrapX||this.pdf.internal.pageSize.width;pageWrapY=pageWrapY||this.pdf.internal.pageSize.height-this.margin[0]-this.margin[2];var yOffset=this.posY+this.ctx.prevPageLastElemOffset;switch(path.type){default:case"mt":case"lt":result.push(Math.floor((path.y+yOffset)/pageWrapY)+1);break;case"arc":result.push(Math.floor((path.y+yOffset-path.radius)/pageWrapY)+1);result.push(Math.floor((path.y+yOffset+path.radius)/pageWrapY)+1);break;case"qct":var rectOfQuadraticCurve=getQuadraticCurveBoundary(this.ctx.lastPoint.x,this.ctx.lastPoint.y,path.x1,path.y1,path.x,path.y);result.push(Math.floor((rectOfQuadraticCurve.y+yOffset)/pageWrapY)+1);result.push(Math.floor((rectOfQuadraticCurve.y+rectOfQuadraticCurve.h+yOffset)/pageWrapY)+1);break;case"bct":var rectOfBezierCurve=getBezierCurveBoundary(this.ctx.lastPoint.x,this.ctx.lastPoint.y,path.x1,path.y1,path.x2,path.y2,path.x,path.y);result.push(Math.floor((rectOfBezierCurve.y+yOffset)/pageWrapY)+1);result.push(Math.floor((rectOfBezierCurve.y+rectOfBezierCurve.h+yOffset)/pageWrapY)+1);break;case"rect":result.push(Math.floor((path.y+yOffset)/pageWrapY)+1);result.push(Math.floor((path.y+path.h+yOffset)/pageWrapY)+1);}for(var i=0;i<result.length;i+=1){while(this.pdf.internal.getNumberOfPages()<result[i]){addPage.call(this);}}return result;};var addPage=function addPage(){var fillStyle=this.fillStyle;var strokeStyle=this.strokeStyle;var font=this.font;var lineCap=this.lineCap;var lineWidth=this.lineWidth;var lineJoin=this.lineJoin;this.pdf.addPage();this.fillStyle=fillStyle;this.strokeStyle=strokeStyle;this.font=font;this.lineCap=lineCap;this.lineWidth=lineWidth;this.lineJoin=lineJoin;};var pathPositionRedo=function pathPositionRedo(paths,x,y){for(var i=0;i<paths.length;i++){switch(paths[i].type){case"bct":paths[i].x2+=x;paths[i].y2+=y;case"qct":paths[i].x1+=x;paths[i].y1+=y;case"mt":case"lt":case"arc":default:paths[i].x+=x;paths[i].y+=y;}}return paths;};var sortPages=function sortPages(pages){return pages.sort(function(a,b){return a-b;});};var pathPreProcess=function pathPreProcess(rule,isClip){var fillStyle=this.fillStyle;var strokeStyle=this.strokeStyle;var lineCap=this.lineCap;var oldLineWidth=this.lineWidth;var lineWidth=Math.abs(oldLineWidth*this.ctx.transform.scaleX);var lineJoin=this.lineJoin;var origPath=JSON.parse(JSON.stringify(this.path));var xPath=JSON.parse(JSON.stringify(this.path));var clipPath;var tmpPath;var pages=[];for(var i=0;i<xPath.length;i++){if(typeof xPath[i].x!=="undefined"){var page=getPagesByPath.call(this,xPath[i]);for(var ii=0;ii<page.length;ii+=1){if(pages.indexOf(page[ii])===-1){pages.push(page[ii]);}}}}for(var j=0;j<pages.length;j++){while(this.pdf.internal.getNumberOfPages()<pages[j]){addPage.call(this);}}sortPages(pages);if(this.autoPaging){var min=pages[0];var max=pages[pages.length-1];for(var k=min;k<max+1;k++){this.pdf.setPage(k);this.fillStyle=fillStyle;this.strokeStyle=strokeStyle;this.lineCap=lineCap;this.lineWidth=lineWidth;this.lineJoin=lineJoin;var pageWidthMinusMargins=this.pdf.internal.pageSize.width-this.margin[3]-this.margin[1];var topMargin=k===1?this.posY+this.margin[0]:this.margin[0];var firstPageHeight=this.pdf.internal.pageSize.height-this.posY-this.margin[0]-this.margin[2];var pageHeightMinusMargins=this.pdf.internal.pageSize.height-this.margin[0]-this.margin[2];var previousPageHeightSum=k===1?0:firstPageHeight+(k-2)*pageHeightMinusMargins;if(this.ctx.clip_path.length!==0){var tmpPaths=this.path;clipPath=JSON.parse(JSON.stringify(this.ctx.clip_path));this.path=pathPositionRedo(clipPath,this.posX+this.margin[3],-previousPageHeightSum+topMargin+this.ctx.prevPageLastElemOffset);drawPaths.call(this,rule,true);this.path=tmpPaths;}tmpPath=JSON.parse(JSON.stringify(origPath));this.path=pathPositionRedo(tmpPath,this.posX+this.margin[3],-previousPageHeightSum+topMargin+this.ctx.prevPageLastElemOffset);if(isClip===false||k===0){var needsClipping=(k>min||k<max)&&hasMargins.call(this);if(needsClipping){this.pdf.saveGraphicsState();this.pdf.rect(this.margin[3],this.margin[0],pageWidthMinusMargins,pageHeightMinusMargins,null).clip().discardPath();}drawPaths.call(this,rule,isClip);if(needsClipping){this.pdf.restoreGraphicsState();}}this.lineWidth=oldLineWidth;}}else{this.lineWidth=lineWidth;drawPaths.call(this,rule,isClip);this.lineWidth=oldLineWidth;}this.path=origPath;};/**
@@ -199158,7 +199286,7 @@ var es_function_name = __webpack_require__(68309);
 // EXTERNAL MODULE: external {"commonjs":"vue","commonjs2":"vue","root":"Vue"}
 var external_commonjs_vue_commonjs2_vue_root_Vue_ = __webpack_require__(13797);
 var external_commonjs_vue_commonjs2_vue_root_Vue_default = /*#__PURE__*/__webpack_require__.n(external_commonjs_vue_commonjs2_vue_root_Vue_);
-;// CONCATENATED MODULE: ./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/HoDocs.vue?vue&type=template&id=83a638fc&
+;// CONCATENATED MODULE: ./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/HoDocs.vue?vue&type=template&id=77aa5c8d&
 var render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return (_vm.hoEditorFactoryIdList.length > 0)?_c('div',{staticClass:"ho-docs"},[_c('section',{class:_vm.defaultEditJson.isFooter ? 'ho-editor-list' : 'ho-editor-list editor-no-footer',on:{"contextmenu":function($event){return _vm.blankAreaRightClick.apply(null, arguments)}}},[_vm._l((_vm.hoEditorFactoryIdList),function(hoEditorId,index){return [_c('HoDoc',{key:index,attrs:{"docIndex":index,"hoEditorId":hoEditorId,"hoEditorFactoryIdList":_vm.hoEditorFactoryIdList,"activeDocId":_vm.activeDocId,"editJson":_vm.defaultEditJson,"isUseTipText":_vm.isUseTipText,"textStyle":_vm.textStyle},on:{"dblNodeClick":_vm.dblNodeClick,"setFontStyles":_vm.setFontStyles,"rightClickEvent":_vm.rightClickEvent,"setActiveDocIndex":_vm.setActiveDocIndex,"setActivePageIndex":_vm.setActivePageIndex,"drawPagesLengthChange":_vm.drawPagesLengthChange},scopedSlots:_vm._u([{key:"hoDocHead",fn:function(){return [_vm._t("hoHead")]},proxy:true},{key:"hoDocFoot",fn:function(){return [_vm._t("hoFoot")]},proxy:true}],null,true)})]})],2),(_vm.notUseModal)?_c('ControlModal',{attrs:{"hoEditorFactoryId":_vm.activeDocId,"controlProperty":_vm.controlProperty,"isDataSource":_vm.isDataSource,"isCustoms":_vm.isCustoms,"isTableProperty":_vm.isTableProperty,"isListStyle":_vm.isListStyle,"uploadImageParams":_vm.uploadImageParams},on:{"insertComments":_vm.insertComments,"closeControlmodal":_vm.closeControlModal},scopedSlots:_vm._u([{key:"hoTextModal",fn:function(){return [_vm._t("hoTextField")]},proxy:true},{key:"hoParagraphModal",fn:function(){return [_vm._t("hoParagraphField")]},proxy:true},{key:"hoComment",fn:function(){return [_vm._t("hoTextComment")]},proxy:true}],null,true)}):_vm._e(),(_vm.controlFindType)?_c('FindReplaceDialog',{attrs:{"hoEditorFactoryId":_vm.activeDocId}}):_vm._e(),(_vm.defaultEditJson.isFooter)?_c('HoFooter',{attrs:{"docProperty":_vm.defaultDocProperty,"hoEditorFactoryId":_vm.activeDocId,"drawPages":_vm.drawPageLength,"currentActivePages":_vm.activePageIndex}}):_vm._e()],1):_vm._e()}
 var staticRenderFns = []
 
@@ -201942,11 +202070,11 @@ var HoToPage_component = normalizeComponent(
 /* harmony default export */ var backToPage = (HoToPage);
 // EXTERNAL MODULE: ./src/plugins/util.ts
 var util = __webpack_require__(33913);
-;// CONCATENATED MODULE: ./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/poperSelect/PoperSelect.vue?vue&type=template&id=aa143c0a&scoped=true&
-var PoperSelectvue_type_template_id_aa143c0a_scoped_true_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{ref:"poperSelectedModal",staticClass:"poper-selected-modal animation-in"},[_c('div',{staticStyle:{"height":"0","overflow":"hidden"}},[_c('svg',{attrs:{"viewBox":"0 0 1303 1024","version":"1.1","xmlns":"http://www.w3.org/2000/svg","width":"16","height":"16"}},[_c('defs',[_c('g',{attrs:{"id":"selected"}},[_c('path',{attrs:{"d":"M498.688 1024c-26.996364 0-52.782545-11.636364-71.214545-32.395636L29.323636 536.017455a124.276364 124.276364 0 0 1 0-160.302546 89.181091 89.181091 0 0 1 132.747637-11.915636l11.264 11.915636L497.105455 749.288727 1133.102545 34.443636a88.994909 88.994909 0 0 1 129.489455-11.915636l11.357091 11.915636c39.098182 45.521455 39.098182 114.874182 0 160.395637l-705.629091 796.765091c-17.966545 20.48-43.194182 32.209455-69.632 32.395636","fill":"#2175FF"}})])])])]),(_vm.isCanSearch && !_vm.mutexSelect)?_c('div',{staticStyle:{"padding":"5px"}},[_c('el-input',{attrs:{"placeholder":_vm.currentListNameText + '搜索',"size":"mini"},on:{"input":_vm.searchList},model:{value:(_vm.input),callback:function ($$v) {_vm.input=$$v},expression:"input"}})],1):_vm._e(),(_vm.poperType === 'selectPoper' && _vm.currentList.length >= 0)?_c('div',{staticClass:"select-poper"},[_c('div',{staticClass:"list-box"},[(_vm.currentList.length == 0)?_c('ul',{staticClass:"list"},[_c('li',{staticStyle:{"text-align":"center"}},[_vm._v("无选项")])]):_vm._e(),(_vm.isAllowMultiSelect && !_vm.mutexSelect && _vm.currentList.length > 0)?_c('el-checkbox-group',{on:{"change":_vm.selectItemsChange},model:{value:(_vm.selectedIds),callback:function ($$v) {_vm.selectedIds=$$v},expression:"selectedIds"}},[_c('RecycleScroller',{staticClass:"scroller",attrs:{"items":_vm.currentList,"item-size":32,"key-field":"id"},scopedSlots:_vm._u([{key:"default",fn:function(ref){
+;// CONCATENATED MODULE: ./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/poperSelect/PoperSelect.vue?vue&type=template&id=0c390485&scoped=true&
+var PoperSelectvue_type_template_id_0c390485_scoped_true_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{ref:"poperSelectedModal",staticClass:"poper-selected-modal animation-in"},[_c('div',{staticStyle:{"height":"0","overflow":"hidden"}},[_c('svg',{attrs:{"viewBox":"0 0 1303 1024","version":"1.1","xmlns":"http://www.w3.org/2000/svg","width":"16","height":"16"}},[_c('defs',[_c('g',{attrs:{"id":"selected"}},[_c('path',{attrs:{"d":"M498.688 1024c-26.996364 0-52.782545-11.636364-71.214545-32.395636L29.323636 536.017455a124.276364 124.276364 0 0 1 0-160.302546 89.181091 89.181091 0 0 1 132.747637-11.915636l11.264 11.915636L497.105455 749.288727 1133.102545 34.443636a88.994909 88.994909 0 0 1 129.489455-11.915636l11.357091 11.915636c39.098182 45.521455 39.098182 114.874182 0 160.395637l-705.629091 796.765091c-17.966545 20.48-43.194182 32.209455-69.632 32.395636","fill":"#2175FF"}})])])])]),(_vm.isCanSearch && !_vm.mutexSelect)?_c('div',{staticStyle:{"padding":"5px"}},[_c('el-input',{attrs:{"placeholder":_vm.currentListNameText + '搜索',"size":"mini"},on:{"input":_vm.searchList},model:{value:(_vm.input),callback:function ($$v) {_vm.input=$$v},expression:"input"}})],1):_vm._e(),(_vm.poperType === 'selectPoper' && _vm.currentList.length >= 0)?_c('div',{staticClass:"select-poper"},[_c('div',{staticClass:"list-box"},[(_vm.currentList.length == 0)?_c('ul',{staticClass:"list"},[_c('li',{staticStyle:{"text-align":"center"}},[_vm._v("无选项")])]):_vm._e(),(_vm.isAllowMultiSelect && !_vm.mutexSelect && _vm.currentList.length > 0)?_c('el-checkbox-group',{on:{"change":_vm.selectItemsChange},model:{value:(_vm.selectedIds),callback:function ($$v) {_vm.selectedIds=$$v},expression:"selectedIds"}},[_c('RecycleScroller',{staticClass:"scroller",attrs:{"items":_vm.currentList,"item-size":32,"key-field":"id"},scopedSlots:_vm._u([{key:"default",fn:function(ref){
 var item = ref.item;
 return [(item.title)?_c('p',{staticClass:"poper-select-title"},[_vm._v(_vm._s(item.text))]):_vm._e(),(!item.title)?_c('el-checkbox',{key:item.id + Math.random(),attrs:{"label":item.id}},[_vm._v(" "+_vm._s(item.text && item.text.indexOf("<元素>") !== -1 ? item.text.split("<元素>")[0] : item.text.split("<搜索>")[0])+" ")]):_vm._e()]}}],null,false,4143456003)})],1):_vm._e(),(_vm.isAllowMultiSelect && _vm.mutexSelect && _vm.currentList.length > 0)?[_c('el-checkbox-group',{on:{"change":_vm.mutexSelectItemsChange},model:{value:(_vm.mutexSelectedIds),callback:function ($$v) {_vm.mutexSelectedIds=$$v},expression:"mutexSelectedIds"}},[_vm._l((_vm.currentList),function(item,index){return [(index >= 1 && item.type != _vm.currentList[index - 1].type)?_c('p',{key:index + Math.random(),staticClass:"el-checkbox-mutex-line"}):_vm._e(),_c('el-checkbox',{key:item.id + Math.random(),attrs:{"label":item.id,"disabled":_vm.mutexType !== '' && _vm.mutexType != item.type}},[_vm._v(" "+_vm._s(item.text && item.text.indexOf("<元素>") !== -1 ? item.text.split("<元素>")[0] : item.text.split("<搜索>")[0])+" ")])]})],2)]:_vm._e(),(!_vm.isAllowMultiSelect && _vm.currentList.length > 0)?_c('el-radio-group',{on:{"change":_vm.selectItemsChange},model:{value:(_vm.selectedId),callback:function ($$v) {_vm.selectedId=$$v},expression:"selectedId"}},_vm._l((_vm.currentList),function(item){return _c('el-radio',{key:item.id + Math.random(),attrs:{"label":item.id}},[_vm._v(" "+_vm._s(item.text && item.text.indexOf("<元素>") !== -1 ? item.text.split("<元素>")[0] : item.text.split("<搜索>")[0])+" ")])}),1):_vm._e(),(_vm.selectedList.length > 0 && _vm.isAllowMultiSelect && !_vm.mutexSelect && _vm.isCanSearch)?_c('transition-group',{staticClass:"list",attrs:{"name":"drag","tag":"ul"}},[_c('li',{key:"已选择",staticStyle:{"position":"absolute","top":"0px","z-index":"111","background":"#fff"}},[_vm._v("已选择"+_vm._s(_vm.currentListNameText))]),_vm._l((_vm.selectedList),function(item,index){return [_c('li',{key:item.id + Math.random(),staticClass:"drag-item selected",attrs:{"draggable":""},on:{"dragenter":function($event){return _vm.dragenter($event, index)},"dragover":function($event){return _vm.dragover($event, index)},"dragstart":function($event){return _vm.dragstart(index)}}},[_c('span',[_vm._v(_vm._s(item.text && item.text.indexOf("<元素>") !== -1 ? item.text.split("<元素>")[0] : item.text.split("<搜索>")[0]))]),_c('i',{staticClass:"el-icon-delete",on:{"click":function($event){return _vm.deleteItems(item, index)}}})])]})],2):_vm._e()],2)]):_vm._e(),(_vm.poperType === 'selectPoper' && !_vm.isAllowMultiSelect)?_c('footer',[_c('el-button',{staticStyle:{"padding":"5px 13px"},attrs:{"size":"mini"},on:{"click":_vm.handleClose}},[_vm._v("关闭")])],1):_vm._e(),(_vm.poperType === 'selectPoper' && _vm.isAllowMultiSelect)?_c('footer',[_c('el-button',{staticStyle:{"padding":"5px 13px"},attrs:{"size":"mini"},on:{"click":_vm.sureSelect}},[_vm._v("确定")]),_c('el-button',{staticStyle:{"padding":"5px 13px"},attrs:{"size":"mini"},on:{"click":_vm.cancelSelect}},[_vm._v("清空")]),_c('el-button',{staticStyle:{"padding":"5px 13px"},attrs:{"size":"mini"},on:{"click":_vm.handleClose}},[_vm._v("取消")])],1):_vm._e(),(_vm.poperType === 'datePoper')?_c('div',{staticClass:"date-poper"},[(_vm.dateTimeStyle.includes('dd'))?_c('DatePanel',{attrs:{"value":_vm.date},on:{"getValue":_vm.getTime}}):_vm._e(),(_vm.dateTimeStyle.includes('MM') && !_vm.dateTimeStyle.includes('dd'))?_c('DatePanel',{attrs:{"dateType":"month","value":_vm.date},on:{"getValue":_vm.getTime}}):_vm._e(),(_vm.dateTimeStyle.includes('yyyy') && !_vm.dateTimeStyle.includes('MM'))?_c('DatePanel',{attrs:{"dateType":"year","value":_vm.date},on:{"getValue":_vm.getTime}}):_vm._e(),(_vm.dateTimeStyle.includes('HH'))?_c('div',{staticClass:"timepicker",staticStyle:{"padding":"8px 0"}},[_c('el-time-picker',{staticStyle:{"width":"200px"},attrs:{"type":"time","format":_vm.timeStyle,"value-format":_vm.timeStyle,"size":"mini"},model:{value:(_vm.time),callback:function ($$v) {_vm.time=$$v},expression:"time"}})],1):_vm._e(),_c('footer',[_c('el-button',{staticStyle:{"padding":"5px 13px"},attrs:{"size":"mini"},on:{"click":_vm.sureDate}},[_vm._v("确定")]),_c('el-button',{staticStyle:{"padding":"5px 13px"},attrs:{"size":"mini"},on:{"click":_vm.currentDateTime}},[_vm._v("此刻")]),_c('el-button',{staticStyle:{"padding":"5px 13px"},attrs:{"size":"mini"},on:{"click":_vm.handleClose}},[_vm._v("取消")])],1)],1):_vm._e()])}
-var PoperSelectvue_type_template_id_aa143c0a_scoped_true_staticRenderFns = []
+var PoperSelectvue_type_template_id_0c390485_scoped_true_staticRenderFns = []
 
 
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.object.assign.js
@@ -204648,12 +204776,12 @@ var PoperSelectModal = /*#__PURE__*/function (_Mixins) {
           // } else {
           v.id = String(v.id); // }
 
-          v.default = false;
+          v.selected = false;
 
           if (selectedString.length > 0 && selectedString.filter(function (m) {
             return v.id == m;
           }).length === 1) {
-            v.default = true;
+            v.selected = true;
 
             if (_this2.isAllowMultiSelect && _this2.poperSelectList.length >= 20) {
               _this2.selectedList[selectedString.indexOf(v.id)] = v;
@@ -204860,7 +204988,7 @@ var PoperSelectModal = /*#__PURE__*/function (_Mixins) {
           selectItemIndex = index;
         }
       });
-      item.default = false;
+      item.selected = false;
       this.poperSelectList.splice(selectItemIndex, 1, item); // this.selectedList.splice(key, 1, item);
 
       this.currentList = this.currentList.filter(function (m) {
@@ -204886,16 +205014,16 @@ var PoperSelectModal = /*#__PURE__*/function (_Mixins) {
       if (value.length > 0) {
         this.poperSelectList.forEach(function (v) {
           if (value.includes(v.id)) {
-            v.default = true;
+            v.selected = true;
             _this5.mutexType = String(v.type);
           } else {
-            v.default = false;
+            v.selected = false;
           }
         });
         this.currentList = (0,toConsumableArray/* default */.Z)(this.poperSelectList);
       } else if (value.length === 0) {
         this.poperSelectList.forEach(function (v) {
-          v.default = false;
+          v.selected = false;
           _this5.mutexType = "";
         });
         this.currentList = (0,toConsumableArray/* default */.Z)(this.poperSelectList);
@@ -204914,21 +205042,21 @@ var PoperSelectModal = /*#__PURE__*/function (_Mixins) {
         var item = {};
         var selectItemIndex = 0;
         this.poperSelectList.forEach(function (v, index) {
-          v.default = false;
+          v.selected = false;
 
           if (v.id == value) {
             item = v;
             selectItemIndex = index;
           }
         });
-        item.default = !item.default;
+        item.selected = !item.selected;
         this.poperSelectList.splice(selectItemIndex, 1, item);
         this.currentList = (0,toConsumableArray/* default */.Z)(this.poperSelectList);
         this.sureSelect();
       } else {
         this.poperSelectList.forEach(function (v) {
           if (value.includes(v.id)) {
-            v.default = true;
+            v.selected = true;
 
             if (_this6.isCanSearch && _this6.selectedList.filter(function (m) {
               return m.id == v.id;
@@ -204936,7 +205064,7 @@ var PoperSelectModal = /*#__PURE__*/function (_Mixins) {
               _this6.selectedList.push(v);
             }
           } else {
-            v.default = false;
+            v.selected = false;
             if (_this6.isCanSearch) _this6.selectedList = _this6.selectedList.filter(function (m) {
               return m.id != v.id;
             });
@@ -204953,19 +205081,19 @@ var PoperSelectModal = /*#__PURE__*/function (_Mixins) {
 
       if (!this.isAllowMultiSelect) {
         this.poperSelectList.forEach(function (v) {
-          v.default = false;
+          v.selected = false;
         });
-        item.default = !item.default;
+        item.selected = !item.selected;
         this.poperSelectList.splice(index, 1, item);
         this.currentList = (0,toConsumableArray/* default */.Z)(this.poperSelectList);
         this.sureSelect();
       } else {
         this.poperSelectList.forEach(function (v) {
           if (v.id == item.id) {
-            v.default = !v.default;
+            v.selected = !v.selected;
           }
 
-          if (v.default) {
+          if (v.selected) {
             if (_this7.isCanSearch && _this7.selectedList.filter(function (m) {
               return m.id == v.id;
             }).length == 0) {
@@ -204986,7 +205114,7 @@ var PoperSelectModal = /*#__PURE__*/function (_Mixins) {
     key: "cancelSelect",
     value: function cancelSelect() {
       this.poperSelectList.forEach(function (v) {
-        v.default = false;
+        v.selected = false;
       });
       this.currentList = (0,toConsumableArray/* default */.Z)(this.poperSelectList);
       this.selectedList = [];
@@ -205010,7 +205138,7 @@ var PoperSelectModal = /*#__PURE__*/function (_Mixins) {
       var keyValue = "";
       var currentPoperNode = this.getCurrentPoperNode();
       var selected = this.isAllowMultiSelect && this.isCanSearch ? this.selectedList : this.poperSelectList.filter(function (v) {
-        return v.default;
+        return v.selected;
       });
       var len = selected.length;
 
@@ -205168,10 +205296,10 @@ PoperSelectModal = __decorate([vue_class_component_esm({
 /* harmony default export */ var PoperSelectvue_type_script_lang_ts_ = (PoperSelectModal);
 ;// CONCATENATED MODULE: ./src/components/controls/poperSelect/PoperSelect.vue?vue&type=script&lang=ts&
  /* harmony default export */ var poperSelect_PoperSelectvue_type_script_lang_ts_ = (PoperSelectvue_type_script_lang_ts_); 
-;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-22[0].rules[0].use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22[0].rules[0].use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22[0].rules[0].use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22[0].rules[0].use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/poperSelect/PoperSelect.vue?vue&type=style&index=0&id=aa143c0a&lang=scss&scoped=true&
+;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-22[0].rules[0].use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22[0].rules[0].use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22[0].rules[0].use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22[0].rules[0].use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/poperSelect/PoperSelect.vue?vue&type=style&index=0&id=0c390485&lang=scss&scoped=true&
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./src/components/controls/poperSelect/PoperSelect.vue?vue&type=style&index=0&id=aa143c0a&lang=scss&scoped=true&
+;// CONCATENATED MODULE: ./src/components/controls/poperSelect/PoperSelect.vue?vue&type=style&index=0&id=0c390485&lang=scss&scoped=true&
 
 ;// CONCATENATED MODULE: ./src/components/controls/poperSelect/PoperSelect.vue
 
@@ -205184,11 +205312,11 @@ PoperSelectModal = __decorate([vue_class_component_esm({
 
 var PoperSelect_component = normalizeComponent(
   poperSelect_PoperSelectvue_type_script_lang_ts_,
-  PoperSelectvue_type_template_id_aa143c0a_scoped_true_render,
-  PoperSelectvue_type_template_id_aa143c0a_scoped_true_staticRenderFns,
+  PoperSelectvue_type_template_id_0c390485_scoped_true_render,
+  PoperSelectvue_type_template_id_0c390485_scoped_true_staticRenderFns,
   false,
   null,
-  "aa143c0a",
+  "0c390485",
   null
   
 )
@@ -207141,7 +207269,7 @@ var SignNode = __webpack_require__(34450);
 // EXTERNAL MODULE: ./src/editor/dom/treeNode/ParagraphNode.ts
 var ParagraphNode = __webpack_require__(14208);
 ;// CONCATENATED MODULE: ./src/components/version.ts
-/* harmony default export */ var version = ('2.0.63');
+/* harmony default export */ var version = ('2.0.66');
 ;// CONCATENATED MODULE: ./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/poperTipText/PoperTipText.vue?vue&type=template&id=3fa4e4d3&scoped=true&
 var PoperTipTextvue_type_template_id_3fa4e4d3_scoped_true_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{directives:[{name:"show",rawName:"v-show",value:(_vm.isShow),expression:"isShow"},{name:"click-outside",rawName:"v-click-outside",value:(_vm.handleClose),expression:"handleClose"}],ref:"poperTextNode",staticClass:"poper-text-modal animation-in",style:(_vm.posStyle),on:{"mouseenter":_vm.mouseEnter,"mouseleave":_vm.mouseLeave}},_vm._l((_vm.poperText),function(text){return _c('div',{key:text + Math.random(0, 1),staticClass:"poper-text"},[_vm._v(" "+_vm._s(text)+" ")])}),0)}
 var PoperTipTextvue_type_template_id_3fa4e4d3_scoped_true_staticRenderFns = []
@@ -209652,8 +209780,8 @@ var UserInfo = __webpack_require__(75013);
 /*
  * @Author: your name
  * @Date: 2021-06-21 17:47:51
- * @LastEditTime: 2022-04-22 14:24:28
- * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2022-07-08 23:50:19
+ * @LastEditors: liyanan 2441631434@qq.com
  * @Description: In User Settings Edit
  * @FilePath: \hoeditor-web\src\editor\runTimeInfo\Option.ts
  */
@@ -209673,7 +209801,7 @@ var Option = /*#__PURE__*/function () {
 
     this._downListColor = "#D2ECB1"; //下拉列表元素颜色//#D2ECB1
 
-    this._downListColor2 = "#D2ECB1"; //下拉列表默认元素颜色
+    this._downListColor2 = "#D2ACB1"; //下拉列表默认元素颜色
 
     this._hoEditorFactoryID = hoEditorFactoryID;
   }
@@ -220917,10 +221045,17 @@ var VueController = /*#__PURE__*/function () {
 
         for (var j = 0; j < elements.length; j++) {
           var element = elements[j];
+          var commentID = hoEditorFactory.gernerateCode.generateID("C");
+          var comment = void 0;
 
           if (element instanceof TextInputFieldNode/* TextInputFieldNode */.re) {
-            var commentID = hoEditorFactory.gernerateCode.generateID("C");
-            var comment = new Comment/* Comment */.s(this._hoEditorFactoryID, commentID, oldValue, element.EndMarkNode);
+            comment = new Comment/* Comment */.s(this._hoEditorFactoryID, commentID, oldValue, element.EndMarkNode);
+            comment.lineHeight = comment.lineHeight - 20;
+            comments.push(comment);
+          }
+
+          if (element instanceof DateTimeNode/* DateTimeNode */.Z || element instanceof DownListNode/* DownListNode */.yF) {
+            comment = new Comment/* Comment */.s(this._hoEditorFactoryID, commentID, oldValue, element);
             comment.lineHeight = comment.lineHeight - 20;
             comments.push(comment);
           }
@@ -220939,9 +221074,13 @@ var VueController = /*#__PURE__*/function () {
 
         var spX = dline.parent instanceof DrawPageCell/* DrawPageCell */.k ? localPos.x : endDrawNode.x;
         var spY = localPos.y;
-        drawArea.removeComment(comment);
+        drawArea.removeComment(comment, true);
         var path = comment.eNode.getNodePath();
 
+        if (comment.eNode instanceof DateTimeNode/* DateTimeNode */.Z || comment.eNode instanceof DownListNode/* DownListNode */.yF) {
+          spX = spX + comment.eNode.drawNodes[0].dWidth;
+        }
+
         if (index === 1) {
           drawArea.drawEditRecords(comment, spX, spY, spY);
         }
@@ -224665,6 +224804,8 @@ var HOEditorFactory = /*#__PURE__*/function () {
 
     this._isEnabledGlobalColor = false; //是否启用全局颜色
 
+    this._isSameColorWithEmptyVlaue = false; //下拉列表元素的默认项颜色是否和空元素的颜色保持一致
+
     this._hoEditorFactoryId = id;
   }
   /**
@@ -225372,6 +225513,16 @@ var HOEditorFactory = /*#__PURE__*/function () {
         this._isEnabledGlobalColor = value;
       }
     }
+  }, {
+    key: "isSameColorWithEmptyVlaue",
+    get: function get() {
+      return this._isSameColorWithEmptyVlaue;
+    },
+    set: function set(value) {
+      if (this._isSameColorWithEmptyVlaue !== value) {
+        this._isSameColorWithEmptyVlaue = value;
+      }
+    }
   }, {
     key: "clear",
     value: function clear() {
@@ -225733,9 +225884,9 @@ var ControlModalvue_type_template_id_36fbe7eb_render = function () {var _vm=this
 var ControlModalvue_type_template_id_36fbe7eb_staticRenderFns = []
 
 
-;// CONCATENATED MODULE: ./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/selectDialog/SelectDialog.vue?vue&type=template&id=3b6d4c1e&scoped=true&
-var SelectDialogvue_type_template_id_3b6d4c1e_scoped_true_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{class:_vm.animationClassNames},[_c('header',{staticClass:"modal-title"},[_c('span',[_vm._v("下拉框")]),_c('i',{staticClass:"el-icon-close modal-title-close",on:{"click":_vm.handleClose}})]),_c('section',{staticClass:"modal-content"},[_c('ul',{staticClass:"control-list"},[_c('li',{staticClass:"control-item"},[_c('span',{staticClass:"label"},[_vm._v("编号")]),_c('span',{staticClass:"readonly-value"},[_vm._v(_vm._s(_vm.id))])]),_c('li',{staticClass:"control-item"},[_c('span',{staticClass:"label"},[_vm._v("内部标识符")]),_c('el-input',{attrs:{"size":"mini","placeholder":"内部标识符"},model:{value:(_vm.innerIdentifier),callback:function ($$v) {_vm.innerIdentifier=$$v},expression:"innerIdentifier"}})],1),_c('li',{staticClass:"control-item"},[_c('span',{staticClass:"label"},[_vm._v("数据元标识符")]),_c('el-input',{attrs:{"size":"mini","placeholder":"数据元标识符"},model:{value:(_vm.dataMetaIdentifier),callback:function ($$v) {_vm.dataMetaIdentifier=$$v},expression:"dataMetaIdentifier"}})],1),_c('li',{staticClass:"control-item"},[_c('span',{staticClass:"label"},[_vm._v("表示格式")]),_c('el-input',{attrs:{"size":"mini","placeholder":"表示格式"},model:{value:(_vm.identifierFormat),callback:function ($$v) {_vm.identifierFormat=$$v},expression:"identifierFormat"}})],1),_c('li',{staticClass:"control-item"},[_c('span',{staticClass:"label"},[_vm._v("名称")]),_c('el-input',{attrs:{"size":"mini","placeholder":"名称"},model:{value:(_vm.name),callback:function ($$v) {_vm.name=$$v},expression:"name"}})],1),_c('li',{staticClass:"control-item"},[_c('span',{staticClass:"label"},[_vm._v("提示文本")]),_c('el-input',{attrs:{"size":"mini","placeholder":"提示文本"},model:{value:(_vm.tipText),callback:function ($$v) {_vm.tipText=$$v},expression:"tipText"}})],1),_c('li',{staticClass:"control-item"},[_c('div',{staticStyle:{"width":"20%"}},[_c('el-checkbox',{model:{value:(_vm.isReadOnly),callback:function ($$v) {_vm.isReadOnly=$$v},expression:"isReadOnly"}},[_vm._v("内容只读")])],1),_c('div',{staticStyle:{"width":"20%"}},[_c('el-checkbox',{model:{value:(_vm.isAllowDelete),callback:function ($$v) {_vm.isAllowDelete=$$v},expression:"isAllowDelete"}},[_vm._v("允许删除")])],1),_c('div',{staticStyle:{"width":"20%"}},[_c('el-checkbox',{on:{"change":_vm.allowMultiSelectChange},model:{value:(_vm.allowMultiSelect),callback:function ($$v) {_vm.allowMultiSelect=$$v},expression:"allowMultiSelect"}},[_vm._v("允许多选")])],1),_c('div',{staticStyle:{"width":"20%"}},[_c('el-checkbox',{model:{value:(_vm.readType),callback:function ($$v) {_vm.readType=$$v},expression:"readType"}},[_vm._v("自动回填")])],1),_c('div',{staticStyle:{"width":"20%"}},[_c('el-checkbox',{attrs:{"disabled":!_vm.allowMultiSelect},model:{value:(_vm.mutexSelect),callback:function ($$v) {_vm.mutexSelect=$$v},expression:"mutexSelect"}},[_vm._v("选项互斥")])],1)]),_c('li',{staticClass:"control-item"},[_c('el-table',{staticStyle:{"width":"100%"},attrs:{"data":_vm.downListContent,"height":"210px"}},[_c('el-table-column',{staticStyle:{"text-align":"center"},attrs:{"label":"","width":"32"},scopedSlots:_vm._u([{key:"default",fn:function(scope){return [_c('i',{directives:[{name:"show",rawName:"v-show",value:(scope.$index === _vm.focusIndexs),expression:"scope.$index === focusIndexs"}],staticClass:"el-icon-edit",staticStyle:{"transform":"translateX(6px)"}})]}}])}),_c('el-table-column',{attrs:{"label":"文本","width":"130"},scopedSlots:_vm._u([{key:"default",fn:function(scope){return [_c('el-input',{class:_vm.errorIndex.includes(scope.row.id) ? 'error' : '',attrs:{"size":"mini"},on:{"focus":function($event){return _vm.focusIndex(scope.$index)},"input":function($event){return _vm.inputIndex(scope.$index)},"blur":function($event){return _vm.blurIndex(scope.$index)}},model:{value:(scope.row.text),callback:function ($$v) {_vm.$set(scope.row, "text", $$v)},expression:"scope.row.text"}})]}}])}),_c('el-table-column',{attrs:{"label":"值","width":"130"},scopedSlots:_vm._u([{key:"default",fn:function(scope){return [_c('el-input',{attrs:{"size":"mini"},on:{"focus":function($event){return _vm.focusIndex(scope.$index)},"input":function($event){return _vm.inputIndex(scope.$index)},"blur":function($event){return _vm.blurIndex(scope.$index)}},model:{value:(scope.row.value),callback:function ($$v) {_vm.$set(scope.row, "value", $$v)},expression:"scope.row.value"}})]}}])}),_c('el-table-column',{attrs:{"label":"类型","width":"70"},scopedSlots:_vm._u([{key:"default",fn:function(scope){return [_c('el-input',{attrs:{"size":"mini"},on:{"focus":function($event){return _vm.focusIndex(scope.$index)},"input":function($event){return _vm.inputIndex(scope.$index)},"blur":function($event){return _vm.blurIndex(scope.$index)}},model:{value:(scope.row.type),callback:function ($$v) {_vm.$set(scope.row, "type", $$v)},expression:"scope.row.type"}})]}}])}),_c('el-table-column',{scopedSlots:_vm._u([{key:"default",fn:function(scope){return [(scope.row.default)?_c('span',{staticClass:"tags"},[_vm._v("默认")]):_vm._e(),(scope.row.default)?_c('el-button',{attrs:{"size":"mini"},on:{"click":function($event){$event.stopPropagation();return _vm.cancelDefault(scope.row.id)}}},[_vm._v("取消")]):_vm._e(),(!scope.row.default && scope.row.text)?_c('el-button',{attrs:{"size":"mini"},on:{"click":function($event){$event.stopPropagation();return _vm.setDefault(scope.row.id)}}},[_vm._v("设为默认")]):_vm._e(),(scope.$index !== _vm.downListContent.length - 1 && _vm.focusIndexs === scope.$index)?_c('el-button',{attrs:{"size":"mini"},on:{"click":function($event){$event.stopPropagation();return _vm.deleteCurrentRow(scope.row.id)}}},[_vm._v("删除")]):_vm._e()]}}])})],1)],1)])]),_c('footer',{staticClass:"ho-modal-footer"},[_c('el-button',{attrs:{"size":"small","type":"primary"},on:{"click":_vm.sure}},[_vm._v("确定")]),_c('el-button',{staticStyle:{"margin-left":"30px"},attrs:{"size":"small"},on:{"click":_vm.handleClose}},[_vm._v("取消")])],1)])}
-var SelectDialogvue_type_template_id_3b6d4c1e_scoped_true_staticRenderFns = []
+;// CONCATENATED MODULE: ./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/selectDialog/SelectDialog.vue?vue&type=template&id=62e16cb5&scoped=true&
+var SelectDialogvue_type_template_id_62e16cb5_scoped_true_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{class:_vm.animationClassNames},[_c('header',{staticClass:"modal-title"},[_c('span',[_vm._v("下拉框")]),_c('i',{staticClass:"el-icon-close modal-title-close",on:{"click":_vm.handleClose}})]),_c('section',{staticClass:"modal-content"},[_c('ul',{staticClass:"control-list"},[_c('li',{staticClass:"control-item"},[_c('span',{staticClass:"label"},[_vm._v("编号")]),_c('span',{staticClass:"readonly-value"},[_vm._v(_vm._s(_vm.id))])]),_c('li',{staticClass:"control-item"},[_c('span',{staticClass:"label"},[_vm._v("内部标识符")]),_c('el-input',{attrs:{"size":"mini","placeholder":"内部标识符"},model:{value:(_vm.innerIdentifier),callback:function ($$v) {_vm.innerIdentifier=$$v},expression:"innerIdentifier"}})],1),_c('li',{staticClass:"control-item"},[_c('span',{staticClass:"label"},[_vm._v("数据元标识符")]),_c('el-input',{attrs:{"size":"mini","placeholder":"数据元标识符"},model:{value:(_vm.dataMetaIdentifier),callback:function ($$v) {_vm.dataMetaIdentifier=$$v},expression:"dataMetaIdentifier"}})],1),_c('li',{staticClass:"control-item"},[_c('span',{staticClass:"label"},[_vm._v("表示格式")]),_c('el-input',{attrs:{"size":"mini","placeholder":"表示格式"},model:{value:(_vm.identifierFormat),callback:function ($$v) {_vm.identifierFormat=$$v},expression:"identifierFormat"}})],1),_c('li',{staticClass:"control-item"},[_c('span',{staticClass:"label"},[_vm._v("名称")]),_c('el-input',{attrs:{"size":"mini","placeholder":"名称"},model:{value:(_vm.name),callback:function ($$v) {_vm.name=$$v},expression:"name"}})],1),_c('li',{staticClass:"control-item"},[_c('span',{staticClass:"label"},[_vm._v("提示文本")]),_c('el-input',{attrs:{"size":"mini","placeholder":"提示文本"},model:{value:(_vm.tipText),callback:function ($$v) {_vm.tipText=$$v},expression:"tipText"}})],1),_c('li',{staticClass:"control-item"},[_c('div',{staticStyle:{"width":"20%"}},[_c('el-checkbox',{model:{value:(_vm.isReadOnly),callback:function ($$v) {_vm.isReadOnly=$$v},expression:"isReadOnly"}},[_vm._v("内容只读")])],1),_c('div',{staticStyle:{"width":"20%"}},[_c('el-checkbox',{model:{value:(_vm.isAllowDelete),callback:function ($$v) {_vm.isAllowDelete=$$v},expression:"isAllowDelete"}},[_vm._v("允许删除")])],1),_c('div',{staticStyle:{"width":"20%"}},[_c('el-checkbox',{on:{"change":_vm.allowMultiSelectChange},model:{value:(_vm.allowMultiSelect),callback:function ($$v) {_vm.allowMultiSelect=$$v},expression:"allowMultiSelect"}},[_vm._v("允许多选")])],1),_c('div',{staticStyle:{"width":"20%"}},[_c('el-checkbox',{model:{value:(_vm.readType),callback:function ($$v) {_vm.readType=$$v},expression:"readType"}},[_vm._v("自动回填")])],1),_c('div',{staticStyle:{"width":"20%"}},[_c('el-checkbox',{attrs:{"disabled":!_vm.allowMultiSelect},model:{value:(_vm.mutexSelect),callback:function ($$v) {_vm.mutexSelect=$$v},expression:"mutexSelect"}},[_vm._v("选项互斥")])],1)]),_c('li',{staticClass:"control-item"},[_c('el-table',{staticStyle:{"width":"100%"},attrs:{"data":_vm.downListContent,"height":"210px"}},[_c('el-table-column',{staticStyle:{"text-align":"center"},attrs:{"label":"","width":"32"},scopedSlots:_vm._u([{key:"default",fn:function(scope){return [_c('i',{directives:[{name:"show",rawName:"v-show",value:(scope.$index === _vm.focusIndexs),expression:"scope.$index === focusIndexs"}],staticClass:"el-icon-edit",staticStyle:{"transform":"translateX(6px)"}})]}}])}),_c('el-table-column',{attrs:{"label":"文本","width":"130"},scopedSlots:_vm._u([{key:"default",fn:function(scope){return [_c('el-input',{class:_vm.errorIndex.includes(scope.row.id) ? 'error' : '',attrs:{"size":"mini"},on:{"focus":function($event){return _vm.focusIndex(scope.$index)},"input":function($event){return _vm.inputIndex(scope.$index)},"blur":function($event){return _vm.blurIndex(scope.$index)}},model:{value:(scope.row.text),callback:function ($$v) {_vm.$set(scope.row, "text", $$v)},expression:"scope.row.text"}})]}}])}),_c('el-table-column',{attrs:{"label":"值","width":"130"},scopedSlots:_vm._u([{key:"default",fn:function(scope){return [_c('el-input',{attrs:{"size":"mini"},on:{"focus":function($event){return _vm.focusIndex(scope.$index)},"input":function($event){return _vm.inputIndex(scope.$index)},"blur":function($event){return _vm.blurIndex(scope.$index)}},model:{value:(scope.row.value),callback:function ($$v) {_vm.$set(scope.row, "value", $$v)},expression:"scope.row.value"}})]}}])}),_c('el-table-column',{attrs:{"label":"类型","width":"70"},scopedSlots:_vm._u([{key:"default",fn:function(scope){return [_c('el-input',{attrs:{"size":"mini"},on:{"focus":function($event){return _vm.focusIndex(scope.$index)},"input":function($event){return _vm.inputIndex(scope.$index)},"blur":function($event){return _vm.blurIndex(scope.$index)}},model:{value:(scope.row.type),callback:function ($$v) {_vm.$set(scope.row, "type", $$v)},expression:"scope.row.type"}})]}}])}),_c('el-table-column',{scopedSlots:_vm._u([{key:"default",fn:function(scope){return [(scope.row.default)?_c('span',{staticClass:"tags"},[_vm._v("默认")]):_vm._e(),(scope.row.default)?_c('el-button',{attrs:{"size":"mini"},on:{"click":function($event){$event.stopPropagation();return _vm.cancelDefault(scope.row.id)}}},[_vm._v("取消")]):_vm._e(),(!scope.row.default && scope.row.text)?_c('el-button',{attrs:{"size":"mini"},on:{"click":function($event){$event.stopPropagation();return _vm.setDefault(scope.row.id)}}},[_vm._v("设为默认")]):_vm._e(),(scope.$index !== _vm.downListContent.length - 1 && _vm.focusIndexs === scope.$index)?_c('el-button',{attrs:{"size":"mini"},on:{"click":function($event){$event.stopPropagation();return _vm.deleteCurrentRow(scope.row.id)}}},[_vm._v("删除")]):_vm._e()]}}])})],1)],1)])]),_c('footer',{staticClass:"ho-modal-footer"},[_c('el-button',{attrs:{"size":"small","type":"primary"},on:{"click":_vm.sure}},[_vm._v("确定")]),_c('el-button',{staticStyle:{"margin-left":"30px"},attrs:{"size":"small"},on:{"click":_vm.handleClose}},[_vm._v("取消")])],1)])}
+var SelectDialogvue_type_template_id_62e16cb5_scoped_true_staticRenderFns = []
 
 
 ;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js!./node_modules/ts-loader/index.js??clonedRuleSet-41[0].rules[0].use[1]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/selectDialog/SelectDialog.vue?vue&type=script&lang=ts&
@@ -225827,13 +225978,12 @@ var SelectDialog = /*#__PURE__*/function (_Vue) {
         this.downListContent = (0,toConsumableArray/* default */.Z)(this.downListContent.map(function (v, index) {
           if (v.id === undefined) {
             v.id = _this2.getKeyId(index);
-          }
+          } // if(updateNode.keyValue.includes(v.id)) {
+          //     v.default = true;
+          // } else {
+          //     v.default = false;
+          // }
 
-          if (updateNode.keyValue.includes(v.id)) {
-            v.default = true;
-          } else {
-            v.default = false;
-          }
 
           return v;
         }));
@@ -226076,10 +226226,10 @@ SelectDialog = __decorate([vue_class_component_esm({
 /* harmony default export */ var SelectDialogvue_type_script_lang_ts_ = (SelectDialog);
 ;// CONCATENATED MODULE: ./src/components/controls/selectDialog/SelectDialog.vue?vue&type=script&lang=ts&
  /* harmony default export */ var selectDialog_SelectDialogvue_type_script_lang_ts_ = (SelectDialogvue_type_script_lang_ts_); 
-;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-22[0].rules[0].use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22[0].rules[0].use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22[0].rules[0].use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22[0].rules[0].use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/selectDialog/SelectDialog.vue?vue&type=style&index=0&id=3b6d4c1e&lang=scss&scoped=true&
+;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-22[0].rules[0].use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22[0].rules[0].use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22[0].rules[0].use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22[0].rules[0].use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/selectDialog/SelectDialog.vue?vue&type=style&index=0&id=62e16cb5&lang=scss&scoped=true&
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./src/components/controls/selectDialog/SelectDialog.vue?vue&type=style&index=0&id=3b6d4c1e&lang=scss&scoped=true&
+;// CONCATENATED MODULE: ./src/components/controls/selectDialog/SelectDialog.vue?vue&type=style&index=0&id=62e16cb5&lang=scss&scoped=true&
 
 ;// CONCATENATED MODULE: ./src/components/controls/selectDialog/SelectDialog.vue
 
@@ -226092,11 +226242,11 @@ SelectDialog = __decorate([vue_class_component_esm({
 
 var SelectDialog_component = normalizeComponent(
   selectDialog_SelectDialogvue_type_script_lang_ts_,
-  SelectDialogvue_type_template_id_3b6d4c1e_scoped_true_render,
-  SelectDialogvue_type_template_id_3b6d4c1e_scoped_true_staticRenderFns,
+  SelectDialogvue_type_template_id_62e16cb5_scoped_true_render,
+  SelectDialogvue_type_template_id_62e16cb5_scoped_true_staticRenderFns,
   false,
   null,
-  "3b6d4c1e",
+  "62e16cb5",
   null
   
 )
@@ -226889,9 +227039,9 @@ var QrCode_component = normalizeComponent(
 ;// CONCATENATED MODULE: ./src/components/controls/qrCode/index.ts
 
 /* harmony default export */ var qrCode = (QrCode);
-;// CONCATENATED MODULE: ./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/textDialog/TextDialog.vue?vue&type=template&id=75c07514&
-var TextDialogvue_type_template_id_75c07514_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{class:_vm.animationClassNames},[_c('header',{staticClass:"modal-title"},[_c('span',[_vm._v("文本域")]),_c('i',{staticClass:"el-icon-close modal-title-close",on:{"click":_vm.handleClose}})]),_c('section',{staticClass:"modal-content"},[_c('tabs',{attrs:{"tabKey":_vm.textActiveName}},[_c('tab-pane',{attrs:{"label":"基本属性","notHover":false,"name":"first"}},[_c('ul',{staticClass:"control-list"},[_c('li',{staticClass:"control-item"},[_c('span',{staticClass:"label"},[_vm._v("类型")]),_c('el-radio',{attrs:{"disabled":_vm.controlStatus === 'update',"size":"small","label":0},model:{value:(_vm.textParam.inputFieldType),callback:function ($$v) {_vm.$set(_vm.textParam, "inputFieldType", $$v)},expression:"textParam.inputFieldType"}},[_vm._v("直接输入文本数据")]),_c('el-radio',{attrs:{"disabled":_vm.controlStatus === 'update',"size":"small","label":1},model:{value:(_vm.textParam.inputFieldType),callback:function ($$v) {_vm.$set(_vm.textParam, "inputFieldType", $$v)},expression:"textParam.inputFieldType"}},[_vm._v("下拉列表方式")])],1),_c('li',{staticClass:"control-item"},[_c('span',{staticClass:"label"},[_vm._v("编号")]),_c('span',{staticClass:"readonly-value"},[_vm._v(_vm._s(_vm.textParam.id))])]),_c('li',{staticClass:"control-item"},[_c('span',{staticClass:"label"},[_vm._v("内部标识符")]),_c('el-input',{attrs:{"size":"mini","placeholder":"内部标识符"},model:{value:(_vm.textParam.innerIdentifier),callback:function ($$v) {_vm.$set(_vm.textParam, "innerIdentifier", $$v)},expression:"textParam.innerIdentifier"}})],1),_c('li',{staticClass:"control-item"},[_c('span',{staticClass:"label"},[_vm._v("数据元标识符")]),_c('el-input',{attrs:{"size":"mini","placeholder":"数据元标识符"},model:{value:(_vm.textParam.dataMetaIdentifier),callback:function ($$v) {_vm.$set(_vm.textParam, "dataMetaIdentifier", $$v)},expression:"textParam.dataMetaIdentifier"}})],1),_c('li',{staticClass:"control-item"},[_c('span',{staticClass:"label"},[_vm._v("表示格式")]),_c('el-input',{attrs:{"size":"mini","placeholder":"表示格式"},model:{value:(_vm.textParam.identifierFormat),callback:function ($$v) {_vm.$set(_vm.textParam, "identifierFormat", $$v)},expression:"textParam.identifierFormat"}})],1),_c('li',{staticClass:"control-item"},[_c('span',{staticClass:"label"},[_vm._v("名称")]),_c('el-input',{attrs:{"size":"mini","placeholder":"名称"},model:{value:(_vm.textParam.name),callback:function ($$v) {_vm.$set(_vm.textParam, "name", $$v)},expression:"textParam.name"}})],1),_c('li',{staticClass:"line"}),(_vm.textParam.inputFieldType === 0)?_c('li',{staticClass:"control-item"},[_c('span',{staticClass:"label"},[_vm._v("文本内容")]),_c('el-input',{attrs:{"disabled":_vm.controlStatus === 'update',"size":"mini","placeholder":"文本内容"},model:{value:(_vm.textParam.text),callback:function ($$v) {_vm.$set(_vm.textParam, "text", $$v)},expression:"textParam.text"}})],1):_vm._e(),(_vm.textParam.inputFieldType === 1)?_c('li',{staticClass:"control-item"},[_c('span',{staticClass:"label"},[_vm._v("下拉列表")]),_c('el-input',{attrs:{"size":"mini","disabled":true,"placeholder":"下拉列表项"},model:{value:(_vm.textParam.downListProperty.source),callback:function ($$v) {_vm.$set(_vm.textParam.downListProperty, "source", $$v)},expression:"textParam.downListProperty.source"}}),_c('el-button',{attrs:{"size":"mini"},on:{"click":function($event){$event.stopPropagation();return _vm.openListArrModel.apply(null, arguments)}}},[_vm._v("浏览")])],1):_vm._e(),(_vm.textParam.inputFieldType === 1)?_c('li',{staticClass:"control-item"},[_c('span',{staticClass:"label"},[_vm._v("是否多选")]),_c('div',{staticStyle:{"width":"40%"}},[_c('el-checkbox',{on:{"change":_vm.allowMultiSelectChange},model:{value:(_vm.textParam.downListProperty.allowMultiSelected),callback:function ($$v) {_vm.$set(_vm.textParam.downListProperty, "allowMultiSelected", $$v)},expression:"textParam.downListProperty.allowMultiSelected"}},[_vm._v("允许多选")]),_c('el-checkbox',{model:{value:(_vm.textParam.downListProperty.mutexSelect),callback:function ($$v) {_vm.$set(_vm.textParam.downListProperty, "mutexSelect", $$v)},expression:"textParam.downListProperty.mutexSelect"}},[_vm._v("选项互斥")])],1),_c('div',{staticClass:"control-item"},[_c('span',{staticClass:"label",staticStyle:{"width":"60px"}},[_vm._v("分隔符")]),_c('el-select',{staticStyle:{"text-align":"left","font-size":"20px"},attrs:{"placeholder":"分隔符","size":"mini"},model:{value:(_vm.textParam.downListProperty.splitCharacter),callback:function ($$v) {_vm.$set(_vm.textParam.downListProperty, "splitCharacter", $$v)},expression:"textParam.downListProperty.splitCharacter"}},[_c('el-option',{attrs:{"label":",","value":","}}),_c('el-option',{attrs:{"label":"、","value":"、"}}),_c('el-option',{attrs:{"label":"/","value":"/"}}),_c('el-option',{attrs:{"label":"-","value":"-"}}),_c('el-option',{attrs:{"label":"\\","value":"\\"}})],1)],1)]):_vm._e(),_c('li',{staticClass:"line"}),_c('li',{staticClass:"control-item"},[_c('span',{staticClass:"label"},[_vm._v("提示文本")]),_c('el-input',{attrs:{"type":"textarea","size":"mini","placeholder":"提示文本"},model:{value:(_vm.textParam.tipText),callback:function ($$v) {_vm.$set(_vm.textParam, "tipText", $$v)},expression:"textParam.tipText"}})],1),_c('li',{staticClass:"control-item"},[_c('span',{staticClass:"label"},[_vm._v("内容只读状态")]),_c('el-select',{staticStyle:{"text-align":"left"},attrs:{"placeholder":"请选择","size":"mini"},model:{value:(_vm.textParam.readOnlyStatus),callback:function ($$v) {_vm.$set(_vm.textParam, "readOnlyStatus", $$v)},expression:"textParam.readOnlyStatus"}},[_c('el-option',{attrs:{"label":"继承父元素","value":2}}),_c('el-option',{attrs:{"label":"是","value":0}}),_c('el-option',{attrs:{"label":"否","value":1}})],1)],1),_c('li',{staticClass:"control-item"},[_c('span',{staticClass:"label"},[_vm._v("固定宽度")]),_c('el-input-number',{staticStyle:{"width":"120px","display":"flex"},attrs:{"size":"mini","precision":2,"min":0,"controls":false},model:{value:(_vm.textParam.fixedWidth),callback:function ($$v) {_vm.$set(_vm.textParam, "fixedWidth", $$v)},expression:"textParam.fixedWidth"}}),_c('span',{staticStyle:{"padding-left":"10px"}},[_vm._v("厘米")])],1),_c('li',{staticClass:"line"}),_c('li',{staticClass:"control-item"},[_c('div',{staticClass:"control-item"},[_c('el-checkbox',{model:{value:(_vm.textParam.canModifyContent),callback:function ($$v) {_vm.$set(_vm.textParam, "canModifyContent", $$v)},expression:"textParam.canModifyContent"}},[_vm._v("用户可以直接编辑修改内容")])],1),_c('div',{staticClass:"control-item"},[_c('el-checkbox',{model:{value:(_vm.textParam.isAllowDelete),callback:function ($$v) {_vm.$set(_vm.textParam, "isAllowDelete", $$v)},expression:"textParam.isAllowDelete"}},[_vm._v("允许被删除")])],1),_c('div',{staticClass:"control-item"},[_c('el-checkbox',{model:{value:(_vm.textParam.enableGlobalColor),callback:function ($$v) {_vm.$set(_vm.textParam, "enableGlobalColor", $$v)},expression:"textParam.enableGlobalColor"}},[_vm._v("启用全局文本颜色")])],1)]),_c('li',{staticClass:"control-item"},[_c('div',{staticClass:"control-item"},[_c('el-checkbox',{model:{value:(_vm.textParam.alignWithBlocked),callback:function ($$v) {_vm.$set(_vm.textParam, "alignWithBlocked", $$v)},expression:"textParam.alignWithBlocked"}},[_vm._v("文本域中的段落使用块对齐（诊断专用）")])],1),_c('div',{staticClass:"control-item",staticStyle:{"margin-left":"38px"}},[_c('el-checkbox',{model:{value:(_vm.textParam.readType),callback:function ($$v) {_vm.$set(_vm.textParam, "readType", $$v)},expression:"textParam.readType"}},[_vm._v("自动回填")])],1)])])]),_c('tab-pane',{attrs:{"label":"其他属性","notHover":false,"name":"third"}},[_c('ul',{staticClass:"control-list"},[_c('li',{staticClass:"control-item"},[_c('span',{staticClass:"label"},[_vm._v("数据源")]),_c('el-button',{attrs:{"size":"mini"},on:{"click":_vm.openDataSourceModal}},[_vm._v("设置数据源")])],1)])]),_vm._t("hoTextFieldModal")],2)],1),_c('footer',{staticClass:"ho-modal-footer"},[_c('el-button',{attrs:{"size":"small","type":"primary"},on:{"click":_vm.sure}},[_vm._v("确定")]),_c('el-button',{staticStyle:{"margin-left":"30px"},attrs:{"size":"small"},on:{"click":_vm.handleClose}},[_vm._v("取消")])],1)])}
-var TextDialogvue_type_template_id_75c07514_staticRenderFns = []
+;// CONCATENATED MODULE: ./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/textDialog/TextDialog.vue?vue&type=template&id=52be23a2&
+var TextDialogvue_type_template_id_52be23a2_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{class:_vm.animationClassNames},[_c('header',{staticClass:"modal-title"},[_c('span',[_vm._v("文本域")]),_c('i',{staticClass:"el-icon-close modal-title-close",on:{"click":_vm.handleClose}})]),_c('section',{staticClass:"modal-content"},[_c('tabs',{attrs:{"tabKey":_vm.textActiveName}},[_c('tab-pane',{attrs:{"label":"基本属性","notHover":false,"name":"first"}},[_c('ul',{staticClass:"control-list"},[_c('li',{staticClass:"control-item"},[_c('span',{staticClass:"label"},[_vm._v("类型")]),_c('el-radio',{attrs:{"disabled":_vm.controlStatus === 'update',"size":"small","label":0},model:{value:(_vm.textParam.inputFieldType),callback:function ($$v) {_vm.$set(_vm.textParam, "inputFieldType", $$v)},expression:"textParam.inputFieldType"}},[_vm._v("直接输入文本数据")]),_c('el-radio',{attrs:{"disabled":_vm.controlStatus === 'update',"size":"small","label":1},model:{value:(_vm.textParam.inputFieldType),callback:function ($$v) {_vm.$set(_vm.textParam, "inputFieldType", $$v)},expression:"textParam.inputFieldType"}},[_vm._v("下拉列表方式")])],1),_c('li',{staticClass:"control-item"},[_c('span',{staticClass:"label"},[_vm._v("编号")]),_c('span',{staticClass:"readonly-value"},[_vm._v(_vm._s(_vm.textParam.id))])]),_c('li',{staticClass:"control-item"},[_c('span',{staticClass:"label"},[_vm._v("内部标识符")]),_c('el-input',{attrs:{"size":"mini","placeholder":"内部标识符"},model:{value:(_vm.textParam.innerIdentifier),callback:function ($$v) {_vm.$set(_vm.textParam, "innerIdentifier", $$v)},expression:"textParam.innerIdentifier"}})],1),_c('li',{staticClass:"control-item"},[_c('span',{staticClass:"label"},[_vm._v("数据元标识符")]),_c('el-input',{attrs:{"size":"mini","placeholder":"数据元标识符"},model:{value:(_vm.textParam.dataMetaIdentifier),callback:function ($$v) {_vm.$set(_vm.textParam, "dataMetaIdentifier", $$v)},expression:"textParam.dataMetaIdentifier"}})],1),_c('li',{staticClass:"control-item"},[_c('span',{staticClass:"label"},[_vm._v("表示格式")]),_c('el-input',{attrs:{"size":"mini","placeholder":"表示格式"},model:{value:(_vm.textParam.identifierFormat),callback:function ($$v) {_vm.$set(_vm.textParam, "identifierFormat", $$v)},expression:"textParam.identifierFormat"}})],1),_c('li',{staticClass:"control-item"},[_c('span',{staticClass:"label"},[_vm._v("名称")]),_c('el-input',{attrs:{"size":"mini","placeholder":"名称"},model:{value:(_vm.textParam.name),callback:function ($$v) {_vm.$set(_vm.textParam, "name", $$v)},expression:"textParam.name"}})],1),_c('li',{staticClass:"line"}),(_vm.textParam.inputFieldType === 0)?_c('li',{staticClass:"control-item"},[_c('span',{staticClass:"label"},[_vm._v("文本内容")]),_c('el-input',{attrs:{"disabled":_vm.controlStatus === 'update',"size":"mini","placeholder":"文本内容"},model:{value:(_vm.textParam.text),callback:function ($$v) {_vm.$set(_vm.textParam, "text", $$v)},expression:"textParam.text"}})],1):_vm._e(),(_vm.textParam.inputFieldType === 1)?_c('li',{staticClass:"control-item"},[_c('span',{staticClass:"label"},[_vm._v("下拉列表")]),_c('el-input',{attrs:{"size":"mini","disabled":true,"placeholder":"下拉列表项"},model:{value:(_vm.textParam.downListProperty.source),callback:function ($$v) {_vm.$set(_vm.textParam.downListProperty, "source", $$v)},expression:"textParam.downListProperty.source"}}),_c('el-button',{attrs:{"size":"mini"},on:{"click":function($event){$event.stopPropagation();return _vm.openListArrModel.apply(null, arguments)}}},[_vm._v("浏览")])],1):_vm._e(),(_vm.textParam.inputFieldType === 1)?_c('li',{staticClass:"control-item"},[_c('span',{staticClass:"label"},[_vm._v("是否多选")]),_c('div',{staticStyle:{"width":"40%"}},[_c('el-checkbox',{on:{"change":_vm.allowMultiSelectChange},model:{value:(_vm.textParam.downListProperty.allowMultiSelected),callback:function ($$v) {_vm.$set(_vm.textParam.downListProperty, "allowMultiSelected", $$v)},expression:"textParam.downListProperty.allowMultiSelected"}},[_vm._v("允许多选")]),_c('el-checkbox',{model:{value:(_vm.textParam.downListProperty.mutexSelect),callback:function ($$v) {_vm.$set(_vm.textParam.downListProperty, "mutexSelect", $$v)},expression:"textParam.downListProperty.mutexSelect"}},[_vm._v("选项互斥")])],1),_c('div',{staticClass:"control-item"},[_c('span',{staticClass:"label",staticStyle:{"width":"60px"}},[_vm._v("分隔符")]),_c('el-select',{staticStyle:{"text-align":"left","font-size":"20px"},attrs:{"placeholder":"分隔符","size":"mini"},model:{value:(_vm.textParam.downListProperty.splitCharacter),callback:function ($$v) {_vm.$set(_vm.textParam.downListProperty, "splitCharacter", $$v)},expression:"textParam.downListProperty.splitCharacter"}},[_c('el-option',{attrs:{"label":",","value":","}}),_c('el-option',{attrs:{"label":"、","value":"、"}}),_c('el-option',{attrs:{"label":"/","value":"/"}}),_c('el-option',{attrs:{"label":"-","value":"-"}}),_c('el-option',{attrs:{"label":"\\","value":"\\"}})],1)],1)]):_vm._e(),_c('li',{staticClass:"line"}),_c('li',{staticClass:"control-item"},[_c('span',{staticClass:"label"},[_vm._v("提示文本")]),_c('el-input',{attrs:{"type":"textarea","size":"mini","placeholder":"提示文本"},model:{value:(_vm.textParam.tipText),callback:function ($$v) {_vm.$set(_vm.textParam, "tipText", $$v)},expression:"textParam.tipText"}})],1),_c('li',{staticClass:"control-item"},[_c('span',{staticClass:"label"},[_vm._v("内容只读状态")]),_c('el-select',{staticStyle:{"text-align":"left"},attrs:{"placeholder":"请选择","size":"mini"},model:{value:(_vm.textParam.readOnlyStatus),callback:function ($$v) {_vm.$set(_vm.textParam, "readOnlyStatus", $$v)},expression:"textParam.readOnlyStatus"}},[_c('el-option',{attrs:{"label":"继承父元素","value":2}}),_c('el-option',{attrs:{"label":"是","value":0}}),_c('el-option',{attrs:{"label":"否","value":1}})],1)],1),_c('li',{staticClass:"control-item"},[_c('span',{staticClass:"label"},[_vm._v("固定宽度")]),_c('el-input-number',{staticStyle:{"width":"120px","display":"flex"},attrs:{"size":"mini","precision":2,"min":0,"controls":false},model:{value:(_vm.textParam.fixedWidth),callback:function ($$v) {_vm.$set(_vm.textParam, "fixedWidth", $$v)},expression:"textParam.fixedWidth"}}),_c('span',{staticStyle:{"padding-left":"10px"}},[_vm._v("厘米")])],1),_c('li',{staticClass:"line"}),_c('li',{staticClass:"control-item"},[_c('div',{staticClass:"control-item"},[_c('el-checkbox',{model:{value:(_vm.textParam.canModifyContent),callback:function ($$v) {_vm.$set(_vm.textParam, "canModifyContent", $$v)},expression:"textParam.canModifyContent"}},[_vm._v("用户可以直接编辑修改内容")])],1),_c('div',{staticClass:"control-item"},[_c('el-checkbox',{model:{value:(_vm.textParam.isAllowDelete),callback:function ($$v) {_vm.$set(_vm.textParam, "isAllowDelete", $$v)},expression:"textParam.isAllowDelete"}},[_vm._v("允许被删除")])],1),_c('div',{staticClass:"control-item"},[_c('el-checkbox',{model:{value:(_vm.textParam.enableGlobalColor),callback:function ($$v) {_vm.$set(_vm.textParam, "enableGlobalColor", $$v)},expression:"textParam.enableGlobalColor"}},[_vm._v("启用全局文本颜色")])],1)]),_c('li',{staticClass:"control-item"},[_c('div',{staticClass:"control-item"},[_c('el-checkbox',{model:{value:(_vm.textParam.alignWithBlocked),callback:function ($$v) {_vm.$set(_vm.textParam, "alignWithBlocked", $$v)},expression:"textParam.alignWithBlocked"}},[_vm._v("文本域中的段落使用块对齐（诊断专用）")])],1),_c('div',{staticClass:"control-item",staticStyle:{"margin-left":"38px"}},[_c('el-checkbox',{model:{value:(_vm.textParam.readType),callback:function ($$v) {_vm.$set(_vm.textParam, "readType", $$v)},expression:"textParam.readType"}},[_vm._v("自动回填")])],1)])])]),_c('tab-pane',{attrs:{"label":"其他属性","notHover":false,"name":"third"}},[_c('ul',{staticClass:"control-list"},[_c('li',{staticClass:"control-item"},[_c('span',{staticClass:"label"},[_vm._v("数据源")]),_c('el-button',{attrs:{"size":"mini"},on:{"click":_vm.openDataSourceModal}},[_vm._v("设置数据源")])],1)])]),_vm._t("hoTextFieldModal")],2)],1),_c('footer',{staticClass:"ho-modal-footer"},[_c('el-button',{attrs:{"size":"small","type":"primary"},on:{"click":_vm.sure}},[_vm._v("确定")]),_c('el-button',{staticStyle:{"margin-left":"30px"},attrs:{"size":"small"},on:{"click":_vm.handleClose}},[_vm._v("取消")])],1)])}
+var TextDialogvue_type_template_id_52be23a2_staticRenderFns = []
 
 
 ;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js!./node_modules/ts-loader/index.js??clonedRuleSet-41[0].rules[0].use[1]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/textDialog/TextDialog.vue?vue&type=script&lang=ts&
@@ -226933,12 +227083,12 @@ var TextDialog = /*#__PURE__*/function (_Vue) {
 
     _this = _super.apply(this, arguments);
     _this.textParam = Object.assign({}, textParams);
-    _this.textActiveName = "first";
+    _this.textActiveName = 'first';
     _this.isMinLenth = false;
     _this.isMaxLenth = false;
     _this.isMin = false;
     _this.isMax = false;
-    _this.animationClassNames = "control-modal-contents text-modal animation-in";
+    _this.animationClassNames = 'control-modal-contents text-modal animation-in';
     _this.customPropertyValue = new Object();
     _this.endPath = '';
     return _this;
@@ -226974,15 +227124,15 @@ var TextDialog = /*#__PURE__*/function (_Vue) {
       var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this.hoEditorFactoryId);
       this.endPath = hoEditorFactory.docTree.curDomRange.normalize().endPath;
 
-      if (this.controlStatus === "update") {
+      if (this.controlStatus === 'update') {
         var updateNode = this.getTextNode();
         Object.keys(this.textParam).forEach(function (v) {
-          var key = v.replace(/_/g, "");
+          var key = v.replace(/_/g, '');
 
           if (Object.prototype.hasOwnProperty.call(_this2.textParam, key)) {
-            if (key === "readOnlyStatus") {
+            if (key === 'readOnlyStatus') {
               _this2.textParam.readOnlyStatus = Number(updateNode.readOnlyStatus);
-            } else if (key === "customProperty") {
+            } else if (key === 'customProperty') {
               if ((0,type/* isObject */.Kn)(updateNode[key])) {
                 _this2.textParam.customProperty = updateNode.customProperty;
               } else {
@@ -226994,7 +227144,7 @@ var TextDialog = /*#__PURE__*/function (_Vue) {
                 property[key] = _this2.textParam.customProperty[key];
               });
               _this2.customPropertyValue = _objectSpread2({}, property);
-            } else if (key === "readType") {
+            } else if (key === 'readType') {
               _this2.textParam.readType = updateNode.readType == 1 ? true : false;
             } else {
               _this2.textParam[key] = updateNode[key];
@@ -227010,8 +227160,8 @@ var TextDialog = /*#__PURE__*/function (_Vue) {
           this.textParam.inputFieldType = 0;
         }
       } else {
-        this.textParam.id = this.vueController.generateID("TF");
-        this.textParam.downListProperty.splitCharacter = ",";
+        this.textParam.id = this.vueController.generateID('TF');
+        this.textParam.downListProperty.splitCharacter = ',';
       }
     }
   }, {
@@ -227086,6 +227236,13 @@ var TextDialog = /*#__PURE__*/function (_Vue) {
           if (v.default) textArr.push(v.text);
         });
         this.textParam.text = textArr.join(',');
+        var value = '';
+        this.getListStyle().forEach(function (v, index) {
+          if (v.default) {
+            value += v.id + ',';
+          }
+        });
+        this.textParam.keyValue = value;
       } else {
         this.textParam.downListProperty = new TextInputFieldNode/* DownListProperty */.OL();
       }
@@ -227093,18 +227250,18 @@ var TextDialog = /*#__PURE__*/function (_Vue) {
       this.textParam.bandDataSource = this.dataSource;
 
       if (this.textParam.inputFieldType === 0) {
-        this.textParam.name = this.textParam.name ? this.textParam.name : "请输入";
+        this.textParam.name = this.textParam.name ? this.textParam.name : '请输入';
       } else if (this.textParam.inputFieldType === 1) {
-        this.textParam.name = this.textParam.name ? this.textParam.name : "请选择";
+        this.textParam.name = this.textParam.name ? this.textParam.name : '请选择';
       }
 
       this.textParam.labelText = this.textParam.name;
       this.textParam.customProperty = _objectSpread2({}, this.customProperty);
       this.textParam.readType ? this.textParam.readType = 1 : this.textParam.readType = 0;
 
-      if (this.controlStatus === "add") {
+      if (this.controlStatus === 'add') {
         this.vueController.insertTextInputField(this.controlStatus, this.textParam);
-      } else if (this.controlStatus === "update") {
+      } else if (this.controlStatus === 'update') {
         this.vueController.updateTextInputField(this.textParam);
       }
 
@@ -227113,8 +227270,8 @@ var TextDialog = /*#__PURE__*/function (_Vue) {
   }, {
     key: "handleClose",
     value: function handleClose() {
-      this.animationClassNames = "control-modal-contents text-modal animation-out";
-      this.$emit("closed");
+      this.animationClassNames = 'control-modal-contents text-modal animation-out';
+      this.$emit('closed');
       this.endPath = '';
     }
   }]);
@@ -227130,28 +227287,28 @@ __decorate([Prop()], TextDialog.prototype, "controlStatus", void 0);
 
 __decorate([Prop()], TextDialog.prototype, "vueController", void 0);
 
-__decorate([Inject("setIsDataSource")], TextDialog.prototype, "setIsDataSource", void 0);
+__decorate([Inject('setIsDataSource')], TextDialog.prototype, "setIsDataSource", void 0);
 
-__decorate([Inject("getDataSource")], TextDialog.prototype, "getDataSource", void 0);
+__decorate([Inject('getDataSource')], TextDialog.prototype, "getDataSource", void 0);
 
-__decorate([Inject("setIsCustoms")], TextDialog.prototype, "setIsCustoms", void 0);
+__decorate([Inject('setIsCustoms')], TextDialog.prototype, "setIsCustoms", void 0);
 
-__decorate([Inject("getCustomsValue")], TextDialog.prototype, "getCustomsValue", void 0);
+__decorate([Inject('getCustomsValue')], TextDialog.prototype, "getCustomsValue", void 0);
 
-__decorate([Inject("setListAllowMultiSelected")], TextDialog.prototype, "setListAllowMultiSelected", void 0);
+__decorate([Inject('setListAllowMultiSelected')], TextDialog.prototype, "setListAllowMultiSelected", void 0);
 
-__decorate([Inject("setIsListStyle")], TextDialog.prototype, "setIsListStyle", void 0);
+__decorate([Inject('setIsListStyle')], TextDialog.prototype, "setIsListStyle", void 0);
 
-__decorate([Inject("getListStyle")], TextDialog.prototype, "getListStyle", void 0);
+__decorate([Inject('getListStyle')], TextDialog.prototype, "getListStyle", void 0);
 
-__decorate([Inject("getListArrSource")], TextDialog.prototype, "getListArrSource", void 0);
+__decorate([Inject('getListArrSource')], TextDialog.prototype, "getListArrSource", void 0);
 
-__decorate([Inject("setListStyle")], TextDialog.prototype, "setListStyle", void 0);
+__decorate([Inject('setListStyle')], TextDialog.prototype, "setListStyle", void 0);
 
-__decorate([Inject("getCustomProperty")], TextDialog.prototype, "getCustomProperty", void 0);
+__decorate([Inject('getCustomProperty')], TextDialog.prototype, "getCustomProperty", void 0);
 
 TextDialog = __decorate([vue_class_component_esm({
-  name: "TextDialog",
+  name: 'TextDialog',
   components: {
     Tabs: Tab
   }
@@ -227175,8 +227332,8 @@ TextDialog = __decorate([vue_class_component_esm({
 
 var TextDialog_component = normalizeComponent(
   textDialog_TextDialogvue_type_script_lang_ts_,
-  TextDialogvue_type_template_id_75c07514_render,
-  TextDialogvue_type_template_id_75c07514_staticRenderFns,
+  TextDialogvue_type_template_id_52be23a2_render,
+  TextDialogvue_type_template_id_52be23a2_staticRenderFns,
   false,
   null,
   null,
@@ -233152,6 +233309,13 @@ var HoDocs = /*#__PURE__*/function (_Mixins) {
       var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().hoEditorFactoryMap.get(activeDocId);
       hoEditorFactory && (hoEditorFactory.isEnabledGlobalColor = this.isEnabledGlobalColor);
     }
+  }, {
+    key: "isSameColorWithEmptyVlaueChange",
+    value: function isSameColorWithEmptyVlaueChange() {
+      var activeDocId = this.activeDocId ? this.activeDocId : this.hoEditorFactoryIdList[0];
+      var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().hoEditorFactoryMap.get(activeDocId);
+      hoEditorFactory && (hoEditorFactory.isSameColorWithEmptyVlaue = this.isSameColorWithEmptyVlaue);
+    }
   }, {
     key: "created",
     value: function created() {
@@ -233203,6 +233367,7 @@ var HoDocs = /*#__PURE__*/function (_Mixins) {
         hoEditor.isUseForm = _this3.isUseForm;
         hoEditor.printBlack = _this3.printBlack;
         hoEditor.isEnabledGlobalColor = _this3.isEnabledGlobalColor;
+        hoEditor.isSameColorWithEmptyVlaue = _this3.isSameColorWithEmptyVlaue;
         hoEditor.contentIsModify = _this3.contentIsModify;
         hoEditor.isCanEditHeadFoot = _this3.isCanEditHeadFoot;
         hoEditor.docTree.docProperty = _this3.defaultDocProperty;
@@ -233582,6 +233747,10 @@ __decorate([Prop({
   default: false
 })], HoDocs.prototype, "isEnabledGlobalColor", void 0);
 
+__decorate([Prop({
+  default: false
+})], HoDocs.prototype, "isSameColorWithEmptyVlaue", void 0);
+
 __decorate([Watch('contentIsModify', {
   deep: true
 })], HoDocs.prototype, "contentIsModifyChange", null);
@@ -233632,6 +233801,8 @@ __decorate([Watch('printBlack')], HoDocs.prototype, "printBlackChange", null);
 
 __decorate([Watch('isEnabledGlobalColor')], HoDocs.prototype, "isEnabledGlobalColorChange", null);
 
+__decorate([Watch('isSameColorWithEmptyVlaue')], HoDocs.prototype, "isSameColorWithEmptyVlaueChange", null);
+
 HoDocs = __decorate([vue_class_component_esm({
   name: 'HoDocs',
   components: {