hoeditor-web 3.0.81 → 3.0.82

package/lib/hoeditor.umd.js

@@ -16591,7 +16591,7 @@ var component = (0,componentNormalizer/* default */.Z)(
 
 /***/ }),
 
-/***/ 9614:
+/***/ 61973:
 /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -16607,7 +16607,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=efc009a4&
+;// 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=488dae95&
 
 
 var render = function render() {
@@ -16856,7 +16856,11 @@ var render = function render() {
     staticStyle: {
       "display": "inline-block"
     }
-  }, [_vm._v("边框颜色")]), _c('ho-color-picker', {
+  }, [_vm._v("边框颜色")]), _c('span', {
+    staticStyle: {
+      "padding": "0 10px 0 0"
+    }
+  }, [_vm._v("上")]), _c('ho-color-picker', {
     model: {
       value: _vm.gridLinesColor[0],
       callback: function callback($$v) {
@@ -16864,6 +16868,99 @@ var render = function render() {
       },
       expression: "gridLinesColor[0]"
     }
+  }), _c('span', {
+    staticStyle: {
+      "padding": "0 10px 0 0"
+    }
+  }, [_vm._v("下")]), _c('ho-color-picker', {
+    model: {
+      value: _vm.gridLinesColor[1],
+      callback: function callback($$v) {
+        _vm.$set(_vm.gridLinesColor, 1, $$v);
+      },
+      expression: "gridLinesColor[1]"
+    }
+  }), _c('span', {
+    staticStyle: {
+      "padding": "0 10px 0 0"
+    }
+  }, [_vm._v("左")]), _c('ho-color-picker', {
+    model: {
+      value: _vm.gridLinesColor[2],
+      callback: function callback($$v) {
+        _vm.$set(_vm.gridLinesColor, 2, $$v);
+      },
+      expression: "gridLinesColor[2]"
+    }
+  }), _c('span', {
+    staticStyle: {
+      "padding": "0 10px 0 0"
+    }
+  }, [_vm._v("右")]), _c('ho-color-picker', {
+    model: {
+      value: _vm.gridLinesColor[3],
+      callback: function callback($$v) {
+        _vm.$set(_vm.gridLinesColor, 3, $$v);
+      },
+      expression: "gridLinesColor[3]"
+    }
+  })], 1)]), _c('div', {
+    staticClass: "control-item"
+  }, [_c('div', {
+    staticClass: "grid-lines-color-item"
+  }, [_c('span', {
+    staticClass: "label",
+    staticStyle: {
+      "display": "inline-block"
+    }
+  }, [_vm._v("显示边框")]), _c('span', {
+    staticStyle: {
+      "padding": "0 10px 0 0"
+    }
+  }, [_vm._v("上")]), _c('a-checkbox', {
+    model: {
+      value: _vm.gridLineDisplay[0],
+      callback: function callback($$v) {
+        _vm.$set(_vm.gridLineDisplay, 0, $$v);
+      },
+      expression: "gridLineDisplay[0]"
+    }
+  }), _c('span', {
+    staticStyle: {
+      "padding": "0 10px"
+    }
+  }, [_vm._v("下")]), _c('a-checkbox', {
+    model: {
+      value: _vm.gridLineDisplay[1],
+      callback: function callback($$v) {
+        _vm.$set(_vm.gridLineDisplay, 1, $$v);
+      },
+      expression: "gridLineDisplay[1]"
+    }
+  }), _c('span', {
+    staticStyle: {
+      "padding": "0 10px"
+    }
+  }, [_vm._v("左")]), _c('a-checkbox', {
+    model: {
+      value: _vm.gridLineDisplay[2],
+      callback: function callback($$v) {
+        _vm.$set(_vm.gridLineDisplay, 2, $$v);
+      },
+      expression: "gridLineDisplay[2]"
+    }
+  }), _c('span', {
+    staticStyle: {
+      "padding": "0 10px"
+    }
+  }, [_vm._v("右")]), _c('a-checkbox', {
+    model: {
+      value: _vm.gridLineDisplay[3],
+      callback: function callback($$v) {
+        _vm.$set(_vm.gridLineDisplay, 3, $$v);
+      },
+      expression: "gridLineDisplay[3]"
+    }
   })], 1)]), _c('PrintLineStyle', {
     attrs: {
       "isDrawGridlines": false,
@@ -16876,9 +16973,6 @@ var render = function render() {
   }), _c('li', {
     staticClass: "control-item"
   }, [_c('a-checkbox', {
-    attrs: {
-      "disabled": !_vm.isDrawGridlines
-    },
     model: {
       value: _vm.printGridLines,
       callback: function callback($$v) {
@@ -17335,7 +17429,7 @@ var render = function render() {
 };
 var staticRenderFns = [];
 
-;// CONCATENATED MODULE: ./src/components/controls/table/TableCellProperty.vue?vue&type=template&id=efc009a4&
+;// CONCATENATED MODULE: ./src/components/controls/table/TableCellProperty.vue?vue&type=template&id=488dae95&
 
 // EXTERNAL MODULE: ./node_modules/@babel/runtime/helpers/esm/slicedToArray.js + 3 modules
 var slicedToArray = __webpack_require__(27222);
@@ -17347,6 +17441,8 @@ var es_array_filter = __webpack_require__(57327);
 var es_object_to_string = __webpack_require__(41539);
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.function.name.js
 var es_function_name = __webpack_require__(68309);
+// EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.map.js
+var es_array_map = __webpack_require__(21249);
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.concat.js
 var es_array_concat = __webpack_require__(92222);
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.regexp.exec.js
@@ -17388,6 +17484,7 @@ var util = __webpack_require__(62783);
 
 
 
+
 var columns = [{
   dataIndex: 'rowIndexs',
   key: 'rowIndexs',
@@ -17461,6 +17558,7 @@ var columns = [{
       // 是否绘制边框
       gridLinesColor: ['#000000', '#000000', '#000000', '#000000'],
       // 边框边框颜色  上、下、左、右
+      gridLineDisplay: [true, true, true, true],
       gridLinesStyle: 4,
       // 边框样式
       span: 0,
@@ -17519,6 +17617,16 @@ var columns = [{
       } else {
         this.gridLinesColor = ['#000000', '#000000', '#000000', '#000000'];
       }
+      if (Array.isArray(cellNode.cellProperty.gridLineDisplay)) {
+        this.gridLineDisplay = (0,toConsumableArray/* default */.Z)(cellNode.cellProperty.gridLineDisplay).map(function (v) {
+          if (v == true || v == 'true') {
+            return true;
+          }
+          return false;
+        });
+      } else {
+        this.gridLineDisplay = [true, true, true, true];
+      }
       this.backColor = cellNode.cellProperty.backColor ? cellNode.cellProperty.backColor : '#ffffff';
       this.gridLinesStyle = cellNode.cellProperty.gridLinesStyle;
       this.span = cellNode.cellProperty.span;
@@ -17559,9 +17667,9 @@ var columns = [{
   },
   methods: {
     isDrawGridlinesChange: function isDrawGridlinesChange() {
-      if (!this.isDrawGridlines) {
-        this.printGridLines = false;
-      }
+      // if (!this.isDrawGridlines) {
+      //     this.printGridLines = false;
+      // }
     },
     getCellNodes: function getCellNodes() {
       var nodes = this.vueController.findNodebyPath(this.endPath).node;
@@ -17659,7 +17767,8 @@ var columns = [{
     },
     sure: function sure() {
       var _this2 = this;
-      this.gridLinesColor = [this.gridLinesColor[0], this.gridLinesColor[0], this.gridLinesColor[0], this.gridLinesColor[0]];
+      // this.gridLinesColor = [this.gridLinesColor[0], this.gridLinesColor[0], this.gridLinesColor[0], this.gridLinesColor[0]];
+
       var params = {
         id: this.id,
         lightCellBorders: this.lightCellBorders,
@@ -17671,6 +17780,7 @@ var columns = [{
         cellInnerMargin: [this.cellTop, this.cellBottom, this.cellLeft, this.cellRight],
         isDrawGridlines: this.isDrawGridlines,
         gridLinesColor: this.gridLinesColor,
+        gridLineDisplay: this.gridLineDisplay,
         gridLinesStyle: this.gridLinesStyle,
         span: this.span,
         alignTextToGridline: this.alignTextToGridline,
@@ -17717,10 +17827,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=efc009a4&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=488dae95&prod&lang=scss&
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./src/components/controls/table/TableCellProperty.vue?vue&type=style&index=0&id=efc009a4&prod&lang=scss&
+;// CONCATENATED MODULE: ./src/components/controls/table/TableCellProperty.vue?vue&type=style&index=0&id=488dae95&prod&lang=scss&
 
 // EXTERNAL MODULE: ./node_modules/@vue/vue-loader-v15/lib/runtime/componentNormalizer.js
 var componentNormalizer = __webpack_require__(70713);
@@ -39481,16 +39591,20 @@ var DocController = /*#__PURE__*/function () {
       }
       startPath = domRange.startPath;
       endPath = domRange.endPath;
-      if (startPath !== endPath && domRange.npEnd.node instanceof _treeNode_MarkNode__WEBPACK_IMPORTED_MODULE_46__/* .MarkNode */ .j) {
-        var nodes = _DomRange__WEBPACK_IMPORTED_MODULE_30__/* .DomRange.getSelectDomNodesForDelete */ .a.getSelectDomNodesForDelete(this._hoEditorFactoryID, startPath, endPath);
-        if (nodes.length == 1 && nodes[0] instanceof _treeNode_TextInputFieldNode__WEBPACK_IMPORTED_MODULE_45__/* .TextInputFieldNode */ .re && nodes[0].isEmpty()) {
-          startPath = nodes[0].StartMarkNode.getNodePath();
-          endPath = nodes[0].childNodes[1].getNodePath();
-          var newDomRange = new _DomRange__WEBPACK_IMPORTED_MODULE_30__/* .DomRange */ .a(this._hoEditorFactoryID, startPath, endPath);
-          hoEditorFactory.docTree.curDomRange = newDomRange;
-          hoEditorFactory.drawTree.moveCaretToPath(startPath);
-        }
-      }
+      // if (startPath !== endPath && domRange.npEnd.node instanceof MarkNode) {
+      //   const nodes = DomRange.getSelectDomNodesForDelete(
+      //     this._hoEditorFactoryID,
+      //     startPath,
+      //     endPath
+      //   );
+      //   if (nodes.length == 1 && nodes[0] instanceof TextInputFieldNode && nodes[0].isEmpty()) {
+      //     startPath = nodes[0].StartMarkNode.getNodePath();
+      //     endPath = nodes[0].childNodes[1].getNodePath();
+      //     const newDomRange = new DomRange(this._hoEditorFactoryID, startPath, endPath);
+      //     hoEditorFactory.docTree.curDomRange = newDomRange;
+      //     hoEditorFactory.drawTree.moveCaretToPath(startPath);
+      //   }
+      // }
       var changingEvent = new _events_NodeChangingEvent__WEBPACK_IMPORTED_MODULE_22__/* .NodeChangingEvent */ .Q(_DocTree__WEBPACK_IMPORTED_MODULE_25__/* .DocAction.daInsert */ .gk.daInsert, startPath, endPath, _events_NodeChangingEvent__WEBPACK_IMPORTED_MODULE_22__/* .OperType.keyBoardInput */ .y.keyBoardInput);
       if (hoEditorFactory.docTree.changing(changingEvent)) {
         if (domRange.npStart.node && domRange.npStart.node.parentNode instanceof _treeNode_CellNode__WEBPACK_IMPORTED_MODULE_56__/* .CellNode */ .D) {
@@ -72972,15 +73086,17 @@ var DrawContainer = /*#__PURE__*/function (_createjs$Container) {
 /* harmony export */   "L": function() { return /* binding */ DrawDateTime; }
 /* harmony export */ });
 /* harmony import */ var D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_classCallCheck_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(70280);
-/* harmony import */ var D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(66298);
+/* harmony import */ var D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(66298);
 /* harmony import */ var D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(75808);
 /* harmony import */ var D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_inherits_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(11651);
 /* harmony import */ var D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createSuper_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(19593);
-/* harmony import */ var D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(78255);
+/* harmony import */ var D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(78255);
 /* 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 _editor_utils_DrawSimpleText__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(57590);
 /* harmony import */ var _DrawCombineNode__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(66114);
+/* harmony import */ var _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(74089);
+
 
 
 
@@ -73005,9 +73121,9 @@ var DrawDateTime = /*#__PURE__*/function (_DrawCombineNode) {
     var _this;
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_classCallCheck_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z)(this, DrawDateTime);
     _this = _super.call(this, hoeditfactoryID, rootPath, node, 0);
-    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_7__/* ["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), "_text", void 0);
-    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_7__/* ["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), "_textStyle", void 0);
-    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_7__/* ["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), "_dText", void 0);
+    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_8__/* ["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), "_text", void 0);
+    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_8__/* ["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), "_textStyle", void 0);
+    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_8__/* ["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), "_dText", void 0);
     _this._text = node.text;
     _this._textStyle = textStyle;
     _this._dText = new _editor_utils_DrawSimpleText__WEBPACK_IMPORTED_MODULE_5__/* .DrawSimpleText */ .b(_this._text, textStyle.getStyleKey(), textStyle.color, 0);
@@ -73015,12 +73131,13 @@ var DrawDateTime = /*#__PURE__*/function (_DrawCombineNode) {
     _this.dHeight = height;
     _this.charSpace = 0;
     _this.drawDateTime();
-    if (node.customProperty && node.customProperty.must && node.text === node.labelText) {
+    var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_7__/* .HOEditorFactorys.instance */ .b.instance().getFactory(_this._hoEditorFactoryID);
+    if (hoEditorFactory.isDrawMustMarker && node.customProperty && node.customProperty.must && node.text === node.labelText) {
       _this.drawMarkIcon();
     }
     return _this;
   }
-  (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_8__/* ["default"] */ .Z)(DrawDateTime, [{
+  (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_9__/* ["default"] */ .Z)(DrawDateTime, [{
     key: "text",
     get: function get() {
       return this._text;
@@ -73070,11 +73187,11 @@ var DrawDateTime = /*#__PURE__*/function (_DrawCombineNode) {
 /* harmony export */   "I": function() { return /* binding */ DrawDownListNode; }
 /* harmony export */ });
 /* harmony import */ var D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_classCallCheck_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(70280);
-/* harmony import */ var D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(66298);
+/* harmony import */ var D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(66298);
 /* harmony import */ var D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(75808);
 /* harmony import */ var D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_inherits_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(11651);
 /* harmony import */ var D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createSuper_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(19593);
-/* harmony import */ var D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(78255);
+/* harmony import */ var D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(78255);
 /* 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_array_splice_js__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(40561);
@@ -73082,6 +73199,8 @@ var DrawDateTime = /*#__PURE__*/function (_DrawCombineNode) {
 /* harmony import */ var _editor_dom_treeNode_DownListNode__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(45712);
 /* harmony import */ var _editor_utils_DrawSimpleText__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(57590);
 /* harmony import */ var _DrawCombineNode__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(66114);
+/* harmony import */ var _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(74089);
+
 
 
 
@@ -73110,10 +73229,10 @@ var DrawDownListNode = /*#__PURE__*/function (_DrawCombineNode) {
     var _this;
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_classCallCheck_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z)(this, DrawDownListNode);
     _this = _super.call(this, hoEditorFactoryID, rootPath, node, 0);
-    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_9__/* ["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), "_text", void 0);
-    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_9__/* ["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), "_textStyle", void 0);
-    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_9__/* ["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), "_dText", void 0);
-    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_9__/* ["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), "_charCount", void 0);
+    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_10__/* ["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), "_text", void 0);
+    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_10__/* ["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), "_textStyle", void 0);
+    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_10__/* ["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), "_dText", void 0);
+    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_10__/* ["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), "_charCount", void 0);
     _this._text = node.text;
     _this._textStyle = textStyle;
     _this._node = node;
@@ -73122,12 +73241,13 @@ var DrawDownListNode = /*#__PURE__*/function (_DrawCombineNode) {
     _this.dWidth = _this._dText.getMeasuredWidth(); //+ charSpace * (this._text.length - 1);
     _this.dHeight = height;
     _this.drawDownList(0);
-    if (node instanceof _editor_dom_treeNode_DownListNode__WEBPACK_IMPORTED_MODULE_6__/* .DownListNode */ .yF && node.customProperty && node.customProperty.must && node.keyValue === "") {
+    var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_9__/* .HOEditorFactorys.instance */ .b.instance().getFactory(_this._hoEditorFactoryID);
+    if (hoEditorFactory.isDrawMustMarker && node instanceof _editor_dom_treeNode_DownListNode__WEBPACK_IMPORTED_MODULE_6__/* .DownListNode */ .yF && node.customProperty && node.customProperty.must && node.keyValue === "") {
       _this.drawMarkIcon();
     }
     return _this;
   }
-  (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_10__/* ["default"] */ .Z)(DrawDownListNode, [{
+  (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_11__/* ["default"] */ .Z)(DrawDownListNode, [{
     key: "charCount",
     get: function get() {
       return this._charCount;
@@ -73303,7 +73423,7 @@ var DrawMarkNode = /*#__PURE__*/function (_DrawCombineNode) {
     if (_this.dWidth != 0 && node.MarkNodeType == _editor_dom_treeNode_MarkNode__WEBPACK_IMPORTED_MODULE_9__/* .MarkNodeType.mtContent */ .q.mtContent) _this.addChild(_this._dText);
     _this.drawBackColor();
     _this.drawUnderline();
-    if (node.MarkNodeType == _editor_dom_treeNode_MarkNode__WEBPACK_IMPORTED_MODULE_9__/* .MarkNodeType.mtEnd */ .q.mtEnd && _this.text.substring(0, 1) !== "C" && node.parentNode instanceof _editor_dom_treeNode_TextInputFieldNode__WEBPACK_IMPORTED_MODULE_10__/* .TextInputFieldNode */ .re) {
+    if (hoEditorFactory.isDrawMustMarker && node.MarkNodeType == _editor_dom_treeNode_MarkNode__WEBPACK_IMPORTED_MODULE_9__/* .MarkNodeType.mtEnd */ .q.mtEnd && _this.text.substring(0, 1) !== "C" && node.parentNode instanceof _editor_dom_treeNode_TextInputFieldNode__WEBPACK_IMPORTED_MODULE_10__/* .TextInputFieldNode */ .re) {
       var customProperty = node.parentNode.customProperty;
       if (customProperty && customProperty.must && node.parentNode.childNodes[1] instanceof _editor_dom_treeNode_MarkNode__WEBPACK_IMPORTED_MODULE_9__/* .MarkNode */ .j) {
         _this.drawMarkIcon();
@@ -89346,30 +89466,26 @@ 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)) {
-                  _context2.next = 42;
+                  _context2.next = 38;
                   break;
                 }
                 n = 0;
               case 14:
                 if (!(n < nodes.length)) {
-                  _context2.next = 41;
-                  break;
-                }
-                node = nodes[n];
-                if (!(node instanceof _dom_treeNode_MarkNode__WEBPACK_IMPORTED_MODULE_23__/* .MarkNode */ .j && node.parentNode instanceof _dom_treeNode_TextInputFieldNode__WEBPACK_IMPORTED_MODULE_22__/* .TextInputFieldNode */ .re && node.MarkNodeType === 1 && !node.parentNode.isAllowDelete)) {
-                  _context2.next = 20;
+                  _context2.next = 37;
                   break;
                 }
-                ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_40__/* ["default"].warn */ .Z.warn("元素已设置为不允许删除。请先右键元素属性设置成允许删除,再进行删除操作。");
-                this._isError = true;
-                return _context2.abrupt("return");
-              case 20:
+                node = nodes[n]; // if (node instanceof MarkNode && node.parentNode instanceof TextInputFieldNode && node.MarkNodeType === 1 && !node.parentNode.isAllowDelete) {
+                //   message.warn("元素已设置为不允许删除。请先右键元素属性设置成允许删除,再进行删除操作。");
+                //   this._isError = true;
+                //   return;
+                // }
                 if (!(node instanceof _dom_treeNode_ControlNode__WEBPACK_IMPORTED_MODULE_30__/* .ControlNode */ .w || node instanceof _dom_treeNode_TextInputFieldNode__WEBPACK_IMPORTED_MODULE_22__/* .TextInputFieldNode */ .re)) {
-                  _context2.next = 30;
+                  _context2.next = 26;
                   break;
                 }
                 if (node.isAllowDelete) {
-                  _context2.next = 30;
+                  _context2.next = 26;
                   break;
                 }
                 tip = "";
@@ -89388,34 +89504,34 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
                 ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_40__/* ["default"].warn */ .Z.warn(tip + "元素已设置为不允许删除。请先右键元素属性设置成允许删除,再进行删除操作。");
                 this._isError = true;
                 return _context2.abrupt("return");
-              case 30:
+              case 26:
                 if (!(node instanceof _dom_treeNode_TableFormula__WEBPACK_IMPORTED_MODULE_37__/* .TableFormula */ .N)) {
-                  _context2.next = 34;
+                  _context2.next = 30;
                   break;
                 }
                 ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_40__/* ["default"].warn */ .Z.warn("不允许删除表格计算公式");
                 this._isError = true;
                 return _context2.abrupt("return");
-              case 34:
+              case 30:
                 if (!(node instanceof _dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_35__/* .SignNode */ .N && node.isTemplate && node.number === 0)) {
-                  _context2.next = 38;
+                  _context2.next = 34;
                   break;
                 }
                 ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_40__/* ["default"].warn */ .Z.warn("该签名元素不允许删除！");
                 this._isError = true;
                 return _context2.abrupt("return");
-              case 38:
+              case 34:
                 n++;
                 _context2.next = 14;
                 break;
-              case 41:
+              case 37:
                 if (nodes.length === 1 && nodes[0] instanceof _dom_treeNode_TextInputFieldNode__WEBPACK_IMPORTED_MODULE_22__/* .TextInputFieldNode */ .re && !nodes[0].isAllowDelete && nodes[0].childNodes[1] instanceof _dom_treeNode_MarkNode__WEBPACK_IMPORTED_MODULE_23__/* .MarkNode */ .j) {
                   hoEditorFactory.docTree.curDomRange.setSamePath(this._endPath);
                 }
-              case 42:
+              case 38:
                 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))) {
-                  _context2.next = 48;
+                  _context2.next = 44;
                   break;
                 }
                 //判断当前TextInputField是否可编辑
@@ -89427,19 +89543,19 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
                   // this._undo.commit();
                 });
                 if (_res[0]) {
-                  _context2.next = 48;
+                  _context2.next = 44;
                   break;
                 }
                 return _context2.abrupt("return");
-              case 48:
+              case 44:
                 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) {
-                  _context2.next = 51;
+                  _context2.next = 47;
                   break;
                 }
                 throw _events_Exception__WEBPACK_IMPORTED_MODULE_24__/* .Exception.NodeNotFound */ .P.NodeNotFound();
-              case 51:
+              case 47:
                 // const [startPath, endPath] = DomRange.skipStartEndTablePath(
                 //   this._hoEditorFactory,
                 //   currRange.startPath,
@@ -89451,17 +89567,17 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
                 changeEvent.oldDrawTreeLines = new _draw_SelectRange__WEBPACK_IMPORTED_MODULE_27__/* .SelectRange */ .E(this._hoEditorFactoryID).getRangeDrawTreeLines(startPath, endPath);
                 res = this.deleteRange(currRange.endPath, currRange.startPath);
                 if (!(res == 1)) {
-                  _context2.next = 63;
+                  _context2.next = 59;
                   break;
                 }
                 changeEvent.beforeChangePath = startPath;
                 changeEvent.afterChangePath = this._tmp.start;
-                _context2.next = 61;
+                _context2.next = 57;
                 return hoEditorFactory.docTree.change(changeEvent);
-              case 61:
+              case 57:
                 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 63:
+              case 59:
                 hoEditorFactory.docTree.curDomRange.setSamePath(this._tmp.start);
                 hoEditorFactory.drawTree.moveCaretToPath(this._tmp.start);
                 aNode = currRange.npStart.node;
@@ -89469,12 +89585,12 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
                   pnode = aNode.parentNode;
                 }
                 if (!(aNode && pnode)) {
-                  _context2.next = 70;
+                  _context2.next = 66;
                   break;
                 }
-                _context2.next = 70;
+                _context2.next = 66;
                 return this.ParentRepaint(pnode);
-              case 70:
+              case 66:
               case "end":
                 return _context2.stop();
             }
@@ -198355,7 +198471,7 @@ var map = {
 	"./selectDialog/SelectDialog.vue": 59075,
 	"./sign/Sign.vue": 28715,
 	"./table/TableCellPoper.vue": 61917,
-	"./table/TableCellProperty.vue": 9614,
+	"./table/TableCellProperty.vue": 61973,
 	"./table/TableColProperty.vue": 2116,
 	"./table/TableForm.vue": 19064,
 	"./table/TableFormTree.vue": 39703,
@@ -237717,7 +237833,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.81');
+/* harmony default export */ var version = ('3.0.82');
 // EXTERNAL MODULE: ./src/components/controls/poperTipText/PoperTipText.vue + 5 modules
 var PoperTipText = __webpack_require__(36081);
 ;// CONCATENATED MODULE: ./src/components/controls/poperTipText/index.ts
@@ -245284,6 +245400,7 @@ var hoCreateHistory = {
 
 
 
+
 
 
 var VueController = /*#__PURE__*/function () {
@@ -249862,7 +249979,7 @@ var VueController = /*#__PURE__*/function () {
       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 _loop2 = function _loop2(i) {
           var node = nodes[i];
           if (node instanceof TextInputFieldNode/* TextInputFieldNode */.re || node instanceof DownListNode/* DownListNode */.yF || node instanceof DateTimeNode/* DateTimeNode */.Z) {
             var elementObj = {
@@ -249878,10 +249995,47 @@ var VueController = /*#__PURE__*/function () {
               dataMetaIdentifier: node.dataMetaIdentifier,
               customProperty: node.customProperty,
               keyValue: '',
-              value: ''
+              value: '',
+              verifyTipList: []
             };
             if (!(node instanceof TextInputFieldNode/* TextInputFieldNode */.re)) {
               elementObj.controlType = node.type;
+            } else {
+              var verifyTipList = [];
+              var includesKeyword = node.includesKeyword ? JSON.parse(node.includesKeyword) : [];
+              var valueArea = node.valueArea ? JSON.parse(node.valueArea) : [];
+              if (includesKeyword.length > 0) {
+                includesKeyword.forEach(function (keyword) {
+                  if (node.text.includes(keyword.text)) {
+                    verifyTipList.push(keyword.tip);
+                  }
+                });
+              }
+              if (valueArea.length > 0) {
+                valueArea.forEach(function (value) {
+                  var min = value.min == '' ? NaN : Number(value.min);
+                  var max = value.max == '' ? NaN : Number(value.max);
+                  var nodeValue = node.text == '' ? NaN : Number(node.text);
+                  if (!isNaN(nodeValue)) {
+                    if (!isNaN(min) && !isNaN(max)) {
+                      if (nodeValue >= min && nodeValue <= max) {
+                        verifyTipList.push(value.tip);
+                      }
+                    }
+                    if (!isNaN(min) && isNaN(max)) {
+                      if (nodeValue >= min) {
+                        verifyTipList.push(value.tip);
+                      }
+                    }
+                    if (isNaN(min) && !isNaN(max)) {
+                      if (nodeValue <= max) {
+                        verifyTipList.push(value.tip);
+                      }
+                    }
+                  }
+                });
+              }
+              elementObj.verifyTipList = verifyTipList;
             }
             if (node instanceof TextInputFieldNode/* TextInputFieldNode */.re && node.inputFieldType == 1 || node instanceof DownListNode/* DownListNode */.yF) {
               elementObj.keyValue = node.keyValue;
@@ -249893,6 +250047,9 @@ var VueController = /*#__PURE__*/function () {
           if (node instanceof BaseCombineNode/* BaseCombineNode */.V) {
             getAllNodes(node.childNodes);
           }
+        };
+        for (var i = 0; i < nodes.length; i++) {
+          _loop2(i);
         }
       };
       if (area == undefined || area == 'header') {
@@ -249925,7 +250082,7 @@ var VueController = /*#__PURE__*/function () {
       var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID);
       var allArr = [];
       var getAllNodes = function getAllNodes(nodes, arr) {
-        var _loop2 = function _loop2(i) {
+        var _loop3 = function _loop3(i) {
           var node = nodes[i];
           if (node instanceof DownListNode/* DownListNode */.yF && node.isReadOnly || node instanceof DateTimeNode/* DateTimeNode */.Z && node.isReadOnly || node instanceof TextInputFieldNode/* TextInputFieldNode */.re && node.inputFieldType == 0 && node.childNodes.filter(function (child) {
             return child instanceof TextInputFieldNode/* TextInputFieldNode */.re;
@@ -249963,7 +250120,7 @@ var VueController = /*#__PURE__*/function () {
           }
         };
         for (var i = 0; i < nodes.length; i++) {
-          _loop2(i);
+          _loop3(i);
         }
       };
       var headerDocTree = hoEditorFactory.subDocManger.headerDocTree;
@@ -258080,6 +258237,7 @@ var HOEditorFactory = /*#__PURE__*/function () {
       old: false // 是否使用完善后的批注界面
     });
     (0,esm_defineProperty/* default */.Z)(this, "_commentParams", void 0);
+    (0,esm_defineProperty/* default */.Z)(this, "_isDrawMustMarker", true);
     this._hoEditorFactoryId = id;
   }
   (0,esm_createClass/* default */.Z)(HOEditorFactory, [{
@@ -258126,6 +258284,7 @@ var HOEditorFactory = /*#__PURE__*/function () {
 
     // 审阅参数设置
     // 批注相关动态变更
+    //是否绘制必填标记
     /**
      * Getter hoLocalStorage
      * @return {HoLocalStorage}
@@ -258885,6 +259044,16 @@ var HOEditorFactory = /*#__PURE__*/function () {
         this._isEnabledGlobalColor = value;
       }
     }
+  }, {
+    key: "isDrawMustMarker",
+    get: function get() {
+      return this._isDrawMustMarker;
+    },
+    set: function set(value) {
+      if (this._isDrawMustMarker !== value) {
+        this._isDrawMustMarker = value;
+      }
+    }
   }, {
     key: "isSameColorWithEmptyVlaue",
     get: function get() {