@visactor/vtable 0.11.1-alpha.8 → 0.11.1-alpha.9

package/cjs/index.d.ts

@@ -13,7 +13,7 @@ import type { MousePointerCellEvent } from './ts-types/events';
 import * as CustomLayout from './render/layout';
 export { getDataCellPath } from './tools/get-data-path';
 export * from './render/jsx';
-export declare const version = "0.11.1-alpha.8";
+export declare const version = "0.11.1-alpha.9";
 export { TYPES, core, ListTable, ListTableConstructorOptions, PivotTable, PivotTableConstructorOptions, PivotChartConstructorOptions, PivotChart, IHeaderTreeDefine, IDimension, ColumnsDefine, ColumnDefine, LinkColumnDefine, ChartColumnDefine, ImageColumnDefine, SparklineColumnDefine, ProgressbarColumnDefine, TextColumnDefine, GroupColumnDefine, TextAlignType, TextBaselineType, themes, data, MousePointerCellEvent, getIcons, clearGlobal, register, DataStatistics, CustomLayout };
 declare function getIcons(): {
     [key: string]: TYPES.ColumnIconOption;

package/cjs/index.js

@@ -102,6 +102,6 @@ Object.defineProperty(exports, "getDataCellPath", {
     get: function() {
         return get_data_path_1.getDataCellPath;
     }
-}), __exportStar(require("./render/jsx"), exports), exports.version = "0.11.1-alpha.8", 
+}), __exportStar(require("./render/jsx"), exports), exports.version = "0.11.1-alpha.9", 
 exports.getIcons = getIcons, exports.clearGlobal = clearGlobal, TYPES.AggregationType;
 //# sourceMappingURL=index.js.map

package/cjs/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,8CAA4C;AAC5C,kDAAoC;AA0ClC,sBAAK;AAzCP,6CAA+B;AA0C7B,oBAAI;AAzCN,6CAA+B;AA8D7B,oBAAI;AA7DN,+CAAiC;AACjC,qDAAuC;AAiErC,4BAAQ;AAhEV,iDAAmC;AA0DjC,wBAAM;AAzDR,yEAA2D;AAmEzD,wCAAc;AAhDhB,2CAAwC;AAmBtC,0FAnBO,qBAAS,OAmBP;AAlBX,6CAA0C;AAoBxC,2FApBO,uBAAU,OAoBP;AAnBZ,6CAA0C;AAsBxC,2FAtBO,uBAAU,OAsBP;AApBZ,8DAAgD;AA6C9C,oCAAY;AA5Cd,uDAAwD;AAA/C,gHAAA,eAAe,OAAA;AACxB,+CAA6B;AAEhB,QAAA,OAAO,GAAG,gBAAgB,CAAC;AA6CxC,SAAS,QAAQ;IAGf,OAAO,KAAK,CAAC,GAAG,EAAE,CAAC;AACrB,CAAC;AAhBC,4BAAQ;AAkBV,SAAS,WAAW;IAClB,QAAQ,CAAC,QAAQ,EAAE,CAAC;AAGtB,CAAC;AArBC,kCAAW;AAsBb,KAAK,CAAC,eAAe,CAAC","file":"index.js","sourcesContent":["/* eslint-disable sort-imports */\nimport 'core-js/proposals/reflect-metadata'; // wait for vrender fix\nimport * as TYPES from './ts-types';\nimport * as core from './core';\nimport * as data from './data';\nimport * as icons from './icons';\nimport * as register from './register';\nimport * as themes from './themes';\nimport * as DataStatistics from './dataset/DataStatistics';\nimport type {\n  ColumnDefine,\n  ColumnsDefine,\n  LinkColumnDefine,\n  ChartColumnDefine,\n  ImageColumnDefine,\n  SparklineColumnDefine,\n  ProgressbarColumnDefine,\n  TextColumnDefine,\n  GroupColumnDefine,\n  ListTableConstructorOptions,\n  PivotTableConstructorOptions,\n  PivotChartConstructorOptions,\n  IHeaderTreeDefine,\n  IDimension,\n  TextAlignType,\n  TextBaselineType\n} from './ts-types';\nimport { ListTable } from './ListTable';\nimport { PivotTable } from './PivotTable';\nimport { PivotChart } from './PivotChart';\nimport type { MousePointerCellEvent } from './ts-types/events';\nimport * as CustomLayout from './render/layout';\nexport { getDataCellPath } from './tools/get-data-path';\nexport * from './render/jsx';\n\nexport const version = \"0.11.1-alpha.8\";\n/**\n * @namespace VTable\n */\nexport {\n  /**\n   * Types\n   * @namespace VTable.TYPES\n   */\n  TYPES,\n  core,\n  ListTable,\n  ListTableConstructorOptions,\n  PivotTable,\n  PivotTableConstructorOptions,\n  PivotChartConstructorOptions,\n  PivotChart,\n  IHeaderTreeDefine,\n  IDimension,\n  ColumnsDefine,\n  ColumnDefine,\n  LinkColumnDefine,\n  ChartColumnDefine,\n  ImageColumnDefine,\n  SparklineColumnDefine,\n  ProgressbarColumnDefine,\n  TextColumnDefine,\n  GroupColumnDefine,\n  TextAlignType,\n  TextBaselineType,\n  themes,\n  data,\n  MousePointerCellEvent,\n  getIcons,\n  clearGlobal,\n  //plugin registers\n  register,\n  /**\n   * 暂不推荐使用\n   */\n  DataStatistics,\n  CustomLayout\n};\n\n/** @private */\nfunction getIcons(): {\n  [key: string]: TYPES.ColumnIconOption;\n} {\n  return icons.get();\n}\n/** 清理内部的全局变量 如注册的icon theme等 以及共享的header column类实例 */\nfunction clearGlobal() {\n  register.clearAll();\n  // headers.type.clearGlobal();\n  // columns.type.clearGlobal();\n}\nTYPES.AggregationType;\n"]}
+{"version":3,"sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,8CAA4C;AAC5C,kDAAoC;AA0ClC,sBAAK;AAzCP,6CAA+B;AA0C7B,oBAAI;AAzCN,6CAA+B;AA8D7B,oBAAI;AA7DN,+CAAiC;AACjC,qDAAuC;AAiErC,4BAAQ;AAhEV,iDAAmC;AA0DjC,wBAAM;AAzDR,yEAA2D;AAmEzD,wCAAc;AAhDhB,2CAAwC;AAmBtC,0FAnBO,qBAAS,OAmBP;AAlBX,6CAA0C;AAoBxC,2FApBO,uBAAU,OAoBP;AAnBZ,6CAA0C;AAsBxC,2FAtBO,uBAAU,OAsBP;AApBZ,8DAAgD;AA6C9C,oCAAY;AA5Cd,uDAAwD;AAA/C,gHAAA,eAAe,OAAA;AACxB,+CAA6B;AAEhB,QAAA,OAAO,GAAG,gBAAgB,CAAC;AA6CxC,SAAS,QAAQ;IAGf,OAAO,KAAK,CAAC,GAAG,EAAE,CAAC;AACrB,CAAC;AAhBC,4BAAQ;AAkBV,SAAS,WAAW;IAClB,QAAQ,CAAC,QAAQ,EAAE,CAAC;AAGtB,CAAC;AArBC,kCAAW;AAsBb,KAAK,CAAC,eAAe,CAAC","file":"index.js","sourcesContent":["/* eslint-disable sort-imports */\nimport 'core-js/proposals/reflect-metadata'; // wait for vrender fix\nimport * as TYPES from './ts-types';\nimport * as core from './core';\nimport * as data from './data';\nimport * as icons from './icons';\nimport * as register from './register';\nimport * as themes from './themes';\nimport * as DataStatistics from './dataset/DataStatistics';\nimport type {\n  ColumnDefine,\n  ColumnsDefine,\n  LinkColumnDefine,\n  ChartColumnDefine,\n  ImageColumnDefine,\n  SparklineColumnDefine,\n  ProgressbarColumnDefine,\n  TextColumnDefine,\n  GroupColumnDefine,\n  ListTableConstructorOptions,\n  PivotTableConstructorOptions,\n  PivotChartConstructorOptions,\n  IHeaderTreeDefine,\n  IDimension,\n  TextAlignType,\n  TextBaselineType\n} from './ts-types';\nimport { ListTable } from './ListTable';\nimport { PivotTable } from './PivotTable';\nimport { PivotChart } from './PivotChart';\nimport type { MousePointerCellEvent } from './ts-types/events';\nimport * as CustomLayout from './render/layout';\nexport { getDataCellPath } from './tools/get-data-path';\nexport * from './render/jsx';\n\nexport const version = \"0.11.1-alpha.9\";\n/**\n * @namespace VTable\n */\nexport {\n  /**\n   * Types\n   * @namespace VTable.TYPES\n   */\n  TYPES,\n  core,\n  ListTable,\n  ListTableConstructorOptions,\n  PivotTable,\n  PivotTableConstructorOptions,\n  PivotChartConstructorOptions,\n  PivotChart,\n  IHeaderTreeDefine,\n  IDimension,\n  ColumnsDefine,\n  ColumnDefine,\n  LinkColumnDefine,\n  ChartColumnDefine,\n  ImageColumnDefine,\n  SparklineColumnDefine,\n  ProgressbarColumnDefine,\n  TextColumnDefine,\n  GroupColumnDefine,\n  TextAlignType,\n  TextBaselineType,\n  themes,\n  data,\n  MousePointerCellEvent,\n  getIcons,\n  clearGlobal,\n  //plugin registers\n  register,\n  /**\n   * 暂不推荐使用\n   */\n  DataStatistics,\n  CustomLayout\n};\n\n/** @private */\nfunction getIcons(): {\n  [key: string]: TYPES.ColumnIconOption;\n} {\n  return icons.get();\n}\n/** 清理内部的全局变量 如注册的icon theme等 以及共享的header column类实例 */\nfunction clearGlobal() {\n  register.clearAll();\n  // headers.type.clearGlobal();\n  // columns.type.clearGlobal();\n}\nTYPES.AggregationType;\n"]}

package/cjs/layout/pivot-layout.d.ts

@@ -40,6 +40,8 @@ export declare class PivotLayoutMap implements LayoutMapAPI {
     _table: PivotTable | PivotChart;
     hasTwoIndicatorAxes: boolean;
     _chartItemSpanSize: number;
+    _chartPaddingInner: number;
+    _chartPaddingOuter: number;
     _chartItemBandSize: number;
     _chartPadding?: number | number[];
     constructor(table: PivotTable | PivotChart, dataset: Dataset);

package/cjs/layout/pivot-layout.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.PivotLayoutMap = void 0;
 
-const util_1 = require("../tools/util"), global_1 = require("../tools/global"), get_axis_config_1 = require("./chart-helper/get-axis-config"), get_chart_spec_1 = require("./chart-helper/get-chart-spec"), padding_1 = require("../scenegraph/utils/padding"), EMPTY_HEADER = {
+const util_1 = require("../tools/util"), global_1 = require("../tools/global"), vutils_1 = require("@visactor/vutils"), get_axis_config_1 = require("./chart-helper/get-axis-config"), get_chart_spec_1 = require("./chart-helper/get-chart-spec"), padding_1 = require("../scenegraph/utils/padding"), EMPTY_HEADER = {
     isEmpty: !0,
     id: void 0,
     field: void 0,
@@ -85,12 +85,14 @@ class PivotLayoutMap {
         }
         if (this._table.isPivotChart()) if (this.hasTwoIndicatorAxes = this._indicatorObjects.some((indicatorObject => !!(indicatorObject.chartSpec && indicatorObject.chartSpec.series && indicatorObject.chartSpec.series.length > 1))), 
         this._chartItemSpanSize = 0, this._chartItemBandSize = 0, this._indicatorObjects.find((indicatorObject => {
-            var _a, _b, _c, _d, _e, _f;
+            var _a, _b, _c, _d, _e, _f, _g, _h;
             (null === (_a = null == indicatorObject ? void 0 : indicatorObject.style) || void 0 === _a ? void 0 : _a.padding) && (this._chartPadding = indicatorObject.style.padding), 
             (null === (_b = indicatorObject.chartSpec) || void 0 === _b ? void 0 : _b.barWidth) && (this._chartItemSpanSize = null === (_c = indicatorObject.chartSpec) || void 0 === _c ? void 0 : _c.barWidth);
             const bandAxisConfig = null === (_e = null === (_d = indicatorObject.chartSpec) || void 0 === _d ? void 0 : _d.axes) || void 0 === _e ? void 0 : _e.find((axis => "band" === axis.type));
-            return (null == bandAxisConfig ? void 0 : bandAxisConfig.bandSize) && (this._chartItemBandSize = null == bandAxisConfig ? void 0 : bandAxisConfig.bandSize), 
-            this._chartItemSpanSize > 0 || (null === (_f = indicatorObject.chartSpec.series) || void 0 === _f || _f.find((seriesObject => (seriesObject.barWidth && (this._chartItemSpanSize = seriesObject.barWidth), 
+            return (null == bandAxisConfig ? void 0 : bandAxisConfig.bandSize) && (this._chartItemBandSize = null == bandAxisConfig ? void 0 : bandAxisConfig.bandSize, 
+            this._chartPaddingInner = null !== (_f = (0, vutils_1.isArray)(bandAxisConfig.paddingInner) ? bandAxisConfig.paddingInner[0] : bandAxisConfig.paddingInner) && void 0 !== _f ? _f : 0, 
+            this._chartPaddingOuter = null !== (_g = (0, vutils_1.isArray)(bandAxisConfig.paddingOuter) ? bandAxisConfig.paddingOuter[0] : bandAxisConfig.paddingOuter) && void 0 !== _g ? _g : 0), 
+            this._chartItemSpanSize > 0 || (null === (_h = indicatorObject.chartSpec.series) || void 0 === _h || _h.find((seriesObject => (seriesObject.barWidth && (this._chartItemSpanSize = seriesObject.barWidth), 
             this._chartItemSpanSize > 0))), !1);
         })), this.indicatorsAsCol) {
             const cell_id = "rowHeaderEmpty";
@@ -737,7 +739,7 @@ class PivotLayoutMap {
             collectedValues = this.dataset.collectedValues[key][path.map((pathObj => pathObj.value)).join(this.dataset.stringJoinChar)];
             break;
         }
-        if (this._chartItemBandSize) width = (null !== (_a = null == collectedValues ? void 0 : collectedValues.length) && void 0 !== _a ? _a : 0) * this._chartItemBandSize; else {
+        if (this._chartItemBandSize) width = scaleWholeRangeSize(null !== (_a = null == collectedValues ? void 0 : collectedValues.length) && void 0 !== _a ? _a : 0, this._chartItemBandSize, this._chartPaddingInner, this._chartPaddingOuter); else {
             const barWidth = this._chartItemSpanSize || 25;
             width = (null !== (_b = null == collectedValues ? void 0 : collectedValues.length) && void 0 !== _b ? _b : 0) * (barWidth + barWidth / 3);
         }
@@ -752,7 +754,7 @@ class PivotLayoutMap {
             collectedValues = this.dataset.collectedValues[key][path.map((pathObj => pathObj.value)).join(this.dataset.stringJoinChar)];
             break;
         }
-        if (this._chartItemBandSize) height = (null !== (_a = null == collectedValues ? void 0 : collectedValues.length) && void 0 !== _a ? _a : 0) * this._chartItemBandSize; else {
+        if (this._chartItemBandSize) height = scaleWholeRangeSize(null !== (_a = null == collectedValues ? void 0 : collectedValues.length) && void 0 !== _a ? _a : 0, this._chartItemBandSize, this._chartPaddingInner, this._chartPaddingOuter); else {
             const barWidth = this._chartItemSpanSize || 25;
             height = (null !== (_b = null == collectedValues ? void 0 : collectedValues.length) && void 0 !== _b ? _b : 0) * (barWidth + barWidth / 3);
         }
@@ -803,5 +805,16 @@ class PivotLayoutMap {
     clearCellRangeMap() {}
 }
 
-exports.PivotLayoutMap = PivotLayoutMap;
-//# sourceMappingURL=pivot-layout.js.map
+function scaleWholeRangeSize(count, bandwidth, paddingInner, paddingOuter) {
+    1 === paddingInner && (paddingInner = 0);
+    return bandSpace(count, paddingInner, paddingOuter) * (bandwidth / (1 - paddingInner));
+}
+
+function bandSpace(count, paddingInner, paddingOuter) {
+    let space;
+    return space = 1 === count ? count + 2 * paddingOuter : count - paddingInner + 2 * paddingOuter, 
+    count ? space > 0 ? space : 1 : 0;
+}
+
+//# sourceMappingURL=pivot-layout.js.map
+exports.PivotLayoutMap = PivotLayoutMap;