@visactor/vtable 0.9.1-alpha.3 → 0.9.1-alpha.4

package/dist/vtable.js

@@ -9882,7 +9882,7 @@
       }, {
         key: "lineEnd",
         value: function lineEnd() {
-          if (2 === this._point) _point$1(this, 6 * this._x1 - (this._x0 + 4 * this._x1), 6 * this._y1 - (this._y0 + 4 * this._y1), !1 !== this._lastDefined);
+          if (2 === this._point) _point$1(this, 6 * this._x1 - (this._x0 + 4 * this._x1), 6 * this._y1 - (this._y0 + 4 * this._y1), !1 !== this._lastDefined1 && !1 !== this._lastDefined2);
           (this._line || 0 !== this._line && 1 === this._point) && this.context.closePath(), this._line = 1 - this._line;
         }
       }, {
@@ -9892,15 +9892,15 @@
             y = p.y;
           switch (this._point) {
             case 0:
-              this._point = 1, this._line ? this.context.lineTo(x, y, !1 !== this._lastDefined && !1 !== p.defined) : this.context.moveTo(x, y);
+              this._point = 1, this._line ? this.context.lineTo(x, y, !1 !== this._lastDefined1 && !1 !== this._lastDefined2) : this.context.moveTo(x, y);
               break;
             case 1:
               this._point = 2;
               break;
             default:
-              _point$1(this, x, y, !1 !== this._lastDefined && !1 !== p.defined);
+              _point$1(this, x, y, !1 !== this._lastDefined1 && !1 !== this._lastDefined2);
           }
-          this._x0 = this._x1, this._x1 = x, this._y0 = this._y1, this._y1 = y, this._lastDefined = p.defined;
+          this._x0 = this._x1, this._x1 = x, this._y0 = this._y1, this._y1 = y, this._lastDefined1 = this._lastDefined2, this._lastDefined2 = p.defined;
         }
       }, {
         key: "tryUpdateLength",
@@ -9973,10 +9973,10 @@
         value: function lineEnd() {
           switch (this._point) {
             case 2:
-              this.context.lineTo(this._x1, this._y1, !1 !== this._lastDefined);
+              this.context.lineTo(this._x1, this._y1, !1 !== this._lastDefined2);
               break;
             case 3:
-              _point(this, this._t0, slope2(this, this._t0), !1 !== this._lastDefined);
+              _point(this, this._t0, slope2(this, this._t0), !1 !== this._lastDefined2);
           }
           (this._line || 0 !== this._line && 1 === this._point) && this.context.closePath(), this._line = 1 - this._line;
         }
@@ -9989,18 +9989,18 @@
           if (x !== this._x1 || y !== this._y1) {
             switch (this._point) {
               case 0:
-                this._point = 1, this._line ? this.context.lineTo(x, y, !1 !== this._lastDefined && !1 !== p.defined) : this.context.moveTo(x, y);
+                this._point = 1, this._line ? this.context.lineTo(x, y, !1 !== this._lastDefined1 && !1 !== this._lastDefined2) : this.context.moveTo(x, y);
                 break;
               case 1:
                 this._point = 2;
                 break;
               case 2:
-                this._point = 3, _point(this, slope2(this, t1 = slope3(this, x, y)), t1, !1 !== this._lastDefined && !1 !== p.defined);
+                this._point = 3, _point(this, slope2(this, t1 = slope3(this, x, y)), t1, !1 !== this._lastDefined1 && !1 !== this._lastDefined2);
                 break;
               default:
-                _point(this, this._t0, t1 = slope3(this, x, y), !1 !== this._lastDefined && !1 !== p.defined);
+                _point(this, this._t0, t1 = slope3(this, x, y), !1 !== this._lastDefined1 && !1 !== this._lastDefined2);
             }
-            this._x0 = this._x1, this._x1 = x, this._y0 = this._y1, this._y1 = y, this._t0 = t1, this._lastDefined = !1 !== p.defined;
+            this._x0 = this._x1, this._x1 = x, this._y0 = this._y1, this._y1 = y, this._t0 = t1, this._lastDefined1 = this._lastDefined2, this._lastDefined2 = !1 !== p.defined;
           }
         }
       }, {
@@ -14585,7 +14585,12 @@
     }();
     ColorStore.store255 = {}, ColorStore.store1 = {};
 
+    function colorArrayToString(color) {
+      var alphaChannel = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : !1;
+      return Array.isArray(color) ? alphaChannel ? "rgb(".concat(Math.round(color[0]), ",").concat(Math.round(color[1]), ",").concat(Math.round(color[2]), ",").concat(color[3].toFixed(2), ")") : "rgb(".concat(Math.round(color[0]), ",").concat(Math.round(color[1]), ",").concat(Math.round(color[2]), ")") : color;
+    }
     function interpolateColor(from, to, ratio, alphaChannel, cb) {
+      if (!from || !to) return from && colorArrayToString(from) || to && colorArrayToString(to) || !1;
       var fromArray,
         toArray,
         fromGradient = !1,
@@ -14605,8 +14610,7 @@
         return !1;
       }
       cb && cb(fromArray, toArray);
-      var result = interpolatePureColorArray(fromArray, toArray, ratio);
-      return alphaChannel ? "rgb(".concat(Math.round(result[0]), ",").concat(Math.round(result[1]), ",").concat(Math.round(result[2]), ",").concat(result[3].toFixed(2), ")") : "rgb(".concat(Math.round(result[0]), ",").concat(Math.round(result[1]), ",").concat(Math.round(result[2]), ")");
+      return colorArrayToString(interpolatePureColorArray(fromArray, toArray, ratio), alphaChannel);
     }
     function interpolateGradientLinearColor(fc, tc, ratio) {
       var fStops = fc.stops,
@@ -34056,7 +34060,7 @@
                 return percentCompleteBarGroup;
             }
             if ((progressBarDefine.barType ?? 'default') === 'default') {
-                const rate = num < progressBarDefine.min
+                const percentile = num < progressBarDefine.min
                     ? 0
                     : num > progressBarDefine.max
                         ? 1
@@ -34071,7 +34075,7 @@
                     context: null,
                     value,
                     dataValue,
-                    rate
+                    percentile
                 });
                 if (bgFillColor) {
                     const barBack = createRect({
@@ -34083,7 +34087,7 @@
                     });
                     percentCompleteBarGroup.addChild(barBack);
                 }
-                const barSize = Math.min(barMaxWidth * rate, barMaxWidth);
+                const barSize = Math.min(barMaxWidth * percentile, barMaxWidth);
                 const fillColor = getOrApply(barColor, {
                     col,
                     row,
@@ -34091,7 +34095,7 @@
                     context: null,
                     value,
                     dataValue,
-                    rate
+                    percentile
                 }) || '#20a8d8';
                 const barMain = createRect({
                     x: barLeft,
@@ -34119,7 +34123,7 @@
                     context: null,
                     value,
                     dataValue,
-                    rate: positiveRate
+                    percentile: positiveRate
                 });
                 if (bgFillColor) {
                     const barBack = createRect({
@@ -34153,7 +34157,7 @@
                     context: null,
                     value,
                     dataValue,
-                    rate: negativeRate
+                    percentile: negativeRate
                 }) || '#20a8d8';
                 const barNega = createRect({
                     x: barRectNega.left,
@@ -34184,7 +34188,7 @@
                     context: null,
                     value,
                     dataValue,
-                    rate: positiveRate
+                    percentile: positiveRate
                 }) || '#20a8d8';
                 const barPosi = createRect({
                     x: barRectPosi.left,
@@ -34221,7 +34225,7 @@
                                 context: null,
                                 value,
                                 dataValue,
-                                rate: positiveRate
+                                percentile: positiveRate
                             }) || '#20a8d8';
                         if (barMarkPosition === 'right') {
                             const markLeft = barRightToLeft
@@ -34250,7 +34254,7 @@
                                 context: null,
                                 value,
                                 dataValue,
-                                rate: negativeRate
+                                percentile: negativeRate
                             }) || '#20a8d8';
                         if (barMarkPosition === 'right') {
                             const markLeft = barRightToLeft
@@ -34284,9 +34288,9 @@
                 const _negativeRange = progressBarDefine.min < 0 ? -progressBarDefine.min : 0;
                 const _positiveRange = progressBarDefine.max > 0 ? progressBarDefine.max : 0;
                 const range = Math.max(_negativeRange, _positiveRange);
-                const rate = range === 0 ? 0 : Math.abs(num) / range;
+                const percentile = range === 0 ? 0 : Math.abs(num) / range;
                 const barMaxWidth = width - barPaddingLeft - barPaddingRight - 1;
-                const barSize = Math.min(barMaxWidth * rate, barMaxWidth);
+                const barSize = Math.min(barMaxWidth * percentile, barMaxWidth);
                 const barTop = bottom - barPaddingBottom - barHeight - barBottom - 1;
                 const barLeft = barRightToLeft ? right - barPaddingRight - barSize : left + barPaddingLeft;
                 const barBgFillColor = getOrApply(barBgColor, {
@@ -34296,7 +34300,7 @@
                     context: null,
                     value,
                     dataValue,
-                    rate
+                    percentile
                 }) || '#f0f3f5';
                 const barBg = createRect({
                     x: barLeft,
@@ -34321,7 +34325,7 @@
                             table,
                             context: null,
                             value,
-                            rate,
+                            percentile,
                             dataValue
                         }) || '#20a8d8';
                 }
@@ -34334,7 +34338,7 @@
                             context: null,
                             value,
                             dataValue,
-                            rate
+                            percentile
                         }) || '#20a8d8';
                 }
                 const bar = createRect({
@@ -34358,7 +34362,7 @@
                                 context: null,
                                 value,
                                 dataValue,
-                                rate
+                                percentile
                             }) || '#20a8d8';
                     }
                     else {
@@ -34370,7 +34374,7 @@
                                 context: null,
                                 value,
                                 dataValue,
-                                rate
+                                percentile
                             }) || '#20a8d8';
                     }
                     if (barMarkPosition === 'right') {
@@ -35175,8 +35179,8 @@
         line.max = yScale.range()[1];
         const symbolGroup = chartGroup.getChildByName('sparkline-symbol-group');
         if (symbolGroup) {
-            const isShowIsolatedPoint = sparklineSpec.point?.visible && sparklineSpec.pointShowRule === 'isolatedPoint';
-            if (sparklineSpec.point?.visible && sparklineSpec.pointShowRule === 'all') {
+            const isShowIsolatedPoint = sparklineSpec.pointShowRule === 'isolatedPoint';
+            if (sparklineSpec.pointShowRule === 'all') {
                 for (let i = 0; i < items.length; i++) {
                     const { x, y, defined } = items[i];
                     if (defined) {
@@ -35218,7 +35222,7 @@
             const line = createLine({
                 x: 0,
                 y: 0,
-                curveType: specObj.smooth ?? specObj.line?.style?.interpolate === 'linear' ? 'linear' : 'monotoneX',
+                curveType: specObj.smooth ? 'monotoneX' : 'linear',
                 stroke: specObj.line?.style?.stroke ?? 'blue',
                 lineWidth: specObj.line?.style?.strokeWidth ?? 2
             });
@@ -37031,8 +37035,8 @@
                 const y = Math.min(tableHeight, totalHeight);
                 const rangeEnd = Math.max(0.05, (tableWidth - frozenColsWidth) / (totalWidth - frozenColsWidth));
                 this.hScrollBar.setAttributes({
-                    x: frozenColsWidth,
-                    y: y - (this.table.theme.scrollStyle.hoverOn ? width : 0),
+                    x: frozenColsWidth + (!this.table.theme.scrollStyle.hoverOn ? this.table.scenegraph.tableGroup.attribute.x : 0),
+                    y: y - (this.table.theme.scrollStyle.hoverOn ? width : -this.table.scenegraph.tableGroup.attribute.y),
                     width: tableWidth - frozenColsWidth,
                     range: [0, rangeEnd],
                     visible: visible === 'always'
@@ -37050,8 +37054,8 @@
                 const x = Math.min(tableWidth, totalWidth);
                 const rangeEnd = Math.max(0.05, (tableHeight - frozenRowsHeight) / (totalHeight - frozenRowsHeight));
                 this.vScrollBar.setAttributes({
-                    x: x - (this.table.theme.scrollStyle.hoverOn ? width : 0),
-                    y: frozenRowsHeight,
+                    x: x - (this.table.theme.scrollStyle.hoverOn ? width : -this.table.scenegraph.tableGroup.attribute.x),
+                    y: frozenRowsHeight + (!this.table.theme.scrollStyle.hoverOn ? this.table.scenegraph.tableGroup.attribute.y : 0),
                     height: tableHeight - frozenRowsHeight,
                     range: [0, rangeEnd],
                     visible: visible === 'always'
@@ -44328,7 +44332,7 @@
             return TABLE_EVENT_TYPE;
         }
         options;
-        version = "0.9.1-alpha.3";
+        version = "0.9.1-alpha.4";
         pagerConf;
         id = `VTable${Date.now()}`;
         headerStyleCache;
@@ -45934,8 +45938,10 @@
             return {
                 textAlign: theme.text.textAlign,
                 textBaseline: theme.text.textBaseline,
-                bgColor: theme.group.fill,
-                color: theme.text.fill,
+                bgColor: isBoolean(theme.group.fill)
+                    ? getProp('bgColor', actStyle, col, row, this)
+                    : theme.group.fill,
+                color: isBoolean(theme.text.fill) ? getProp('color', actStyle, col, row, this) : theme.text.fill,
                 fontFamily: theme.text.fontFamily,
                 fontSize: theme.text.fontSize,
                 fontWeight: theme.text.fontWeight,
@@ -45945,13 +45951,16 @@
                 autoWrapText: autoWrapText ?? false,
                 lineClamp: lineClamp ?? 'auto',
                 textOverflow,
-                borderColor: theme.group.stroke,
+                borderColor: isBoolean(theme.group.stroke)
+                    ? getProp('borderColor', actStyle, col, row, this)
+                    : theme.group.stroke,
                 borderLineWidth: theme.group.lineWidth,
                 borderLineDash: theme.group.lineDash,
-                underline: theme.text.underline,
-                underlineDash: theme.text.underlineDash,
-                lineThrough: theme.text.lineThrough,
-                lineThroughDash: theme.text.lineThroughDash
+                underline: !!theme.text.underline,
+                lineThrough: !!theme.text.lineThrough,
+                padding: theme._vtable.padding,
+                underlineWidth: theme.text.underline,
+                lineThroughLineWidth: theme.text.lineThrough
             };
         }
         getAllBodyCells(colMaxCount, rowMaxCount) {
@@ -51124,7 +51133,7 @@
         percentCalc: percentCalc
     });
 
-    const version = "0.9.1-alpha.3";
+    const version = "0.9.1-alpha.4";
     function getIcons() {
         return get();
     }