hoeditor-web 3.0.77 → 3.0.78

package/lib/hoeditor.umd.js

@@ -5836,7 +5836,7 @@ var component = (0,componentNormalizer/* default */.Z)(
 
 /***/ }),
 
-/***/ 79648:
+/***/ 44603:
 /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -5852,7 +5852,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/expressionForm/ExpressionForm.vue?vue&type=template&id=aae854a4&
+;// 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/expressionForm/ExpressionForm.vue?vue&type=template&id=6e6eed5d&
 
 
 var render = function render() {
@@ -6764,10 +6764,12 @@ var render = function render() {
           return _vm.topLeftClick(item[0]);
         }
       }
-    }, [_c('img', {
-      attrs: {
-        "src": __webpack_require__(1842)("./r-t-z-" + item[0] + "-1.png"),
-        "alt": ""
+    }, [_c('div', {
+      class: 'img-box r-t-z-' + item[0] + '-1',
+      staticStyle: {
+        "bottom": "0",
+        "top": "2px",
+        "background-position-y": "bottom"
       }
     })]);
   }), 0), _vm._l(['8', '7', '6', '5', '4', '3', '2', '1'], function (item) {
@@ -6808,10 +6810,12 @@ var render = function render() {
           return _vm.topRightClick(item[0]);
         }
       }
-    }, [_c('img', {
-      attrs: {
-        "src": __webpack_require__(74632)("./l-t-z-" + item[0] + "-1.png"),
-        "alt": ""
+    }, [_c('div', {
+      class: 'img-box l-t-z-' + item[0] + '-1',
+      staticStyle: {
+        "bottom": "0",
+        "top": "2px",
+        "background-position-y": "bottom"
       }
     })]);
   }), 0), _vm._l(['1', '2', '3', '4', '5', '6', '7', '8'], function (item) {
@@ -6875,14 +6879,11 @@ var render = function render() {
           return _vm.bottomLeftClick(item[0]);
         }
       }
-    }, [_c('img', {
+    }, [_c('div', {
+      class: 'img-box r-b-z-' + item[0] + '-1',
       staticStyle: {
         "bottom": "0",
         "top": "2px"
-      },
-      attrs: {
-        "src": __webpack_require__(66001)("./r-b-z-" + item[0] + "-1.png"),
-        "alt": ""
       }
     })]);
   }), 0)], 2), _c('a-checkbox-group', {
@@ -6927,14 +6928,11 @@ var render = function render() {
           return _vm.bottomRightClick(item[0]);
         }
       }
-    }, [_c('img', {
+    }, [_c('div', {
+      class: 'img-box l-b-z-' + item[0] + '-1',
       staticStyle: {
         "bottom": "0",
         "top": "2px"
-      },
-      attrs: {
-        "src": __webpack_require__(77732)("./l-b-z-" + item[0] + "-1.png"),
-        "alt": ""
       }
     })]);
   }), 0)], 2)], 1)])] : _vm._e()], 2), _c('footer', {
@@ -7047,7 +7045,7 @@ var staticRenderFns = [function () {
   }, [_vm._v("49")])]);
 }];
 
-;// CONCATENATED MODULE: ./src/components/controls/expressionForm/ExpressionForm.vue?vue&type=template&id=aae854a4&
+;// CONCATENATED MODULE: ./src/components/controls/expressionForm/ExpressionForm.vue?vue&type=template&id=6e6eed5d&
 
 // EXTERNAL MODULE: ./node_modules/@babel/runtime/helpers/esm/objectSpread2.js
 var objectSpread2 = __webpack_require__(63442);
@@ -7591,10 +7589,10 @@ var zh_cn = __webpack_require__(83839);
 });
 ;// CONCATENATED MODULE: ./src/components/controls/expressionForm/ExpressionForm.vue?vue&type=script&lang=js&
  /* harmony default export */ var expressionForm_ExpressionFormvue_type_script_lang_js_ = (ExpressionFormvue_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/expressionForm/ExpressionForm.vue?vue&type=style&index=0&id=aae854a4&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/expressionForm/ExpressionForm.vue?vue&type=style&index=0&id=6e6eed5d&prod&lang=scss&
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./src/components/controls/expressionForm/ExpressionForm.vue?vue&type=style&index=0&id=aae854a4&prod&lang=scss&
+;// CONCATENATED MODULE: ./src/components/controls/expressionForm/ExpressionForm.vue?vue&type=style&index=0&id=6e6eed5d&prod&lang=scss&
 
 // EXTERNAL MODULE: ./node_modules/@vue/vue-loader-v15/lib/runtime/componentNormalizer.js
 var componentNormalizer = __webpack_require__(70713);
@@ -46170,7 +46168,7 @@ var PageProperty = /*#__PURE__*/function () {
 /*
  * @Author: your name
  * @Date: 2020-12-24 16:01:16
- * @LastEditTime: 2023-06-30 15:42:37
+ * @LastEditTime: 2023-07-04 11:48:39
  * @LastEditors: liyanan 2441631434@qq.com
  * @Description: In User Settings Edit
  * @FilePath: \hoeditor-web\src\editor\dom\TableProperty.ts
@@ -46929,7 +46927,7 @@ var DiagonalType;
 })(DiagonalType || (DiagonalType = {}));
 var CellProperty = /*#__PURE__*/function () {
   //编号
-  //突出显示单元格边框
+  //private _lightCellBorders = false;//突出显示单元格边框
   //标题
   //自定义属性
   //private _dataSource!: DataSource;//数据源
@@ -46949,7 +46947,6 @@ var CellProperty = /*#__PURE__*/function () {
   ) {
     (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, "_lightCellBorders", false);
     (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);
@@ -47013,14 +47010,12 @@ var CellProperty = /*#__PURE__*/function () {
     set: function set(value) {
       this._id = value;
     }
-  }, {
-    key: "lightCellBorders",
-    get: function get() {
-      return this._lightCellBorders;
-    },
-    set: function set(value) {
-      this._lightCellBorders = value;
-    }
+    // get lightCellBorders(): boolean {
+    //     return this._lightCellBorders;
+    // }
+    // set lightCellBorders(value: boolean) {
+    //     this._lightCellBorders = value;
+    // }
   }, {
     key: "title",
     get: function get() {
@@ -50951,7 +50946,7 @@ var CellNode = /*#__PURE__*/function (_RectNode) {
         cellInnerMargin: this.cellProperty.cellInnerMargin ? this.cellProperty.cellInnerMargin.toString() : "0,0,0.1,0.1",
         //customProperties: !this.cellProperty.customProperties ? undefined : this.cellProperty.customProperties,
         customProperties: customProperties,
-        lightCellBorders: this.cellProperty.lightCellBorders,
+        //lightCellBorders: this.cellProperty.lightCellBorders,
         //dataSource: this.cellProperty.dataSource,
         backColor: this.cellProperty.backColor,
         editorProperty: this.cellProperty.editorProperty,
@@ -63032,7 +63027,7 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
         isDrawGridlines: true,
         cellInnerMargin: "0,0,0.1,0.1",
         customProperties: "",
-        lightCellBorders: false,
+        //lightCellBorders: false,
         //dataSource: "",
         backColor: "transparent",
         editorProperty: _TableProperty__WEBPACK_IMPORTED_MODULE_30__/* .EditorProperty.None */ .YS.None,
@@ -91978,30 +91973,33 @@ var isMap = function isMap(map) {
 /* harmony export */ });
 /* unused harmony exports generateGetBoundingClientRect, createPrintHTMLIframe, resetScale, getUserIP, createRarewordsCanvas */
 /* harmony import */ var D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_toConsumableArray_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(61748);
-/* harmony import */ var core_js_modules_es_regexp_exec_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(74916);
-/* harmony import */ var core_js_modules_es_regexp_exec_js__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_regexp_exec_js__WEBPACK_IMPORTED_MODULE_1__);
-/* harmony import */ var core_js_modules_es_string_replace_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(15306);
-/* harmony import */ var core_js_modules_es_string_replace_js__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_string_replace_js__WEBPACK_IMPORTED_MODULE_2__);
-/* harmony import */ var core_js_modules_es_array_includes_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(26699);
-/* harmony import */ var core_js_modules_es_array_includes_js__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_includes_js__WEBPACK_IMPORTED_MODULE_3__);
-/* harmony import */ var core_js_modules_es_string_includes_js__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(32023);
-/* harmony import */ var core_js_modules_es_string_includes_js__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_string_includes_js__WEBPACK_IMPORTED_MODULE_4__);
-/* harmony import */ var core_js_modules_es_array_from_js__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(91038);
-/* harmony import */ var core_js_modules_es_array_from_js__WEBPACK_IMPORTED_MODULE_5___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_from_js__WEBPACK_IMPORTED_MODULE_5__);
-/* harmony import */ var core_js_modules_es_string_iterator_js__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(78783);
-/* harmony import */ var core_js_modules_es_string_iterator_js__WEBPACK_IMPORTED_MODULE_6___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_string_iterator_js__WEBPACK_IMPORTED_MODULE_6__);
-/* harmony import */ var core_js_modules_es_object_to_string_js__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(41539);
-/* harmony import */ var core_js_modules_es_object_to_string_js__WEBPACK_IMPORTED_MODULE_7___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_object_to_string_js__WEBPACK_IMPORTED_MODULE_7__);
-/* harmony import */ var core_js_modules_es_regexp_to_string_js__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(39714);
-/* harmony import */ var core_js_modules_es_regexp_to_string_js__WEBPACK_IMPORTED_MODULE_8___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_regexp_to_string_js__WEBPACK_IMPORTED_MODULE_8__);
-/* harmony import */ var core_js_modules_es_array_concat_js__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(92222);
-/* harmony import */ var core_js_modules_es_array_concat_js__WEBPACK_IMPORTED_MODULE_9___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_concat_js__WEBPACK_IMPORTED_MODULE_9__);
-/* harmony import */ var core_js_modules_web_dom_collections_for_each_js__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(54747);
-/* harmony import */ var core_js_modules_web_dom_collections_for_each_js__WEBPACK_IMPORTED_MODULE_10___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_web_dom_collections_for_each_js__WEBPACK_IMPORTED_MODULE_10__);
-/* harmony import */ var core_js_modules_es_string_match_js__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(4723);
-/* harmony import */ var core_js_modules_es_string_match_js__WEBPACK_IMPORTED_MODULE_11___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_string_match_js__WEBPACK_IMPORTED_MODULE_11__);
-/* harmony import */ var _popperjs_core__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(95551);
-/* harmony import */ var _editor_utils_UnitConvert__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(91404);
+/* harmony import */ var core_js_modules_es_number_constructor_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(9653);
+/* harmony import */ var core_js_modules_es_number_constructor_js__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_number_constructor_js__WEBPACK_IMPORTED_MODULE_1__);
+/* harmony import */ var core_js_modules_es_regexp_exec_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(74916);
+/* harmony import */ var core_js_modules_es_regexp_exec_js__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_regexp_exec_js__WEBPACK_IMPORTED_MODULE_2__);
+/* harmony import */ var core_js_modules_es_string_replace_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(15306);
+/* harmony import */ var core_js_modules_es_string_replace_js__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_string_replace_js__WEBPACK_IMPORTED_MODULE_3__);
+/* harmony import */ var core_js_modules_es_array_includes_js__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(26699);
+/* harmony import */ var core_js_modules_es_array_includes_js__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_includes_js__WEBPACK_IMPORTED_MODULE_4__);
+/* harmony import */ var core_js_modules_es_string_includes_js__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(32023);
+/* harmony import */ var core_js_modules_es_string_includes_js__WEBPACK_IMPORTED_MODULE_5___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_string_includes_js__WEBPACK_IMPORTED_MODULE_5__);
+/* harmony import */ var core_js_modules_es_array_from_js__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(91038);
+/* harmony import */ var core_js_modules_es_array_from_js__WEBPACK_IMPORTED_MODULE_6___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_from_js__WEBPACK_IMPORTED_MODULE_6__);
+/* harmony import */ var core_js_modules_es_string_iterator_js__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(78783);
+/* harmony import */ var core_js_modules_es_string_iterator_js__WEBPACK_IMPORTED_MODULE_7___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_string_iterator_js__WEBPACK_IMPORTED_MODULE_7__);
+/* harmony import */ var core_js_modules_es_object_to_string_js__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(41539);
+/* harmony import */ var core_js_modules_es_object_to_string_js__WEBPACK_IMPORTED_MODULE_8___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_object_to_string_js__WEBPACK_IMPORTED_MODULE_8__);
+/* harmony import */ var core_js_modules_es_regexp_to_string_js__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(39714);
+/* harmony import */ var core_js_modules_es_regexp_to_string_js__WEBPACK_IMPORTED_MODULE_9___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_regexp_to_string_js__WEBPACK_IMPORTED_MODULE_9__);
+/* harmony import */ var core_js_modules_es_array_concat_js__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(92222);
+/* harmony import */ var core_js_modules_es_array_concat_js__WEBPACK_IMPORTED_MODULE_10___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_concat_js__WEBPACK_IMPORTED_MODULE_10__);
+/* harmony import */ var core_js_modules_web_dom_collections_for_each_js__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(54747);
+/* harmony import */ var core_js_modules_web_dom_collections_for_each_js__WEBPACK_IMPORTED_MODULE_11___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_web_dom_collections_for_each_js__WEBPACK_IMPORTED_MODULE_11__);
+/* harmony import */ var core_js_modules_es_string_match_js__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(4723);
+/* harmony import */ var core_js_modules_es_string_match_js__WEBPACK_IMPORTED_MODULE_12___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_string_match_js__WEBPACK_IMPORTED_MODULE_12__);
+/* harmony import */ var _popperjs_core__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(95551);
+/* harmony import */ var _editor_utils_UnitConvert__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(91404);
+
 
 
 
@@ -92096,22 +92094,26 @@ var dateFormatValueList = [{
 var dateFormat = function dateFormat(date, format) {
   var _date;
   if (date && typeof date === 'string') {
-    var stringDate = date.replace(/[年|月|-]/g, '/');
-    stringDate = stringDate.replace(/[点|时|分]/g, ':');
-    stringDate = stringDate.replace(/[日|秒]/g, '');
-    if (isNaN(new Date(stringDate).getTime())) {
-      if (format && format.includes('MM') && !format.includes('yyyy')) {
-        stringDate = '2021/' + stringDate;
-      }
-      if (format && format.includes('HH') && !format.includes('ss')) {
-        stringDate = stringDate + ':00';
-        stringDate = stringDate.replace('::', ':');
-      }
-      if (!stringDate.includes('/')) {
-        stringDate = '2021/10/01 ' + stringDate;
+    if (!isNaN(Number(date))) {
+      _date = toDate(Number(date));
+    } else {
+      var stringDate = date.replace(/[年|月|-]/g, '/');
+      stringDate = stringDate.replace(/[点|时|分]/g, ':');
+      stringDate = stringDate.replace(/[日|秒]/g, '');
+      if (isNaN(new Date(stringDate).getTime())) {
+        if (format && format.includes('MM') && !format.includes('yyyy')) {
+          stringDate = '2021/' + stringDate;
+        }
+        if (format && format.includes('HH') && !format.includes('ss')) {
+          stringDate = stringDate + ':00';
+          stringDate = stringDate.replace('::', ':');
+        }
+        if (!stringDate.includes('/')) {
+          stringDate = '2021/10/01 ' + stringDate;
+        }
       }
+      _date = toDate(stringDate);
     }
-    _date = toDate(stringDate);
   } else {
     _date = toDate(date);
   }
@@ -92262,7 +92264,7 @@ var createRightMenu = function createRightMenu(clientX, clientY, rightMenuModal)
   var virtualElement = {
     getBoundingClientRect: generateGetBoundingClientRect(clientX, clientY)
   };
-  (0,_popperjs_core__WEBPACK_IMPORTED_MODULE_13__/* .createPopper */ .fi)(virtualElement, rightMenuModal, {
+  (0,_popperjs_core__WEBPACK_IMPORTED_MODULE_14__/* .createPopper */ .fi)(virtualElement, rightMenuModal, {
     placement: 'bottom-start',
     modifiers: [{
       name: 'flip',
@@ -197136,150 +197138,6 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
 });
 
 
-/***/ }),
-
-/***/ 77732:
-/***/ (function(module, __unused_webpack_exports, __webpack_require__) {
-
-var map = {
-	"./l-b-z-1-1.png": 98166,
-	"./l-b-z-2-1.png": 88887,
-	"./l-b-z-3-1.png": 16253,
-	"./l-b-z-4-1.png": 7881,
-	"./l-b-z-5-1.png": 66764,
-	"./l-b-z-6-1.png": 47160,
-	"./l-b-z-7-1.png": 62983,
-	"./l-b-z-8-1.png": 54938
-};
-
-
-function webpackContext(req) {
-	var id = webpackContextResolve(req);
-	return __webpack_require__(id);
-}
-function webpackContextResolve(req) {
-	if(!__webpack_require__.o(map, req)) {
-		var e = new Error("Cannot find module '" + req + "'");
-		e.code = 'MODULE_NOT_FOUND';
-		throw e;
-	}
-	return map[req];
-}
-webpackContext.keys = function webpackContextKeys() {
-	return Object.keys(map);
-};
-webpackContext.resolve = webpackContextResolve;
-module.exports = webpackContext;
-webpackContext.id = 77732;
-
-/***/ }),
-
-/***/ 74632:
-/***/ (function(module, __unused_webpack_exports, __webpack_require__) {
-
-var map = {
-	"./l-t-z-1-1.png": 75640,
-	"./l-t-z-2-1.png": 78223,
-	"./l-t-z-3-1.png": 22633,
-	"./l-t-z-4-1.png": 21747,
-	"./l-t-z-5-1.png": 94348,
-	"./l-t-z-6-1.png": 69216,
-	"./l-t-z-7-1.png": 88493,
-	"./l-t-z-8-1.png": 89867
-};
-
-
-function webpackContext(req) {
-	var id = webpackContextResolve(req);
-	return __webpack_require__(id);
-}
-function webpackContextResolve(req) {
-	if(!__webpack_require__.o(map, req)) {
-		var e = new Error("Cannot find module '" + req + "'");
-		e.code = 'MODULE_NOT_FOUND';
-		throw e;
-	}
-	return map[req];
-}
-webpackContext.keys = function webpackContextKeys() {
-	return Object.keys(map);
-};
-webpackContext.resolve = webpackContextResolve;
-module.exports = webpackContext;
-webpackContext.id = 74632;
-
-/***/ }),
-
-/***/ 66001:
-/***/ (function(module, __unused_webpack_exports, __webpack_require__) {
-
-var map = {
-	"./r-b-z-1-1.png": 32269,
-	"./r-b-z-2-1.png": 77989,
-	"./r-b-z-3-1.png": 45764,
-	"./r-b-z-4-1.png": 36100,
-	"./r-b-z-5-1.png": 27372,
-	"./r-b-z-6-1.png": 68912,
-	"./r-b-z-7-1.png": 56851,
-	"./r-b-z-8-1.png": 54980
-};
-
-
-function webpackContext(req) {
-	var id = webpackContextResolve(req);
-	return __webpack_require__(id);
-}
-function webpackContextResolve(req) {
-	if(!__webpack_require__.o(map, req)) {
-		var e = new Error("Cannot find module '" + req + "'");
-		e.code = 'MODULE_NOT_FOUND';
-		throw e;
-	}
-	return map[req];
-}
-webpackContext.keys = function webpackContextKeys() {
-	return Object.keys(map);
-};
-webpackContext.resolve = webpackContextResolve;
-module.exports = webpackContext;
-webpackContext.id = 66001;
-
-/***/ }),
-
-/***/ 1842:
-/***/ (function(module, __unused_webpack_exports, __webpack_require__) {
-
-var map = {
-	"./r-t-z-1-1.png": 91598,
-	"./r-t-z-2-1.png": 58365,
-	"./r-t-z-3-1.png": 94845,
-	"./r-t-z-4-1.png": 41308,
-	"./r-t-z-5-1.png": 65695,
-	"./r-t-z-6-1.png": 78393,
-	"./r-t-z-7-1.png": 2815,
-	"./r-t-z-8-1.png": 86136
-};
-
-
-function webpackContext(req) {
-	var id = webpackContextResolve(req);
-	return __webpack_require__(id);
-}
-function webpackContextResolve(req) {
-	if(!__webpack_require__.o(map, req)) {
-		var e = new Error("Cannot find module '" + req + "'");
-		e.code = 'MODULE_NOT_FOUND';
-		throw e;
-	}
-	return map[req];
-}
-webpackContext.keys = function webpackContextKeys() {
-	return Object.keys(map);
-};
-webpackContext.resolve = webpackContextResolve;
-module.exports = webpackContext;
-webpackContext.id = 1842;
-
 /***/ }),
 
 /***/ 60276:
@@ -197295,7 +197153,7 @@ var map = {
 	"./dataSource/DataSource.vue": 9238,
 	"./dateDialog/DateDialog.vue": 17237,
 	"./delimiter/Delimiter.vue": 31861,
-	"./expressionForm/ExpressionForm.vue": 79648,
+	"./expressionForm/ExpressionForm.vue": 44603,
 	"./findReplace/FindReplace.vue": 25918,
 	"./gestation/Gestation.vue": 6251,
 	"./hoprint/HoPrint.vue": 62321,
@@ -197351,262 +197209,6 @@ webpackContext.id = 60276;
 
 /***/ }),
 
-/***/ 98166:
-/***/ (function(module, __unused_webpack_exports, __webpack_require__) {
-
-"use strict";
-module.exports = __webpack_require__.p + "img/l-b-z-1-1.png";
-
-/***/ }),
-
-/***/ 88887:
-/***/ (function(module, __unused_webpack_exports, __webpack_require__) {
-
-"use strict";
-module.exports = __webpack_require__.p + "img/l-b-z-2-1.png";
-
-/***/ }),
-
-/***/ 16253:
-/***/ (function(module, __unused_webpack_exports, __webpack_require__) {
-
-"use strict";
-module.exports = __webpack_require__.p + "img/l-b-z-3-1.png";
-
-/***/ }),
-
-/***/ 7881:
-/***/ (function(module, __unused_webpack_exports, __webpack_require__) {
-
-"use strict";
-module.exports = __webpack_require__.p + "img/l-b-z-4-1.png";
-
-/***/ }),
-
-/***/ 66764:
-/***/ (function(module, __unused_webpack_exports, __webpack_require__) {
-
-"use strict";
-module.exports = __webpack_require__.p + "img/l-b-z-5-1.png";
-
-/***/ }),
-
-/***/ 47160:
-/***/ (function(module, __unused_webpack_exports, __webpack_require__) {
-
-"use strict";
-module.exports = __webpack_require__.p + "img/l-b-z-6-1.png";
-
-/***/ }),
-
-/***/ 62983:
-/***/ (function(module, __unused_webpack_exports, __webpack_require__) {
-
-"use strict";
-module.exports = __webpack_require__.p + "img/l-b-z-7-1.png";
-
-/***/ }),
-
-/***/ 54938:
-/***/ (function(module, __unused_webpack_exports, __webpack_require__) {
-
-"use strict";
-module.exports = __webpack_require__.p + "img/l-b-z-8-1.png";
-
-/***/ }),
-
-/***/ 75640:
-/***/ (function(module, __unused_webpack_exports, __webpack_require__) {
-
-"use strict";
-module.exports = __webpack_require__.p + "img/l-t-z-1-1.png";
-
-/***/ }),
-
-/***/ 78223:
-/***/ (function(module, __unused_webpack_exports, __webpack_require__) {
-
-"use strict";
-module.exports = __webpack_require__.p + "img/l-t-z-2-1.png";
-
-/***/ }),
-
-/***/ 22633:
-/***/ (function(module, __unused_webpack_exports, __webpack_require__) {
-
-"use strict";
-module.exports = __webpack_require__.p + "img/l-t-z-3-1.png";
-
-/***/ }),
-
-/***/ 21747:
-/***/ (function(module, __unused_webpack_exports, __webpack_require__) {
-
-"use strict";
-module.exports = __webpack_require__.p + "img/l-t-z-4-1.png";
-
-/***/ }),
-
-/***/ 94348:
-/***/ (function(module, __unused_webpack_exports, __webpack_require__) {
-
-"use strict";
-module.exports = __webpack_require__.p + "img/l-t-z-5-1.png";
-
-/***/ }),
-
-/***/ 69216:
-/***/ (function(module, __unused_webpack_exports, __webpack_require__) {
-
-"use strict";
-module.exports = __webpack_require__.p + "img/l-t-z-6-1.png";
-
-/***/ }),
-
-/***/ 88493:
-/***/ (function(module, __unused_webpack_exports, __webpack_require__) {
-
-"use strict";
-module.exports = __webpack_require__.p + "img/l-t-z-7-1.png";
-
-/***/ }),
-
-/***/ 89867:
-/***/ (function(module, __unused_webpack_exports, __webpack_require__) {
-
-"use strict";
-module.exports = __webpack_require__.p + "img/l-t-z-8-1.png";
-
-/***/ }),
-
-/***/ 32269:
-/***/ (function(module, __unused_webpack_exports, __webpack_require__) {
-
-"use strict";
-module.exports = __webpack_require__.p + "img/r-b-z-1-1.png";
-
-/***/ }),
-
-/***/ 77989:
-/***/ (function(module, __unused_webpack_exports, __webpack_require__) {
-
-"use strict";
-module.exports = __webpack_require__.p + "img/r-b-z-2-1.png";
-
-/***/ }),
-
-/***/ 45764:
-/***/ (function(module, __unused_webpack_exports, __webpack_require__) {
-
-"use strict";
-module.exports = __webpack_require__.p + "img/r-b-z-3-1.png";
-
-/***/ }),
-
-/***/ 36100:
-/***/ (function(module, __unused_webpack_exports, __webpack_require__) {
-
-"use strict";
-module.exports = __webpack_require__.p + "img/r-b-z-4-1.png";
-
-/***/ }),
-
-/***/ 27372:
-/***/ (function(module, __unused_webpack_exports, __webpack_require__) {
-
-"use strict";
-module.exports = __webpack_require__.p + "img/r-b-z-5-1.png";
-
-/***/ }),
-
-/***/ 68912:
-/***/ (function(module, __unused_webpack_exports, __webpack_require__) {
-
-"use strict";
-module.exports = __webpack_require__.p + "img/r-b-z-6-1.png";
-
-/***/ }),
-
-/***/ 56851:
-/***/ (function(module, __unused_webpack_exports, __webpack_require__) {
-
-"use strict";
-module.exports = __webpack_require__.p + "img/r-b-z-7-1.png";
-
-/***/ }),
-
-/***/ 54980:
-/***/ (function(module, __unused_webpack_exports, __webpack_require__) {
-
-"use strict";
-module.exports = __webpack_require__.p + "img/r-b-z-8-1.png";
-
-/***/ }),
-
-/***/ 91598:
-/***/ (function(module, __unused_webpack_exports, __webpack_require__) {
-
-"use strict";
-module.exports = __webpack_require__.p + "img/r-t-z-1-1.png";
-
-/***/ }),
-
-/***/ 58365:
-/***/ (function(module, __unused_webpack_exports, __webpack_require__) {
-
-"use strict";
-module.exports = __webpack_require__.p + "img/r-t-z-2-1.png";
-
-/***/ }),
-
-/***/ 94845:
-/***/ (function(module, __unused_webpack_exports, __webpack_require__) {
-
-"use strict";
-module.exports = __webpack_require__.p + "img/r-t-z-3-1.png";
-
-/***/ }),
-
-/***/ 41308:
-/***/ (function(module, __unused_webpack_exports, __webpack_require__) {
-
-"use strict";
-module.exports = __webpack_require__.p + "img/r-t-z-4-1.png";
-
-/***/ }),
-
-/***/ 65695:
-/***/ (function(module, __unused_webpack_exports, __webpack_require__) {
-
-"use strict";
-module.exports = __webpack_require__.p + "img/r-t-z-5-1.png";
-
-/***/ }),
-
-/***/ 78393:
-/***/ (function(module, __unused_webpack_exports, __webpack_require__) {
-
-"use strict";
-module.exports = __webpack_require__.p + "img/r-t-z-6-1.png";
-
-/***/ }),
-
-/***/ 2815:
-/***/ (function(module, __unused_webpack_exports, __webpack_require__) {
-
-"use strict";
-module.exports = __webpack_require__.p + "img/r-t-z-7-1.png";
-
-/***/ }),
-
-/***/ 86136:
-/***/ (function(module, __unused_webpack_exports, __webpack_require__) {
-
-"use strict";
-module.exports = __webpack_require__.p + "img/r-t-z-8-1.png";
-
-/***/ }),
-
 /***/ 77203:
 /***/ (function(module) {
 
@@ -236930,7 +236532,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.77');
+/* harmony default export */ var version = ('3.0.78');
 // EXTERNAL MODULE: ./src/components/controls/poperTipText/PoperTipText.vue + 5 modules
 var PoperTipText = __webpack_require__(36081);
 ;// CONCATENATED MODULE: ./src/components/controls/poperTipText/index.ts
@@ -250880,7 +250482,7 @@ var VueController = /*#__PURE__*/function () {
             isDrawGridlines: true,
             cellInnerMargin: '0,0,0.1,0.1',
             customProperties: '',
-            lightCellBorders: false,
+            //lightCellBorders: false,
             dataSource: '',
             backColor: 'transparent',
             editorProperty: TableProperty/* EditorProperty.None */.YS.None,
@@ -250996,7 +250598,7 @@ var VueController = /*#__PURE__*/function () {
             isDrawGridlines: node.cellProperty.isDrawGridlines,
             cellInnerMargin: node.cellProperty.cellInnerMargin ? node.cellProperty.cellInnerMargin.toString() : '0,0,0.1,0.1',
             customProperties: _customProperties3,
-            lightCellBorders: node.cellProperty.lightCellBorders,
+            //lightCellBorders: node.cellProperty.lightCellBorders,
             //dataSource: node.cellProperty.dataSource,
             backColor: node.cellProperty.backColor,
             editorProperty: node.cellProperty.editorProperty,
@@ -252817,7 +252419,8 @@ var EditController = /*#__PURE__*/function () {
     key: "canIsEdit",
     value: function canIsEdit(hoEditorFactory) {
       var result = true;
-      //hoEditorFactory.isUseForm = true;
+      // hoEditorFactory.isUseForm = true;
+      // hoEditorFactory.allowEditCellInForm = false;
       if (hoEditorFactory.isUseForm) {
         var _enode$parentNode, _enode$parentNode2;
         var curDomRange = hoEditorFactory.docTree.curDomRange.normalize(); //获取当前选中区域
@@ -252837,6 +252440,11 @@ var EditController = /*#__PURE__*/function () {
         if (enode instanceof MarkNode/* MarkNode */.j && enode.MarkNodeType == 2 && (((_enode$parentNode = enode.parentNode) === null || _enode$parentNode === void 0 ? void 0 : _enode$parentNode.parentNode) == null || ((_enode$parentNode2 = enode.parentNode) === null || _enode$parentNode2 === void 0 ? void 0 : _enode$parentNode2.parentNode) instanceof CellNode/* CellNode */.D)) {
           result = false;
         }
+        if (!hoEditorFactory.allowEditCellInForm) {
+          if ((enode === null || enode === void 0 ? void 0 : enode.parentNode) instanceof CellNode/* CellNode */.D) {
+            result = false;
+          }
+        }
       }
       if (!result) {
         message/* default.destroy */.Z.destroy();
@@ -257057,6 +256665,7 @@ var HOEditorFactory = /*#__PURE__*/function () {
     (0,esm_classCallCheck/* default */.Z)(this, HOEditorFactory);
     (0,esm_defineProperty/* default */.Z)(this, "_printBlack", void 0);
     (0,esm_defineProperty/* default */.Z)(this, "_isUseForm", void 0);
+    (0,esm_defineProperty/* default */.Z)(this, "_allowEditCellInForm", true);
     (0,esm_defineProperty/* default */.Z)(this, "_isUseImagePrint", void 0);
     (0,esm_defineProperty/* default */.Z)(this, "_isFixedPrintToA4", void 0);
     (0,esm_defineProperty/* default */.Z)(this, "_isRotate", void 0);
@@ -257136,6 +256745,7 @@ var HOEditorFactory = /*#__PURE__*/function () {
     get:
     // 打印时将彩色字体转换成黑色
     // 是否启用表单模式
+    //表单模式下是否允许编辑单元格文本
     // 是否启用图片打印 默认不启用即使用svg打印
     // 是否将病历固定打印到a4纸上 默认不启用，如果启用则不管什么病历都会在打印生成a4尺寸的pdf，将病历居中靠上绘制到pdf上面
     // 特殊打印时是否旋转过pdf的context内容
@@ -257150,7 +256760,6 @@ var HOEditorFactory = /*#__PURE__*/function () {
     // 待加载的图片数量
     // 图片加载完成回调
     // 获取ai文本函数
-    //private _aiText = ""; // ai文本
 
     // 医生签名图片高度
     // 患者签名签字图片高度
@@ -257808,16 +257417,7 @@ var HOEditorFactory = /*#__PURE__*/function () {
     key: "aiTextFunc",
     get: function get() {
       return this._aiTextFunc;
-    }
-    // set aiText(value: string) {
-    // 	if (this._aiText !== value) {
-    // 		this._aiText = value;
-    // 	}
-    // }
-    // get aiText(): string {
-    // 	return this._aiText;
-    // }
-    ,
+    },
     set: function set(value) {
       if (this._aiTextFunc !== value) {
         this._aiTextFunc = value;
@@ -257913,6 +257513,16 @@ var HOEditorFactory = /*#__PURE__*/function () {
         this._isUseForm = value;
       }
     }
+  }, {
+    key: "allowEditCellInForm",
+    get: function get() {
+      return this._allowEditCellInForm;
+    },
+    set: function set(value) {
+      if (this._allowEditCellInForm !== value) {
+        this._allowEditCellInForm = value;
+      }
+    }
   }, {
     key: "printBlack",
     get: function get() {