hoeditor-web 3.1.85 → 3.1.86

package/lib/hoeditor.umd.js

@@ -15859,7 +15859,7 @@ var component = (0,componentNormalizer/* default */.Z)(
 
 /***/ }),
 
-/***/ 53505:
+/***/ 67218:
 /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -15875,7 +15875,7 @@ __webpack_require__.d(__webpack_exports__, {
 var es_function_name = __webpack_require__(68309);
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.concat.js
 var es_array_concat = __webpack_require__(92222);
-;// 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/sign/Sign.vue?vue&type=template&id=0751a270&
+;// 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/sign/Sign.vue?vue&type=template&id=82b7b7ba&
 
 
 var render = function render() {
@@ -15975,7 +15975,7 @@ var render = function render() {
       },
       expression: "connectChar"
     }
-  })], 1) : _vm.signType >= 4 ? [_c('li', {
+  })], 1) : _vm._e(), _vm.signType == 4 ? [_c('li', {
     staticClass: "control-item"
   }, [_c('span', {
     staticClass: "label"
@@ -16095,7 +16095,7 @@ var render = function render() {
     attrs: {
       "value": "1"
     }
-  }, [_vm._v("右")])], 1)], 1) : _vm._e()] : _vm.signType >= 9 ? [_c('li', {
+  }, [_vm._v("右")])], 1)], 1) : _vm._e()] : _vm._e(), _vm.signType == 9 ? [_c('li', {
     staticClass: "control-item"
   }, [_c('span', {
     staticClass: "label"
@@ -16287,7 +16287,7 @@ var render = function render() {
       },
       expression: "additionsEditor"
     }
-  })], 1) : _vm._e()], 2), _vm.signType >= 9 ? _c('div', {
+  })], 1) : _vm._e()], 2), _vm.signType == 9 ? _c('div', {
     staticClass: "section-right"
   }, [_c('div', {
     staticClass: "custom-format-tool-box"
@@ -16389,7 +16389,7 @@ var render = function render() {
 };
 var staticRenderFns = [];
 
-;// CONCATENATED MODULE: ./src/components/controls/sign/Sign.vue?vue&type=template&id=0751a270&
+;// CONCATENATED MODULE: ./src/components/controls/sign/Sign.vue?vue&type=template&id=82b7b7ba&
 
 // EXTERNAL MODULE: ./node_modules/@babel/runtime/helpers/esm/objectSpread2.js
 var objectSpread2 = __webpack_require__(63442);
@@ -16698,10 +16698,10 @@ var SignNode = __webpack_require__(24701);
 });
 ;// CONCATENATED MODULE: ./src/components/controls/sign/Sign.vue?vue&type=script&lang=js&
  /* harmony default export */ var sign_Signvue_type_script_lang_js_ = (Signvue_type_script_lang_js_); 
-;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-32.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-32.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-32.use[2]!./node_modules/less-loader/dist/cjs.js??clonedRuleSet-32.use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/sign/Sign.vue?vue&type=style&index=0&id=0751a270&prod&lang=less&
+;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-32.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-32.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-32.use[2]!./node_modules/less-loader/dist/cjs.js??clonedRuleSet-32.use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/sign/Sign.vue?vue&type=style&index=0&id=82b7b7ba&prod&lang=less&
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./src/components/controls/sign/Sign.vue?vue&type=style&index=0&id=0751a270&prod&lang=less&
+;// CONCATENATED MODULE: ./src/components/controls/sign/Sign.vue?vue&type=style&index=0&id=82b7b7ba&prod&lang=less&
 
 // EXTERNAL MODULE: ./node_modules/@vue/vue-loader-v15/lib/runtime/componentNormalizer.js
 var componentNormalizer = __webpack_require__(70713);
@@ -20876,7 +20876,7 @@ var component = (0,componentNormalizer/* default */.Z)(
 
 /***/ }),
 
-/***/ 45865:
+/***/ 80199:
 /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -20888,7 +20888,7 @@ __webpack_require__.d(__webpack_exports__, {
   "default": function() { return /* binding */ table_TableFormula; }
 });
 
-;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/table/TableFormula.vue?vue&type=template&id=d89134ea&
+;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/table/TableFormula.vue?vue&type=template&id=4401ee8a&
 var render = function render() {
   var _vm = this,
     _c = _vm._self._c;
@@ -21195,7 +21195,11 @@ var render = function render() {
     }
   })], 1)]) : _vm._e(), _vm.formula === 'idealWeight' ? _c('section', [_c('div', {
     staticClass: "ho-table-features-list"
-  }, [_c('p', [_vm._v("身高")]), _c('a-input', {
+  }, [_c('span', {
+    staticStyle: {
+      "margin-right": "34px"
+    }
+  }, [_vm._v("身高")]), _c('a-input', {
     attrs: {
       "autocomplete": "off"
     },
@@ -21206,6 +21210,18 @@ var render = function render() {
       },
       expression: "idealWeightHeight"
     }
+  })], 1), _c('div', [_c('span', {
+    staticStyle: {
+      "margin-right": "10px"
+    }
+  }, [_vm._v("显示范围")]), _c('a-checkbox', {
+    model: {
+      value: _vm.displayRange,
+      callback: function callback($$v) {
+        _vm.displayRange = $$v;
+      },
+      expression: "displayRange"
+    }
   })], 1)]) : _vm._e(), _vm.formula === 'iss' ? _c('section', [_c('div', {
     staticClass: "ho-table-features-list"
   }, [_c('p', {
@@ -21429,6 +21445,7 @@ var TableFormula = __webpack_require__(90832);
       startDateCode: '',
       endDateCode: '',
       idealWeightHeight: '',
+      displayRange: false,
       issCode: ''
     };
   },
@@ -21499,6 +21516,16 @@ var TableFormula = __webpack_require__(90832);
             }
           } else if (this.formula === 'iss') {
             this.issCode = node.formulaStr;
+          } else if (this.formula === 'idealWeight') {
+            var idealWeightArr = node.formulaStr.split(',');
+            if (idealWeightArr.length > 1) {
+              this.idealWeightHeight = idealWeightArr.filter(function (v, index) {
+                return index < idealWeightArr.length - 1;
+              }).join(',');
+              this.displayRange = idealWeightArr[idealWeightArr.length - 1] === 'true' ? true : false;
+            } else {
+              this.idealWeightHeight = node.formulaStr;
+            }
           }
         }
       }
@@ -21558,7 +21585,7 @@ var TableFormula = __webpack_require__(90832);
       } else if (this.formula === 'ftCalcTime') {
         this.vueController.insertTableFormula("".concat(this.startDateCode, ",").concat(this.endDateCode).toLocaleLowerCase(), this.isHideZero, TableFormula/* FormularType */.a.ftCalcTime);
       } else if (this.formula === 'idealWeight') {
-        this.vueController.insertTableFormula("".concat(this.idealWeightHeight).toLocaleLowerCase(), this.isHideZero, TableFormula/* FormularType */.a.ftIdealWeight);
+        this.vueController.insertTableFormula("".concat(this.idealWeightHeight, ",").concat(this.displayRange).toLocaleLowerCase(), this.isHideZero, TableFormula/* FormularType */.a.ftIdealWeight);
       } else if (this.formula === 'iss') {
         this.vueController.insertTableFormula("".concat(this.issCode).toLocaleLowerCase(), this.isHideZero, TableFormula/* FormularType */.a.ftISS);
       }
@@ -21582,10 +21609,10 @@ var TableFormula = __webpack_require__(90832);
 });
 ;// CONCATENATED MODULE: ./src/components/controls/table/TableFormula.vue?vue&type=script&lang=js&
  /* harmony default export */ var table_TableFormulavue_type_script_lang_js_ = (TableFormulavue_type_script_lang_js_); 
-;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-32.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-32.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-32.use[2]!./node_modules/less-loader/dist/cjs.js??clonedRuleSet-32.use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/table/TableFormula.vue?vue&type=style&index=0&id=d89134ea&prod&lang=less&
+;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-32.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-32.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-32.use[2]!./node_modules/less-loader/dist/cjs.js??clonedRuleSet-32.use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/table/TableFormula.vue?vue&type=style&index=0&id=4401ee8a&prod&lang=less&
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./src/components/controls/table/TableFormula.vue?vue&type=style&index=0&id=d89134ea&prod&lang=less&
+;// CONCATENATED MODULE: ./src/components/controls/table/TableFormula.vue?vue&type=style&index=0&id=4401ee8a&prod&lang=less&
 
 // EXTERNAL MODULE: ./node_modules/@vue/vue-loader-v15/lib/runtime/componentNormalizer.js
 var componentNormalizer = __webpack_require__(70713);
@@ -60613,7 +60640,16 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
       if (this.formulaStr == "") {
         ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_39__/* ["default"] */ .Z.warn("身高的单元格编号传入有误:" + this.formulaStr);
       }
-      var _this$getRowColByCell31 = this.getRowColByCellAdress(this.formulaStr),
+      var cellNo = "";
+      var isRange = false;
+      var arr = this.formulaStr.split(",");
+      if (arr.length === 1) {
+        cellNo = this.formulaStr;
+      } else {
+        cellNo = arr[0];
+        isRange = arr[1] === "true" ? true : false;
+      }
+      var _this$getRowColByCell31 = this.getRowColByCellAdress(cellNo),
         _this$getRowColByCell32 = (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)(_this$getRowColByCell31, 2),
         row = _this$getRowColByCell32[0],
         col = _this$getRowColByCell32[1];
@@ -60637,7 +60673,13 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
             if (num < 0) {
               strRet = "?";
             } else {
-              strRet = num.toFixed(2);
+              if (isRange) {
+                var from = (0.9 * num).toFixed(2);
+                var to = (1.1 * num).toFixed(2);
+                strRet = from.toString() + "～" + to.toString();
+              } else {
+                strRet = num.toFixed(2);
+              }
             }
           }
         }
@@ -166588,14 +166630,14 @@ var map = {
 	"./qrCode/QrCode.vue": 59805,
 	"./radioCheckBox/RadioCheckbox.vue": 52512,
 	"./selectDialog/SelectDialog.vue": 32497,
-	"./sign/Sign.vue": 53505,
+	"./sign/Sign.vue": 67218,
 	"./table/TableCellPoper.vue": 97628,
 	"./table/TableCellPoper1.vue": 44645,
 	"./table/TableCellProperty.vue": 63689,
 	"./table/TableColProperty.vue": 15417,
 	"./table/TableForm.vue": 79036,
 	"./table/TableFormTree.vue": 84804,
-	"./table/TableFormula.vue": 45865,
+	"./table/TableFormula.vue": 80199,
 	"./table/TableProperty.vue": 54054,
 	"./table/TableRowProperty.vue": 21568,
 	"./textDialog/TextDialog.vue": 29520,
@@ -207229,7 +207271,7 @@ var TextNode = __webpack_require__(27198);
 // EXTERNAL MODULE: ./src/editor/dom/treeNode/ParagraphNode.ts
 var ParagraphNode = __webpack_require__(67945);
 ;// CONCATENATED MODULE: ./src/components/version.ts
-/* harmony default export */ var version = ('3.1.85');
+/* harmony default export */ var version = ('3.1.86');
 // EXTERNAL MODULE: ./src/components/controls/poperTipText/PoperTipText.vue + 5 modules
 var PoperTipText = __webpack_require__(50987);
 ;// CONCATENATED MODULE: ./src/components/controls/poperTipText/index.ts