hoeditor-web 3.1.160 → 3.1.161

package/lib/hoeditor.umd.js

@@ -59004,9 +59004,10 @@ var RadioAndCheckBoxNode = /*#__PURE__*/function (_ControlNode) {
       //this.name,
       this.isSelected, this.boxAlign, this.numericValue, dHeight, cbStyle);
       this._drawNodes.push(dNode);
+      var dBoxWidth = dNode.dBoxWidth || dHeight;
       var dNodePrint = new _editor_draw_drawNode_DrawRadioAndCheckBoxPrint__WEBPACK_IMPORTED_MODULE_16__/* .DrawRadioAndCheckBoxPrint */ .w(this._hoEditorFactoryID, this._rootPath, this, 0, this.controlStyle,
       //this.name,
-      this.isSelected, this.boxAlign, this.numericValue, dHeight, cbStyle);
+      this.isSelected, this.boxAlign, this.numericValue, dHeight, cbStyle, dBoxWidth);
       this._drawNodes.push(dNodePrint);
     }
   }, {
@@ -61046,7 +61047,8 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
                     _this$getCellNumber2 = (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)(_this$getCellNumber, 2),
                     bret = _this$getCellNumber2[0],
                     value = _this$getCellNumber2[1];
-                  if (cell.cellProperty.downListProperty) {
+                  var downListProperty = cell.cellProperty.downListProperty;
+                  if (downListProperty) {
                     if (bret) {
                       //total+=value;
                       if (value !== "") {
@@ -61054,7 +61056,6 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
                       }
                     } else {
                       var cellText = cell.getCellText();
-                      var downListProperty = cell.cellProperty.downListProperty;
                       var listItems = JSON.parse(downListProperty.listItems);
                       if (listItems.length === undefined) {
                         listItems = Array(JSON.parse(downListProperty.listItems));
@@ -61111,6 +61112,7 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
   }, {
     key: "getCellNumber",
     value: function getCellNumber(tb, irow, icol) {
+      var _cell$getCellText;
       var ret = "";
       var bret = false;
       var cell = tb.rows[irow][icol];
@@ -61124,6 +61126,7 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
       // }
       //const strValue = cell.getCellText().replaceAll('\n', '').replaceAll(' ', '').replaceAll('\b', '').replaceAll('\r', '');
       var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_35__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID);
+      var cellText = ((_cell$getCellText = cell.getCellText()) === null || _cell$getCellText === void 0 ? void 0 : _cell$getCellText.replace(/\n/g, '')) || '';
       var strValue = hoEditorFactory.unitConvert.replaceAll(cell.getCellText(), '\n', '');
       //如果单元格存在下拉项,取值为下拉项的value，而非节点的text
       if (cell.cellProperty.downListProperty) {
@@ -61146,10 +61149,6 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
               }
             });
             strValue = String(value);
-            // strValue = itemObject.value
-            // if(strValue === ''){
-            //     strValue = itemObject.text
-            // }
           }
         }
         //针对单元格childNodes节点下嵌套的下拉选择处理
@@ -61182,6 +61181,9 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
           }
         }
       }
+      if (strValue == '' && !isNaN(Number(cellText))) {
+        strValue = cellText;
+      }
       strValue = hoEditorFactory.unitConvert.replaceAll(strValue, ' ', '');
       strValue = hoEditorFactory.unitConvert.replaceAll(strValue, '\b', '');
       strValue = hoEditorFactory.unitConvert.replaceAll(strValue, '\r', '');
@@ -79029,6 +79031,7 @@ var DrawRadioAndCheckBox = /*#__PURE__*/function (_DrawCombineNode) {
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_5__/* ["default"] */ .Z)((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z)(_this), "_dAppendText", void 0);
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_5__/* ["default"] */ .Z)((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z)(_this), "_dUnderLine", void 0);
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_5__/* ["default"] */ .Z)((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z)(_this), "_charCount", void 0);
+    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_5__/* ["default"] */ .Z)((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z)(_this), "dBoxWidth", 0);
     _this._controlStyle = controlStyle;
     if (node.isTransToText) {
       _this._charCount = 1;
@@ -79063,6 +79066,7 @@ var DrawRadioAndCheckBox = /*#__PURE__*/function (_DrawCombineNode) {
     }
     var textWidth = _this._dText.getMeasuredWidth();
     var boxwidth = _this._dBox.getMeasuredWidth();
+    _this.dBoxWidth = boxwidth;
     _this.dWidth = textWidth + boxwidth + blockWidth;
     if (node.isEditText) {
       var underLineLen = 40;
@@ -79076,10 +79080,6 @@ var DrawRadioAndCheckBox = /*#__PURE__*/function (_DrawCombineNode) {
     }
     _this.dHeight = height;
     _this._textStyle = textStyle;
-    // this._border = new createjs.Shape();
-    // this._border.graphics.beginFill("red").drawRect(0, 0, this.dWidth, this.dHeight);
-    // this._border.y = - this.dHeight;
-    //this._mouseOverShape = new createjs.Shape();
     _this.drawRadioAndCheckBox();
     return _this;
   }
@@ -79140,14 +79140,6 @@ var DrawRadioAndCheckBox = /*#__PURE__*/function (_DrawCombineNode) {
     key: "drawRadioAndCheckBox",
     value: function drawRadioAndCheckBox() {
       this.clear();
-      // const backColor = new createjs.Shape();
-      // backColor.graphics.clear();
-      // backColor.graphics
-      //   .beginFill("#ADD8E6")
-      //   .drawRect(0, 0, this.dWidth, -this.dHeight);
-      // backColor.alpha = 0.01;
-      // backColor.name = "backColor";
-      // this.addChildAt(backColor, 0);
       if (this.boxAlign) {
         this.drawBox();
         if (!this.node.isTransToText && this.text.length > 0) {
@@ -79279,9 +79271,10 @@ var DrawRadioAndCheckBox = /*#__PURE__*/function (_DrawCombineNode) {
 var DrawRadioAndCheckBoxPrint = /*#__PURE__*/function (_DrawCombineNode) {
   (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_inherits_js__WEBPACK_IMPORTED_MODULE_3__/* ["default"] */ .Z)(DrawRadioAndCheckBoxPrint, _DrawCombineNode);
   var _super = (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createSuper_js__WEBPACK_IMPORTED_MODULE_4__/* ["default"] */ .Z)(DrawRadioAndCheckBoxPrint);
+  //   public dBoxWidth: number = 0;
   function DrawRadioAndCheckBoxPrint(hoeditfactoryID, rootPath, node, index, controlStyle,
   //name: string,
-  isSelected, boxAlign, numericValue, height, textStyle) {
+  isSelected, boxAlign, numericValue, height, textStyle, dBoxWidth) {
     var _this;
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_classCallCheck_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z)(this, DrawRadioAndCheckBoxPrint);
     _this = _super.call(this, hoeditfactoryID, rootPath, node, index);
@@ -79317,12 +79310,12 @@ var DrawRadioAndCheckBoxPrint = /*#__PURE__*/function (_DrawCombineNode) {
       _this._dBox.graphics.clear().setStrokeStyle(1, 'round', 'round').beginStroke("#000").drawCircle((height - 2) / 2, -height / 2 + 2, (height - 2) / 2).endStroke();
     }
     var textWidth = _this._dText.getMeasuredWidth();
-    var boxwidth = height;
     var blockWidth = 0;
     if (_this.text !== "") {
       blockWidth = 6;
     }
-    _this.dWidth = textWidth + boxwidth + blockWidth;
+    // this.dBoxWidth = dBoxWidth;
+    _this.dWidth = textWidth + dBoxWidth + blockWidth;
     if (node.isEditText) {
       var underLineLen = 40;
       if (node.appendText.length > 0) {
@@ -79415,54 +79408,57 @@ var DrawRadioAndCheckBoxPrint = /*#__PURE__*/function (_DrawCombineNode) {
     value: function drawBox() {
       var drawBox;
       drawBox = new createjs.Shape();
+      var textWidth = this._dText.getMeasuredWidth();
+      var x = 0;
+      if (this.boxAlign) {
+        // if(this.controlStyle === "CheckBox"){
+        //     x = Math.max(1, this.dBoxWidth - this.dHeight);
+        // } else {
+        x = 1;
+        // }
+      } else {
+        x = textWidth;
+      }
       if (this.controlStyle === "CheckBox") {
         //复选框
         if (this.isSelected) {
           drawBox.graphics.clear().beginStroke(this._textStyle.color).drawRect(0, -this.dHeight + 2, this.dHeight - 2, this.dHeight - 2).endStroke();
-          this.addChild(drawBox);
           var line1 = new createjs.Shape();
           var line2 = new createjs.Shape();
           if (this.boxAlign) {
             line1.graphics.beginStroke(this._textStyle.color).moveTo(3, -this.dHeight / 2 + 2).lineTo(this.dHeight / 2 - 1, -2).endStroke();
-            this.addChild(line1);
             line2.graphics.beginStroke(this._textStyle.color).moveTo(this.dHeight / 2 - 1, -2).lineTo(this.dHeight - 3, -this.dHeight + 4).endStroke();
-            this.addChild(line2);
+            line1.x = x;
+            line2.x = x;
           } else {
-            var textWidth = this._dText.getMeasuredWidth();
             line1.graphics.beginStroke(this._textStyle.color).moveTo(3 + textWidth, -this.dHeight / 2 + 2).lineTo(this.dHeight / 2 - 1 + textWidth, -2).endStroke();
-            this.addChild(line1);
             line2.graphics.beginStroke(this._textStyle.color).moveTo(this.dHeight / 2 - 1 + textWidth, -2).lineTo(this.dHeight - 3 + textWidth, -this.dHeight + 4).endStroke();
-            this.addChild(line2);
           }
+          this.addChild(line1);
+          this.addChild(line2);
         } else {
           drawBox.graphics.clear().beginStroke(this._textStyle.color).drawRect(0, -this.dHeight + 2, this.dHeight - 2, this.dHeight - 2).endStroke();
-          this.addChild(drawBox);
         }
       } else {
         //单选框
         if (this.isSelected) {
           drawBox.graphics.clear().setStrokeStyle(1, 'round', 'round').beginStroke(this._textStyle.color).drawCircle((this.dHeight - 2) / 2, -this.dHeight / 2 + 2, (this.dHeight - 2) / 2).endStroke();
-          this.addChild(drawBox);
           var dot = new createjs.Shape();
           if (this.boxAlign) {
-            dot.graphics.clear().beginStroke(this._textStyle.color).beginFill(this._textStyle.color).drawCircle((this.dHeight - 2) / 2 + 1, -this.dHeight / 2 + 2, 1).endStroke();
+            dot.graphics.clear().beginStroke(this._textStyle.color).beginFill(this._textStyle.color).drawCircle((this.dHeight - 2) / 2 + x, -this.dHeight / 2 + 2, 1).endStroke();
             this.addChild(dot);
           } else {
-            dot.graphics.clear().beginStroke(this._textStyle.color).beginFill(this._textStyle.color).drawCircle((this.dHeight - 2) / 2 + this._dText.getMeasuredWidth(), -this.dHeight / 2 + 2, 1).endStroke();
+            dot.graphics.clear().beginStroke(this._textStyle.color).beginFill(this._textStyle.color).drawCircle((this.dHeight - 2) / 2 + textWidth, -this.dHeight / 2 + 2, 1).endStroke();
             this.addChild(dot);
           }
         } else {
           drawBox.graphics.clear().setStrokeStyle(1, 'round', 'round').beginStroke(this._textStyle.color).drawCircle((this.dHeight - 2) / 2, -this.dHeight / 2 + 2, (this.dHeight - 2) / 2).endStroke();
-          this.addChild(drawBox);
         }
       }
       drawBox.name = "box";
-      if (this.boxAlign) {
-        drawBox.x = 1;
-      } else {
-        drawBox.x = this._dText.getMeasuredWidth();
-      }
+      drawBox.x = x;
       drawBox.y = this.y;
+      this.addChild(drawBox);
     }
   }, {
     key: "drawText",
@@ -210502,7 +210498,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.160');
+/* harmony default export */ var version = ('3.1.161');
 // EXTERNAL MODULE: ./src/components/controls/poperTipText/PoperTipText.vue + 5 modules
 var PoperTipText = __webpack_require__(84531);
 ;// CONCATENATED MODULE: ./src/components/controls/poperTipText/index.ts