hoeditor-web 2.0.121 → 2.0.123

package/lib/hoeditor.common.js

@@ -19098,7 +19098,7 @@ var component = (0,componentNormalizer/* default */.Z)(
 
 /***/ }),
 
-/***/ 78972:
+/***/ 78259:
 /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -19110,7 +19110,7 @@ __webpack_require__.d(__webpack_exports__, {
   "default": function() { return /* binding */ CanvasImageDialog; }
 });
 
-;// 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/upload/CanvasImageDialog.vue?vue&type=template&id=1e0a2026&scoped=true&
+;// 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/upload/CanvasImageDialog.vue?vue&type=template&id=52ddc202&scoped=true&
 var render = function render() {
   var _vm = this,
     _c = _vm._self._c;
@@ -19403,7 +19403,7 @@ var HOEditorFactorys = __webpack_require__(74089);
         x: e.offsetX,
         y: e.offsetY
       });
-      if (this.quadraticCurvePoints.length > 3) {
+      if (this.quadraticCurvePoints.length > 3 && this.tool === 1) {
         var lastTwoPoints = this.quadraticCurvePoints.slice(-2);
         var controlPoint = lastTwoPoints[0];
         var endPoint = {
@@ -19528,10 +19528,10 @@ var HOEditorFactorys = __webpack_require__(74089);
 });
 ;// CONCATENATED MODULE: ./src/components/controls/upload/CanvasImageDialog.vue?vue&type=script&lang=js&
  /* harmony default export */ var upload_CanvasImageDialogvue_type_script_lang_js_ = (CanvasImageDialogvue_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/upload/CanvasImageDialog.vue?vue&type=style&index=0&id=1e0a2026&prod&lang=scss&scoped=true&
+;// 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/upload/CanvasImageDialog.vue?vue&type=style&index=0&id=52ddc202&prod&lang=scss&scoped=true&
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./src/components/controls/upload/CanvasImageDialog.vue?vue&type=style&index=0&id=1e0a2026&prod&lang=scss&scoped=true&
+;// CONCATENATED MODULE: ./src/components/controls/upload/CanvasImageDialog.vue?vue&type=style&index=0&id=52ddc202&prod&lang=scss&scoped=true&
 
 // EXTERNAL MODULE: ./node_modules/@vue/vue-loader-v15/lib/runtime/componentNormalizer.js
 var componentNormalizer = __webpack_require__(1001);
@@ -19550,7 +19550,7 @@ var component = (0,componentNormalizer/* default */.Z)(
   staticRenderFns,
   false,
   null,
-  "1e0a2026",
+  "52ddc202",
   null
   
 )
@@ -36814,7 +36814,7 @@ var PageProperty = /*#__PURE__*/function () {
 /*
  * @Author: your name
  * @Date: 2020-12-24 16:01:16
- * @LastEditTime: 2022-08-04 16:39:13
+ * @LastEditTime: 2022-11-25 16:32:17
  * @LastEditors: liyanan 2441631434@qq.com
  * @Description: In User Settings Edit
  * @FilePath: \hoeditor-web\src\editor\dom\TableProperty.ts
@@ -36833,6 +36833,7 @@ 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);
@@ -36849,6 +36850,7 @@ var TableProperty = /*#__PURE__*/function () {
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_8__/* ["default"] */ .Z)(this, "_autoLineHeight", 0.53);
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_8__/* ["default"] */ .Z)(this, "_autoLineHeightPx", _treeNode_TableNode__WEBPACK_IMPORTED_MODULE_7__/* .gDefaultRowHeight */ .dT);
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_8__/* ["default"] */ .Z)(this, "_fixedOnePage", false);
+    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_8__/* ["default"] */ .Z)(this, "_isUsePopEdit", false);
     if (objectValues !== "") {
       var valuesObj = eval('(' + objectValues + ')');
       var assignvalue = function assignvalue(target, source) {
@@ -36979,6 +36981,14 @@ var TableProperty = /*#__PURE__*/function () {
     set: function set(value) {
       this._fixedOnePage = value;
     }
+  }, {
+    key: "isUsePopEdit",
+    get: function get() {
+      return this._isUsePopEdit;
+    },
+    set: function set(value) {
+      this._isUsePopEdit = value;
+    }
   }]);
   return TableProperty;
 }();
@@ -52389,7 +52399,8 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
             tightLineSpace: this.tableProperty.tightLineSpace,
             isAutoChangeLine: this.tableProperty.isAutoChangeLine,
             autoLineHeight: this.tableProperty.autoLineHeight,
-            fixedOnePage: this.tableProperty.fixedOnePage
+            fixedOnePage: this.tableProperty.fixedOnePage,
+            isUsePopEdit: this.tableProperty.isUsePopEdit
           };
           ;
         }
@@ -52628,7 +52639,8 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
         tightLineSpace: this.tableProperty.tightLineSpace,
         isAutoChangeLine: this.tableProperty.isAutoChangeLine,
         autoLineHeight: this.tableProperty.autoLineHeight,
-        fixedOnePage: this.tableProperty.fixedOnePage
+        fixedOnePage: this.tableProperty.fixedOnePage,
+        isUsePopEdit: this.tableProperty.isUsePopEdit
       };
       var retJson = {
         nodeType: _BaseNode__WEBPACK_IMPORTED_MODULE_26__/* .NodeType */ .Jq[this.nodeType],
@@ -53291,6 +53303,7 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
       tableProperty.layoutFullLinisAutoChangeLineidth = tableProperty["canAdjustRowWidth"] || false;
       tableProperty.canAdjustRowHeight = tableProperty["canAdjustRowHeight"] || false;
       tableProperty.fixedOnePage = tableProperty["fixedOnePage"] || false;
+      tableProperty.isUsePopEdit = tableProperty["isUsePopEdit"] || false;
       tableProperty.isAutoChangeLine = tableProperty["isAutoChangeLine"] || false;
       tableProperty.autoLineHeight = tableProperty["autoLineHeight"] || 0.53;
       tableProperty.autoLineHeightPx = _editor_utils_UnitConvert__WEBPACK_IMPORTED_MODULE_37__/* .UnitConvert.instance.mmConversionPx */ .P.instance.mmConversionPx(parseFloat(tableProperty.autoLineHeight) * 10, false);
@@ -70162,6 +70175,11 @@ var EditorController = /*#__PURE__*/function () {
             //return true;
           } else if (keyCode === 46) {
             var _result2 = hoeditorfactory.editController.canIsEdit(hoeditorfactory);
+            //console.log("enter press1");
+            if (hoeditorfactory.notAllowEditInReview && hoeditorfactory.drawTree.paintStatus === PaintState.psReview) {
+              message_box_default().alert("质控医生站的病历只可进行批注不可编辑修改");
+              return;
+            }
             if (_result2) {
               hoeditorfactory.docController.keyBoardDelete("Delete");
             }
@@ -205862,7 +205880,7 @@ var map = {
 	"./table/TableProperty.vue": 7993,
 	"./table/TableRowProperty.vue": 12662,
 	"./textDialog/TextDialog.vue": 16114,
-	"./upload/CanvasImageDialog.vue": 78972,
+	"./upload/CanvasImageDialog.vue": 78259,
 	"./upload/UploadImageDialog.vue": 39490
 };
 
@@ -211269,7 +211287,7 @@ var SignNode = __webpack_require__(24701);
 // EXTERNAL MODULE: ./src/editor/dom/treeNode/ParagraphNode.ts
 var ParagraphNode = __webpack_require__(67945);
 ;// CONCATENATED MODULE: ./src/components/version.ts
-/* harmony default export */ var version = ('2.0.121');
+/* harmony default export */ var version = ('2.0.123');
 // EXTERNAL MODULE: ./src/components/controls/poperTipText/PoperTipText.vue + 5 modules
 var PoperTipText = __webpack_require__(14954);
 ;// CONCATENATED MODULE: ./src/components/controls/poperTipText/index.ts
@@ -213869,6 +213887,7 @@ var HTMLconverter2 = /*#__PURE__*/function () {
       tableProperty.canAdjustRowWidth = tableProperty["canAdjustRowWidth"] || false;
       tableProperty.canAdjustRowHeight = tableProperty["canAdjustRowHeight"] || false;
       tableProperty.fixedOnePage = tableProperty["fixedOnePage"] || false;
+      tableProperty.isUsePopEdit = tableProperty["isUsePopEdit"] || false;
       tableProperty.isAutoChangeLine = tableProperty["isAutoChangeLine"] || false;
       tableProperty.autoLineHeight = tableProperty["autoLineHeight"] || 0.53;
       return tableProperty;
@@ -223346,7 +223365,8 @@ var VueController = /*#__PURE__*/function () {
             tightLineSpace: node.tableProperty.tightLineSpace,
             isAutoChangeLine: node.tableProperty.isAutoChangeLine,
             autoLineHeight: node.tableProperty.autoLineHeight,
-            fixedOnePage: node.tableProperty.fixedOnePage
+            fixedOnePage: node.tableProperty.fixedOnePage,
+            isUsePopEdit: node.tableProperty.isUsePopEdit
           };
           var defaultRowProp = {
             customProperties: '',