hoeditor-web 2.0.120 → 2.0.122

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. package/lib/hoeditor.common.js +26 -6
  2. package/lib/hoeditor.umd.js +26 -6
  3. package/lib/hoeditor.umd.min.js +2 -2
  4. package/package.json +1 -1
package/lib/hoeditor.common.js CHANGED
@@ -36814,7 +36814,7 @@ var PageProperty = /*#__PURE__*/function () {
36814
36814
  /*
36815
36815
  * @Author: your name
36816
36816
  * @Date: 2020-12-24 16:01:16
36817
- * @LastEditTime: 2022-08-04 16:39:13
36817
+ * @LastEditTime: 2022-11-25 16:32:17
36818
36818
  * @LastEditors: liyanan 2441631434@qq.com
36819
36819
  * @Description: In User Settings Edit
36820
36820
  * @FilePath: \hoeditor-web\src\editor\dom\TableProperty.ts
@@ -36833,6 +36833,7 @@ var TableProperty = /*#__PURE__*/function () {
36833
36833
  //表格内是否自动换行
36834
36834
 
36835
36835
  //表格固定在一页
36836
+ //是否启用表单弹框编辑
36836
36837
  function TableProperty(objectValues) {
36837
36838
  (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_classCallCheck_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)(this, TableProperty);
36838
36839
  (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 () {
36849
36850
  (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);
36850
36851
  (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);
36851
36852
  (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);
36853
+ (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);
36852
36854
  if (objectValues !== "") {
36853
36855
  var valuesObj = eval('(' + objectValues + ')');
36854
36856
  var assignvalue = function assignvalue(target, source) {
@@ -36979,6 +36981,14 @@ var TableProperty = /*#__PURE__*/function () {
36979
36981
  set: function set(value) {
36980
36982
  this._fixedOnePage = value;
36981
36983
  }
36984
+ }, {
36985
+ key: "isUsePopEdit",
36986
+ get: function get() {
36987
+ return this._isUsePopEdit;
36988
+ },
36989
+ set: function set(value) {
36990
+ this._isUsePopEdit = value;
36991
+ }
36982
36992
  }]);
36983
36993
  return TableProperty;
36984
36994
  }();
@@ -52389,7 +52399,8 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
52389
52399
  tightLineSpace: this.tableProperty.tightLineSpace,
52390
52400
  isAutoChangeLine: this.tableProperty.isAutoChangeLine,
52391
52401
  autoLineHeight: this.tableProperty.autoLineHeight,
52392
- fixedOnePage: this.tableProperty.fixedOnePage
52402
+ fixedOnePage: this.tableProperty.fixedOnePage,
52403
+ isUsePopEdit: this.tableProperty.isUsePopEdit
52393
52404
  };
52394
52405
  ;
52395
52406
  }
@@ -52628,7 +52639,8 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
52628
52639
  tightLineSpace: this.tableProperty.tightLineSpace,
52629
52640
  isAutoChangeLine: this.tableProperty.isAutoChangeLine,
52630
52641
  autoLineHeight: this.tableProperty.autoLineHeight,
52631
- fixedOnePage: this.tableProperty.fixedOnePage
52642
+ fixedOnePage: this.tableProperty.fixedOnePage,
52643
+ isUsePopEdit: this.tableProperty.isUsePopEdit
52632
52644
  };
52633
52645
  var retJson = {
52634
52646
  nodeType: _BaseNode__WEBPACK_IMPORTED_MODULE_26__/* .NodeType */ .Jq[this.nodeType],
@@ -53291,6 +53303,7 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
53291
53303
  tableProperty.layoutFullLinisAutoChangeLineidth = tableProperty["canAdjustRowWidth"] || false;
53292
53304
  tableProperty.canAdjustRowHeight = tableProperty["canAdjustRowHeight"] || false;
53293
53305
  tableProperty.fixedOnePage = tableProperty["fixedOnePage"] || false;
53306
+ tableProperty.isUsePopEdit = tableProperty["isUsePopEdit"] || false;
53294
53307
  tableProperty.isAutoChangeLine = tableProperty["isAutoChangeLine"] || false;
53295
53308
  tableProperty.autoLineHeight = tableProperty["autoLineHeight"] || 0.53;
53296
53309
  tableProperty.autoLineHeightPx = _editor_utils_UnitConvert__WEBPACK_IMPORTED_MODULE_37__/* .UnitConvert.instance.mmConversionPx */ .P.instance.mmConversionPx(parseFloat(tableProperty.autoLineHeight) * 10, false);
@@ -59395,7 +59408,7 @@ var DrawArea = /*#__PURE__*/function (_DrawRect) {
59395
59408
  var lHeight = tempComment.lineHeight;
59396
59409
  for (var i = 1; i < topComments.length; i++) {
59397
59410
  var stageY = getStagePos(topComments[i])[1];
59398
- if (stageY > maxValue) {
59411
+ if (stageY >= maxValue) {
59399
59412
  maxValue = stageY;
59400
59413
  lHeight = topComments[i].lineHeight;
59401
59414
  tempComment = topComments[i];
@@ -70162,6 +70175,11 @@ var EditorController = /*#__PURE__*/function () {
70162
70175
  //return true;
70163
70176
  } else if (keyCode === 46) {
70164
70177
  var _result2 = hoeditorfactory.editController.canIsEdit(hoeditorfactory);
70178
+ //console.log("enter press1");
70179
+ if (hoeditorfactory.notAllowEditInReview && hoeditorfactory.drawTree.paintStatus === PaintState.psReview) {
70180
+ message_box_default().alert("质控医生站的病历只可进行批注不可编辑修改");
70181
+ return;
70182
+ }
70165
70183
  if (_result2) {
70166
70184
  hoeditorfactory.docController.keyBoardDelete("Delete");
70167
70185
  }
@@ -211269,7 +211287,7 @@ var SignNode = __webpack_require__(24701);
211269
211287
  // EXTERNAL MODULE: ./src/editor/dom/treeNode/ParagraphNode.ts
211270
211288
  var ParagraphNode = __webpack_require__(67945);
211271
211289
  ;// CONCATENATED MODULE: ./src/components/version.ts
211272
- /* harmony default export */ var version = ('2.0.120');
211290
+ /* harmony default export */ var version = ('2.0.122');
211273
211291
  // EXTERNAL MODULE: ./src/components/controls/poperTipText/PoperTipText.vue + 5 modules
211274
211292
  var PoperTipText = __webpack_require__(14954);
211275
211293
  ;// CONCATENATED MODULE: ./src/components/controls/poperTipText/index.ts
@@ -213869,6 +213887,7 @@ var HTMLconverter2 = /*#__PURE__*/function () {
213869
213887
  tableProperty.canAdjustRowWidth = tableProperty["canAdjustRowWidth"] || false;
213870
213888
  tableProperty.canAdjustRowHeight = tableProperty["canAdjustRowHeight"] || false;
213871
213889
  tableProperty.fixedOnePage = tableProperty["fixedOnePage"] || false;
213890
+ tableProperty.isUsePopEdit = tableProperty["isUsePopEdit"] || false;
213872
213891
  tableProperty.isAutoChangeLine = tableProperty["isAutoChangeLine"] || false;
213873
213892
  tableProperty.autoLineHeight = tableProperty["autoLineHeight"] || 0.53;
213874
213893
  return tableProperty;
@@ -223346,7 +223365,8 @@ var VueController = /*#__PURE__*/function () {
223346
223365
  tightLineSpace: node.tableProperty.tightLineSpace,
223347
223366
  isAutoChangeLine: node.tableProperty.isAutoChangeLine,
223348
223367
  autoLineHeight: node.tableProperty.autoLineHeight,
223349
- fixedOnePage: node.tableProperty.fixedOnePage
223368
+ fixedOnePage: node.tableProperty.fixedOnePage,
223369
+ isUsePopEdit: node.tableProperty.isUsePopEdit
223350
223370
  };
223351
223371
  var defaultRowProp = {
223352
223372
  customProperties: '',
package/lib/hoeditor.umd.js CHANGED
@@ -36824,7 +36824,7 @@ var PageProperty = /*#__PURE__*/function () {
36824
36824
  /*
36825
36825
  * @Author: your name
36826
36826
  * @Date: 2020-12-24 16:01:16
36827
- * @LastEditTime: 2022-08-04 16:39:13
36827
+ * @LastEditTime: 2022-11-25 16:32:17
36828
36828
  * @LastEditors: liyanan 2441631434@qq.com
36829
36829
  * @Description: In User Settings Edit
36830
36830
  * @FilePath: \hoeditor-web\src\editor\dom\TableProperty.ts
@@ -36843,6 +36843,7 @@ var TableProperty = /*#__PURE__*/function () {
36843
36843
  //表格内是否自动换行
36844
36844
 
36845
36845
  //表格固定在一页
36846
+ //是否启用表单弹框编辑
36846
36847
  function TableProperty(objectValues) {
36847
36848
  (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_classCallCheck_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)(this, TableProperty);
36848
36849
  (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);
@@ -36859,6 +36860,7 @@ var TableProperty = /*#__PURE__*/function () {
36859
36860
  (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);
36860
36861
  (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);
36861
36862
  (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);
36863
+ (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);
36862
36864
  if (objectValues !== "") {
36863
36865
  var valuesObj = eval('(' + objectValues + ')');
36864
36866
  var assignvalue = function assignvalue(target, source) {
@@ -36989,6 +36991,14 @@ var TableProperty = /*#__PURE__*/function () {
36989
36991
  set: function set(value) {
36990
36992
  this._fixedOnePage = value;
36991
36993
  }
36994
+ }, {
36995
+ key: "isUsePopEdit",
36996
+ get: function get() {
36997
+ return this._isUsePopEdit;
36998
+ },
36999
+ set: function set(value) {
37000
+ this._isUsePopEdit = value;
37001
+ }
36992
37002
  }]);
36993
37003
  return TableProperty;
36994
37004
  }();
@@ -52399,7 +52409,8 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
52399
52409
  tightLineSpace: this.tableProperty.tightLineSpace,
52400
52410
  isAutoChangeLine: this.tableProperty.isAutoChangeLine,
52401
52411
  autoLineHeight: this.tableProperty.autoLineHeight,
52402
- fixedOnePage: this.tableProperty.fixedOnePage
52412
+ fixedOnePage: this.tableProperty.fixedOnePage,
52413
+ isUsePopEdit: this.tableProperty.isUsePopEdit
52403
52414
  };
52404
52415
  ;
52405
52416
  }
@@ -52638,7 +52649,8 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
52638
52649
  tightLineSpace: this.tableProperty.tightLineSpace,
52639
52650
  isAutoChangeLine: this.tableProperty.isAutoChangeLine,
52640
52651
  autoLineHeight: this.tableProperty.autoLineHeight,
52641
- fixedOnePage: this.tableProperty.fixedOnePage
52652
+ fixedOnePage: this.tableProperty.fixedOnePage,
52653
+ isUsePopEdit: this.tableProperty.isUsePopEdit
52642
52654
  };
52643
52655
  var retJson = {
52644
52656
  nodeType: _BaseNode__WEBPACK_IMPORTED_MODULE_26__/* .NodeType */ .Jq[this.nodeType],
@@ -53301,6 +53313,7 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
53301
53313
  tableProperty.layoutFullLinisAutoChangeLineidth = tableProperty["canAdjustRowWidth"] || false;
53302
53314
  tableProperty.canAdjustRowHeight = tableProperty["canAdjustRowHeight"] || false;
53303
53315
  tableProperty.fixedOnePage = tableProperty["fixedOnePage"] || false;
53316
+ tableProperty.isUsePopEdit = tableProperty["isUsePopEdit"] || false;
53304
53317
  tableProperty.isAutoChangeLine = tableProperty["isAutoChangeLine"] || false;
53305
53318
  tableProperty.autoLineHeight = tableProperty["autoLineHeight"] || 0.53;
53306
53319
  tableProperty.autoLineHeightPx = _editor_utils_UnitConvert__WEBPACK_IMPORTED_MODULE_37__/* .UnitConvert.instance.mmConversionPx */ .P.instance.mmConversionPx(parseFloat(tableProperty.autoLineHeight) * 10, false);
@@ -59405,7 +59418,7 @@ var DrawArea = /*#__PURE__*/function (_DrawRect) {
59405
59418
  var lHeight = tempComment.lineHeight;
59406
59419
  for (var i = 1; i < topComments.length; i++) {
59407
59420
  var stageY = getStagePos(topComments[i])[1];
59408
- if (stageY > maxValue) {
59421
+ if (stageY >= maxValue) {
59409
59422
  maxValue = stageY;
59410
59423
  lHeight = topComments[i].lineHeight;
59411
59424
  tempComment = topComments[i];
@@ -70172,6 +70185,11 @@ var EditorController = /*#__PURE__*/function () {
70172
70185
  //return true;
70173
70186
  } else if (keyCode === 46) {
70174
70187
  var _result2 = hoeditorfactory.editController.canIsEdit(hoeditorfactory);
70188
+ //console.log("enter press1");
70189
+ if (hoeditorfactory.notAllowEditInReview && hoeditorfactory.drawTree.paintStatus === PaintState.psReview) {
70190
+ message_box_default().alert("质控医生站的病历只可进行批注不可编辑修改");
70191
+ return;
70192
+ }
70175
70193
  if (_result2) {
70176
70194
  hoeditorfactory.docController.keyBoardDelete("Delete");
70177
70195
  }
@@ -211279,7 +211297,7 @@ var SignNode = __webpack_require__(47241);
211279
211297
  // EXTERNAL MODULE: ./src/editor/dom/treeNode/ParagraphNode.ts
211280
211298
  var ParagraphNode = __webpack_require__(3021);
211281
211299
  ;// CONCATENATED MODULE: ./src/components/version.ts
211282
- /* harmony default export */ var version = ('2.0.120');
211300
+ /* harmony default export */ var version = ('2.0.122');
211283
211301
  // EXTERNAL MODULE: ./src/components/controls/poperTipText/PoperTipText.vue + 5 modules
211284
211302
  var PoperTipText = __webpack_require__(68240);
211285
211303
  ;// CONCATENATED MODULE: ./src/components/controls/poperTipText/index.ts
@@ -213879,6 +213897,7 @@ var HTMLconverter2 = /*#__PURE__*/function () {
213879
213897
  tableProperty.canAdjustRowWidth = tableProperty["canAdjustRowWidth"] || false;
213880
213898
  tableProperty.canAdjustRowHeight = tableProperty["canAdjustRowHeight"] || false;
213881
213899
  tableProperty.fixedOnePage = tableProperty["fixedOnePage"] || false;
213900
+ tableProperty.isUsePopEdit = tableProperty["isUsePopEdit"] || false;
213882
213901
  tableProperty.isAutoChangeLine = tableProperty["isAutoChangeLine"] || false;
213883
213902
  tableProperty.autoLineHeight = tableProperty["autoLineHeight"] || 0.53;
213884
213903
  return tableProperty;
@@ -223356,7 +223375,8 @@ var VueController = /*#__PURE__*/function () {
223356
223375
  tightLineSpace: node.tableProperty.tightLineSpace,
223357
223376
  isAutoChangeLine: node.tableProperty.isAutoChangeLine,
223358
223377
  autoLineHeight: node.tableProperty.autoLineHeight,
223359
- fixedOnePage: node.tableProperty.fixedOnePage
223378
+ fixedOnePage: node.tableProperty.fixedOnePage,
223379
+ isUsePopEdit: node.tableProperty.isUsePopEdit
223360
223380
  };
223361
223381
  var defaultRowProp = {
223362
223382
  customProperties: '',