hoeditor-web 2.0.116 → 2.0.117

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 +45 -21
  2. package/lib/hoeditor.umd.js +45 -21
  3. package/lib/hoeditor.umd.min.js +4 -4
  4. package/package.json +1 -1
package/lib/hoeditor.common.js CHANGED
@@ -49820,13 +49820,13 @@ var SpecialCharsNode = /*#__PURE__*/function (_ControlNode) {
49820
49820
  /* harmony import */ var D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(27222);
49821
49821
  /* harmony import */ var D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_typeof_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(8495);
49822
49822
  /* harmony import */ var D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_classCallCheck_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(70280);
49823
- /* harmony import */ var D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_36__ = __webpack_require__(66298);
49823
+ /* harmony import */ var D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_37__ = __webpack_require__(66298);
49824
49824
  /* harmony import */ var D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(75808);
49825
49825
  /* harmony import */ var D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_get_js__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(52060);
49826
49826
  /* harmony import */ var D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_getPrototypeOf_js__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(27967);
49827
49827
  /* harmony import */ var D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_inherits_js__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(11651);
49828
49828
  /* harmony import */ var D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createSuper_js__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(19593);
49829
- /* harmony import */ var D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_35__ = __webpack_require__(78255);
49829
+ /* harmony import */ var D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_36__ = __webpack_require__(78255);
49830
49830
  /* harmony import */ var core_js_modules_es_object_to_string_js__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(41539);
49831
49831
  /* harmony import */ var core_js_modules_es_object_to_string_js__WEBPACK_IMPORTED_MODULE_9___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_object_to_string_js__WEBPACK_IMPORTED_MODULE_9__);
49832
49832
  /* harmony import */ var core_js_modules_web_dom_collections_for_each_js__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(54747);
@@ -49871,6 +49871,8 @@ var SpecialCharsNode = /*#__PURE__*/function (_ControlNode) {
49871
49871
  /* harmony import */ var _BaseNode__WEBPACK_IMPORTED_MODULE_32__ = __webpack_require__(62358);
49872
49872
  /* harmony import */ var _CellNode__WEBPACK_IMPORTED_MODULE_33__ = __webpack_require__(68598);
49873
49873
  /* harmony import */ var _ControlNode__WEBPACK_IMPORTED_MODULE_34__ = __webpack_require__(91105);
49874
+ /* harmony import */ var _RadioAndCheckBoxNode__WEBPACK_IMPORTED_MODULE_35__ = __webpack_require__(99152);
49875
+
49874
49876
 
49875
49877
 
49876
49878
 
@@ -49935,10 +49937,10 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
49935
49937
  var _this;
49936
49938
  (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_classCallCheck_js__WEBPACK_IMPORTED_MODULE_3__/* ["default"] */ .Z)(this, TableFormula);
49937
49939
  _this = _super.call(this, hoEditorFactoryID, rootNodes, pNode, nodeType);
49938
- (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_35__/* ["default"] */ .Z)((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_4__/* ["default"] */ .Z)(_this), "_formularType", FormularType.ftSum);
49939
- (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_35__/* ["default"] */ .Z)((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_4__/* ["default"] */ .Z)(_this), "_formulaStr", "");
49940
- (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_35__/* ["default"] */ .Z)((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_4__/* ["default"] */ .Z)(_this), "_hideZero", true);
49941
- (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_35__/* ["default"] */ .Z)((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_4__/* ["default"] */ .Z)(_this), "_cellRange", void 0);
49940
+ (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_36__/* ["default"] */ .Z)((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_4__/* ["default"] */ .Z)(_this), "_formularType", FormularType.ftSum);
49941
+ (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_36__/* ["default"] */ .Z)((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_4__/* ["default"] */ .Z)(_this), "_formulaStr", "");
49942
+ (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_36__/* ["default"] */ .Z)((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_4__/* ["default"] */ .Z)(_this), "_hideZero", true);
49943
+ (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_36__/* ["default"] */ .Z)((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_4__/* ["default"] */ .Z)(_this), "_cellRange", void 0);
49942
49944
  _this._id = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_29__/* .HOEditorFactorys.instance */ .b.instance().getFactory(hoEditorFactoryID).gernerateCode.generateID("TFS");
49943
49945
  _this._styleIndex = styleIndex;
49944
49946
  _this.isAllowDelete = true;
@@ -49946,7 +49948,7 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
49946
49948
  if (formularType !== undefined) {
49947
49949
  _this._formularType = formularType;
49948
49950
  } else {
49949
- _this._formularType = formulaStr.indexOf(':') > 0 ? FormularType.ftSum : FormularType.ftFormular;
49951
+ _this._formularType = formulaStr.indexOf(':') >= 0 ? FormularType.ftSum : FormularType.ftFormular;
49950
49952
  }
49951
49953
  _this.formulaStr = formulaStr;
49952
49954
  if (hideZero !== undefined) _this._hideZero = hideZero;
@@ -49956,7 +49958,7 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
49956
49958
  _this.updateResult();
49957
49959
  return _this;
49958
49960
  }
49959
- (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_36__/* ["default"] */ .Z)(TableFormula, [{
49961
+ (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_37__/* ["default"] */ .Z)(TableFormula, [{
49960
49962
  key: "setCustomProperty",
49961
49963
  value: function setCustomProperty(customProperty) {
49962
49964
  var assignvalue = function assignvalue(target, source) {
@@ -50242,11 +50244,34 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
50242
50244
  strValue = hoEditorFactory.unitConvert.replaceAll(strValue, '\r', '');
50243
50245
  if (strValue === '') {
50244
50246
  bret = true;
50247
+ for (var i = 1; i < cell.childNodes.length; i++) {
50248
+ var aNode = cell.childNodes[i];
50249
+ if (aNode instanceof _RadioAndCheckBoxNode__WEBPACK_IMPORTED_MODULE_35__/* .RadioAndCheckBoxNode */ .Yh) {
50250
+ bret = true;
50251
+ if (aNode.isSelected && aNode.numericValue != "" && Number(aNode.numericValue) > 0) {
50252
+ ret = aNode.numericValue;
50253
+ } else {
50254
+ ret = "";
50255
+ }
50256
+ }
50257
+ }
50245
50258
  } else {
50246
50259
  var ivalue = Number(strValue);
50247
50260
  if (!isNaN(ivalue)) {
50248
50261
  bret = true;
50249
50262
  ret = strValue;
50263
+ } else {
50264
+ for (var j = 1; j < cell.childNodes.length; j++) {
50265
+ var bNode = cell.childNodes[j];
50266
+ if (bNode instanceof _RadioAndCheckBoxNode__WEBPACK_IMPORTED_MODULE_35__/* .RadioAndCheckBoxNode */ .Yh) {
50267
+ bret = true;
50268
+ if (bNode.isSelected && bNode.numericValue != "" && Number(bNode.numericValue) > 0) {
50269
+ ret = bNode.numericValue;
50270
+ } else {
50271
+ ret = "";
50272
+ }
50273
+ }
50274
+ }
50250
50275
  }
50251
50276
  }
50252
50277
  return [bret, ret];
@@ -50774,7 +50799,7 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
50774
50799
  if (json.formularType) {
50775
50800
  formularType = Number(json.formularType);
50776
50801
  } else {
50777
- formularType = json.text.indexOf(':') > 0 ? FormularType.ftSum : FormularType.ftFormular;
50802
+ formularType = json.text.indexOf(':') >= 0 ? FormularType.ftSum : FormularType.ftFormular;
50778
50803
  }
50779
50804
  var ret = new TableFormula(hoEditorFactoryID, rootNodes, pNode ? pNode : null, _BaseNode__WEBPACK_IMPORTED_MODULE_32__/* .NodeType.ntTableFormula */ .Jq.ntTableFormula, json.text, styleIndex, hideZero, formularType, json.customProperty);
50780
50805
  return ret;
@@ -107398,6 +107423,8 @@ var es_typed_array_float64_array = __webpack_require__(76495);
107398
107423
  var es_string_link = __webpack_require__(29254);
107399
107424
  // EXTERNAL MODULE: ./node_modules/core-js/modules/es.string.trim-start.js
107400
107425
  var es_string_trim_start = __webpack_require__(55674);
107426
+ // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.includes.js
107427
+ var es_array_includes = __webpack_require__(26699);
107401
107428
  // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.fill.js
107402
107429
  var es_array_fill = __webpack_require__(43290);
107403
107430
  // EXTERNAL MODULE: ./node_modules/core-js/modules/es.regexp.constructor.js
@@ -112038,11 +112065,7 @@ var f2,getHorizontalCoordinateString,getVerticalCoordinateString,getHorizontalCo
112038
112065
  * A pattern object to use to fill the drawing (not supported by context2d)
112039
112066
  */Object.defineProperty(this,"fillStyle",{get:function get(){return this.ctx.fillStyle;},set:function set(value){var rgba;rgba=getRGBA(value);this.ctx.fillStyle=rgba.style;this.ctx.isFillTransparent=rgba.a===0;//自定义修改 当透明度小于1时改成0 ,以适配不支持透明度的打印机
112040
112067
  if(rgba.a<1){this.ctx.fillOpacity=0;}else{this.ctx.fillOpacity=rgba.a;}// 自定义修改 处理彩色字体打印问题
112041
- var alpha=this.ctx.fillOpacity;if(window.printBlack&&this.ctx.fillStyle!=="#000000"&&this.ctx.fillStyle.toLocaleUpperCase()!=="#FFFFFF"){// this.ctx.fillStyle = "#000000";
112042
- // rgba.r = 255;
112043
- // rgba.g = 0;
112044
- // rgba.b = 0;
112045
- if(Array.isArray(this.ctx.path)&&this.ctx.path.length>4){this.ctx.fillStyle="#000000";}this.pdf.setFillColor(255,255,255,{a:alpha});this.pdf.setTextColor(0,0,0,{a:alpha});}else{this.pdf.setFillColor(rgba.r,rgba.g,rgba.b,{a:alpha});this.pdf.setTextColor(rgba.r,rgba.g,rgba.b,{a:alpha});}}});/**
112068
+ var alpha=this.ctx.fillOpacity;if(window.printBlack&&!['#000','#0000000','#fff','#ffffff','#FFF','#FFFFFF'].includes(this.ctx.fillStyle)){if(Array.isArray(this.ctx.path)&&this.ctx.path.length>4){this.ctx.fillStyle="#000000";}this.pdf.setFillColor(255,255,255,{a:alpha});this.pdf.setTextColor(0,0,0,{a:alpha});}else{this.pdf.setFillColor(rgba.r,rgba.g,rgba.b,{a:alpha});this.pdf.setTextColor(rgba.r,rgba.g,rgba.b,{a:alpha});}}});/**
112046
112069
  * Sets or returns the color, gradient, or pattern used for strokes
112047
112070
  *
112048
112071
  * @name strokeStyle
@@ -112051,7 +112074,7 @@ if(Array.isArray(this.ctx.path)&&this.ctx.path.length>4){this.ctx.fillStyle="#00
112051
112074
  * @property {gradient} gradient A gradient object (linear or radial) used to create a gradient stroke (not supported by context2d)
112052
112075
  * @property {pattern} pattern A pattern object used to create a pattern stroke (not supported by context2d)
112053
112076
  */Object.defineProperty(this,"strokeStyle",{get:function get(){return this.ctx.strokeStyle;},set:function set(value){var rgba=getRGBA(value);this.ctx.strokeStyle=rgba.style;this.ctx.isStrokeTransparent=rgba.a===0;//自定义修改 当透明度小于1时改成0 ,以适配不支持透明度的打印机
112054
- if(rgba.a<1){this.ctx.strokeOpacity=0;}else{this.ctx.strokeOpacity=rgba.a;}if(rgba.a===0){this.pdf.setDrawColor(255,255,255);}else if(rgba.a===1){this.pdf.setDrawColor(rgba.r,rgba.g,rgba.b);}else{this.pdf.setDrawColor(rgba.r,rgba.g,rgba.b);}if(window.printBlack&&this.ctx.strokeStyle!=="#000000"&&this.ctx.strokeStyle.toLocaleUpperCase()!=="#FFFFFF"){if(Array.isArray(this.ctx.path)&&this.ctx.path.length>4){this.ctx.strokeStyle="#000000";this.pdf.setDrawColor(0,0,0);}}}});/**
112077
+ if(rgba.a<1){this.ctx.strokeOpacity=0;}else{this.ctx.strokeOpacity=rgba.a;}if(rgba.a===0){this.pdf.setDrawColor(255,255,255);}else if(rgba.a===1){this.pdf.setDrawColor(rgba.r,rgba.g,rgba.b);}else{this.pdf.setDrawColor(rgba.r,rgba.g,rgba.b);}if(window.printBlack&&!['#000','#0000000','#fff','#ffffff','#FFF','#FFFFFF'].includes(this.ctx.strokeStyle)){if(Array.isArray(this.ctx.path)&&this.ctx.path.length>4){this.ctx.strokeStyle="#000000";this.pdf.setDrawColor(0,0,0);}}}});/**
112055
112078
  * Sets or returns the style of the end caps for a line
112056
112079
  *
112057
112080
  * @name lineCap
@@ -211225,7 +211248,7 @@ var SignNode = __webpack_require__(24701);
211225
211248
  // EXTERNAL MODULE: ./src/editor/dom/treeNode/ParagraphNode.ts
211226
211249
  var ParagraphNode = __webpack_require__(67945);
211227
211250
  ;// CONCATENATED MODULE: ./src/components/version.ts
211228
- /* harmony default export */ var version = ('2.0.116');
211251
+ /* harmony default export */ var version = ('2.0.117');
211229
211252
  // EXTERNAL MODULE: ./src/components/controls/poperTipText/PoperTipText.vue + 5 modules
211230
211253
  var PoperTipText = __webpack_require__(14954);
211231
211254
  ;// CONCATENATED MODULE: ./src/components/controls/poperTipText/index.ts
@@ -213842,10 +213865,10 @@ var HTMLconverter2 = /*#__PURE__*/function () {
213842
213865
  }
213843
213866
  if (height && height != "0px") {
213844
213867
  var heightNum = 0;
213845
- if (height.indexOf("pt") > 0) {
213868
+ if (height.indexOf("pt") >= 0) {
213846
213869
  heightNum = parseFloat(height.substring(0, height.indexOf("pt")));
213847
213870
  heightNum = hoEditorFactory.unitConvert.fontPt2Pix(heightNum);
213848
- } else if (height.indexOf("px") > 0) {
213871
+ } else if (height.indexOf("px") >= 0) {
213849
213872
  heightNum = parseFloat(height.substring(0, height.indexOf("px")));
213850
213873
  } else {
213851
213874
  heightNum = parseFloat(height);
@@ -213884,11 +213907,11 @@ var HTMLconverter2 = /*#__PURE__*/function () {
213884
213907
  width = jquery_default()(td).attr("width") || "30";
213885
213908
  }
213886
213909
  if (width) {
213887
- if (width.indexOf("pt") > 0) {
213910
+ if (width.indexOf("pt") >= 0) {
213888
213911
  widthNum = parseFloat(width.substring(0, width.indexOf("pt")));
213889
213912
  //widthNum = parseFloat(((widthNum * 96) / 72).toFixed(2));
213890
213913
  widthNum = hoEditorFactory.unitConvert.fontPt2Pix(widthNum);
213891
- } else if (width.indexOf("px") > 0) {
213914
+ } else if (width.indexOf("px") >= 0) {
213892
213915
  widthNum = parseFloat(width.substring(0, width.indexOf("px")));
213893
213916
  } else {
213894
213917
  widthNum = parseFloat(width);
@@ -221731,7 +221754,8 @@ var VueController = /*#__PURE__*/function () {
221731
221754
  var sLine = startPosition.dline;
221732
221755
  if (sLine instanceof DrawLine/* DrawLine */.a) {
221733
221756
  if (sLine.parent instanceof DrawPageCell/* DrawPageCell */.k) {
221734
- sPath = sLine.parent._drawPageTable.table.getNodePath();
221757
+ sPath = sLine.parent._drawPageTable.table.nextLeaf().getNodePath();
221758
+ //sPath = hoEditorFactory.docTree.getNodeLastPath(sLine.parent._drawPageTable.table);
221735
221759
  } else {
221736
221760
  sPath = startPosition.path;
221737
221761
  }
package/lib/hoeditor.umd.js CHANGED
@@ -49830,13 +49830,13 @@ var SpecialCharsNode = /*#__PURE__*/function (_ControlNode) {
49830
49830
  /* harmony import */ var D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(25332);
49831
49831
  /* harmony import */ var D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_typeof_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(24432);
49832
49832
  /* harmony import */ var D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_classCallCheck_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(34733);
49833
- /* harmony import */ var D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_36__ = __webpack_require__(14006);
49833
+ /* harmony import */ var D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_37__ = __webpack_require__(14006);
49834
49834
  /* harmony import */ var D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(94665);
49835
49835
  /* harmony import */ var D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_get_js__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(11492);
49836
49836
  /* harmony import */ var D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_getPrototypeOf_js__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(13642);
49837
49837
  /* harmony import */ var D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_inherits_js__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(92675);
49838
49838
  /* harmony import */ var D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createSuper_js__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(35057);
49839
- /* harmony import */ var D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_35__ = __webpack_require__(49888);
49839
+ /* harmony import */ var D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_36__ = __webpack_require__(49888);
49840
49840
  /* harmony import */ var core_js_modules_es_object_to_string_js__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(41539);
49841
49841
  /* harmony import */ var core_js_modules_es_object_to_string_js__WEBPACK_IMPORTED_MODULE_9___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_object_to_string_js__WEBPACK_IMPORTED_MODULE_9__);
49842
49842
  /* harmony import */ var core_js_modules_web_dom_collections_for_each_js__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(54747);
@@ -49881,6 +49881,8 @@ var SpecialCharsNode = /*#__PURE__*/function (_ControlNode) {
49881
49881
  /* harmony import */ var _BaseNode__WEBPACK_IMPORTED_MODULE_32__ = __webpack_require__(62800);
49882
49882
  /* harmony import */ var _CellNode__WEBPACK_IMPORTED_MODULE_33__ = __webpack_require__(66121);
49883
49883
  /* harmony import */ var _ControlNode__WEBPACK_IMPORTED_MODULE_34__ = __webpack_require__(58714);
49884
+ /* harmony import */ var _RadioAndCheckBoxNode__WEBPACK_IMPORTED_MODULE_35__ = __webpack_require__(93741);
49885
+
49884
49886
 
49885
49887
 
49886
49888
 
@@ -49945,10 +49947,10 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
49945
49947
  var _this;
49946
49948
  (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_classCallCheck_js__WEBPACK_IMPORTED_MODULE_3__/* ["default"] */ .Z)(this, TableFormula);
49947
49949
  _this = _super.call(this, hoEditorFactoryID, rootNodes, pNode, nodeType);
49948
- (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_35__/* ["default"] */ .Z)((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_4__/* ["default"] */ .Z)(_this), "_formularType", FormularType.ftSum);
49949
- (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_35__/* ["default"] */ .Z)((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_4__/* ["default"] */ .Z)(_this), "_formulaStr", "");
49950
- (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_35__/* ["default"] */ .Z)((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_4__/* ["default"] */ .Z)(_this), "_hideZero", true);
49951
- (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_35__/* ["default"] */ .Z)((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_4__/* ["default"] */ .Z)(_this), "_cellRange", void 0);
49950
+ (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_36__/* ["default"] */ .Z)((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_4__/* ["default"] */ .Z)(_this), "_formularType", FormularType.ftSum);
49951
+ (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_36__/* ["default"] */ .Z)((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_4__/* ["default"] */ .Z)(_this), "_formulaStr", "");
49952
+ (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_36__/* ["default"] */ .Z)((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_4__/* ["default"] */ .Z)(_this), "_hideZero", true);
49953
+ (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_36__/* ["default"] */ .Z)((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_4__/* ["default"] */ .Z)(_this), "_cellRange", void 0);
49952
49954
  _this._id = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_29__/* .HOEditorFactorys.instance */ .b.instance().getFactory(hoEditorFactoryID).gernerateCode.generateID("TFS");
49953
49955
  _this._styleIndex = styleIndex;
49954
49956
  _this.isAllowDelete = true;
@@ -49956,7 +49958,7 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
49956
49958
  if (formularType !== undefined) {
49957
49959
  _this._formularType = formularType;
49958
49960
  } else {
49959
- _this._formularType = formulaStr.indexOf(':') > 0 ? FormularType.ftSum : FormularType.ftFormular;
49961
+ _this._formularType = formulaStr.indexOf(':') >= 0 ? FormularType.ftSum : FormularType.ftFormular;
49960
49962
  }
49961
49963
  _this.formulaStr = formulaStr;
49962
49964
  if (hideZero !== undefined) _this._hideZero = hideZero;
@@ -49966,7 +49968,7 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
49966
49968
  _this.updateResult();
49967
49969
  return _this;
49968
49970
  }
49969
- (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_36__/* ["default"] */ .Z)(TableFormula, [{
49971
+ (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_37__/* ["default"] */ .Z)(TableFormula, [{
49970
49972
  key: "setCustomProperty",
49971
49973
  value: function setCustomProperty(customProperty) {
49972
49974
  var assignvalue = function assignvalue(target, source) {
@@ -50252,11 +50254,34 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
50252
50254
  strValue = hoEditorFactory.unitConvert.replaceAll(strValue, '\r', '');
50253
50255
  if (strValue === '') {
50254
50256
  bret = true;
50257
+ for (var i = 1; i < cell.childNodes.length; i++) {
50258
+ var aNode = cell.childNodes[i];
50259
+ if (aNode instanceof _RadioAndCheckBoxNode__WEBPACK_IMPORTED_MODULE_35__/* .RadioAndCheckBoxNode */ .Yh) {
50260
+ bret = true;
50261
+ if (aNode.isSelected && aNode.numericValue != "" && Number(aNode.numericValue) > 0) {
50262
+ ret = aNode.numericValue;
50263
+ } else {
50264
+ ret = "";
50265
+ }
50266
+ }
50267
+ }
50255
50268
  } else {
50256
50269
  var ivalue = Number(strValue);
50257
50270
  if (!isNaN(ivalue)) {
50258
50271
  bret = true;
50259
50272
  ret = strValue;
50273
+ } else {
50274
+ for (var j = 1; j < cell.childNodes.length; j++) {
50275
+ var bNode = cell.childNodes[j];
50276
+ if (bNode instanceof _RadioAndCheckBoxNode__WEBPACK_IMPORTED_MODULE_35__/* .RadioAndCheckBoxNode */ .Yh) {
50277
+ bret = true;
50278
+ if (bNode.isSelected && bNode.numericValue != "" && Number(bNode.numericValue) > 0) {
50279
+ ret = bNode.numericValue;
50280
+ } else {
50281
+ ret = "";
50282
+ }
50283
+ }
50284
+ }
50260
50285
  }
50261
50286
  }
50262
50287
  return [bret, ret];
@@ -50784,7 +50809,7 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
50784
50809
  if (json.formularType) {
50785
50810
  formularType = Number(json.formularType);
50786
50811
  } else {
50787
- formularType = json.text.indexOf(':') > 0 ? FormularType.ftSum : FormularType.ftFormular;
50812
+ formularType = json.text.indexOf(':') >= 0 ? FormularType.ftSum : FormularType.ftFormular;
50788
50813
  }
50789
50814
  var ret = new TableFormula(hoEditorFactoryID, rootNodes, pNode ? pNode : null, _BaseNode__WEBPACK_IMPORTED_MODULE_32__/* .NodeType.ntTableFormula */ .Jq.ntTableFormula, json.text, styleIndex, hideZero, formularType, json.customProperty);
50790
50815
  return ret;
@@ -107408,6 +107433,8 @@ var es_typed_array_float64_array = __webpack_require__(76495);
107408
107433
  var es_string_link = __webpack_require__(29254);
107409
107434
  // EXTERNAL MODULE: ./node_modules/core-js/modules/es.string.trim-start.js
107410
107435
  var es_string_trim_start = __webpack_require__(55674);
107436
+ // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.includes.js
107437
+ var es_array_includes = __webpack_require__(26699);
107411
107438
  // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.fill.js
107412
107439
  var es_array_fill = __webpack_require__(43290);
107413
107440
  // EXTERNAL MODULE: ./node_modules/core-js/modules/es.regexp.constructor.js
@@ -112048,11 +112075,7 @@ var f2,getHorizontalCoordinateString,getVerticalCoordinateString,getHorizontalCo
112048
112075
  * A pattern object to use to fill the drawing (not supported by context2d)
112049
112076
  */Object.defineProperty(this,"fillStyle",{get:function get(){return this.ctx.fillStyle;},set:function set(value){var rgba;rgba=getRGBA(value);this.ctx.fillStyle=rgba.style;this.ctx.isFillTransparent=rgba.a===0;//自定义修改 当透明度小于1时改成0 ,以适配不支持透明度的打印机
112050
112077
  if(rgba.a<1){this.ctx.fillOpacity=0;}else{this.ctx.fillOpacity=rgba.a;}// 自定义修改 处理彩色字体打印问题
112051
- var alpha=this.ctx.fillOpacity;if(window.printBlack&&this.ctx.fillStyle!=="#000000"&&this.ctx.fillStyle.toLocaleUpperCase()!=="#FFFFFF"){// this.ctx.fillStyle = "#000000";
112052
- // rgba.r = 255;
112053
- // rgba.g = 0;
112054
- // rgba.b = 0;
112055
- if(Array.isArray(this.ctx.path)&&this.ctx.path.length>4){this.ctx.fillStyle="#000000";}this.pdf.setFillColor(255,255,255,{a:alpha});this.pdf.setTextColor(0,0,0,{a:alpha});}else{this.pdf.setFillColor(rgba.r,rgba.g,rgba.b,{a:alpha});this.pdf.setTextColor(rgba.r,rgba.g,rgba.b,{a:alpha});}}});/**
112078
+ var alpha=this.ctx.fillOpacity;if(window.printBlack&&!['#000','#0000000','#fff','#ffffff','#FFF','#FFFFFF'].includes(this.ctx.fillStyle)){if(Array.isArray(this.ctx.path)&&this.ctx.path.length>4){this.ctx.fillStyle="#000000";}this.pdf.setFillColor(255,255,255,{a:alpha});this.pdf.setTextColor(0,0,0,{a:alpha});}else{this.pdf.setFillColor(rgba.r,rgba.g,rgba.b,{a:alpha});this.pdf.setTextColor(rgba.r,rgba.g,rgba.b,{a:alpha});}}});/**
112056
112079
  * Sets or returns the color, gradient, or pattern used for strokes
112057
112080
  *
112058
112081
  * @name strokeStyle
@@ -112061,7 +112084,7 @@ if(Array.isArray(this.ctx.path)&&this.ctx.path.length>4){this.ctx.fillStyle="#00
112061
112084
  * @property {gradient} gradient A gradient object (linear or radial) used to create a gradient stroke (not supported by context2d)
112062
112085
  * @property {pattern} pattern A pattern object used to create a pattern stroke (not supported by context2d)
112063
112086
  */Object.defineProperty(this,"strokeStyle",{get:function get(){return this.ctx.strokeStyle;},set:function set(value){var rgba=getRGBA(value);this.ctx.strokeStyle=rgba.style;this.ctx.isStrokeTransparent=rgba.a===0;//自定义修改 当透明度小于1时改成0 ,以适配不支持透明度的打印机
112064
- if(rgba.a<1){this.ctx.strokeOpacity=0;}else{this.ctx.strokeOpacity=rgba.a;}if(rgba.a===0){this.pdf.setDrawColor(255,255,255);}else if(rgba.a===1){this.pdf.setDrawColor(rgba.r,rgba.g,rgba.b);}else{this.pdf.setDrawColor(rgba.r,rgba.g,rgba.b);}if(window.printBlack&&this.ctx.strokeStyle!=="#000000"&&this.ctx.strokeStyle.toLocaleUpperCase()!=="#FFFFFF"){if(Array.isArray(this.ctx.path)&&this.ctx.path.length>4){this.ctx.strokeStyle="#000000";this.pdf.setDrawColor(0,0,0);}}}});/**
112087
+ if(rgba.a<1){this.ctx.strokeOpacity=0;}else{this.ctx.strokeOpacity=rgba.a;}if(rgba.a===0){this.pdf.setDrawColor(255,255,255);}else if(rgba.a===1){this.pdf.setDrawColor(rgba.r,rgba.g,rgba.b);}else{this.pdf.setDrawColor(rgba.r,rgba.g,rgba.b);}if(window.printBlack&&!['#000','#0000000','#fff','#ffffff','#FFF','#FFFFFF'].includes(this.ctx.strokeStyle)){if(Array.isArray(this.ctx.path)&&this.ctx.path.length>4){this.ctx.strokeStyle="#000000";this.pdf.setDrawColor(0,0,0);}}}});/**
112065
112088
  * Sets or returns the style of the end caps for a line
112066
112089
  *
112067
112090
  * @name lineCap
@@ -211235,7 +211258,7 @@ var SignNode = __webpack_require__(47241);
211235
211258
  // EXTERNAL MODULE: ./src/editor/dom/treeNode/ParagraphNode.ts
211236
211259
  var ParagraphNode = __webpack_require__(3021);
211237
211260
  ;// CONCATENATED MODULE: ./src/components/version.ts
211238
- /* harmony default export */ var version = ('2.0.116');
211261
+ /* harmony default export */ var version = ('2.0.117');
211239
211262
  // EXTERNAL MODULE: ./src/components/controls/poperTipText/PoperTipText.vue + 5 modules
211240
211263
  var PoperTipText = __webpack_require__(68240);
211241
211264
  ;// CONCATENATED MODULE: ./src/components/controls/poperTipText/index.ts
@@ -213852,10 +213875,10 @@ var HTMLconverter2 = /*#__PURE__*/function () {
213852
213875
  }
213853
213876
  if (height && height != "0px") {
213854
213877
  var heightNum = 0;
213855
- if (height.indexOf("pt") > 0) {
213878
+ if (height.indexOf("pt") >= 0) {
213856
213879
  heightNum = parseFloat(height.substring(0, height.indexOf("pt")));
213857
213880
  heightNum = hoEditorFactory.unitConvert.fontPt2Pix(heightNum);
213858
- } else if (height.indexOf("px") > 0) {
213881
+ } else if (height.indexOf("px") >= 0) {
213859
213882
  heightNum = parseFloat(height.substring(0, height.indexOf("px")));
213860
213883
  } else {
213861
213884
  heightNum = parseFloat(height);
@@ -213894,11 +213917,11 @@ var HTMLconverter2 = /*#__PURE__*/function () {
213894
213917
  width = jquery_default()(td).attr("width") || "30";
213895
213918
  }
213896
213919
  if (width) {
213897
- if (width.indexOf("pt") > 0) {
213920
+ if (width.indexOf("pt") >= 0) {
213898
213921
  widthNum = parseFloat(width.substring(0, width.indexOf("pt")));
213899
213922
  //widthNum = parseFloat(((widthNum * 96) / 72).toFixed(2));
213900
213923
  widthNum = hoEditorFactory.unitConvert.fontPt2Pix(widthNum);
213901
- } else if (width.indexOf("px") > 0) {
213924
+ } else if (width.indexOf("px") >= 0) {
213902
213925
  widthNum = parseFloat(width.substring(0, width.indexOf("px")));
213903
213926
  } else {
213904
213927
  widthNum = parseFloat(width);
@@ -221741,7 +221764,8 @@ var VueController = /*#__PURE__*/function () {
221741
221764
  var sLine = startPosition.dline;
221742
221765
  if (sLine instanceof DrawLine/* DrawLine */.a) {
221743
221766
  if (sLine.parent instanceof DrawPageCell/* DrawPageCell */.k) {
221744
- sPath = sLine.parent._drawPageTable.table.getNodePath();
221767
+ sPath = sLine.parent._drawPageTable.table.nextLeaf().getNodePath();
221768
+ //sPath = hoEditorFactory.docTree.getNodeLastPath(sLine.parent._drawPageTable.table);
221745
221769
  } else {
221746
221770
  sPath = startPosition.path;
221747
221771
  }