hoeditor-web 3.0.85 → 3.0.87

package/lib/hoeditor.umd.js

@@ -13500,7 +13500,7 @@ var component = (0,componentNormalizer/* default */.Z)(
 
 /***/ }),
 
-/***/ 82243:
+/***/ 8632:
 /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -13512,14 +13512,17 @@ __webpack_require__.d(__webpack_exports__, {
   "default": function() { return /* binding */ RadioCheckbox; }
 });
 
-;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/radioCheckBox/RadioCheckbox.vue?vue&type=template&id=3f147ff5&
+// EXTERNAL MODULE: ./node_modules/core-js/modules/es.function.name.js
+var es_function_name = __webpack_require__(68309);
+;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/radioCheckBox/RadioCheckbox.vue?vue&type=template&id=0d790650&
+
 var render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
     class: 'control-modal-contents radio-checkbox-modal ' + _vm.animationClassName,
     style: {
-      width: _vm.boxGroup === 1 ? '1060px' : '500px'
+      width: _vm.boxGroup === 1 ? '1160px' : '500px'
     }
   }, [_c('header', {
     staticClass: "modal-title"
@@ -13661,7 +13664,7 @@ var render = function render() {
     key: "tipText",
     attrs: {
       "title": "提示文本",
-      "width": 100
+      "width": 80
     },
     scopedSlots: _vm._u([{
       key: "default",
@@ -13709,7 +13712,7 @@ var render = function render() {
     key: "innerIdentifier",
     attrs: {
       "title": "内部标识符",
-      "width": 120
+      "width": 80
     },
     scopedSlots: _vm._u([{
       key: "default",
@@ -13733,7 +13736,7 @@ var render = function render() {
     key: "dataMetaIdentifier",
     attrs: {
       "title": "数据元标识符",
-      "width": 120
+      "width": 80
     },
     scopedSlots: _vm._u([{
       key: "default",
@@ -13757,7 +13760,7 @@ var render = function render() {
     key: "identifierFormat",
     attrs: {
       "title": "表示格式",
-      "width": 100
+      "width": 80
     },
     scopedSlots: _vm._u([{
       key: "default",
@@ -13903,6 +13906,48 @@ var render = function render() {
         })];
       }
     }], null, false, 3493846107)
+  }), _c('a-table-column', {
+    key: "associatedElement",
+    attrs: {
+      "title": "关联后元素必填",
+      "width": 260
+    },
+    scopedSlots: _vm._u([{
+      key: "default",
+      fn: function fn(text, record) {
+        return [_c('a-select', {
+          staticStyle: {
+            "text-align": "left",
+            "width": "100%"
+          },
+          attrs: {
+            "showSearch": "",
+            "allowClear": "",
+            "placeholder": "请选择需要关联的元素"
+          },
+          model: {
+            value: record.associatedElement,
+            callback: function callback($$v) {
+              _vm.$set(record, "associatedElement", $$v);
+            },
+            expression: "record.associatedElement"
+          }
+        }, _vm._l(_vm.nodeList, function (node, index) {
+          return _c('a-select-option', {
+            key: node.name + '___' + node.dataId + '___' + index,
+            attrs: {
+              "value": node.dataId
+            }
+          }, [_c('div', {
+            staticStyle: {
+              "display": "flex",
+              "justify-content": "space-between",
+              "font-size": "12px"
+            }
+          }, [_c('span', [_vm._v(_vm._s(node.name))]), _c('span', [_vm._v(_vm._s(node.dataId))])])]);
+        }), 1)];
+      }
+    }], null, false, 2145354177)
   }), _c('a-table-column', {
     key: "opt",
     attrs: {
@@ -14113,7 +14158,42 @@ var render = function render() {
       },
       expression: "radioCheckBox.additionalData"
     }
-  })], 1)] : _vm._e()], 2)]), _c('footer', {
+  })], 1), _c('li', {
+    staticClass: "control-item"
+  }, [_c('span', {
+    staticClass: "label"
+  }, [_vm._v("关联后元素必填")]), _c('a-select', {
+    staticStyle: {
+      "text-align": "left"
+    },
+    attrs: {
+      "getPopupContainer": function getPopupContainer(triggerNode) {
+        return triggerNode.parentNode;
+      },
+      "showSearch": "",
+      "allowClear": "",
+      "placeholder": "关联后元素必填"
+    },
+    model: {
+      value: _vm.radioCheckBox.associatedElement,
+      callback: function callback($$v) {
+        _vm.$set(_vm.radioCheckBox, "associatedElement", $$v);
+      },
+      expression: "radioCheckBox.associatedElement"
+    }
+  }, _vm._l(_vm.nodeList, function (node, index) {
+    return _c('a-select-option', {
+      key: node.name + '___' + node.dataId + '___' + index,
+      attrs: {
+        "value": node.dataId
+      }
+    }, [_c('div', {
+      staticStyle: {
+        "display": "flex",
+        "justify-content": "space-between"
+      }
+    }, [_c('span', [_vm._v(_vm._s(node.name))]), _c('span', [_vm._v(_vm._s(node.dataId))])])]);
+  }), 1)], 1)] : _vm._e()], 2)]), _c('footer', {
     staticClass: "ho-modal-footer"
   }, [_vm.boxGroup === 1 ? _c('a-button', {
     staticStyle: {
@@ -14143,6 +14223,8 @@ var render = function render() {
 };
 var staticRenderFns = [];
 
+;// CONCATENATED MODULE: ./src/components/controls/radioCheckBox/RadioCheckbox.vue?vue&type=template&id=0d790650&
+
 // EXTERNAL MODULE: ./node_modules/@babel/runtime/helpers/esm/objectSpread2.js
 var objectSpread2 = __webpack_require__(63442);
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.json.stringify.js
@@ -14165,6 +14247,10 @@ var es_array_splice = __webpack_require__(40561);
 var RadioAndCheckBoxNode = __webpack_require__(99152);
 // EXTERNAL MODULE: ./src/HOEditorFactorys.ts
 var HOEditorFactorys = __webpack_require__(74089);
+// EXTERNAL MODULE: ./src/editor/dom/treeNode/TextInputFieldNode.ts
+var TextInputFieldNode = __webpack_require__(90161);
+// EXTERNAL MODULE: ./src/editor/dom/treeNode/BaseCombineNode.ts
+var BaseCombineNode = __webpack_require__(4938);
 ;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/radioCheckBox/RadioCheckbox.vue?vue&type=script&lang=js&
 
 
@@ -14177,9 +14263,12 @@ var HOEditorFactorys = __webpack_require__(74089);
 
 
 
+
+
+
 var defaultBox = {
   id: '',
-  dataId: "",
+  dataId: '',
   title: '',
   groupName: '',
   controlStyle: '',
@@ -14204,7 +14293,8 @@ var defaultBox = {
   readType: false,
   isTransToText: false,
   isEditText: false,
-  groupHasOptions: false
+  groupHasOptions: false,
+  associatedElement: ''
 };
 /* harmony default export */ var RadioCheckboxvue_type_script_lang_js_ = ({
   name: 'RadioCheckBox',
@@ -14220,7 +14310,8 @@ var defaultBox = {
       dynamicTags: [],
       inputVisible: false,
       inputValue: '',
-      saveTagInput: null
+      saveTagInput: null,
+      nodeList: []
     };
   },
   inject: {
@@ -14252,9 +14343,11 @@ var defaultBox = {
   },
   created: function created() {
     var _this = this;
+    this.nodeList = this.getTextFieldNode();
     if (this.controlStatus === 'update') {
+      var _updateNode$value;
       var updateNode = this.getRadioCheckNode();
-      if (updateNode.value.groupName) {
+      if ((_updateNode$value = updateNode.value) !== null && _updateNode$value !== void 0 && _updateNode$value.groupName) {
         updateNode.valueList.forEach(function (v) {
           var value = {
             id: v.id,
@@ -14296,6 +14389,29 @@ var defaultBox = {
     }
   },
   methods: {
+    getTextFieldNode: function getTextFieldNode() {
+      var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this.hoEditorFactoryId);
+      var ret = [];
+      var getAllNodes = function getAllNodes(nodes) {
+        for (var i = 0; i < nodes.length; i++) {
+          var node = nodes[i];
+          if (node instanceof TextInputFieldNode/* TextInputFieldNode */.re) {
+            if (node.name == '单次用量') {}
+            ret.push({
+              dataId: node.dataId,
+              name: node.name,
+              text: node.text
+            });
+          }
+          if (node instanceof BaseCombineNode/* BaseCombineNode */.V) {
+            getAllNodes(node.childNodes);
+          }
+        }
+      };
+      var mainNodes = hoEditorFactory.docTree.mainNodes;
+      getAllNodes(mainNodes);
+      return ret;
+    },
     defaultSelectChange: function defaultSelectChange(index) {
       if (this.controlType === 'RadioBox') {
         this.radioCheckBoxGroup.map(function (v, key) {
@@ -14309,8 +14425,8 @@ var defaultBox = {
       }
     },
     getRadioCheckNode: function getRadioCheckNode() {
-      var _hoEditorFactory$vueC;
-      var value = null;
+      var _hoEditorFactory$vueC, _value;
+      var value = {};
       var valueList = [];
       var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this.hoEditorFactoryId);
       var path = hoEditorFactory.docTree.curDomRange.normalize().endPath;
@@ -14319,7 +14435,7 @@ var defaultBox = {
       if (node instanceof RadioAndCheckBoxNode/* RadioAndCheckBoxNode */.Yh) {
         value = node;
       }
-      if (value.groupName) {
+      if ((_value = value) !== null && _value !== void 0 && _value.groupName) {
         radioAndCheckBoxs.forEach(function (v) {
           if (v.groupName === value.groupName && v.controlStyle === value.controlStyle) {
             valueList.push(v);
@@ -14409,10 +14525,10 @@ var defaultBox = {
 });
 ;// CONCATENATED MODULE: ./src/components/controls/radioCheckBox/RadioCheckbox.vue?vue&type=script&lang=js&
  /* harmony default export */ var radioCheckBox_RadioCheckboxvue_type_script_lang_js_ = (RadioCheckboxvue_type_script_lang_js_); 
-;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/radioCheckBox/RadioCheckbox.vue?vue&type=style&index=0&id=3f147ff5&prod&lang=scss&
+;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/radioCheckBox/RadioCheckbox.vue?vue&type=style&index=0&id=0d790650&prod&lang=scss&
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./src/components/controls/radioCheckBox/RadioCheckbox.vue?vue&type=style&index=0&id=3f147ff5&prod&lang=scss&
+;// CONCATENATED MODULE: ./src/components/controls/radioCheckBox/RadioCheckbox.vue?vue&type=style&index=0&id=0d790650&prod&lang=scss&
 
 // EXTERNAL MODULE: ./node_modules/@vue/vue-loader-v15/lib/runtime/componentNormalizer.js
 var componentNormalizer = __webpack_require__(70713);
@@ -16597,7 +16713,7 @@ var component = (0,componentNormalizer/* default */.Z)(
 
 /***/ }),
 
-/***/ 47158:
+/***/ 63718:
 /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -16613,7 +16729,7 @@ __webpack_require__.d(__webpack_exports__, {
 var es_array_includes = __webpack_require__(26699);
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.string.includes.js
 var es_string_includes = __webpack_require__(32023);
-;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/table/TableCellProperty.vue?vue&type=template&id=59ad6eba&
+;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/table/TableCellProperty.vue?vue&type=template&id=c8ad1234&
 
 
 var render = function render() {
@@ -17447,7 +17563,7 @@ var render = function render() {
 };
 var staticRenderFns = [];
 
-;// CONCATENATED MODULE: ./src/components/controls/table/TableCellProperty.vue?vue&type=template&id=59ad6eba&
+;// CONCATENATED MODULE: ./src/components/controls/table/TableCellProperty.vue?vue&type=template&id=c8ad1234&
 
 // EXTERNAL MODULE: ./node_modules/@babel/runtime/helpers/esm/slicedToArray.js + 3 modules
 var slicedToArray = __webpack_require__(27222);
@@ -17845,10 +17961,10 @@ var columns = [{
 });
 ;// CONCATENATED MODULE: ./src/components/controls/table/TableCellProperty.vue?vue&type=script&lang=js&
  /* harmony default export */ var table_TableCellPropertyvue_type_script_lang_js_ = (TableCellPropertyvue_type_script_lang_js_); 
-;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/table/TableCellProperty.vue?vue&type=style&index=0&id=59ad6eba&prod&lang=scss&
+;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/table/TableCellProperty.vue?vue&type=style&index=0&id=c8ad1234&prod&lang=scss&
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./src/components/controls/table/TableCellProperty.vue?vue&type=style&index=0&id=59ad6eba&prod&lang=scss&
+;// CONCATENATED MODULE: ./src/components/controls/table/TableCellProperty.vue?vue&type=style&index=0&id=c8ad1234&prod&lang=scss&
 
 // EXTERNAL MODULE: ./node_modules/@vue/vue-loader-v15/lib/runtime/componentNormalizer.js
 var componentNormalizer = __webpack_require__(70713);
@@ -47167,13 +47283,13 @@ var PageProperty = /*#__PURE__*/function () {
 /*
  * @Author: your name
  * @Date: 2020-12-24 16:01:16
- * @LastEditTime: 2023-07-13 10:31:51
+ * @LastEditTime: 2023-07-19 09:53:35
  * @LastEditors: liyanan 2441631434@qq.com
  * @Description: In User Settings Edit
  * @FilePath: \hoeditor-web\src\editor\dom\TableProperty.ts
  */
 var TableProperty = /*#__PURE__*/function () {
-  //编号
+  //private _id!: string; //编号
   //自定义属性
   //用户可调整行高
   //用户可调整行宽
@@ -47190,7 +47306,6 @@ var TableProperty = /*#__PURE__*/function () {
   //是否启用表单弹框编辑
   function TableProperty(objectValues) {
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_classCallCheck_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)(this, TableProperty);
-    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_8__/* ["default"] */ .Z)(this, "_id", void 0);
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_8__/* ["default"] */ .Z)(this, "_customProperties", []);
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_8__/* ["default"] */ .Z)(this, "_canAdjustRowHeight", false);
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_8__/* ["default"] */ .Z)(this, "_canAdjustRowWidth", false);
@@ -47224,15 +47339,13 @@ var TableProperty = /*#__PURE__*/function () {
       assignvalue(this, valuesObj);
     }
   }
+  // get id(): string {
+  //     return this._id;
+  // }
+  // set id(value: string) {
+  //     this._id = value;
+  // }
   (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_9__/* ["default"] */ .Z)(TableProperty, [{
-    key: "id",
-    get: function get() {
-      return this._id;
-    },
-    set: function set(value) {
-      this._id = value;
-    }
-  }, {
     key: "customProperties",
     get: function get() {
       return this._customProperties;
@@ -47762,7 +47875,7 @@ var EditorProperty;
   EditorProperty[EditorProperty["Textarea"] = 5] = "Textarea";
 })(EditorProperty || (EditorProperty = {})); //编辑器属性 {无,下拉列表,日期,数值,签名,输入域}
 var ColProperty = /*#__PURE__*/function () {
-  //编号
+  //private _id!: string;//编号
   //编辑器属性
   //垂直对齐方式,
   //宽度
@@ -47773,7 +47886,6 @@ var ColProperty = /*#__PURE__*/function () {
   function ColProperty(objectValues //, table: TableNode
   ) {
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_classCallCheck_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)(this, ColProperty);
-    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_8__/* ["default"] */ .Z)(this, "_id", void 0);
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_8__/* ["default"] */ .Z)(this, "_editorProperty", EditorProperty.None);
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_8__/* ["default"] */ .Z)(this, "_align", VAlign.vatop);
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_8__/* ["default"] */ .Z)(this, "_width", 0);
@@ -47815,15 +47927,13 @@ var ColProperty = /*#__PURE__*/function () {
       }
     }
   }
+  // get id(): string {
+  //     return this._id;
+  // }
+  // set id(value: string) {
+  //     this._id = value;
+  // }
   (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_9__/* ["default"] */ .Z)(ColProperty, [{
-    key: "id",
-    get: function get() {
-      return this._id;
-    },
-    set: function set(value) {
-      this._id = value;
-    }
-  }, {
     key: "editorProperty",
     get: function get() {
       return this._editorProperty;
@@ -47926,9 +48036,9 @@ var DiagonalType;
   DiagonalType[DiagonalType["Right"] = 2] = "Right";
 })(DiagonalType || (DiagonalType = {}));
 var CellProperty = /*#__PURE__*/function () {
-  //编号
+  //private _id!: string;//编号
   //private _lightCellBorders = false;//突出显示单元格边框
-  //标题
+  //private _title = "";//标题
   //自定义属性
   //private _dataSource!: DataSource;//数据源
   //垂直对齐方式
@@ -47947,8 +48057,6 @@ var CellProperty = /*#__PURE__*/function () {
   function CellProperty(objectValues //, table: TableNode
   ) {
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_classCallCheck_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)(this, CellProperty);
-    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_8__/* ["default"] */ .Z)(this, "_id", void 0);
-    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_8__/* ["default"] */ .Z)(this, "_title", "");
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_8__/* ["default"] */ .Z)(this, "_customProperties", []);
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_8__/* ["default"] */ .Z)(this, "_align", VAlign.vatop);
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_8__/* ["default"] */ .Z)(this, "_cellInnerMargin", [0, 0, 0.1, 0.1]);
@@ -48004,29 +48112,25 @@ var CellProperty = /*#__PURE__*/function () {
       }
     }
   }
+  // get id(): string {
+  //     return this._id;
+  // }
+  // set id(value: string) {
+  //     this._id = value;
+  // }
+  // get lightCellBorders(): boolean {
+  //     return this._lightCellBorders;
+  // }
+  // set lightCellBorders(value: boolean) {
+  //     this._lightCellBorders = value;
+  // }
+  // get title(): string {
+  //     return this._title;
+  // }
+  // set title(value: string) {
+  //     this._title = value;
+  // }
   (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_9__/* ["default"] */ .Z)(CellProperty, [{
-    key: "id",
-    get: function get() {
-      return this._id;
-    },
-    set: function set(value) {
-      this._id = value;
-    }
-    // get lightCellBorders(): boolean {
-    //     return this._lightCellBorders;
-    // }
-    // set lightCellBorders(value: boolean) {
-    //     this._lightCellBorders = value;
-    // }
-  }, {
-    key: "title",
-    get: function get() {
-      return this._title;
-    },
-    set: function set(value) {
-      this._title = value;
-    }
-  }, {
     key: "customProperties",
     get: function get() {
       return this._customProperties;
@@ -48198,7 +48302,7 @@ var CellProperty = /*#__PURE__*/function () {
 /*
  * @Author: your name
  * @Date: 2021-01-20 10:18:55
- * @LastEditTime: 2023-05-23 11:29:52
+ * @LastEditTime: 2023-07-18 16:01:49
  * @LastEditors: liyanan 2441631434@qq.com
  * @Description: In User Settings Edit
  * @FilePath: \hoeditor-web\src\editor\dom\domNode\Comment.ts
@@ -48213,6 +48317,7 @@ var Comment = /*#__PURE__*/function () {
 
   // 自定义属性 处理插入批注时带上的评分内容和插入批注后下级医生是否确认处理批注内容
 
+  //是否已处理(标记)
   function Comment(hoEditorFactoryID, id, text, endNode, source) {
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_classCallCheck_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z)(this, Comment);
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_6__/* ["default"] */ .Z)(this, "_id", '');
@@ -48225,6 +48330,7 @@ var Comment = /*#__PURE__*/function () {
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_6__/* ["default"] */ .Z)(this, "_hoEditorFactoryID", void 0);
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_6__/* ["default"] */ .Z)(this, "_customProperty", void 0);
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_6__/* ["default"] */ .Z)(this, "_permissionLevel", void 0);
+    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_6__/* ["default"] */ .Z)(this, "_isProcessed", false);
     this._hoEditorFactoryID = hoEditorFactoryID;
     var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_5__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
     this._id = id;
@@ -48262,6 +48368,16 @@ var Comment = /*#__PURE__*/function () {
         this._customProperty = value;
       }
     }
+  }, {
+    key: "isProcessed",
+    get: function get() {
+      return this._isProcessed;
+    },
+    set: function set(value) {
+      if (this._isProcessed !== value) {
+        this._isProcessed = value;
+      }
+    }
   }, {
     key: "text",
     get: function get() {
@@ -51943,7 +52059,7 @@ var CellNode = /*#__PURE__*/function (_RectNode) {
         customProperty: Array(this.cellProperty.customProperties)
       };
       var cellProperty = {
-        title: this.cellProperty.title,
+        //title: this.cellProperty.title,
         align: Number(this.cellProperty.align || 0),
         obliqueSplitLine: Number(this.cellProperty.obliqueSplitLine || 0),
         //ObliqueSplitLine[Number(this.cellProperty.obliqueSplitLine || 0)],
@@ -59046,6 +59162,7 @@ var RadioAndCheckBoxInstance = /*#__PURE__*/function () {
   //追加文本
   //内容是否转成文本节点
   //同组保存时必须有选项不能全部为空
+  //关联元素id
   function RadioAndCheckBoxInstance() {
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_classCallCheck_js__WEBPACK_IMPORTED_MODULE_4__/* ["default"] */ .Z)(this, RadioAndCheckBoxInstance);
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_20__/* ["default"] */ .Z)(this, "id", void 0);
@@ -59067,6 +59184,7 @@ var RadioAndCheckBoxInstance = /*#__PURE__*/function () {
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_20__/* ["default"] */ .Z)(this, "appendText", "");
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_20__/* ["default"] */ .Z)(this, "isTransToText", false);
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_20__/* ["default"] */ .Z)(this, "groupHasOptions", false);
+    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_20__/* ["default"] */ .Z)(this, "associatedElement", "");
     RadioAndCheckBoxInstance.makeDefaultValue(this);
   }
   (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_21__/* ["default"] */ .Z)(RadioAndCheckBoxInstance, [{
@@ -59265,6 +59383,16 @@ var RadioAndCheckBoxInstance = /*#__PURE__*/function () {
         this.groupHasOptions = value;
       }
     }
+  }, {
+    key: "AssociatedElement",
+    get: function get() {
+      return this.associatedElement;
+    },
+    set: function set(value) {
+      if (this.associatedElement !== value) {
+        this.associatedElement = value;
+      }
+    }
     // get BandDataSource(): BandDataSource {
     //   return this.bandDataSource;
     // }
@@ -59307,6 +59435,7 @@ var RadioAndCheckBoxInstance = /*#__PURE__*/function () {
       ret.appendText = "";
       ret.isTransToText = false;
       ret.groupHasOptions = false;
+      ret.associatedElement = "";
       return ret;
     }
   }]);
@@ -59326,6 +59455,7 @@ var RadioAndCheckBoxNode = /*#__PURE__*/function (_ControlNode) {
   //追加文本
   //内容是否转成文本
   //同组保存时必须有选项不能全部为空
+  //关联元素id
   function RadioAndCheckBoxNode(hoEditorFactoryID, rootNodes, pNode, nodeType, valuesObject, styleIndex //, backColor: string
   ) {
     var _this;
@@ -59341,6 +59471,7 @@ var RadioAndCheckBoxNode = /*#__PURE__*/function (_ControlNode) {
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_20__/* ["default"] */ .Z)((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)(_this), "_appendText", "");
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_20__/* ["default"] */ .Z)((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)(_this), "_isTransToText", false);
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_20__/* ["default"] */ .Z)((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)(_this), "_groupHasOptions", false);
+    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_20__/* ["default"] */ .Z)((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)(_this), "_associatedElement", "");
     _this._styleIndex = styleIndex;
     //const valuesObj = eval("(" + valuesObject + ")");
     _this.setValuesObject(valuesObject);
@@ -59536,6 +59667,16 @@ var RadioAndCheckBoxNode = /*#__PURE__*/function (_ControlNode) {
         this._groupHasOptions = value;
       }
     }
+  }, {
+    key: "associatedElement",
+    get: function get() {
+      return this._associatedElement;
+    },
+    set: function set(value) {
+      if (this._associatedElement !== value) {
+        this._associatedElement = value;
+      }
+    }
     // get bandDataSource(): BandDataSource {
     //   return this._bandDataSource;
     // }
@@ -59601,6 +59742,7 @@ var RadioAndCheckBoxNode = /*#__PURE__*/function (_ControlNode) {
       ret.AppendText = this.appendText !== undefined ? this.appendText : ret.AppendText;
       ret.IsTransToText = this.isTransToText != undefined ? this.isTransToText : ret.IsTransToText;
       ret.GroupHasOptions = this.groupHasOptions != undefined ? this.groupHasOptions : ret.GroupHasOptions;
+      ret.AssociatedElement = this.associatedElement != undefined ? this.associatedElement : ret.AssociatedElement;
       return ret;
     }
     /**
@@ -59724,6 +59866,7 @@ var RadioAndCheckBoxNode = /*#__PURE__*/function (_ControlNode) {
           appendText: this.appendText,
           readType: this.readType,
           //bandDataSource: this.bandDataSource,
+          associatedElement: this.associatedElement,
           remark: this.remark
         };
       }
@@ -59756,6 +59899,7 @@ var RadioAndCheckBoxNode = /*#__PURE__*/function (_ControlNode) {
         isEditText: this.isEditText,
         appendText: this.appendText,
         readType: this.readType,
+        associatedElement: this.associatedElement,
         //bandDataSource: this.bandDataSource,
         remark: this.remark
       };
@@ -64031,7 +64175,7 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
         });
       }
       var defaultCellProp = {
-        title: "",
+        //title: "",
         align: _TableProperty__WEBPACK_IMPORTED_MODULE_30__/* .VAlign.vatop */ .TR.vatop,
         obliqueSplitLine: _TableProperty__WEBPACK_IMPORTED_MODULE_30__/* .ObliqueSplitLine.None */ .lH.None,
         printGridLines: true,
@@ -65240,7 +65384,7 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
 /*
  * @Author: your name
  * @Date: 2020-11-03 15:17:54
- * @LastEditTime: 2023-07-14 09:49:07
+ * @LastEditTime: 2023-07-14 16:52:06
  * @LastEditors: liyanan 2441631434@qq.com
  * @Description: In User Settings Edit
  * @FilePath: \hoeditor-web\src\editor\dom\treeNode\TextInputFieldNode.ts
@@ -66499,9 +66643,10 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
                   hoEditorFactory.docController.deleteRange(aRange, true, 'update');
                 }
                 if (!(text === '')) {
-                  _context2.next = 22;
+                  _context2.next = 23;
                   break;
                 }
+                this._childNodes.splice(1, this._childNodes.length - 2);
                 markNode = new _MarkNode__WEBPACK_IMPORTED_MODULE_47__/* .MarkNode */ .j(this._hoEditorFactoryID, this.rootNodes, this, _BaseNode__WEBPACK_IMPORTED_MODULE_42__/* .NodeType.ntText */ .Jq.ntText, this.labelText, hoEditorFactory.docTree.curStyleIndex, _MarkNode__WEBPACK_IMPORTED_MODULE_47__/* .MarkNodeType.mtContent */ .q.mtContent);
                 hoEditorFactory.undoService.begin();
                 hoEditorFactory.undoService.add(new _editor_undoRedo_NodeInsertUndoUnit__WEBPACK_IMPORTED_MODULE_35__/* .NodeInsertUndoUnit */ .R(this._hoEditorFactoryID, startPath, markNode));
@@ -66513,11 +66658,11 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
                 this._canModifyContent = oldValue;
                 this.update(0);
                 return _context2.abrupt("return");
-              case 22:
+              case 23:
                 hoEditorFactory.docController.insertPlainTextAfterPath(startPath, text, oldValue);
                 //this._canModifyContent = await oldValue;
                 //this.update(0);
-              case 23:
+              case 24:
               case "end":
                 return _context2.stop();
             }
@@ -67304,7 +67449,7 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
       if (!(eChildNode instanceof _MarkNode__WEBPACK_IMPORTED_MODULE_47__/* .MarkNode */ .j) || eChildNode instanceof _MarkNode__WEBPACK_IMPORTED_MODULE_47__/* .MarkNode */ .j && eChildNode.MarkNodeType !== _MarkNode__WEBPACK_IMPORTED_MODULE_47__/* .MarkNodeType.mtEnd */ .q.mtEnd) {
         throw new Error('经检测，病历元素“' + temp.name + '”的模板格式有问题，无法正常加载，请联系工程师进行处理。');
       }
-      if (temp.childNodes.length > 3 && temp.childNodes[1] instanceof _MarkNode__WEBPACK_IMPORTED_MODULE_47__/* .MarkNode */ .j) {
+      if (temp.childNodes.length > 3 && temp.childNodes[1] instanceof _MarkNode__WEBPACK_IMPORTED_MODULE_47__/* .MarkNode */ .j && temp.childNodes[1].MarkNodeType == _MarkNode__WEBPACK_IMPORTED_MODULE_47__/* .MarkNodeType.mtContent */ .q.mtContent) {
         temp.childNodes.splice(1, 1);
       }
       //}
@@ -77485,10 +77630,10 @@ var DrawRadioAndCheckBoxPrint = /*#__PURE__*/function (_DrawCombineNode) {
     _this._dText = new createjs.Text(node.isTransToText ? "" : _this._text, textStyle.getStyleKey(), textStyle.color);
     if (controlStyle === "CheckBox") {
       _this._dBox = new createjs.Shape();
-      _this._dBox.graphics.clear().beginStroke("#000").drawRect(0, -_this.dHeight + 2, _this.dHeight - 2, _this.dHeight - 2);
+      _this._dBox.graphics.clear().beginStroke("#000").drawRect(0, -_this.dHeight + 2, _this.dHeight - 2, _this.dHeight - 2).endStroke();
     } else {
       _this._dBox = new createjs.Shape();
-      _this._dBox.graphics.clear().setStrokeStyle(1, 'round', 'round').beginStroke("#000").drawCircle((height - 2) / 2, -height / 2 + 2, (height - 2) / 2);
+      _this._dBox.graphics.clear().setStrokeStyle(1, 'round', 'round').beginStroke("#000").drawCircle((height - 2) / 2, -height / 2 + 2, (height - 2) / 2).endStroke();
     }
     var textWidth = _this._dText.getMeasuredWidth();
     var boxwidth = height;
@@ -77504,7 +77649,7 @@ var DrawRadioAndCheckBoxPrint = /*#__PURE__*/function (_DrawCombineNode) {
         underLineLen = _this._dAppendText.getMeasuredWidth();
       }
       _this._dUnderLine = new createjs.Shape();
-      _this._dUnderLine.graphics.beginStroke(textStyle.color).moveTo(_this.dWidth - blockWidth, 1).lineTo(_this.dWidth - blockWidth + underLineLen, 1);
+      _this._dUnderLine.graphics.beginStroke(textStyle.color).moveTo(_this.dWidth - blockWidth, 1).lineTo(_this.dWidth - blockWidth + underLineLen, 1).endStroke();
       _this.dWidth = _this.dWidth - blockWidth + underLineLen;
     }
     _this.dHeight = height;
@@ -77589,41 +77734,41 @@ var DrawRadioAndCheckBoxPrint = /*#__PURE__*/function (_DrawCombineNode) {
       if (this.controlStyle === "CheckBox") {
         //复选框
         if (this.isSelected) {
-          drawBox.graphics.clear().beginStroke(this._textStyle.color).drawRect(0, -this.dHeight + 2, this.dHeight - 2, this.dHeight - 2);
+          drawBox.graphics.clear().beginStroke(this._textStyle.color).drawRect(0, -this.dHeight + 2, this.dHeight - 2, this.dHeight - 2).endStroke();
           this.addChild(drawBox);
           var line1 = new createjs.Shape();
           var line2 = new createjs.Shape();
           if (this.boxAlign) {
-            line1.graphics.beginStroke(this._textStyle.color).moveTo(3, -this.dHeight / 2 + 2).lineTo(this.dHeight / 2 - 1, -2);
+            line1.graphics.beginStroke(this._textStyle.color).moveTo(3, -this.dHeight / 2 + 2).lineTo(this.dHeight / 2 - 1, -2).endStroke();
             this.addChild(line1);
-            line2.graphics.beginStroke(this._textStyle.color).moveTo(this.dHeight / 2 - 1, -2).lineTo(this.dHeight - 3, -this.dHeight + 4);
+            line2.graphics.beginStroke(this._textStyle.color).moveTo(this.dHeight / 2 - 1, -2).lineTo(this.dHeight - 3, -this.dHeight + 4).endStroke();
             this.addChild(line2);
           } else {
             var textWidth = this._dText.getMeasuredWidth();
-            line1.graphics.beginStroke(this._textStyle.color).moveTo(3 + textWidth, -this.dHeight / 2 + 2).lineTo(this.dHeight / 2 - 1 + textWidth, -2);
+            line1.graphics.beginStroke(this._textStyle.color).moveTo(3 + textWidth, -this.dHeight / 2 + 2).lineTo(this.dHeight / 2 - 1 + textWidth, -2).endStroke();
             this.addChild(line1);
-            line2.graphics.beginStroke(this._textStyle.color).moveTo(this.dHeight / 2 - 1 + textWidth, -2).lineTo(this.dHeight - 3 + textWidth, -this.dHeight + 4);
+            line2.graphics.beginStroke(this._textStyle.color).moveTo(this.dHeight / 2 - 1 + textWidth, -2).lineTo(this.dHeight - 3 + textWidth, -this.dHeight + 4).endStroke();
             this.addChild(line2);
           }
         } else {
-          drawBox.graphics.clear().beginStroke(this._textStyle.color).drawRect(0, -this.dHeight + 2, this.dHeight - 2, this.dHeight - 2);
+          drawBox.graphics.clear().beginStroke(this._textStyle.color).drawRect(0, -this.dHeight + 2, this.dHeight - 2, this.dHeight - 2).endStroke();
           this.addChild(drawBox);
         }
       } else {
         //单选框
         if (this.isSelected) {
-          drawBox.graphics.clear().setStrokeStyle(1, 'round', 'round').beginStroke(this._textStyle.color).drawCircle((this.dHeight - 2) / 2, -this.dHeight / 2 + 2, (this.dHeight - 2) / 2);
+          drawBox.graphics.clear().setStrokeStyle(1, 'round', 'round').beginStroke(this._textStyle.color).drawCircle((this.dHeight - 2) / 2, -this.dHeight / 2 + 2, (this.dHeight - 2) / 2).endStroke();
           this.addChild(drawBox);
           var dot = new createjs.Shape();
           if (this.boxAlign) {
-            dot.graphics.clear().beginStroke(this._textStyle.color).beginFill(this._textStyle.color).drawCircle((this.dHeight - 2) / 2 + 1, -this.dHeight / 2 + 2, 1);
+            dot.graphics.clear().beginStroke(this._textStyle.color).beginFill(this._textStyle.color).drawCircle((this.dHeight - 2) / 2 + 1, -this.dHeight / 2 + 2, 1).endStroke();
             this.addChild(dot);
           } else {
-            dot.graphics.clear().beginStroke(this._textStyle.color).beginFill(this._textStyle.color).drawCircle((this.dHeight - 2) / 2 + this._dText.getMeasuredWidth(), -this.dHeight / 2 + 2, 1);
+            dot.graphics.clear().beginStroke(this._textStyle.color).beginFill(this._textStyle.color).drawCircle((this.dHeight - 2) / 2 + this._dText.getMeasuredWidth(), -this.dHeight / 2 + 2, 1).endStroke();
             this.addChild(dot);
           }
         } else {
-          drawBox.graphics.clear().setStrokeStyle(1, 'round', 'round').beginStroke(this._textStyle.color).drawCircle((this.dHeight - 2) / 2, -this.dHeight / 2 + 2, (this.dHeight - 2) / 2);
+          drawBox.graphics.clear().setStrokeStyle(1, 'round', 'round').beginStroke(this._textStyle.color).drawCircle((this.dHeight - 2) / 2, -this.dHeight / 2 + 2, (this.dHeight - 2) / 2).endStroke();
           this.addChild(drawBox);
         }
       }
@@ -80431,6 +80576,9 @@ var DrawTextNode = /*#__PURE__*/function (_DrawCombineNode) {
           var createHistory = hoEditorFactory.docTree.userHistories[createID];
           var deleteHistory = hoEditorFactory.docTree.userHistories[deleteID];
           var comLevel = comment ? comment.permissionLevel : -1;
+          if (comment && comment.isProcessed) {
+            comLevel = -1;
+          }
           var createLevel = createHistory ? createHistory.permissionLevel : -1;
           var deleteLevel = deleteHistory ? deleteHistory.permissionLevel : -1;
           var ilevel = Math.max(comLevel, createLevel, deleteLevel);
@@ -84830,9 +84978,21 @@ var DrawTree = /*#__PURE__*/function () {
           hoEditorFactory.docController.insertRadioAndCheckBox("update", newDomRangeCur, nodeObjectStr, aNode.styleIndex
           //aNode.backColor
           );
+
+          if (e.node.associatedElement) {
+            var node = hoEditorFactory.vueController.getNodeByDataID("main", e.node.associatedElement);
+            if (node && node instanceof TextInputFieldNode/* TextInputFieldNode */.re) {
+              if (e.node.isSelected) {
+                node.customProperty.must = true;
+                node.update(0);
+              } else {
+                node.customProperty.must = false;
+                node.update(0);
+              }
+            }
+          }
         }
       }
-
       return true;
     }
     /**
@@ -99760,7 +99920,7 @@ var f2,getHorizontalCoordinateString,getVerticalCoordinateString,getHorizontalCo
      * A pattern object to use to fill the drawing (not supported by context2d)
      */Object.defineProperty(this,"fillStyle",{get:function get(){return this.ctx.fillStyle;},set:function set(value){var rgba;rgba=getRGBA(value);this.ctx.fillStyle=rgba.style;this.ctx.isFillTransparent=rgba.a===0;//自定义修改  当透明度小于1时改成0 ,以适配不支持透明度的打印机
 if(rgba.a<1){this.ctx.fillOpacity=0;}else{this.ctx.fillOpacity=rgba.a;}// 自定义修改 处理彩色字体打印问题
-var alpha=this.ctx.fillOpacity;if(window.printBlack&&!['#000','#0000000','#fff','#ffffff','#FFF','#FFFFFF'].includes(this.ctx.fillStyle)){if(Array.isArray(this.ctx.path)&&this.ctx.path.length>4){this.ctx.fillStyle="#000000";}this.pdf.setFillColor(255,255,255,{a:alpha});this.pdf.setTextColor(0,0,0,{a:alpha});}else{this.pdf.setFillColor(rgba.r,rgba.g,rgba.b,{a:alpha});this.pdf.setTextColor(rgba.r,rgba.g,rgba.b,{a:alpha});}}});/**
+var alpha=this.ctx.fillOpacity;if(window.printBlack&&!['#000','#000000','#fff','#ffffff','#FFF','#FFFFFF'].includes(this.ctx.fillStyle)){console.log(window.printBlack,this.ctx.fillStyle,"?????????????");if(Array.isArray(this.ctx.path)&&this.ctx.path.length>4){this.ctx.fillStyle="#000000";}this.pdf.setFillColor(255,255,255,{a:alpha});this.pdf.setTextColor(0,0,0,{a:alpha});}else{console.log(rgba.r,rgba.g,rgba.b,alpha,rgba.style,'----------',this.ctx);this.pdf.setFillColor(rgba.r,rgba.g,rgba.b,{a:alpha});this.pdf.setTextColor(rgba.r,rgba.g,rgba.b,{a:alpha});}}});/**
      * Sets or returns the color, gradient, or pattern used for strokes
      *
      * @name strokeStyle
@@ -99769,7 +99929,7 @@ var alpha=this.ctx.fillOpacity;if(window.printBlack&&!['#000','#0000000','#fff',
      * @property {gradient} gradient A gradient object (linear or radial) used to create a gradient stroke (not supported by context2d)
      * @property {pattern} pattern A pattern object used to create a pattern stroke (not supported by context2d)
      */Object.defineProperty(this,"strokeStyle",{get:function get(){return this.ctx.strokeStyle;},set:function set(value){var rgba=getRGBA(value);this.ctx.strokeStyle=rgba.style;this.ctx.isStrokeTransparent=rgba.a===0;//自定义修改  当透明度小于1时改成0 ,以适配不支持透明度的打印机
-if(rgba.a<1){this.ctx.strokeOpacity=0;}else{this.ctx.strokeOpacity=rgba.a;}if(rgba.a===0){this.pdf.setDrawColor(255,255,255);}else if(rgba.a===1){this.pdf.setDrawColor(rgba.r,rgba.g,rgba.b);}else{this.pdf.setDrawColor(rgba.r,rgba.g,rgba.b);}if(window.printBlack&&!['#000','#0000000','#fff','#ffffff','#FFF','#FFFFFF'].includes(this.ctx.strokeStyle)){if(Array.isArray(this.ctx.path)&&this.ctx.path.length>4){this.ctx.strokeStyle="#000000";this.pdf.setDrawColor(0,0,0);}}}});/**
+if(rgba.a<1){this.ctx.strokeOpacity=0;}else{this.ctx.strokeOpacity=rgba.a;}if(rgba.a===0){this.pdf.setDrawColor(255,255,255);}else if(rgba.a===1){this.pdf.setDrawColor(rgba.r,rgba.g,rgba.b);}else{this.pdf.setDrawColor(rgba.r,rgba.g,rgba.b);}if(window.printBlack&&!['#000','#000000','#fff','#ffffff','#FFF','#FFFFFF'].includes(this.ctx.strokeStyle)){if(Array.isArray(this.ctx.path)&&this.ctx.path.length>4){this.ctx.strokeStyle="#000000";this.pdf.setDrawColor(0,0,0);}}}});/**
      * Sets or returns the style of the end caps for a line
      *
      * @name lineCap
@@ -199590,11 +199750,11 @@ var map = {
 	"./popers/Title.vue": 89987,
 	"./printstyle/PrintLineStyle.vue": 51484,
 	"./qrCode/QrCode.vue": 10978,
-	"./radioCheckBox/RadioCheckbox.vue": 82243,
+	"./radioCheckBox/RadioCheckbox.vue": 8632,
 	"./selectDialog/SelectDialog.vue": 59075,
 	"./sign/Sign.vue": 28715,
 	"./table/TableCellPoper.vue": 61917,
-	"./table/TableCellProperty.vue": 47158,
+	"./table/TableCellProperty.vue": 63718,
 	"./table/TableColProperty.vue": 2116,
 	"./table/TableForm.vue": 19064,
 	"./table/TableFormTree.vue": 39703,
@@ -235848,8 +236008,8 @@ var es_string_match = __webpack_require__(4723);
 var es_number_constructor = __webpack_require__(9653);
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.json.stringify.js
 var es_json_stringify = __webpack_require__(38862);
-;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/HoDoc.vue?vue&type=template&id=91a4fbf4&
-var HoDocvue_type_template_id_91a4fbf4_render = function render() {
+;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/HoDoc.vue?vue&type=template&id=197ca538&
+var HoDocvue_type_template_id_197ca538_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -235997,7 +236157,7 @@ var HoDocvue_type_template_id_91a4fbf4_render = function render() {
     }
   }, [_vm._v("v " + _vm._s(_vm.version))])])])], 1);
 };
-var HoDocvue_type_template_id_91a4fbf4_staticRenderFns = [];
+var HoDocvue_type_template_id_197ca538_staticRenderFns = [];
 
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.filter.js
 var es_array_filter = __webpack_require__(57327);
@@ -238956,7 +239116,7 @@ var ParagraphNode = __webpack_require__(67945);
 // EXTERNAL MODULE: ./src/editor/dom/treeNode/MarkNode.ts
 var MarkNode = __webpack_require__(57727);
 ;// CONCATENATED MODULE: ./src/components/version.ts
-/* harmony default export */ var version = ('3.0.85');
+/* harmony default export */ var version = ('3.0.87');
 // EXTERNAL MODULE: ./src/components/controls/poperTipText/PoperTipText.vue + 5 modules
 var PoperTipText = __webpack_require__(36081);
 ;// CONCATENATED MODULE: ./src/components/controls/poperTipText/index.ts
@@ -239484,6 +239644,16 @@ var defaultHeight = Math.floor(1122 * scaleXY) % 2 === 1 ? Math.floor(1122 * sca
             this.hoEditorProvider.setUpdateNodeValue(this.getCurrentSelectNode());
             return;
           }
+          var text = node.text.replace(/ /g, '');
+          if (text != node.parentNode.name && text !== '') {
+            var _node$parentNode$down, _node$parentNode$down2;
+            var list = (_node$parentNode$down = node.parentNode.downListProperty) !== null && _node$parentNode$down !== void 0 && _node$parentNode$down.listItems ? JSON.parse((_node$parentNode$down2 = node.parentNode.downListProperty) === null || _node$parentNode$down2 === void 0 ? void 0 : _node$parentNode$down2.listItems) : [];
+            if (list.filter(function (v) {
+              return v.text.split('<元素>')[0].includes(text);
+            }).length === 0) {
+              return;
+            }
+          }
           var _callback = function _callback(list) {
             _this5.computedPoperPosition(node, pageIndex);
             if (Array.isArray(list) && list.length > 0) {
@@ -239691,10 +239861,10 @@ var defaultHeight = Math.floor(1122 * scaleXY) % 2 === 1 ? Math.floor(1122 * sca
 });
 ;// CONCATENATED MODULE: ./src/components/HoDoc.vue?vue&type=script&lang=js&
  /* harmony default export */ var components_HoDocvue_type_script_lang_js_ = (HoDocvue_type_script_lang_js_); 
-;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/HoDoc.vue?vue&type=style&index=0&id=91a4fbf4&prod&lang=scss&
+;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/HoDoc.vue?vue&type=style&index=0&id=197ca538&prod&lang=scss&
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./src/components/HoDoc.vue?vue&type=style&index=0&id=91a4fbf4&prod&lang=scss&
+;// CONCATENATED MODULE: ./src/components/HoDoc.vue?vue&type=style&index=0&id=197ca538&prod&lang=scss&
 
 ;// CONCATENATED MODULE: ./src/components/HoDoc.vue
 
@@ -239707,8 +239877,8 @@ var defaultHeight = Math.floor(1122 * scaleXY) % 2 === 1 ? Math.floor(1122 * sca
 
 var HoDoc_component = (0,componentNormalizer/* default */.Z)(
   components_HoDocvue_type_script_lang_js_,
-  HoDocvue_type_template_id_91a4fbf4_render,
-  HoDocvue_type_template_id_91a4fbf4_staticRenderFns,
+  HoDocvue_type_template_id_197ca538_render,
+  HoDocvue_type_template_id_197ca538_staticRenderFns,
   false,
   null,
   null,
@@ -244166,6 +244336,11 @@ var StructureConvert = /*#__PURE__*/function () {
               v.backColor = defaultTextStyle.combineStyle.backColor;
             }
           }
+          if (v && typeof v.color === 'string') {
+            if (v.color.replace(/^\s+|\s+$/g, '') === '') {
+              v.color = defaultTextStyle.combineStyle.color;
+            }
+          }
         });
       }
       if (fontStyles) {
@@ -246524,6 +246699,7 @@ var hoCreateHistory = {
 
 
 
+
 
 
 var VueController = /*#__PURE__*/function () {
@@ -253057,7 +253233,7 @@ var VueController = /*#__PURE__*/function () {
             });
           }
           var defaultCellProp = {
-            title: '',
+            //title: '',
             align: TableProperty/* VAlign.vatop */.TR.vatop,
             obliqueSplitLine: 0,
             printGridLines: true,
@@ -253174,7 +253350,7 @@ var VueController = /*#__PURE__*/function () {
             customProperty: Array(node.cellProperty.customProperties)
           };
           var cellProperty = {
-            title: node.cellProperty.title,
+            //title: node.cellProperty.title,
             align: Number(node.cellProperty.align || 0),
             obliqueSplitLine: Number(node.cellProperty.obliqueSplitLine || 0),
             printGridLines: node.cellProperty.printGridLines,
@@ -253912,6 +254088,72 @@ var VueController = /*#__PURE__*/function () {
         }
       }
     }
+    /**
+     * 回填表格数据
+     * @param index 第几个表格
+     * @param data 回填的数据
+     */
+  }, {
+    key: "backFillTableData",
+    value: function backFillTableData(index, data) {
+      var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID);
+      var table = null;
+      var i = 0;
+      for (var k = 0; k < hoEditorFactory.docTree.mainNodes.length; k++) {
+        var node = hoEditorFactory.docTree.mainNodes[k];
+        if (node instanceof TableNode/* TableNode */.Fh) {
+          i++;
+          if (i === index) {
+            table = node;
+            break;
+          }
+        }
+      }
+      if (table) {
+        var rowCellNum = table.rows[0].length;
+        for (var _k4 = rowCellNum; _k4 < table.childNodes.length; _k4++) {
+          var cell = table.childNodes[_k4];
+          if (cell.childNodes.length > 1) {
+            cell.childNodes.splice(1, cell.childNodes.length);
+            cell.drawCell.needUpdate = true;
+          }
+        }
+        if (table.childNodes.length - rowCellNum < data.length) {
+          var needCellNum = data.length - (table.childNodes.length - rowCellNum);
+          var needRows = Number((needCellNum / rowCellNum).toFixed());
+          var remainder = needCellNum % rowCellNum;
+          if (remainder > 0) {
+            needRows++;
+          }
+          table.insertRows(table.rowCount, needRows, table.rowCount - 1);
+        }
+        for (var m = 0; m < data.length; m++) {
+          var _cell = table.childNodes[m + rowCellNum];
+          if (_cell) {
+            var text = data[m];
+            if (text) {
+              _cell.childNodes.splice(1, _cell.childNodes.length);
+              var textNode = new TextNode/* TextNode */.R(this._hoEditorFactoryID, table.rootNodes, _cell, BaseNode/* NodeType.ntText */.Jq.ntText, text, _cell.childNodes[0].styleIndex);
+              _cell.drawCell.needUpdate = true;
+              _cell.childNodes.push(textNode);
+            }
+          }
+        }
+        table.update();
+      }
+    }
+  }, {
+    key: "clearCommentTextBackColor",
+    value: function clearCommentTextBackColor(ids) {
+      var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID);
+      for (var i = 0; i < ids.length; i++) {
+        var id = ids[i];
+        var comment = hoEditorFactory.drawTree.commentsMap.get(id);
+        if (comment) {
+          comment.isProcessed = true;
+        }
+      }
+    }
   }]);
   return VueController;
 }();