@visactor/vseed 0.4.7 → 0.4.9

package/dist/esm/pipeline/spec/table/pipes/cellStyle/table.js

@@ -1,42 +1,82 @@
 import { array } from "@visactor/vutils";
 import { isNullish, isNumber, isPlainObject, isString } from "remeda";
-import { selector as selector_js_selector, selectorWithDynamicFilter } from "../../../../../dataSelector/selector.js";
-import { getCellOriginalDataByDatum, pickBodyCellStyle } from "./common.js";
+import { isFieldSelector, matchesFieldSelector, selector, selectorWithDynamicFilter } from "../../../../../dataSelector/selector.js";
+import { applyColorScale, getCellOriginalDataByDatum, getColumnMinMax, pickBodyCellStyle } from "./common.js";
 import { preorderTraverse } from "../../../../utils/tree/traverse.js";
 const tableBodyCell = (spec, context)=>{
     const { advancedVSeed } = context;
-    const { cellStyle } = advancedVSeed;
+    const { cellStyle, config, chartType } = advancedVSeed;
     const bodyCellStyle = cellStyle?.bodyCellStyle;
+    const themeConfig = config?.[chartType];
     if (!bodyCellStyle) return spec;
     const bodyCellStyleList = array(bodyCellStyle);
     const columns = spec.columns || [];
     const selectedPos = [];
+    const allData = advancedVSeed.dataset || [];
     const setStyleOfColumn = (col)=>{
         const field = col.field;
         const matchedStyles = bodyCellStyleList.filter((style)=>{
             if (style?.dynamicFilter) return style.dynamicFilter?.result?.success === true || !!style.dynamicFilter?.fallback;
             if (isNullish(style.selector)) return true;
             const selectors = array(style.selector);
-            return selectors.some((selector)=>isPlainObject(selector) ? isNullish(selector.field) || selector.field === field : isNumber(selector) || isString(selector));
+            return selectors.some((sel)=>{
+                if (isFieldSelector(sel)) return matchesFieldSelector(field, sel);
+                if (isPlainObject(sel)) return isNullish(sel.field) || sel.field === field;
+                return isNumber(sel) || isString(sel);
+            });
         });
         if (!matchedStyles.length) return false;
         const hasDynamicFilter = matchedStyles.some((style)=>!!style.dynamicFilter);
+        const progressBarStyle = matchedStyles.filter((s)=>s.enableProgressBar && s?.selector && matchesFieldSelector(field, s.selector)).pop();
+        const backgroundColorScale = matchedStyles.find((s)=>s.enableBackgroundColorScale && s?.selector && matchesFieldSelector(field, s.selector));
+        let columnMin;
+        let columnMax;
+        if (progressBarStyle || backgroundColorScale) {
+            const { min, max } = getColumnMinMax(allData, field);
+            columnMin = min;
+            columnMax = max;
+            if (progressBarStyle) {
+                col.cellType = 'progressbar';
+                col.barType = 'negative';
+                col.min = progressBarStyle.barMin ?? columnMin;
+                col.max = progressBarStyle.barMin ?? columnMax;
+            }
+        }
         col.style = (datum)=>{
             const originalDatum = {
                 [field]: datum.dataValue
             };
             const currentCellData = getCellOriginalDataByDatum(datum, hasDynamicFilter, originalDatum);
             const mergedStyle = matchedStyles.reduce((result, style)=>{
-                const shouldApply = style.dynamicFilter ? selectorWithDynamicFilter(currentCellData || originalDatum, style.dynamicFilter, style.selector) : selector_js_selector(originalDatum, style.selector);
+                const shouldApply = style.dynamicFilter ? selectorWithDynamicFilter(currentCellData || originalDatum, style.dynamicFilter, style.selector) : selector(originalDatum, style.selector);
                 if (shouldApply) {
                     if (selectedPos.length && selectedPos[0].col === datum?.col && selectedPos[0].row === datum?.row) selectedPos.length = 0;
                     selectedPos.push({
                         col: datum?.col,
                         row: datum?.row
                     });
+                    let cellStyle = pickBodyCellStyle(style);
+                    if (style.enableBackgroundColorScale) {
+                        const scaledColor = applyColorScale(datum.dataValue, {
+                            minValue: columnMin,
+                            maxValue: columnMax,
+                            ...themeConfig.backgroundColorScale,
+                            ...style?.backgroundColorScale
+                        });
+                        if (scaledColor) cellStyle.bgColor = scaledColor;
+                    }
+                    if ('progressbar' === col.cellType) cellStyle = {
+                        ...cellStyle,
+                        barHeight: themeConfig?.barHeight,
+                        barMarkInBar: themeConfig?.barMarkInBar,
+                        barMarkWidth: themeConfig?.barMarkWidth,
+                        barPadding: themeConfig?.barPadding,
+                        barRightToLeft: themeConfig?.barRightToLeft,
+                        barAxisColor: themeConfig?.barAxisColor
+                    };
                     return {
                         ...result,
-                        ...pickBodyCellStyle(style)
+                        ...cellStyle
                     };
                 }
                 return result;

package/dist/esm/pipeline/spec/table/pipes/cellStyle/table.js.map

@@ -1 +1 @@
-{"version":3,"file":"pipeline/spec/table/pipes/cellStyle/table.js","sources":["webpack://@visactor/vseed/./src/pipeline/spec/table/pipes/cellStyle/table.ts"],"sourcesContent":["import type { ListTableConstructorOptions, ColumnDefine } from '@visactor/vtable'\nimport { array } from '@visactor/vutils'\nimport { isNullish, isNumber, isPlainObject, isString } from 'remeda'\nimport { selector, selectorWithDynamicFilter } from 'src/dataSelector/selector'\nimport type { BodyCellStyle, ListTableSpecPipe } from 'src/types'\nimport type { MeasureSelector, Selectors } from 'src/types/dataSelector'\nimport { getCellOriginalDataByDatum, pickBodyCellStyle } from './common'\nimport { preorderTraverse } from 'src/pipeline/utils/tree/traverse'\n\nexport const tableBodyCell: ListTableSpecPipe = (spec, context) => {\n  const { advancedVSeed } = context\n  const { cellStyle } = advancedVSeed\n  const bodyCellStyle = cellStyle?.bodyCellStyle\n\n  if (!bodyCellStyle) {\n    return spec as ListTableConstructorOptions\n  }\n  const bodyCellStyleList = array(bodyCellStyle) as BodyCellStyle[]\n  const columns = (spec as ListTableConstructorOptions).columns || []\n  const selectedPos: { col: number; row: number }[] = []\n  const setStyleOfColumn = (col: ColumnDefine) => {\n    const field = col.field as string\n    const matchedStyles = bodyCellStyleList.filter((style) => {\n      if (style?.dynamicFilter) {\n        return style.dynamicFilter?.result?.success === true || !!style.dynamicFilter?.fallback\n      }\n      if (isNullish(style.selector)) {\n        return true\n      }\n      const selectors = array(style.selector) as Selectors\n\n      return selectors.some((selector) => {\n        return isPlainObject(selector)\n          ? isNullish(selector.field) || (selector as MeasureSelector).field === field\n          : isNumber(selector) || isString(selector)\n      })\n    })\n\n    if (!matchedStyles.length) {\n      return false\n    }\n\n    const hasDynamicFilter = matchedStyles.some((style) => !!style.dynamicFilter)\n\n    col.style = (datum: any) => {\n      const originalDatum = {\n        [field]: datum.dataValue,\n      }\n      const currentCellData = getCellOriginalDataByDatum(datum, hasDynamicFilter, originalDatum)\n\n      const mergedStyle = matchedStyles.reduce<Record<string, any>>((result, style) => {\n        const shouldApply = style.dynamicFilter\n          ? selectorWithDynamicFilter(currentCellData || originalDatum, style.dynamicFilter, style.selector)\n          : selector(originalDatum, style.selector)\n\n        if (shouldApply) {\n          if (selectedPos.length && selectedPos[0].col === datum?.col && selectedPos[0].row === datum?.row) {\n            // 说明重复进入了，清空历史\n            selectedPos.length = 0\n          }\n          selectedPos.push({\n            col: datum?.col,\n            row: datum?.row,\n          })\n          return {\n            ...result,\n            ...pickBodyCellStyle(style),\n          }\n        }\n\n        return result\n      }, {})\n\n      return mergedStyle\n    }\n    return false\n  }\n\n  preorderTraverse<ColumnDefine, 'columns'>(columns, setStyleOfColumn, 'columns')\n  ;(spec as any).runningConfig = {\n    ...((spec as any).runningConfig || {}),\n    selectedPos,\n  }\n\n  return spec as ListTableConstructorOptions\n}\n"],"names":["tableBodyCell","spec","context","advancedVSeed","cellStyle","bodyCellStyle","bodyCellStyleList","array","columns","selectedPos","setStyleOfColumn","col","field","matchedStyles","style","isNullish","selectors","selector","isPlainObject","isNumber","isString","hasDynamicFilter","datum","originalDatum","currentCellData","getCellOriginalDataByDatum","mergedStyle","result","shouldApply","selectorWithDynamicFilter","pickBodyCellStyle","preorderTraverse"],"mappings":";;;;;AASO,MAAMA,gBAAmC,CAACC,MAAMC;IACrD,MAAM,EAAEC,aAAa,EAAE,GAAGD;IAC1B,MAAM,EAAEE,SAAS,EAAE,GAAGD;IACtB,MAAME,gBAAgBD,WAAW;IAEjC,IAAI,CAACC,eACH,OAAOJ;IAET,MAAMK,oBAAoBC,MAAMF;IAChC,MAAMG,UAAWP,KAAqC,OAAO,IAAI,EAAE;IACnE,MAAMQ,cAA8C,EAAE;IACtD,MAAMC,mBAAmB,CAACC;QACxB,MAAMC,QAAQD,IAAI,KAAK;QACvB,MAAME,gBAAgBP,kBAAkB,MAAM,CAAC,CAACQ;YAC9C,IAAIA,OAAO,eACT,OAAOA,MAAM,aAAa,EAAE,QAAQ,YAAY,QAAQ,CAAC,CAACA,MAAM,aAAa,EAAE;YAEjF,IAAIC,UAAUD,MAAM,QAAQ,GAC1B,OAAO;YAET,MAAME,YAAYT,MAAMO,MAAM,QAAQ;YAEtC,OAAOE,UAAU,IAAI,CAAC,CAACC,WACdC,cAAcD,YACjBF,UAAUE,SAAS,KAAK,KAAMA,SAA6B,KAAK,KAAKL,QACrEO,SAASF,aAAaG,SAASH;QAEvC;QAEA,IAAI,CAACJ,cAAc,MAAM,EACvB,OAAO;QAGT,MAAMQ,mBAAmBR,cAAc,IAAI,CAAC,CAACC,QAAU,CAAC,CAACA,MAAM,aAAa;QAE5EH,IAAI,KAAK,GAAG,CAACW;YACX,MAAMC,gBAAgB;gBACpB,CAACX,MAAM,EAAEU,MAAM,SAAS;YAC1B;YACA,MAAME,kBAAkBC,2BAA2BH,OAAOD,kBAAkBE;YAE5E,MAAMG,cAAcb,cAAc,MAAM,CAAsB,CAACc,QAAQb;gBACrE,MAAMc,cAAcd,MAAM,aAAa,GACnCe,0BAA0BL,mBAAmBD,eAAeT,MAAM,aAAa,EAAEA,MAAM,QAAQ,IAC/FG,qBAASM,eAAeT,MAAM,QAAQ;gBAE1C,IAAIc,aAAa;oBACf,IAAInB,YAAY,MAAM,IAAIA,WAAW,CAAC,EAAE,CAAC,GAAG,KAAKa,OAAO,OAAOb,WAAW,CAAC,EAAE,CAAC,GAAG,KAAKa,OAAO,KAE3Fb,YAAY,MAAM,GAAG;oBAEvBA,YAAY,IAAI,CAAC;wBACf,KAAKa,OAAO;wBACZ,KAAKA,OAAO;oBACd;oBACA,OAAO;wBACL,GAAGK,MAAM;wBACT,GAAGG,kBAAkBhB,MAAM;oBAC7B;gBACF;gBAEA,OAAOa;YACT,GAAG,CAAC;YAEJ,OAAOD;QACT;QACA,OAAO;IACT;IAEAK,iBAA0CvB,SAASE,kBAAkB;IACnET,KAAa,aAAa,GAAG;QAC7B,GAAKA,KAAa,aAAa,IAAI,CAAC,CAAC;QACrCQ;IACF;IAEA,OAAOR;AACT"}
+{"version":3,"file":"pipeline/spec/table/pipes/cellStyle/table.js","sources":["webpack://@visactor/vseed/./src/pipeline/spec/table/pipes/cellStyle/table.ts"],"sourcesContent":["import type { ListTableConstructorOptions, ColumnDefine, ProgressbarColumnDefine } from '@visactor/vtable'\nimport { array } from '@visactor/vutils'\nimport { isNullish, isNumber, isPlainObject, isString } from 'remeda'\nimport { isFieldSelector, matchesFieldSelector, selector, selectorWithDynamicFilter } from 'src/dataSelector/selector'\nimport type { BodyCellStyle, ListTableSpecPipe, TableConfig } from 'src/types'\nimport type { FieldSelector, MeasureSelector } from 'src/types/dataSelector'\nimport { getCellOriginalDataByDatum, pickBodyCellStyle, applyColorScale, getColumnMinMax } from './common'\nimport { preorderTraverse } from 'src/pipeline/utils/tree/traverse'\n\nexport const tableBodyCell: ListTableSpecPipe = (spec, context) => {\n  const { advancedVSeed } = context\n  const { cellStyle, config, chartType } = advancedVSeed\n  const bodyCellStyle = cellStyle?.bodyCellStyle\n  const themeConfig = config?.[chartType] as TableConfig\n\n  if (!bodyCellStyle) {\n    return spec as ListTableConstructorOptions\n  }\n\n  const bodyCellStyleList = array(bodyCellStyle) as BodyCellStyle[]\n  const columns = (spec as ListTableConstructorOptions).columns || []\n  const selectedPos: { col: number; row: number }[] = []\n  const allData = advancedVSeed.dataset || []\n\n  const setStyleOfColumn = (col: ColumnDefine) => {\n    const field = col.field as string\n\n    // 过滤出匹配当前列的样式配置\n    const matchedStyles = bodyCellStyleList.filter((style) => {\n      // 检查 dynamicFilter\n      if (style?.dynamicFilter) {\n        return style.dynamicFilter?.result?.success === true || !!style.dynamicFilter?.fallback\n      }\n\n      // 检查 selector\n      if (isNullish(style.selector)) {\n        return true\n      }\n\n      const selectors = array(style.selector) as any[]\n      return selectors.some((sel) => {\n        // 1. FieldSelector（字段选择器）\n        if (isFieldSelector(sel)) {\n          return matchesFieldSelector(field, sel)\n        }\n\n        // 2. MeasureSelector/DimensionSelector（条件选择器）\n        if (isPlainObject(sel)) {\n          return isNullish(sel.field) || (sel as MeasureSelector).field === field\n        }\n\n        // 3. ValueSelector（值选择器）\n        return isNumber(sel) || isString(sel)\n      })\n    })\n\n    if (!matchedStyles.length) {\n      return false\n    }\n\n    const hasDynamicFilter = matchedStyles.some((style) => !!style.dynamicFilter)\n\n    // 前置处理：检查是否需要 progressBar\n    const progressBarStyle = matchedStyles\n      .filter((s) => s.enableProgressBar && s?.selector && matchesFieldSelector(field, s.selector as FieldSelector))\n      .pop()\n    const backgroundColorScale = matchedStyles.find(\n      (s) => s.enableBackgroundColorScale && s?.selector && matchesFieldSelector(field, s.selector as FieldSelector),\n    )\n    let columnMin: number\n    let columnMax: number\n    if (progressBarStyle || backgroundColorScale) {\n      const { min, max } = getColumnMinMax(allData, field)\n      columnMin = min\n      columnMax = max\n      if (progressBarStyle) {\n        col.cellType = 'progressbar'\n        ;(col as ProgressbarColumnDefine).barType = 'negative'\n        ;(col as ProgressbarColumnDefine).min = progressBarStyle.barMin ?? columnMin\n        ;(col as ProgressbarColumnDefine).max = progressBarStyle.barMin ?? columnMax\n      }\n    }\n\n    // 统一的 col.style 回调\n    col.style = (datum: any) => {\n      const originalDatum = {\n        [field]: datum.dataValue,\n      }\n      const currentCellData = getCellOriginalDataByDatum(datum, hasDynamicFilter, originalDatum)\n\n      const mergedStyle = matchedStyles.reduce<Record<string, any>>((result, style) => {\n        const shouldApply = style.dynamicFilter\n          ? selectorWithDynamicFilter(currentCellData || originalDatum, style.dynamicFilter, style.selector)\n          : selector(originalDatum, style.selector)\n\n        if (shouldApply) {\n          if (selectedPos.length && selectedPos[0].col === datum?.col && selectedPos[0].row === datum?.row) {\n            // 说明重复进入了，清空历史\n            selectedPos.length = 0\n          }\n          selectedPos.push({\n            col: datum?.col,\n            row: datum?.row,\n          })\n\n          let cellStyle = pickBodyCellStyle(style)\n\n          // 应用 backgroundColorScale\n          if (style.enableBackgroundColorScale) {\n            const scaledColor = applyColorScale(datum.dataValue, {\n              minValue: columnMin,\n              maxValue: columnMax,\n              ...themeConfig.backgroundColorScale,\n              ...style?.backgroundColorScale,\n            } as any)\n            if (scaledColor) {\n              cellStyle.bgColor = scaledColor\n            }\n          }\n          // 如果开启了数据条样式\n          if (col.cellType === 'progressbar') {\n            cellStyle = {\n              ...cellStyle,\n              barHeight: themeConfig?.barHeight,\n              barMarkInBar: themeConfig?.barMarkInBar,\n              barMarkWidth: themeConfig?.barMarkWidth,\n              barPadding: themeConfig?.barPadding,\n              barRightToLeft: themeConfig?.barRightToLeft,\n              barAxisColor: themeConfig?.barAxisColor,\n            }\n          }\n\n          return {\n            ...result,\n            ...cellStyle,\n          }\n        }\n\n        return result\n      }, {})\n\n      return mergedStyle\n    }\n\n    return false\n  }\n\n  preorderTraverse<ColumnDefine, 'columns'>(columns, setStyleOfColumn, 'columns')\n  ;(spec as any).runningConfig = {\n    ...((spec as any).runningConfig || {}),\n    selectedPos,\n  }\n\n  return spec as ListTableConstructorOptions\n}\n"],"names":["tableBodyCell","spec","context","advancedVSeed","cellStyle","config","chartType","bodyCellStyle","themeConfig","bodyCellStyleList","array","columns","selectedPos","allData","setStyleOfColumn","col","field","matchedStyles","style","isNullish","selectors","sel","isFieldSelector","matchesFieldSelector","isPlainObject","isNumber","isString","hasDynamicFilter","progressBarStyle","s","backgroundColorScale","columnMin","columnMax","min","max","getColumnMinMax","datum","originalDatum","currentCellData","getCellOriginalDataByDatum","mergedStyle","result","shouldApply","selectorWithDynamicFilter","selector","pickBodyCellStyle","scaledColor","applyColorScale","preorderTraverse"],"mappings":";;;;;AASO,MAAMA,gBAAmC,CAACC,MAAMC;IACrD,MAAM,EAAEC,aAAa,EAAE,GAAGD;IAC1B,MAAM,EAAEE,SAAS,EAAEC,MAAM,EAAEC,SAAS,EAAE,GAAGH;IACzC,MAAMI,gBAAgBH,WAAW;IACjC,MAAMI,cAAcH,QAAQ,CAACC,UAAU;IAEvC,IAAI,CAACC,eACH,OAAON;IAGT,MAAMQ,oBAAoBC,MAAMH;IAChC,MAAMI,UAAWV,KAAqC,OAAO,IAAI,EAAE;IACnE,MAAMW,cAA8C,EAAE;IACtD,MAAMC,UAAUV,cAAc,OAAO,IAAI,EAAE;IAE3C,MAAMW,mBAAmB,CAACC;QACxB,MAAMC,QAAQD,IAAI,KAAK;QAGvB,MAAME,gBAAgBR,kBAAkB,MAAM,CAAC,CAACS;YAE9C,IAAIA,OAAO,eACT,OAAOA,MAAM,aAAa,EAAE,QAAQ,YAAY,QAAQ,CAAC,CAACA,MAAM,aAAa,EAAE;YAIjF,IAAIC,UAAUD,MAAM,QAAQ,GAC1B,OAAO;YAGT,MAAME,YAAYV,MAAMQ,MAAM,QAAQ;YACtC,OAAOE,UAAU,IAAI,CAAC,CAACC;gBAErB,IAAIC,gBAAgBD,MAClB,OAAOE,qBAAqBP,OAAOK;gBAIrC,IAAIG,cAAcH,MAChB,OAAOF,UAAUE,IAAI,KAAK,KAAMA,IAAwB,KAAK,KAAKL;gBAIpE,OAAOS,SAASJ,QAAQK,SAASL;YACnC;QACF;QAEA,IAAI,CAACJ,cAAc,MAAM,EACvB,OAAO;QAGT,MAAMU,mBAAmBV,cAAc,IAAI,CAAC,CAACC,QAAU,CAAC,CAACA,MAAM,aAAa;QAG5E,MAAMU,mBAAmBX,cACtB,MAAM,CAAC,CAACY,IAAMA,EAAE,iBAAiB,IAAIA,GAAG,YAAYN,qBAAqBP,OAAOa,EAAE,QAAQ,GAC1F,GAAG;QACN,MAAMC,uBAAuBb,cAAc,IAAI,CAC7C,CAACY,IAAMA,EAAE,0BAA0B,IAAIA,GAAG,YAAYN,qBAAqBP,OAAOa,EAAE,QAAQ;QAE9F,IAAIE;QACJ,IAAIC;QACJ,IAAIJ,oBAAoBE,sBAAsB;YAC5C,MAAM,EAAEG,GAAG,EAAEC,GAAG,EAAE,GAAGC,gBAAgBtB,SAASG;YAC9Ce,YAAYE;YACZD,YAAYE;YACZ,IAAIN,kBAAkB;gBACpBb,IAAI,QAAQ,GAAG;gBACbA,IAAgC,OAAO,GAAG;gBAC1CA,IAAgC,GAAG,GAAGa,iBAAiB,MAAM,IAAIG;gBACjEhB,IAAgC,GAAG,GAAGa,iBAAiB,MAAM,IAAII;YACrE;QACF;QAGAjB,IAAI,KAAK,GAAG,CAACqB;YACX,MAAMC,gBAAgB;gBACpB,CAACrB,MAAM,EAAEoB,MAAM,SAAS;YAC1B;YACA,MAAME,kBAAkBC,2BAA2BH,OAAOT,kBAAkBU;YAE5E,MAAMG,cAAcvB,cAAc,MAAM,CAAsB,CAACwB,QAAQvB;gBACrE,MAAMwB,cAAcxB,MAAM,aAAa,GACnCyB,0BAA0BL,mBAAmBD,eAAenB,MAAM,aAAa,EAAEA,MAAM,QAAQ,IAC/F0B,SAASP,eAAenB,MAAM,QAAQ;gBAE1C,IAAIwB,aAAa;oBACf,IAAI9B,YAAY,MAAM,IAAIA,WAAW,CAAC,EAAE,CAAC,GAAG,KAAKwB,OAAO,OAAOxB,WAAW,CAAC,EAAE,CAAC,GAAG,KAAKwB,OAAO,KAE3FxB,YAAY,MAAM,GAAG;oBAEvBA,YAAY,IAAI,CAAC;wBACf,KAAKwB,OAAO;wBACZ,KAAKA,OAAO;oBACd;oBAEA,IAAIhC,YAAYyC,kBAAkB3B;oBAGlC,IAAIA,MAAM,0BAA0B,EAAE;wBACpC,MAAM4B,cAAcC,gBAAgBX,MAAM,SAAS,EAAE;4BACnD,UAAUL;4BACV,UAAUC;4BACV,GAAGxB,YAAY,oBAAoB;4BACnC,GAAGU,OAAO,oBAAoB;wBAChC;wBACA,IAAI4B,aACF1C,UAAU,OAAO,GAAG0C;oBAExB;oBAEA,IAAI/B,AAAiB,kBAAjBA,IAAI,QAAQ,EACdX,YAAY;wBACV,GAAGA,SAAS;wBACZ,WAAWI,aAAa;wBACxB,cAAcA,aAAa;wBAC3B,cAAcA,aAAa;wBAC3B,YAAYA,aAAa;wBACzB,gBAAgBA,aAAa;wBAC7B,cAAcA,aAAa;oBAC7B;oBAGF,OAAO;wBACL,GAAGiC,MAAM;wBACT,GAAGrC,SAAS;oBACd;gBACF;gBAEA,OAAOqC;YACT,GAAG,CAAC;YAEJ,OAAOD;QACT;QAEA,OAAO;IACT;IAEAQ,iBAA0CrC,SAASG,kBAAkB;IACnEb,KAAa,aAAa,GAAG;QAC7B,GAAKA,KAAa,aAAa,IAAI,CAAC,CAAC;QACrCW;IACF;IAEA,OAAOX;AACT"}

package/dist/esm/pipeline/spec/table/pipes/columns/measuresToColumns.js

@@ -1,5 +1,7 @@
 import { createFormatterByMeasure, isMeasure } from "../../../../utils/index.js";
 import { treeTreeToColumns } from "./utils.js";
+import { isNullish } from "remeda";
+import { isUndefined } from "@visactor/vutils";
 const measureTreeToColumns = (spec, context)=>{
     const { advancedVSeed } = context;
     const measureTree = advancedVSeed.measureTree;
@@ -27,6 +29,7 @@ const fieldFormat = (node)=>{
     return (datum)=>{
         const { id } = node;
         const value = datum[id];
+        if (isNullish(value) || isUndefined(value)) return value;
         return formatter(value);
     };
 };

package/dist/esm/pipeline/spec/table/pipes/columns/measuresToColumns.js.map

@@ -1 +1 @@
-{"version":3,"file":"pipeline/spec/table/pipes/columns/measuresToColumns.js","sources":["webpack://@visactor/vseed/./src/pipeline/spec/table/pipes/columns/measuresToColumns.ts"],"sourcesContent":["import type { ListTableConstructorOptions } from '@visactor/vtable'\nimport { createFormatterByMeasure, isMeasure } from 'src/pipeline/utils'\nimport type { MeasureGroup, Measure, MeasureTree, ListTableSpecPipe, Datum } from 'src/types'\nimport { treeTreeToColumns } from './utils'\n\nexport const measureTreeToColumns: ListTableSpecPipe = (spec, context) => {\n  const { advancedVSeed } = context\n  const measureTree = (advancedVSeed as unknown as { measureTree: MeasureTree }).measureTree\n  const result = { ...spec } as ListTableConstructorOptions\n\n  const eachNode = (node: Measure | MeasureGroup) => {\n    if (isMeasure(node)) {\n      return {\n        width: 'auto',\n        fieldFormat: fieldFormat(node),\n      }\n    }\n\n    return {}\n  }\n  const columns = treeTreeToColumns<Measure, MeasureGroup>(measureTree, eachNode)\n  return {\n    ...result,\n    columns: [...(result.columns || []), ...columns] as ListTableConstructorOptions['columns'],\n  }\n}\n\nconst fieldFormat = (node: Measure) => {\n  const formatter = createFormatterByMeasure(node)\n\n  return (datum: Datum) => {\n    const { id } = node\n    const value = datum[id] as number | string | undefined\n    return formatter(value)\n  }\n}\n"],"names":["measureTreeToColumns","spec","context","advancedVSeed","measureTree","result","eachNode","node","isMeasure","fieldFormat","columns","treeTreeToColumns","formatter","createFormatterByMeasure","datum","id","value"],"mappings":";;AAKO,MAAMA,uBAA0C,CAACC,MAAMC;IAC5D,MAAM,EAAEC,aAAa,EAAE,GAAGD;IAC1B,MAAME,cAAeD,cAA0D,WAAW;IAC1F,MAAME,SAAS;QAAE,GAAGJ,IAAI;IAAC;IAEzB,MAAMK,WAAW,CAACC;QAChB,IAAIC,UAAUD,OACZ,OAAO;YACL,OAAO;YACP,aAAaE,YAAYF;QAC3B;QAGF,OAAO,CAAC;IACV;IACA,MAAMG,UAAUC,kBAAyCP,aAAaE;IACtE,OAAO;QACL,GAAGD,MAAM;QACT,SAAS;eAAKA,OAAO,OAAO,IAAI,EAAE;eAAMK;SAAQ;IAClD;AACF;AAEA,MAAMD,cAAc,CAACF;IACnB,MAAMK,YAAYC,yBAAyBN;IAE3C,OAAO,CAACO;QACN,MAAM,EAAEC,EAAE,EAAE,GAAGR;QACf,MAAMS,QAAQF,KAAK,CAACC,GAAG;QACvB,OAAOH,UAAUI;IACnB;AACF"}
+{"version":3,"file":"pipeline/spec/table/pipes/columns/measuresToColumns.js","sources":["webpack://@visactor/vseed/./src/pipeline/spec/table/pipes/columns/measuresToColumns.ts"],"sourcesContent":["import type { ListTableConstructorOptions } from '@visactor/vtable'\nimport { createFormatterByMeasure, isMeasure } from 'src/pipeline/utils'\nimport type { MeasureGroup, Measure, MeasureTree, ListTableSpecPipe, Datum } from 'src/types'\nimport { treeTreeToColumns } from './utils'\nimport { isNullish } from 'remeda'\nimport { isUndefined } from '@visactor/vutils'\n\nexport const measureTreeToColumns: ListTableSpecPipe = (spec, context) => {\n  const { advancedVSeed } = context\n  const measureTree = (advancedVSeed as unknown as { measureTree: MeasureTree }).measureTree\n  const result = { ...spec } as ListTableConstructorOptions\n\n  const eachNode = (node: Measure | MeasureGroup) => {\n    if (isMeasure(node)) {\n      return {\n        width: 'auto',\n        fieldFormat: fieldFormat(node),\n      }\n    }\n\n    return {}\n  }\n  const columns = treeTreeToColumns<Measure, MeasureGroup>(measureTree, eachNode)\n  return {\n    ...result,\n    columns: [...(result.columns || []), ...columns] as ListTableConstructorOptions['columns'],\n  }\n}\n\nconst fieldFormat = (node: Measure) => {\n  const formatter = createFormatterByMeasure(node)\n\n  return (datum: Datum) => {\n    const { id } = node\n    const value = datum[id] as number | string | undefined\n    if (isNullish(value) || isUndefined(value)) {\n      return value\n    }\n    return formatter(value)\n  }\n}\n"],"names":["measureTreeToColumns","spec","context","advancedVSeed","measureTree","result","eachNode","node","isMeasure","fieldFormat","columns","treeTreeToColumns","formatter","createFormatterByMeasure","datum","id","value","isNullish","isUndefined"],"mappings":";;;;AAOO,MAAMA,uBAA0C,CAACC,MAAMC;IAC5D,MAAM,EAAEC,aAAa,EAAE,GAAGD;IAC1B,MAAME,cAAeD,cAA0D,WAAW;IAC1F,MAAME,SAAS;QAAE,GAAGJ,IAAI;IAAC;IAEzB,MAAMK,WAAW,CAACC;QAChB,IAAIC,UAAUD,OACZ,OAAO;YACL,OAAO;YACP,aAAaE,YAAYF;QAC3B;QAGF,OAAO,CAAC;IACV;IACA,MAAMG,UAAUC,kBAAyCP,aAAaE;IACtE,OAAO;QACL,GAAGD,MAAM;QACT,SAAS;eAAKA,OAAO,OAAO,IAAI,EAAE;eAAMK;SAAQ;IAClD;AACF;AAEA,MAAMD,cAAc,CAACF;IACnB,MAAMK,YAAYC,yBAAyBN;IAE3C,OAAO,CAACO;QACN,MAAM,EAAEC,EAAE,EAAE,GAAGR;QACf,MAAMS,QAAQF,KAAK,CAACC,GAAG;QACvB,IAAIE,UAAUD,UAAUE,YAAYF,QAClC,OAAOA;QAET,OAAOJ,UAAUI;IACnB;AACF"}

package/dist/esm/pipeline/spec/table/pipes/columns/pivotColumns.js

@@ -1,25 +1,15 @@
-import { MeasureId } from "../../../../../dataReshape/index.js";
-import { findAllMeasures } from "../../../../utils/index.js";
 const pivotColumns = (spec, context)=>{
     const { advancedVSeed } = context;
     const { encoding } = advancedVSeed;
     const dimensions = advancedVSeed.dimensionTree;
     const columns = dimensions.filter((item)=>encoding.column?.includes(item.id));
-    const allMeasures = findAllMeasures(advancedVSeed.measureTree);
     return {
         ...spec,
-        columns: columns.map((item)=>{
-            const res = {
+        columns: columns.map((item)=>({
                 dimensionKey: item.id,
                 title: item.alias || item.id,
                 width: 'auto'
-            };
-            if (item.id === MeasureId) res.headerFormat = (measureId)=>{
-                const measure = allMeasures.find((m)=>m.id === measureId);
-                return measure?.alias ?? measureId;
-            };
-            return res;
-        })
+            }))
     };
 };
 export { pivotColumns };

package/dist/esm/pipeline/spec/table/pipes/columns/pivotColumns.js.map

@@ -1 +1 @@
-{"version":3,"file":"pipeline/spec/table/pipes/columns/pivotColumns.js","sources":["webpack://@visactor/vseed/./src/pipeline/spec/table/pipes/columns/pivotColumns.ts"],"sourcesContent":["import type { PivotTableConstructorOptions } from '@visactor/vtable'\nimport { MeasureId } from 'src/dataReshape'\nimport { findAllMeasures } from 'src/pipeline/utils'\nimport type { Dimensions, PivotTableSpecPipe } from 'src/types'\n\nexport const pivotColumns: PivotTableSpecPipe = (spec, context) => {\n  const { advancedVSeed } = context\n  const { encoding } = advancedVSeed\n  const dimensions = advancedVSeed.dimensionTree as Dimensions\n  const columns = dimensions.filter((item) => encoding.column?.includes(item.id))\n  const allMeasures = findAllMeasures(advancedVSeed.measureTree)\n\n  return {\n    ...spec,\n    columns: columns.map((item) => {\n      const res = {\n        dimensionKey: item.id,\n        title: item.alias || item.id,\n        width: 'auto',\n      }\n      if (item.id === MeasureId) {\n        ;(res as any).headerFormat = (measureId: string) => {\n          const measure = allMeasures.find((m) => m.id === measureId)\n\n          return measure?.alias ?? measureId\n        }\n      }\n\n      return res\n    }),\n  } as PivotTableConstructorOptions\n}\n"],"names":["pivotColumns","spec","context","advancedVSeed","encoding","dimensions","columns","item","allMeasures","findAllMeasures","res","MeasureId","measureId","measure","m"],"mappings":";;AAKO,MAAMA,eAAmC,CAACC,MAAMC;IACrD,MAAM,EAAEC,aAAa,EAAE,GAAGD;IAC1B,MAAM,EAAEE,QAAQ,EAAE,GAAGD;IACrB,MAAME,aAAaF,cAAc,aAAa;IAC9C,MAAMG,UAAUD,WAAW,MAAM,CAAC,CAACE,OAASH,SAAS,MAAM,EAAE,SAASG,KAAK,EAAE;IAC7E,MAAMC,cAAcC,gBAAgBN,cAAc,WAAW;IAE7D,OAAO;QACL,GAAGF,IAAI;QACP,SAASK,QAAQ,GAAG,CAAC,CAACC;YACpB,MAAMG,MAAM;gBACV,cAAcH,KAAK,EAAE;gBACrB,OAAOA,KAAK,KAAK,IAAIA,KAAK,EAAE;gBAC5B,OAAO;YACT;YACA,IAAIA,KAAK,EAAE,KAAKI,WACZD,IAAY,YAAY,GAAG,CAACE;gBAC5B,MAAMC,UAAUL,YAAY,IAAI,CAAC,CAACM,IAAMA,EAAE,EAAE,KAAKF;gBAEjD,OAAOC,SAAS,SAASD;YAC3B;YAGF,OAAOF;QACT;IACF;AACF"}
+{"version":3,"file":"pipeline/spec/table/pipes/columns/pivotColumns.js","sources":["webpack://@visactor/vseed/./src/pipeline/spec/table/pipes/columns/pivotColumns.ts"],"sourcesContent":["import type { PivotTableConstructorOptions } from '@visactor/vtable'\nimport type { Dimensions, PivotTableSpecPipe } from 'src/types'\n\nexport const pivotColumns: PivotTableSpecPipe = (spec, context) => {\n  const { advancedVSeed } = context\n  const { encoding } = advancedVSeed\n  const dimensions = advancedVSeed.dimensionTree as Dimensions\n  const columns = dimensions.filter((item) => encoding.column?.includes(item.id))\n\n  return {\n    ...spec,\n    columns: columns.map((item) => {\n      return {\n        dimensionKey: item.id,\n        title: item.alias || item.id,\n        width: 'auto',\n      }\n    }),\n  } as PivotTableConstructorOptions\n}\n"],"names":["pivotColumns","spec","context","advancedVSeed","encoding","dimensions","columns","item"],"mappings":"AAGO,MAAMA,eAAmC,CAACC,MAAMC;IACrD,MAAM,EAAEC,aAAa,EAAE,GAAGD;IAC1B,MAAM,EAAEE,QAAQ,EAAE,GAAGD;IACrB,MAAME,aAAaF,cAAc,aAAa;IAC9C,MAAMG,UAAUD,WAAW,MAAM,CAAC,CAACE,OAASH,SAAS,MAAM,EAAE,SAASG,KAAK,EAAE;IAE7E,OAAO;QACL,GAAGN,IAAI;QACP,SAASK,QAAQ,GAAG,CAAC,CAACC,OACb;gBACL,cAAcA,KAAK,EAAE;gBACrB,OAAOA,KAAK,KAAK,IAAIA,KAAK,EAAE;gBAC5B,OAAO;YACT;IAEJ;AACF"}

package/dist/esm/pipeline/spec/table/pipes/corner/titleOnDimension.js

@@ -1,9 +1,10 @@
 const titleOnDimension = (spec)=>{
-    const { rows = [], columns = [] } = spec;
+    const { rows = [], columns = [], indicatorsAsCol, indicators = [] } = spec;
+    const rowsLength = rows.length + (indicatorsAsCol ? 0 : indicators?.length > 0 ? 1 : 0);
     return {
         ...spec,
         corner: {
-            titleOnDimension: rows.length <= 1 && columns.length >= 1 ? 'column' : 'row'
+            titleOnDimension: rowsLength <= 1 && columns.length >= 1 && !indicatorsAsCol ? 'column' : 'row'
         }
     };
 };

package/dist/esm/pipeline/spec/table/pipes/corner/titleOnDimension.js.map

@@ -1 +1 @@
-{"version":3,"file":"pipeline/spec/table/pipes/corner/titleOnDimension.js","sources":["webpack://@visactor/vseed/./src/pipeline/spec/table/pipes/corner/titleOnDimension.ts"],"sourcesContent":["import type { PivotTableSpecPipe } from 'src/types'\n\nexport const titleOnDimension: PivotTableSpecPipe = (spec) => {\n  const { rows = [], columns = [] } = spec\n\n  return {\n    ...spec,\n    corner: {\n      titleOnDimension: (rows as any[]).length <= 1 && (columns as any[]).length >= 1 ? 'column' : 'row',\n    },\n  }\n}\n"],"names":["titleOnDimension","spec","rows","columns"],"mappings":"AAEO,MAAMA,mBAAuC,CAACC;IACnD,MAAM,EAAEC,OAAO,EAAE,EAAEC,UAAU,EAAE,EAAE,GAAGF;IAEpC,OAAO;QACL,GAAGA,IAAI;QACP,QAAQ;YACN,kBAAmBC,KAAe,MAAM,IAAI,KAAMC,QAAkB,MAAM,IAAI,IAAI,WAAW;QAC/F;IACF;AACF"}
+{"version":3,"file":"pipeline/spec/table/pipes/corner/titleOnDimension.js","sources":["webpack://@visactor/vseed/./src/pipeline/spec/table/pipes/corner/titleOnDimension.ts"],"sourcesContent":["import type { PivotTableSpecPipe } from 'src/types'\n\nexport const titleOnDimension: PivotTableSpecPipe = (spec) => {\n  const { rows = [], columns = [], indicatorsAsCol, indicators = [] } = spec\n  const rowsLength = rows.length + (indicatorsAsCol ? 0 : indicators?.length > 0 ? 1 : 0)\n\n  return {\n    ...spec,\n    corner: {\n      titleOnDimension: rowsLength <= 1 && columns.length >= 1 && !indicatorsAsCol ? 'column' : 'row',\n    },\n  }\n}\n"],"names":["titleOnDimension","spec","rows","columns","indicatorsAsCol","indicators","rowsLength"],"mappings":"AAEO,MAAMA,mBAAuC,CAACC;IACnD,MAAM,EAAEC,OAAO,EAAE,EAAEC,UAAU,EAAE,EAAEC,eAAe,EAAEC,aAAa,EAAE,EAAE,GAAGJ;IACtE,MAAMK,aAAaJ,KAAK,MAAM,GAAIE,CAAAA,kBAAkB,IAAIC,YAAY,SAAS,IAAI,IAAI;IAErF,OAAO;QACL,GAAGJ,IAAI;QACP,QAAQ;YACN,kBAAkBK,cAAc,KAAKH,QAAQ,MAAM,IAAI,KAAK,CAACC,kBAAkB,WAAW;QAC5F;IACF;AACF"}

package/dist/esm/pipeline/spec/table/pipes/indicators/pivotDataConfig.js

@@ -5,7 +5,7 @@ const dataConfig = (spec, context)=>{
     const measures = findAllMeasures(advancedVSeed.measureTree);
     const aggregationRules = measures.map((measure)=>({
             field: measure.id,
-            aggregationType: 'NONE',
+            aggregationType: 'SUM',
             indicatorKey: measure.id
         }));
     const dataConfigObj = {
@@ -15,9 +15,9 @@ const dataConfig = (spec, context)=>{
     if (totals) {
         const grandTotalLabel = intl.i18n`总计`;
         const subTotalLabel = intl.i18n`小计`;
-        const dimensionIds = (advancedVSeed.dimensionTree || []).map((dim)=>dim.id);
         dataConfigObj.totals = {};
         if (totals.row) {
+            const dimensionIds = (advancedVSeed.dimensionTree || []).filter((dim)=>'row' === dim.encoding).map((dim)=>dim.id);
             const rowSubDimensions = totals.row.subTotalsDimensions?.filter((dim)=>dimensionIds.includes(dim));
             const normalizedRowSubDimensions = totals.row.showSubTotals && (!rowSubDimensions || 0 === rowSubDimensions.length) ? dimensionIds.length > 0 ? [
                 dimensionIds[0]
@@ -31,6 +31,7 @@ const dataConfig = (spec, context)=>{
             };
         }
         if (totals.column) {
+            const dimensionIds = (advancedVSeed.dimensionTree || []).filter((dim)=>'column' === dim.encoding).map((dim)=>dim.id);
             const columnSubDimensions = totals.column.subTotalsDimensions?.filter((dim)=>dimensionIds.includes(dim));
             const normalizedColumnSubDimensions = totals.column.showSubTotals && (!columnSubDimensions || 0 === columnSubDimensions.length) ? dimensionIds.length > 0 ? [
                 dimensionIds[0]

package/dist/esm/pipeline/spec/table/pipes/indicators/pivotDataConfig.js.map

@@ -1 +1 @@
-{"version":3,"file":"pipeline/spec/table/pipes/indicators/pivotDataConfig.js","sources":["webpack://@visactor/vseed/./src/pipeline/spec/table/pipes/indicators/pivotDataConfig.ts"],"sourcesContent":["import { intl } from 'src/i18n'\nimport { findAllMeasures } from 'src/pipeline/utils'\nimport type { PivotTable, PivotTableSpecPipe } from 'src/types'\n\nexport const dataConfig: PivotTableSpecPipe = (spec, context) => {\n  const { advancedVSeed, vseed } = context\n  const measures = findAllMeasures(advancedVSeed.measureTree)\n\n  const aggregationRules = measures.map((measure) => ({\n    field: measure.id,\n    aggregationType: 'NONE',\n    indicatorKey: measure.id,\n  }))\n\n  const dataConfigObj: any = {\n    aggregationRules,\n  }\n\n  // 处理totals配置\n  const { totals } = vseed as PivotTable\n  if (totals) {\n    const grandTotalLabel = intl.i18n`总计`\n    const subTotalLabel = intl.i18n`小计`\n    const dimensionIds = (advancedVSeed.dimensionTree || []).map((dim) => dim.id)\n\n    dataConfigObj.totals = {}\n\n    // 处理行配置\n    if (totals.row) {\n      const rowSubDimensions = totals.row.subTotalsDimensions?.filter((dim) => dimensionIds.includes(dim))\n      const normalizedRowSubDimensions =\n        totals.row.showSubTotals && (!rowSubDimensions || rowSubDimensions.length === 0)\n          ? dimensionIds.length > 0\n            ? [dimensionIds[0]]\n            : []\n          : rowSubDimensions\n\n      dataConfigObj.totals.row = {\n        showGrandTotals: totals.row.showGrandTotals ?? false,\n        showSubTotals: totals.row.showSubTotals ?? false,\n        subTotalsDimensions: normalizedRowSubDimensions,\n        grandTotalLabel,\n        subTotalLabel,\n      }\n    }\n\n    // 处理列配置\n    if (totals.column) {\n      const columnSubDimensions = totals.column.subTotalsDimensions?.filter((dim) => dimensionIds.includes(dim))\n      const normalizedColumnSubDimensions =\n        totals.column.showSubTotals && (!columnSubDimensions || columnSubDimensions.length === 0)\n          ? dimensionIds.length > 0\n            ? [dimensionIds[0]]\n            : []\n          : columnSubDimensions\n\n      dataConfigObj.totals.column = {\n        showGrandTotals: totals.column.showGrandTotals ?? false,\n        showSubTotals: totals.column.showSubTotals ?? false,\n        subTotalsDimensions: normalizedColumnSubDimensions,\n        grandTotalLabel,\n        subTotalLabel,\n      }\n    }\n  }\n\n  return {\n    ...spec,\n    dataConfig: dataConfigObj,\n  }\n}\n"],"names":["dataConfig","spec","context","advancedVSeed","vseed","measures","findAllMeasures","aggregationRules","measure","dataConfigObj","totals","grandTotalLabel","intl","subTotalLabel","dimensionIds","dim","rowSubDimensions","normalizedRowSubDimensions","columnSubDimensions","normalizedColumnSubDimensions"],"mappings":";;AAIO,MAAMA,aAAiC,CAACC,MAAMC;IACnD,MAAM,EAAEC,aAAa,EAAEC,KAAK,EAAE,GAAGF;IACjC,MAAMG,WAAWC,gBAAgBH,cAAc,WAAW;IAE1D,MAAMI,mBAAmBF,SAAS,GAAG,CAAC,CAACG,UAAa;YAClD,OAAOA,QAAQ,EAAE;YACjB,iBAAiB;YACjB,cAAcA,QAAQ,EAAE;QAC1B;IAEA,MAAMC,gBAAqB;QACzBF;IACF;IAGA,MAAM,EAAEG,MAAM,EAAE,GAAGN;IACnB,IAAIM,QAAQ;QACV,MAAMC,kBAAkBC,KAAK,IAAI,CAAC,EAAE,CAAC;QACrC,MAAMC,gBAAgBD,KAAK,IAAI,CAAC,EAAE,CAAC;QACnC,MAAME,eAAgBX,AAAAA,CAAAA,cAAc,aAAa,IAAI,EAAC,EAAG,GAAG,CAAC,CAACY,MAAQA,IAAI,EAAE;QAE5EN,cAAc,MAAM,GAAG,CAAC;QAGxB,IAAIC,OAAO,GAAG,EAAE;YACd,MAAMM,mBAAmBN,OAAO,GAAG,CAAC,mBAAmB,EAAE,OAAO,CAACK,MAAQD,aAAa,QAAQ,CAACC;YAC/F,MAAME,6BACJP,OAAO,GAAG,CAAC,aAAa,IAAK,EAACM,oBAAoBA,AAA4B,MAA5BA,iBAAiB,MAAM,AAAK,IAC1EF,aAAa,MAAM,GAAG,IACpB;gBAACA,YAAY,CAAC,EAAE;aAAC,GACjB,EAAE,GACJE;YAENP,cAAc,MAAM,CAAC,GAAG,GAAG;gBACzB,iBAAiBC,OAAO,GAAG,CAAC,eAAe,IAAI;gBAC/C,eAAeA,OAAO,GAAG,CAAC,aAAa,IAAI;gBAC3C,qBAAqBO;gBACrBN;gBACAE;YACF;QACF;QAGA,IAAIH,OAAO,MAAM,EAAE;YACjB,MAAMQ,sBAAsBR,OAAO,MAAM,CAAC,mBAAmB,EAAE,OAAO,CAACK,MAAQD,aAAa,QAAQ,CAACC;YACrG,MAAMI,gCACJT,OAAO,MAAM,CAAC,aAAa,IAAK,EAACQ,uBAAuBA,AAA+B,MAA/BA,oBAAoB,MAAM,AAAK,IACnFJ,aAAa,MAAM,GAAG,IACpB;gBAACA,YAAY,CAAC,EAAE;aAAC,GACjB,EAAE,GACJI;YAENT,cAAc,MAAM,CAAC,MAAM,GAAG;gBAC5B,iBAAiBC,OAAO,MAAM,CAAC,eAAe,IAAI;gBAClD,eAAeA,OAAO,MAAM,CAAC,aAAa,IAAI;gBAC9C,qBAAqBS;gBACrBR;gBACAE;YACF;QACF;IACF;IAEA,OAAO;QACL,GAAGZ,IAAI;QACP,YAAYQ;IACd;AACF"}
+{"version":3,"file":"pipeline/spec/table/pipes/indicators/pivotDataConfig.js","sources":["webpack://@visactor/vseed/./src/pipeline/spec/table/pipes/indicators/pivotDataConfig.ts"],"sourcesContent":["import { intl } from 'src/i18n'\nimport { findAllMeasures } from 'src/pipeline/utils'\nimport type { Dimension, PivotTable, PivotTableSpecPipe } from 'src/types'\n\nexport const dataConfig: PivotTableSpecPipe = (spec, context) => {\n  const { advancedVSeed, vseed } = context\n  const measures = findAllMeasures(advancedVSeed.measureTree)\n\n  const aggregationRules = measures.map((measure) => ({\n    field: measure.id,\n    aggregationType: 'SUM',\n    indicatorKey: measure.id,\n  }))\n\n  const dataConfigObj: any = {\n    aggregationRules,\n  }\n\n  // 处理totals配置\n  const { totals } = vseed as PivotTable\n  if (totals) {\n    const grandTotalLabel = intl.i18n`总计`\n    const subTotalLabel = intl.i18n`小计`\n\n    dataConfigObj.totals = {}\n\n    // 处理行配置\n    if (totals.row) {\n      const dimensionIds = (advancedVSeed.dimensionTree || [])\n        .filter((dim: Dimension) => dim.encoding === 'row')\n        .map((dim) => dim.id)\n      const rowSubDimensions = totals.row.subTotalsDimensions?.filter((dim) => dimensionIds.includes(dim))\n      const normalizedRowSubDimensions =\n        totals.row.showSubTotals && (!rowSubDimensions || rowSubDimensions.length === 0)\n          ? dimensionIds.length > 0\n            ? [dimensionIds[0]]\n            : []\n          : rowSubDimensions\n\n      dataConfigObj.totals.row = {\n        showGrandTotals: totals.row.showGrandTotals ?? false,\n        showSubTotals: totals.row.showSubTotals ?? false,\n        subTotalsDimensions: normalizedRowSubDimensions,\n        grandTotalLabel,\n        subTotalLabel,\n      }\n    }\n\n    // 处理列配置\n    if (totals.column) {\n      const dimensionIds = (advancedVSeed.dimensionTree || [])\n        .filter((dim: Dimension) => dim.encoding === 'column')\n        .map((dim) => dim.id)\n      const columnSubDimensions = totals.column.subTotalsDimensions?.filter((dim) => dimensionIds.includes(dim))\n      const normalizedColumnSubDimensions =\n        totals.column.showSubTotals && (!columnSubDimensions || columnSubDimensions.length === 0)\n          ? dimensionIds.length > 0\n            ? [dimensionIds[0]]\n            : []\n          : columnSubDimensions\n\n      dataConfigObj.totals.column = {\n        showGrandTotals: totals.column.showGrandTotals ?? false,\n        showSubTotals: totals.column.showSubTotals ?? false,\n        subTotalsDimensions: normalizedColumnSubDimensions,\n        grandTotalLabel,\n        subTotalLabel,\n      }\n    }\n  }\n\n  return {\n    ...spec,\n    dataConfig: dataConfigObj,\n  }\n}\n"],"names":["dataConfig","spec","context","advancedVSeed","vseed","measures","findAllMeasures","aggregationRules","measure","dataConfigObj","totals","grandTotalLabel","intl","subTotalLabel","dimensionIds","dim","rowSubDimensions","normalizedRowSubDimensions","columnSubDimensions","normalizedColumnSubDimensions"],"mappings":";;AAIO,MAAMA,aAAiC,CAACC,MAAMC;IACnD,MAAM,EAAEC,aAAa,EAAEC,KAAK,EAAE,GAAGF;IACjC,MAAMG,WAAWC,gBAAgBH,cAAc,WAAW;IAE1D,MAAMI,mBAAmBF,SAAS,GAAG,CAAC,CAACG,UAAa;YAClD,OAAOA,QAAQ,EAAE;YACjB,iBAAiB;YACjB,cAAcA,QAAQ,EAAE;QAC1B;IAEA,MAAMC,gBAAqB;QACzBF;IACF;IAGA,MAAM,EAAEG,MAAM,EAAE,GAAGN;IACnB,IAAIM,QAAQ;QACV,MAAMC,kBAAkBC,KAAK,IAAI,CAAC,EAAE,CAAC;QACrC,MAAMC,gBAAgBD,KAAK,IAAI,CAAC,EAAE,CAAC;QAEnCH,cAAc,MAAM,GAAG,CAAC;QAGxB,IAAIC,OAAO,GAAG,EAAE;YACd,MAAMI,eAAgBX,AAAAA,CAAAA,cAAc,aAAa,IAAI,EAAC,EACnD,MAAM,CAAC,CAACY,MAAmBA,AAAiB,UAAjBA,IAAI,QAAQ,EACvC,GAAG,CAAC,CAACA,MAAQA,IAAI,EAAE;YACtB,MAAMC,mBAAmBN,OAAO,GAAG,CAAC,mBAAmB,EAAE,OAAO,CAACK,MAAQD,aAAa,QAAQ,CAACC;YAC/F,MAAME,6BACJP,OAAO,GAAG,CAAC,aAAa,IAAK,EAACM,oBAAoBA,AAA4B,MAA5BA,iBAAiB,MAAM,AAAK,IAC1EF,aAAa,MAAM,GAAG,IACpB;gBAACA,YAAY,CAAC,EAAE;aAAC,GACjB,EAAE,GACJE;YAENP,cAAc,MAAM,CAAC,GAAG,GAAG;gBACzB,iBAAiBC,OAAO,GAAG,CAAC,eAAe,IAAI;gBAC/C,eAAeA,OAAO,GAAG,CAAC,aAAa,IAAI;gBAC3C,qBAAqBO;gBACrBN;gBACAE;YACF;QACF;QAGA,IAAIH,OAAO,MAAM,EAAE;YACjB,MAAMI,eAAgBX,AAAAA,CAAAA,cAAc,aAAa,IAAI,EAAC,EACnD,MAAM,CAAC,CAACY,MAAmBA,AAAiB,aAAjBA,IAAI,QAAQ,EACvC,GAAG,CAAC,CAACA,MAAQA,IAAI,EAAE;YACtB,MAAMG,sBAAsBR,OAAO,MAAM,CAAC,mBAAmB,EAAE,OAAO,CAACK,MAAQD,aAAa,QAAQ,CAACC;YACrG,MAAMI,gCACJT,OAAO,MAAM,CAAC,aAAa,IAAK,EAACQ,uBAAuBA,AAA+B,MAA/BA,oBAAoB,MAAM,AAAK,IACnFJ,aAAa,MAAM,GAAG,IACpB;gBAACA,YAAY,CAAC,EAAE;aAAC,GACjB,EAAE,GACJI;YAENT,cAAc,MAAM,CAAC,MAAM,GAAG;gBAC5B,iBAAiBC,OAAO,MAAM,CAAC,eAAe,IAAI;gBAClD,eAAeA,OAAO,MAAM,CAAC,aAAa,IAAI;gBAC9C,qBAAqBS;gBACrBR;gBACAE;YACF;QACF;IACF;IAEA,OAAO;QACL,GAAGZ,IAAI;QACP,YAAYQ;IACd;AACF"}

package/dist/esm/pipeline/spec/table/pipes/indicators/pivotIndicators.js

@@ -1,38 +1,33 @@
 import { isNumber } from "remeda";
 import { intl } from "../../../../../i18n/index.js";
-import { createFormatterByMeasure, findMeasureById } from "../../../../utils/index.js";
+import { createFormatterByMeasure, findAllMeasures } from "../../../../utils/index.js";
 const pivotIndicators = (spec, context)=>{
-    const { advancedVSeed } = context;
-    const { measureTree, datasetReshapeInfo } = advancedVSeed;
-    const { foldInfo } = datasetReshapeInfo[0];
-    const hasRow = spec?.rows?.length > 0;
-    const foldMapValues = Object.values(foldInfo.foldMap);
+    const { advancedVSeed, vseed } = context;
+    const { measureTree } = advancedVSeed;
+    const measures = findAllMeasures(measureTree);
+    const indicatorsAsCol = vseed.indicatorsAsCol ?? false;
     return {
         ...spec,
         indicatorTitle: intl.i18n`指标名称`,
-        indicatorsAsCol: hasRow,
-        hideIndicatorName: hasRow,
-        indicators: [
-            {
+        indicatorsAsCol,
+        hideIndicatorName: measures.length <= 1,
+        indicators: measures.map((measure)=>{
+            const formatter = createFormatterByMeasure(measure);
+            return {
                 cellType: 'text',
-                indicatorKey: foldInfo.measureValue,
-                title: foldMapValues.length > 1 ? '' : foldMapValues[0],
+                indicatorKey: measure.id,
+                title: measure.alias || measure.id,
                 width: 'auto',
-                format: fieldFormat(measureTree, foldInfo)
-            }
-        ]
+                format: (value, col, row, table)=>{
+                    if (!isNumber(col) || !isNumber(row) || !table) return value;
+                    const datum = table.getCellOriginRecord(col, row);
+                    if (!datum?.[0]) return value;
+                    return formatter(value);
+                }
+            };
+        })
     };
 };
-const fieldFormat = (measureTree, foldInfo)=>(value, col, row, table)=>{
-        if (!isNumber(col) || !isNumber(row) || !table) return value;
-        const datum = table.getCellOriginRecord(col, row);
-        if (!datum[0]) return value;
-        const { measureId: foldMeasureId } = foldInfo;
-        const measureId = datum[0][foldMeasureId];
-        const measure = findMeasureById(measureTree, measureId);
-        const formatter = createFormatterByMeasure(measure);
-        return formatter(value);
-    };
 export { pivotIndicators };
 
 //# sourceMappingURL=pivotIndicators.js.map

package/dist/esm/pipeline/spec/table/pipes/indicators/pivotIndicators.js.map

@@ -1 +1 @@
-{"version":3,"file":"pipeline/spec/table/pipes/indicators/pivotIndicators.js","sources":["webpack://@visactor/vseed/./src/pipeline/spec/table/pipes/indicators/pivotIndicators.ts"],"sourcesContent":["import type { PivotChartConstructorOptions, BaseTableAPI } from '@visactor/vtable'\nimport { isNumber } from 'remeda'\nimport { intl } from 'src/i18n'\nimport { createFormatterByMeasure, findMeasureById } from 'src/pipeline/utils'\nimport type { Datum, FoldInfo, MeasureTree, PivotTableSpecPipe } from 'src/types'\n\nexport const pivotIndicators: PivotTableSpecPipe = (spec, context) => {\n  const { advancedVSeed } = context\n  const { measureTree, datasetReshapeInfo } = advancedVSeed\n  const { foldInfo } = datasetReshapeInfo[0]\n  const hasRow = ((spec as any)?.rows as any[])?.length > 0\n  const foldMapValues = Object.values(foldInfo.foldMap)\n\n  return {\n    ...spec,\n    indicatorTitle: intl.i18n`指标名称`,\n    indicatorsAsCol: hasRow,\n    hideIndicatorName: hasRow,\n    indicators: [\n      {\n        cellType: 'text',\n        indicatorKey: foldInfo.measureValue,\n        title: foldMapValues.length > 1 ? '' : foldMapValues[0],\n        width: 'auto',\n        format: fieldFormat(measureTree as MeasureTree, foldInfo as FoldInfo),\n      },\n    ] as unknown as PivotChartConstructorOptions['indicators'],\n  }\n}\n\nconst fieldFormat = (measureTree: MeasureTree, foldInfo: FoldInfo) => {\n  return (value: number | string, col?: number, row?: number, table?: BaseTableAPI) => {\n    if (!isNumber(col) || !isNumber(row) || !table) {\n      return value\n    }\n\n    const datum = table.getCellOriginRecord(col, row) as Datum[]\n    if (!datum[0]) {\n      return value\n    }\n    const { measureId: foldMeasureId } = foldInfo\n    const measureId = datum[0][foldMeasureId] as string\n    const measure = findMeasureById(measureTree, measureId)\n    const formatter = createFormatterByMeasure(measure)\n    return formatter(value)\n  }\n}\n"],"names":["pivotIndicators","spec","context","advancedVSeed","measureTree","datasetReshapeInfo","foldInfo","hasRow","foldMapValues","Object","intl","fieldFormat","value","col","row","table","isNumber","datum","foldMeasureId","measureId","measure","findMeasureById","formatter","createFormatterByMeasure"],"mappings":";;;AAMO,MAAMA,kBAAsC,CAACC,MAAMC;IACxD,MAAM,EAAEC,aAAa,EAAE,GAAGD;IAC1B,MAAM,EAAEE,WAAW,EAAEC,kBAAkB,EAAE,GAAGF;IAC5C,MAAM,EAAEG,QAAQ,EAAE,GAAGD,kBAAkB,CAAC,EAAE;IAC1C,MAAME,SAAWN,MAAc,MAAgB,SAAS;IACxD,MAAMO,gBAAgBC,OAAO,MAAM,CAACH,SAAS,OAAO;IAEpD,OAAO;QACL,GAAGL,IAAI;QACP,gBAAgBS,KAAK,IAAI,CAAC,IAAI,CAAC;QAC/B,iBAAiBH;QACjB,mBAAmBA;QACnB,YAAY;YACV;gBACE,UAAU;gBACV,cAAcD,SAAS,YAAY;gBACnC,OAAOE,cAAc,MAAM,GAAG,IAAI,KAAKA,aAAa,CAAC,EAAE;gBACvD,OAAO;gBACP,QAAQG,YAAYP,aAA4BE;YAClD;SACD;IACH;AACF;AAEA,MAAMK,cAAc,CAACP,aAA0BE,WACtC,CAACM,OAAwBC,KAAcC,KAAcC;QAC1D,IAAI,CAACC,SAASH,QAAQ,CAACG,SAASF,QAAQ,CAACC,OACvC,OAAOH;QAGT,MAAMK,QAAQF,MAAM,mBAAmB,CAACF,KAAKC;QAC7C,IAAI,CAACG,KAAK,CAAC,EAAE,EACX,OAAOL;QAET,MAAM,EAAE,WAAWM,aAAa,EAAE,GAAGZ;QACrC,MAAMa,YAAYF,KAAK,CAAC,EAAE,CAACC,cAAc;QACzC,MAAME,UAAUC,gBAAgBjB,aAAae;QAC7C,MAAMG,YAAYC,yBAAyBH;QAC3C,OAAOE,UAAUV;IACnB"}
+{"version":3,"file":"pipeline/spec/table/pipes/indicators/pivotIndicators.js","sources":["webpack://@visactor/vseed/./src/pipeline/spec/table/pipes/indicators/pivotIndicators.ts"],"sourcesContent":["import type { PivotChartConstructorOptions, BaseTableAPI } from '@visactor/vtable'\nimport { isNumber } from 'remeda'\nimport { intl } from 'src/i18n'\nimport { createFormatterByMeasure, findAllMeasures } from 'src/pipeline/utils'\nimport type { Datum, MeasureTree, PivotTable, PivotTableSpecPipe } from 'src/types'\n\nexport const pivotIndicators: PivotTableSpecPipe = (spec, context) => {\n  const { advancedVSeed, vseed } = context\n  const { measureTree } = advancedVSeed\n  const measures = findAllMeasures(measureTree as MeasureTree)\n\n  // 用户可配置 indicatorsAsCol，默认 true\n  const indicatorsAsCol = (vseed as PivotTable).indicatorsAsCol ?? false\n\n  return {\n    ...spec,\n    indicatorTitle: intl.i18n`指标名称`,\n    indicatorsAsCol,\n    hideIndicatorName: measures.length <= 1,\n    indicators: measures.map((measure) => {\n      const formatter = createFormatterByMeasure(measure)\n      return {\n        cellType: 'text',\n        indicatorKey: measure.id,\n        title: measure.alias || measure.id,\n        width: 'auto',\n        format: (value: number | string, col?: number, row?: number, table?: BaseTableAPI) => {\n          if (!isNumber(col) || !isNumber(row) || !table) {\n            return value\n          }\n          const datum = table.getCellOriginRecord(col, row) as Datum[]\n          if (!datum?.[0]) {\n            return value\n          }\n          return formatter(value)\n        },\n      }\n    }) as unknown as PivotChartConstructorOptions['indicators'],\n  }\n}\n"],"names":["pivotIndicators","spec","context","advancedVSeed","vseed","measureTree","measures","findAllMeasures","indicatorsAsCol","intl","measure","formatter","createFormatterByMeasure","value","col","row","table","isNumber","datum"],"mappings":";;;AAMO,MAAMA,kBAAsC,CAACC,MAAMC;IACxD,MAAM,EAAEC,aAAa,EAAEC,KAAK,EAAE,GAAGF;IACjC,MAAM,EAAEG,WAAW,EAAE,GAAGF;IACxB,MAAMG,WAAWC,gBAAgBF;IAGjC,MAAMG,kBAAmBJ,MAAqB,eAAe,IAAI;IAEjE,OAAO;QACL,GAAGH,IAAI;QACP,gBAAgBQ,KAAK,IAAI,CAAC,IAAI,CAAC;QAC/BD;QACA,mBAAmBF,SAAS,MAAM,IAAI;QACtC,YAAYA,SAAS,GAAG,CAAC,CAACI;YACxB,MAAMC,YAAYC,yBAAyBF;YAC3C,OAAO;gBACL,UAAU;gBACV,cAAcA,QAAQ,EAAE;gBACxB,OAAOA,QAAQ,KAAK,IAAIA,QAAQ,EAAE;gBAClC,OAAO;gBACP,QAAQ,CAACG,OAAwBC,KAAcC,KAAcC;oBAC3D,IAAI,CAACC,SAASH,QAAQ,CAACG,SAASF,QAAQ,CAACC,OACvC,OAAOH;oBAET,MAAMK,QAAQF,MAAM,mBAAmB,CAACF,KAAKC;oBAC7C,IAAI,CAACG,OAAO,CAAC,EAAE,EACb,OAAOL;oBAET,OAAOF,UAAUE;gBACnB;YACF;QACF;IACF;AACF"}

package/dist/esm/pipeline/spec/table/pipes/rows/pivotRows.js

@@ -1,25 +1,15 @@
-import { MeasureId } from "../../../../../dataReshape/index.js";
-import { findAllMeasures } from "../../../../utils/measures/find.js";
 const pivotRows = (spec, context)=>{
     const { advancedVSeed } = context;
     const dimensions = advancedVSeed.dimensionTree;
     const { encoding } = advancedVSeed;
     const rows = dimensions.filter((item)=>encoding.row?.includes(item.id));
-    const allMeasures = findAllMeasures(advancedVSeed.measureTree);
     return {
         ...spec,
-        rows: rows.map((item)=>{
-            const res = {
+        rows: rows.map((item)=>({
                 dimensionKey: item.id,
                 title: item.alias || item.id,
                 width: 'auto'
-            };
-            if (item.id === MeasureId) res.headerFormat = (measureId)=>{
-                const measure = allMeasures.find((m)=>m.id === measureId);
-                return measure?.alias ?? measureId;
-            };
-            return res;
-        })
+            }))
     };
 };
 export { pivotRows };

package/dist/esm/pipeline/spec/table/pipes/rows/pivotRows.js.map

@@ -1 +1 @@
-{"version":3,"file":"pipeline/spec/table/pipes/rows/pivotRows.js","sources":["webpack://@visactor/vseed/./src/pipeline/spec/table/pipes/rows/pivotRows.ts"],"sourcesContent":["import { MeasureId } from 'src/dataReshape'\nimport { findAllMeasures } from 'src/pipeline/utils/measures/find'\nimport type { Dimensions, PivotTableSpecPipe } from 'src/types'\n\nexport const pivotRows: PivotTableSpecPipe = (spec, context) => {\n  const { advancedVSeed } = context\n  const dimensions = advancedVSeed.dimensionTree as Dimensions\n  const { encoding } = advancedVSeed\n  const rows = dimensions.filter((item) => encoding.row?.includes(item.id))\n  const allMeasures = findAllMeasures(advancedVSeed.measureTree)\n\n  return {\n    ...spec,\n    rows: rows.map((item) => {\n      const res = {\n        dimensionKey: item.id,\n        title: item.alias || item.id,\n        width: 'auto',\n      }\n\n      if (item.id === MeasureId) {\n        ;(res as any).headerFormat = (measureId: string) => {\n          const measure = allMeasures.find((m) => m.id === measureId)\n\n          return measure?.alias ?? measureId\n        }\n      }\n\n      return res\n    }),\n  }\n}\n"],"names":["pivotRows","spec","context","advancedVSeed","dimensions","encoding","rows","item","allMeasures","findAllMeasures","res","MeasureId","measureId","measure","m"],"mappings":";;AAIO,MAAMA,YAAgC,CAACC,MAAMC;IAClD,MAAM,EAAEC,aAAa,EAAE,GAAGD;IAC1B,MAAME,aAAaD,cAAc,aAAa;IAC9C,MAAM,EAAEE,QAAQ,EAAE,GAAGF;IACrB,MAAMG,OAAOF,WAAW,MAAM,CAAC,CAACG,OAASF,SAAS,GAAG,EAAE,SAASE,KAAK,EAAE;IACvE,MAAMC,cAAcC,gBAAgBN,cAAc,WAAW;IAE7D,OAAO;QACL,GAAGF,IAAI;QACP,MAAMK,KAAK,GAAG,CAAC,CAACC;YACd,MAAMG,MAAM;gBACV,cAAcH,KAAK,EAAE;gBACrB,OAAOA,KAAK,KAAK,IAAIA,KAAK,EAAE;gBAC5B,OAAO;YACT;YAEA,IAAIA,KAAK,EAAE,KAAKI,WACZD,IAAY,YAAY,GAAG,CAACE;gBAC5B,MAAMC,UAAUL,YAAY,IAAI,CAAC,CAACM,IAAMA,EAAE,EAAE,KAAKF;gBAEjD,OAAOC,SAAS,SAASD;YAC3B;YAGF,OAAOF;QACT;IACF;AACF"}
+{"version":3,"file":"pipeline/spec/table/pipes/rows/pivotRows.js","sources":["webpack://@visactor/vseed/./src/pipeline/spec/table/pipes/rows/pivotRows.ts"],"sourcesContent":["import type { Dimensions, PivotTableSpecPipe } from 'src/types'\n\nexport const pivotRows: PivotTableSpecPipe = (spec, context) => {\n  const { advancedVSeed } = context\n  const dimensions = advancedVSeed.dimensionTree as Dimensions\n  const { encoding } = advancedVSeed\n  const rows = dimensions.filter((item) => encoding.row?.includes(item.id))\n\n  return {\n    ...spec,\n    rows: rows.map((item) => {\n      return {\n        dimensionKey: item.id,\n        title: item.alias || item.id,\n        width: 'auto',\n      }\n    }),\n  }\n}\n"],"names":["pivotRows","spec","context","advancedVSeed","dimensions","encoding","rows","item"],"mappings":"AAEO,MAAMA,YAAgC,CAACC,MAAMC;IAClD,MAAM,EAAEC,aAAa,EAAE,GAAGD;IAC1B,MAAME,aAAaD,cAAc,aAAa;IAC9C,MAAM,EAAEE,QAAQ,EAAE,GAAGF;IACrB,MAAMG,OAAOF,WAAW,MAAM,CAAC,CAACG,OAASF,SAAS,GAAG,EAAE,SAASE,KAAK,EAAE;IAEvE,OAAO;QACL,GAAGN,IAAI;QACP,MAAMK,KAAK,GAAG,CAAC,CAACC,OACP;gBACL,cAAcA,KAAK,EAAE;gBACrB,OAAOA,KAAK,KAAK,IAAIA,KAAK,EAAE;gBAC5B,OAAO;YACT;IAEJ;AACF"}

package/dist/esm/pipeline/spec/table/pipes/theme/bottomFrozenStyle.d.ts

@@ -0,0 +1,2 @@
+import type { PivotTableSpecPipe } from '../../../../../types';
+export declare const bottomFrozenStyle: PivotTableSpecPipe;

package/dist/esm/pipeline/spec/table/pipes/theme/bottomFrozenStyle.js

@@ -0,0 +1,51 @@
+const bottomFrozenStyle = (spec, context)=>{
+    const result = {
+        ...spec
+    };
+    const { advancedVSeed } = context;
+    const { config, chartType } = advancedVSeed;
+    const themConfig = config?.[chartType];
+    if (!result.theme || !themConfig) return result;
+    const borderColor = themConfig.borderColor || 'rgb(224, 224, 224)';
+    const backgroundColor = themConfig.headerBackgroundColor || '#EEF1F5';
+    const fontColor = themConfig.headerFontColor || '#1B1F23';
+    const fontSize = themConfig.headerFontSize || 12;
+    const hoverCellBgColor = themConfig.hoverHeaderBackgroundColor || '#bedaff';
+    const hoverInlineColor = themConfig.hoverHeaderInlineBackgroundColor || '#bedaff';
+    result.theme.bottomFrozenStyle = {
+        borderColor,
+        borderLineWidth: 1,
+        padding: [
+            8,
+            12,
+            8,
+            12
+        ],
+        textAlign: 'center',
+        hover: {
+            cellBgColor: hoverCellBgColor,
+            inlineRowBgColor: hoverInlineColor,
+            inlineColumnBgColor: hoverInlineColor
+        },
+        frameStyle: {
+            borderColor,
+            borderLineWidth: [
+                0,
+                0,
+                1,
+                0
+            ]
+        },
+        fontSize,
+        fontVariant: 'normal',
+        fontStyle: 'normal',
+        fontWeight: 'bold',
+        color: fontColor,
+        bgColor: backgroundColor,
+        lineHeight: 1.5 * fontSize
+    };
+    return result;
+};
+export { bottomFrozenStyle };
+
+//# sourceMappingURL=bottomFrozenStyle.js.map

package/dist/esm/pipeline/spec/table/pipes/theme/bottomFrozenStyle.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"pipeline/spec/table/pipes/theme/bottomFrozenStyle.js","sources":["webpack://@visactor/vseed/./src/pipeline/spec/table/pipes/theme/bottomFrozenStyle.ts"],"sourcesContent":["import type { PivotTableSpecPipe, TableConfig } from 'src/types'\nimport type { ThemeLike, WithTheme } from './type'\n\nexport const bottomFrozenStyle: PivotTableSpecPipe = (spec, context) => {\n  const result = { ...spec } as Partial<typeof spec> & WithTheme\n  const { advancedVSeed } = context\n  const { config, chartType } = advancedVSeed\n  const themConfig = config?.[chartType] as TableConfig\n\n  if (!result.theme || !themConfig) return result\n\n  const borderColor = themConfig.borderColor || 'rgb(224, 224, 224)'\n  const backgroundColor = themConfig.headerBackgroundColor || '#EEF1F5'\n  const fontColor = themConfig.headerFontColor || '#1B1F23'\n  const fontSize = themConfig.headerFontSize || 12\n  const hoverCellBgColor = themConfig.hoverHeaderBackgroundColor || '#bedaff'\n  const hoverInlineColor = themConfig.hoverHeaderInlineBackgroundColor || '#bedaff'\n\n  ;(result.theme as ThemeLike).bottomFrozenStyle = {\n    borderColor,\n    borderLineWidth: 1,\n    padding: [8, 12, 8, 12],\n    textAlign: 'center',\n    hover: {\n      cellBgColor: hoverCellBgColor,\n      inlineRowBgColor: hoverInlineColor,\n      inlineColumnBgColor: hoverInlineColor,\n    },\n    frameStyle: {\n      borderColor,\n      borderLineWidth: [0, 0, 1, 0],\n    },\n    fontSize,\n    fontVariant: 'normal',\n    fontStyle: 'normal',\n    fontWeight: 'bold',\n    color: fontColor,\n    bgColor: backgroundColor,\n    lineHeight: fontSize * 1.5,\n  }\n\n  return result\n}\n"],"names":["bottomFrozenStyle","spec","context","result","advancedVSeed","config","chartType","themConfig","borderColor","backgroundColor","fontColor","fontSize","hoverCellBgColor","hoverInlineColor"],"mappings":"AAGO,MAAMA,oBAAwC,CAACC,MAAMC;IAC1D,MAAMC,SAAS;QAAE,GAAGF,IAAI;IAAC;IACzB,MAAM,EAAEG,aAAa,EAAE,GAAGF;IAC1B,MAAM,EAAEG,MAAM,EAAEC,SAAS,EAAE,GAAGF;IAC9B,MAAMG,aAAaF,QAAQ,CAACC,UAAU;IAEtC,IAAI,CAACH,OAAO,KAAK,IAAI,CAACI,YAAY,OAAOJ;IAEzC,MAAMK,cAAcD,WAAW,WAAW,IAAI;IAC9C,MAAME,kBAAkBF,WAAW,qBAAqB,IAAI;IAC5D,MAAMG,YAAYH,WAAW,eAAe,IAAI;IAChD,MAAMI,WAAWJ,WAAW,cAAc,IAAI;IAC9C,MAAMK,mBAAmBL,WAAW,0BAA0B,IAAI;IAClE,MAAMM,mBAAmBN,WAAW,gCAAgC,IAAI;IAEtEJ,OAAO,KAAK,CAAe,iBAAiB,GAAG;QAC/CK;QACA,iBAAiB;QACjB,SAAS;YAAC;YAAG;YAAI;YAAG;SAAG;QACvB,WAAW;QACX,OAAO;YACL,aAAaI;YACb,kBAAkBC;YAClB,qBAAqBA;QACvB;QACA,YAAY;YACVL;YACA,iBAAiB;gBAAC;gBAAG;gBAAG;gBAAG;aAAE;QAC/B;QACAG;QACA,aAAa;QACb,WAAW;QACX,YAAY;QACZ,OAAOD;QACP,SAASD;QACT,YAAYE,AAAW,MAAXA;IACd;IAEA,OAAOR;AACT"}

package/dist/esm/pipeline/spec/table/pipes/theme/index.d.ts

@@ -1,5 +1,6 @@
 export * from './bodyStyle';
 export * from './headerStyle';
+export * from './bottomFrozenStyle';
 export * from './rowHeaderStyle';
 export * from './cornerHeaderStyle';
 export * from './frameStyle';

package/dist/esm/pipeline/spec/table/pipes/theme/index.js

@@ -1,5 +1,6 @@
 export * from "./bodyStyle.js";
 export * from "./headerStyle.js";
+export * from "./bottomFrozenStyle.js";
 export * from "./rowHeaderStyle.js";
 export * from "./cornerHeaderStyle.js";
 export * from "./frameStyle.js";

package/dist/esm/theme/common/table.d.ts

@@ -2,6 +2,17 @@ export declare const getDefaultTableConfig: () => {
     bodyFontSize: number;
     bodyBackgroundColor: string;
     headerFontSize: number;
+    barHeight: string;
+    barMarkInBar: boolean;
+    barMarkWidth: number;
+    barPadding: (string | number)[];
+    barRightToLeft: boolean;
+    barPositiveColor: string;
+    barNegativeColor: string;
+    backgroundColorScale: {
+        minColor: string;
+        maxColor: string;
+    };
 };
 export declare const getLightTableConfig: () => {
     borderColor: string;
@@ -15,9 +26,21 @@ export declare const getLightTableConfig: () => {
     selectedBorderColor: string;
     selectedBackgroundColor: string;
     backgroundColor: string;
+    barAxisColor: string;
     bodyFontSize: number;
     bodyBackgroundColor: string;
     headerFontSize: number;
+    barHeight: string;
+    barMarkInBar: boolean;
+    barMarkWidth: number;
+    barPadding: (string | number)[];
+    barRightToLeft: boolean;
+    barPositiveColor: string;
+    barNegativeColor: string;
+    backgroundColorScale: {
+        minColor: string;
+        maxColor: string;
+    };
 };
 export declare const getDarkTableConfig: () => {
     borderColor: string;
@@ -30,9 +53,21 @@ export declare const getDarkTableConfig: () => {
     hoverHeaderInlineBackgroundColor: string;
     selectedBorderColor: string;
     selectedBackgroundColor: string;
+    barAxisColor: string;
     bodyFontSize: number;
     bodyBackgroundColor: string;
     headerFontSize: number;
+    barHeight: string;
+    barMarkInBar: boolean;
+    barMarkWidth: number;
+    barPadding: (string | number)[];
+    barRightToLeft: boolean;
+    barPositiveColor: string;
+    barNegativeColor: string;
+    backgroundColorScale: {
+        minColor: string;
+        maxColor: string;
+    };
 };
 export declare const getLightPivotChartGridConfig: () => {
     borderColor?: string | null | undefined;

package/dist/esm/theme/common/table.js

@@ -1,7 +1,21 @@
 const getDefaultTableConfig = ()=>({
         bodyFontSize: 12,
         bodyBackgroundColor: 'transparent',
-        headerFontSize: 12
+        headerFontSize: 12,
+        barHeight: '100%',
+        barMarkInBar: false,
+        barMarkWidth: 2,
+        barPadding: [
+            '25%',
+            10
+        ],
+        barRightToLeft: false,
+        barPositiveColor: 'rgba(188,220,194, 0.5)',
+        barNegativeColor: 'rgba(241,188,191, 0.5)',
+        backgroundColorScale: {
+            minColor: '#D8CFFF',
+            maxColor: '#6B4FD7'
+        }
     });
 const getLightTableConfig = ()=>({
         ...getDefaultTableConfig(),
@@ -15,7 +29,8 @@ const getLightTableConfig = ()=>({
         hoverHeaderInlineBackgroundColor: '#D9DDE455',
         selectedBorderColor: '#4080ff',
         selectedBackgroundColor: '#bedaff33',
-        backgroundColor: 'transparent'
+        backgroundColor: 'transparent',
+        barAxisColor: '#9EAFC6'
     });
 const getDarkTableConfig = ()=>({
         ...getDefaultTableConfig(),
@@ -28,7 +43,8 @@ const getDarkTableConfig = ()=>({
         hoverHeaderBackgroundColor: '#6f7984cc',
         hoverHeaderInlineBackgroundColor: '#4b4f54',
         selectedBorderColor: '#3073f2',
-        selectedBackgroundColor: '#4284ff33'
+        selectedBackgroundColor: '#4284ff33',
+        barAxisColor: '#9EAFC6'
     });
 const pickPivotChartGridConfig = (tableConfig)=>({
         outlineBorderLineWidth: 0,

package/dist/esm/theme/common/table.js.map

@@ -1 +1 @@
-{"version":3,"file":"theme/common/table.js","sources":["webpack://@visactor/vseed/./src/theme/common/table.ts"],"sourcesContent":["import type { PivotChartGridConfig } from 'src/types'\n\nexport const getDefaultTableConfig = () => ({\n  bodyFontSize: 12,\n  bodyBackgroundColor: 'transparent',\n  headerFontSize: 12,\n})\n\nexport const getLightTableConfig = () => ({\n  ...getDefaultTableConfig(),\n  borderColor: '#e3e5eb',\n\n  bodyFontColor: '#141414',\n\n  headerFontColor: '#21252c',\n  headerBackgroundColor: '#f6f7f9',\n\n  hoverBodyBackgroundColor: '#bedaff',\n  hoverBodyInlineBackgroundColor: '#bedaff33',\n  hoverHeaderBackgroundColor: '#D9DDE4',\n  hoverHeaderInlineBackgroundColor: '#D9DDE455',\n\n  selectedBorderColor: '#4080ff',\n  selectedBackgroundColor: '#bedaff33',\n\n  backgroundColor: 'transparent',\n})\n\nexport const getDarkTableConfig = () => ({\n  ...getDefaultTableConfig(),\n  borderColor: '#4b4e53',\n\n  bodyFontColor: '#fdfdfd',\n  headerFontColor: '#fdfdfd',\n  headerBackgroundColor: '#36393e',\n\n  hoverBodyBackgroundColor: '#4284ff66',\n  hoverBodyInlineBackgroundColor: '#4284ff10',\n  hoverHeaderBackgroundColor: '#6f7984cc',\n  hoverHeaderInlineBackgroundColor: '#4b4f54',\n\n  selectedBorderColor: '#3073f2',\n  selectedBackgroundColor: '#4284ff33',\n})\n\nconst pickPivotChartGridConfig = (tableConfig: any) => {\n  return {\n    outlineBorderLineWidth: 0,\n    frameCornerRadius: 0,\n    borderColor: tableConfig.borderColor,\n    bodyFontColor: tableConfig.bodyFontColor,\n    headerFontColor: tableConfig.headerFontColor,\n\n    headerBackgroundColor: 'transparent',\n    hoverHeaderBackgroundColor: tableConfig.hoverHeaderBackgroundColor,\n    hoverHeaderInlineBackgroundColor: tableConfig.hoverHeaderInlineBackgroundColor,\n\n    titleFontColor: tableConfig.headerFontColor,\n    titleFontSize: tableConfig.headerFontSize,\n    titleFontWeight: 'bold',\n  }\n}\n\nexport const getLightPivotChartGridConfig = () => {\n  const res = pickPivotChartGridConfig(getLightTableConfig()) as PivotChartGridConfig\n\n  res.hoverHeaderInlineBackgroundColor = '#D9DDE446'\n\n  res.chartGridColor = '#F0F1F6'\n  res.axisLabelColor = '#BCC1CB'\n\n  return res\n}\n\nexport const getDarkPivotChartGridConfig = () => {\n  const res = pickPivotChartGridConfig(getDarkTableConfig()) as PivotChartGridConfig\n\n  res.hoverHeaderInlineBackgroundColor = '#4b4f5446'\n\n  return res\n}\n"],"names":["getDefaultTableConfig","getLightTableConfig","getDarkTableConfig","pickPivotChartGridConfig","tableConfig","getLightPivotChartGridConfig","res","getDarkPivotChartGridConfig"],"mappings":"AAEO,MAAMA,wBAAwB,IAAO;QAC1C,cAAc;QACd,qBAAqB;QACrB,gBAAgB;IAClB;AAEO,MAAMC,sBAAsB,IAAO;QACxC,GAAGD,uBAAuB;QAC1B,aAAa;QAEb,eAAe;QAEf,iBAAiB;QACjB,uBAAuB;QAEvB,0BAA0B;QAC1B,gCAAgC;QAChC,4BAA4B;QAC5B,kCAAkC;QAElC,qBAAqB;QACrB,yBAAyB;QAEzB,iBAAiB;IACnB;AAEO,MAAME,qBAAqB,IAAO;QACvC,GAAGF,uBAAuB;QAC1B,aAAa;QAEb,eAAe;QACf,iBAAiB;QACjB,uBAAuB;QAEvB,0BAA0B;QAC1B,gCAAgC;QAChC,4BAA4B;QAC5B,kCAAkC;QAElC,qBAAqB;QACrB,yBAAyB;IAC3B;AAEA,MAAMG,2BAA2B,CAACC,cACzB;QACL,wBAAwB;QACxB,mBAAmB;QACnB,aAAaA,YAAY,WAAW;QACpC,eAAeA,YAAY,aAAa;QACxC,iBAAiBA,YAAY,eAAe;QAE5C,uBAAuB;QACvB,4BAA4BA,YAAY,0BAA0B;QAClE,kCAAkCA,YAAY,gCAAgC;QAE9E,gBAAgBA,YAAY,eAAe;QAC3C,eAAeA,YAAY,cAAc;QACzC,iBAAiB;IACnB;AAGK,MAAMC,+BAA+B;IAC1C,MAAMC,MAAMH,yBAAyBF;IAErCK,IAAI,gCAAgC,GAAG;IAEvCA,IAAI,cAAc,GAAG;IACrBA,IAAI,cAAc,GAAG;IAErB,OAAOA;AACT;AAEO,MAAMC,8BAA8B;IACzC,MAAMD,MAAMH,yBAAyBD;IAErCI,IAAI,gCAAgC,GAAG;IAEvC,OAAOA;AACT"}
+{"version":3,"file":"theme/common/table.js","sources":["webpack://@visactor/vseed/./src/theme/common/table.ts"],"sourcesContent":["import type { PivotChartGridConfig } from 'src/types'\n\nexport const getDefaultTableConfig = () => ({\n  bodyFontSize: 12,\n  bodyBackgroundColor: 'transparent',\n  headerFontSize: 12,\n  barHeight: '100%',\n  barMarkInBar: false,\n  barMarkWidth: 2,\n  barPadding: ['25%', 10],\n  barRightToLeft: false,\n  barPositiveColor: 'rgba(188,220,194, 0.5)',\n  barNegativeColor: 'rgba(241,188,191, 0.5)',\n  backgroundColorScale: {\n    minColor: '#D8CFFF',\n    maxColor: '#6B4FD7',\n  },\n})\n\nexport const getLightTableConfig = () => ({\n  ...getDefaultTableConfig(),\n  borderColor: '#e3e5eb',\n\n  bodyFontColor: '#141414',\n\n  headerFontColor: '#21252c',\n  headerBackgroundColor: '#f6f7f9',\n\n  hoverBodyBackgroundColor: '#bedaff',\n  hoverBodyInlineBackgroundColor: '#bedaff33',\n  hoverHeaderBackgroundColor: '#D9DDE4',\n  hoverHeaderInlineBackgroundColor: '#D9DDE455',\n\n  selectedBorderColor: '#4080ff',\n  selectedBackgroundColor: '#bedaff33',\n\n  backgroundColor: 'transparent',\n\n  barAxisColor: '#9EAFC6',\n})\n\nexport const getDarkTableConfig = () => ({\n  ...getDefaultTableConfig(),\n  borderColor: '#4b4e53',\n\n  bodyFontColor: '#fdfdfd',\n  headerFontColor: '#fdfdfd',\n  headerBackgroundColor: '#36393e',\n\n  hoverBodyBackgroundColor: '#4284ff66',\n  hoverBodyInlineBackgroundColor: '#4284ff10',\n  hoverHeaderBackgroundColor: '#6f7984cc',\n  hoverHeaderInlineBackgroundColor: '#4b4f54',\n\n  selectedBorderColor: '#3073f2',\n  selectedBackgroundColor: '#4284ff33',\n  barAxisColor: '#9EAFC6',\n})\n\nconst pickPivotChartGridConfig = (tableConfig: any) => {\n  return {\n    outlineBorderLineWidth: 0,\n    frameCornerRadius: 0,\n    borderColor: tableConfig.borderColor,\n    bodyFontColor: tableConfig.bodyFontColor,\n    headerFontColor: tableConfig.headerFontColor,\n\n    headerBackgroundColor: 'transparent',\n    hoverHeaderBackgroundColor: tableConfig.hoverHeaderBackgroundColor,\n    hoverHeaderInlineBackgroundColor: tableConfig.hoverHeaderInlineBackgroundColor,\n\n    titleFontColor: tableConfig.headerFontColor,\n    titleFontSize: tableConfig.headerFontSize,\n    titleFontWeight: 'bold',\n  }\n}\n\nexport const getLightPivotChartGridConfig = () => {\n  const res = pickPivotChartGridConfig(getLightTableConfig()) as PivotChartGridConfig\n\n  res.hoverHeaderInlineBackgroundColor = '#D9DDE446'\n\n  res.chartGridColor = '#F0F1F6'\n  res.axisLabelColor = '#BCC1CB'\n\n  return res\n}\n\nexport const getDarkPivotChartGridConfig = () => {\n  const res = pickPivotChartGridConfig(getDarkTableConfig()) as PivotChartGridConfig\n\n  res.hoverHeaderInlineBackgroundColor = '#4b4f5446'\n\n  return res\n}\n"],"names":["getDefaultTableConfig","getLightTableConfig","getDarkTableConfig","pickPivotChartGridConfig","tableConfig","getLightPivotChartGridConfig","res","getDarkPivotChartGridConfig"],"mappings":"AAEO,MAAMA,wBAAwB,IAAO;QAC1C,cAAc;QACd,qBAAqB;QACrB,gBAAgB;QAChB,WAAW;QACX,cAAc;QACd,cAAc;QACd,YAAY;YAAC;YAAO;SAAG;QACvB,gBAAgB;QAChB,kBAAkB;QAClB,kBAAkB;QAClB,sBAAsB;YACpB,UAAU;YACV,UAAU;QACZ;IACF;AAEO,MAAMC,sBAAsB,IAAO;QACxC,GAAGD,uBAAuB;QAC1B,aAAa;QAEb,eAAe;QAEf,iBAAiB;QACjB,uBAAuB;QAEvB,0BAA0B;QAC1B,gCAAgC;QAChC,4BAA4B;QAC5B,kCAAkC;QAElC,qBAAqB;QACrB,yBAAyB;QAEzB,iBAAiB;QAEjB,cAAc;IAChB;AAEO,MAAME,qBAAqB,IAAO;QACvC,GAAGF,uBAAuB;QAC1B,aAAa;QAEb,eAAe;QACf,iBAAiB;QACjB,uBAAuB;QAEvB,0BAA0B;QAC1B,gCAAgC;QAChC,4BAA4B;QAC5B,kCAAkC;QAElC,qBAAqB;QACrB,yBAAyB;QACzB,cAAc;IAChB;AAEA,MAAMG,2BAA2B,CAACC,cACzB;QACL,wBAAwB;QACxB,mBAAmB;QACnB,aAAaA,YAAY,WAAW;QACpC,eAAeA,YAAY,aAAa;QACxC,iBAAiBA,YAAY,eAAe;QAE5C,uBAAuB;QACvB,4BAA4BA,YAAY,0BAA0B;QAClE,kCAAkCA,YAAY,gCAAgC;QAE9E,gBAAgBA,YAAY,eAAe;QAC3C,eAAeA,YAAY,cAAc;QACzC,iBAAiB;IACnB;AAGK,MAAMC,+BAA+B;IAC1C,MAAMC,MAAMH,yBAAyBF;IAErCK,IAAI,gCAAgC,GAAG;IAEvCA,IAAI,cAAc,GAAG;IACrBA,IAAI,cAAc,GAAG;IAErB,OAAOA;AACT;AAEO,MAAMC,8BAA8B;IACzC,MAAMD,MAAMH,yBAAyBD;IAErCI,IAAI,gCAAgC,GAAG;IAEvC,OAAOA;AACT"}