@visactor/vtable-calendar 1.17.3 → 1.17.4-alpha.0

package/dist/vtable-calendar.js

@@ -45049,8 +45049,8 @@
       constructor() {
         let style = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
         let bodyStyle = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
-        super(style, bodyStyle), this._showBar = null === (_a = style.showBar) || void 0 === _a || _a, this._barColor = null !== (_b = style.barColor) && void 0 !== _b ? _b : DEFAULT_BAR_COLOR, this._barPositiveColor = null !== (_c = style.barPositiveColor) && void 0 !== _c ? _c : "#4dbd74", this._barNegativeColor = null !== (_d = style.barNegativeColor) && void 0 !== _d ? _d : "#f86c6b", this._barAxisColor = null !== (_e = style.barAxisColor) && void 0 !== _e ? _e : "black", this._barBgColor = style.barBgColor, this._barHeight = null !== (_f = style.barHeight) && void 0 !== _f ? _f : 3, this._barHeight = null !== (_g = style.barHeight) && void 0 !== _g ? _g : 3, this._barBottom = null !== (_h = style.barBottom) && void 0 !== _h ? _h : 0, this._barPadding = null !== (_j = style.barPadding) && void 0 !== _j ? _j : [0, 0, 0, 0], this._showBarMark = null !== (_k = style.showBarMark) && void 0 !== _k && _k, this._barMarkPositiveColor = null !== (_l = style.barMarkPositiveColor) && void 0 !== _l ? _l : "#4dbd74", this._barMarkNegativeColor = null !== (_m = style.barMarkNegativeColor) && void 0 !== _m ? _m : "#f86c6b", this._barMarkWidth = null !== (_o = style.barMarkWidth) && void 0 !== _o ? _o : 2, this._barMarkPosition = null !== (_p = style.barMarkPosition) && void 0 !== _p ? _p : "right", this._barRightToLeft = null !== (_q = style.barRightToLeft) && void 0 !== _q && _q;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
+        super(style, bodyStyle), this._showBar = null === (_a = style.showBar) || void 0 === _a || _a, this._barColor = null !== (_b = style.barColor) && void 0 !== _b ? _b : DEFAULT_BAR_COLOR, this._barPositiveColor = null !== (_c = style.barPositiveColor) && void 0 !== _c ? _c : "#4dbd74", this._barNegativeColor = null !== (_d = style.barNegativeColor) && void 0 !== _d ? _d : "#f86c6b", this._barAxisColor = null !== (_e = style.barAxisColor) && void 0 !== _e ? _e : "black", this._barBgColor = style.barBgColor, this._barHeight = null !== (_f = style.barHeight) && void 0 !== _f ? _f : 3, this._barHeight = null !== (_g = style.barHeight) && void 0 !== _g ? _g : 3, this._barBottom = null !== (_h = style.barBottom) && void 0 !== _h ? _h : 0, this._barPadding = null !== (_j = style.barPadding) && void 0 !== _j ? _j : [0, 0, 0, 0], this._showBarMark = null !== (_k = style.showBarMark) && void 0 !== _k && _k, this._barMarkPositiveColor = null !== (_l = style.barMarkPositiveColor) && void 0 !== _l ? _l : "#4dbd74", this._barMarkNegativeColor = null !== (_m = style.barMarkNegativeColor) && void 0 !== _m ? _m : "#f86c6b", this._barMarkWidth = null !== (_o = style.barMarkWidth) && void 0 !== _o ? _o : 2, this._barMarkPosition = null !== (_p = style.barMarkPosition) && void 0 !== _p ? _p : "right", this._barRightToLeft = null !== (_q = style.barRightToLeft) && void 0 !== _q && _q, this._barMarkInBar = null === (_r = style.barMarkInBar) || void 0 === _r || _r;
       }
       get showBar() {
         return this._showBar;
@@ -45142,6 +45142,12 @@
       set barRightToLeft(value) {
         this._barRightToLeft = value;
       }
+      get barMarkInBar() {
+        return this._barMarkInBar;
+      }
+      set barMarkInBar(value) {
+        this._barMarkInBar = value;
+      }
       clone() {
         return new ProgressBarStyle(this, null);
       }
@@ -47606,7 +47612,7 @@
       constructor(container) {
         let options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
-        if (super(), this.showFrozenIcon = !0, this.version = "1.17.3", this.id = `VTable${Date.now()}`, this.isReleased = !1, this._chartEventMap = {}, this.throttleInvalidate = throttle2(this.render.bind(this), 200), !container && "node" !== options.mode && !options.canvas) throw new Error("vtable's container is undefined");
+        if (super(), this.showFrozenIcon = !0, this.version = "1.17.4-alpha.0", this.id = `VTable${Date.now()}`, this.isReleased = !1, this._chartEventMap = {}, this.throttleInvalidate = throttle2(this.render.bind(this), 200), !container && "node" !== options.mode && !options.canvas) throw new Error("vtable's container is undefined");
         !1 === (null === (_a = options.customConfig) || void 0 === _a ? void 0 : _a.imageAnonymous) && (vglobal.isImageAnonymous = !1);
         const {
           frozenColCount = 0,
@@ -56915,7 +56921,8 @@
         barMarkPositiveColor: barMarkPositiveColor,
         barMarkNegativeColor: barMarkNegativeColor,
         barMarkWidth: barMarkWidth,
-        barMarkPosition: barMarkPosition
+        barMarkPosition: barMarkPosition,
+        barMarkInBar: barMarkInBar
       } = style;
       let {
         barHeight: barHeight,
@@ -56930,11 +56937,11 @@
         return Number(v);
       });
       const borderWidth = getQuadProps(getProp("borderLineWidth", style, col, row, table)),
-        barPaddingTop = Math.max(barPadding[0], Math.ceil(borderWidth[0] / 2)),
-        barPaddingRight = Math.max(barPadding[1], Math.floor(borderWidth[1] / 2)),
-        barPaddingBottom = Math.max(barPadding[2], Math.floor(borderWidth[2] / 2)),
-        barPaddingLeft = Math.max(barPadding[3], Math.ceil(borderWidth[3] / 2));
-      contentWidth -= barPaddingRight + barPaddingLeft, contentHeight -= barPaddingBottom + barPaddingTop, row === table.rowCount - 1 && [0, "0"].includes(barBottom) && (contentHeight -= 1);
+        barPaddingTop = Math.max(barPadding[0], Math.ceil(borderWidth[0] / 2));
+      let barPaddingRight = Math.max(barPadding[1], Math.floor(borderWidth[1] / 2));
+      const barPaddingBottom = Math.max(barPadding[2], Math.floor(borderWidth[2] / 2));
+      let barPaddingLeft = Math.max(barPadding[3], Math.ceil(borderWidth[3] / 2));
+      showBarMark && barMarkWidth > 0 && "right" === barMarkPosition && !1 === barMarkInBar && (barPaddingRight += barMarkWidth, barPaddingLeft += barMarkWidth), contentWidth -= barPaddingRight + barPaddingLeft, contentHeight -= barPaddingBottom + barPaddingTop, row === table.rowCount - 1 && [0, "0"].includes(barBottom) && (contentHeight -= 1);
       const top = barPaddingTop,
         left = barPaddingLeft,
         right = contentWidth;
@@ -57121,7 +57128,7 @@
                 dataValue: dataValue,
                 percentile: positiveRate
               }) || "#20a8d8", "right" === barMarkPosition) {
-                const markLeft = barRightToLeft ? barRectPosi.left + barMarkWidth / 2 : barRectPosi.left + barRectPosi.width - barMarkWidth / 2;
+                const markLeft = barRightToLeft ? barRectPosi.left + barMarkWidth / 2 : barRectPosi.left + barRectPosi.width + (barMarkInBar ? -barMarkWidth / 2 : barMarkWidth / 2);
                 points.push({
                   x: markLeft,
                   y: barRectPosi.top