@visactor/vseed 0.2.8 → 0.3.0

package/dist/esm/pipeline/spec/chart/pipes/color/linearColorForDualAxis.js

@@ -4,7 +4,7 @@ const linearColorForDualAxis = (spec, context)=>{
     };
     const { advancedVSeed } = context;
     const { datasetReshapeInfo, chartType } = advancedVSeed;
-    const { unfoldInfo, id } = datasetReshapeInfo[0];
+    const { unfoldInfo } = datasetReshapeInfo[0];
     const baseConfig = advancedVSeed.config[chartType];
     if (!baseConfig || !baseConfig.color) return result;
     const { color } = baseConfig;
@@ -12,20 +12,12 @@ const linearColorForDualAxis = (spec, context)=>{
     result.color = {
         type: 'linear',
         range: linearColorScheme || colorScheme || [],
-        domain: [
-            {
-                dataId: `${id}-primary-dataset`,
+        domain: spec.series.map((s)=>({
+                dataId: s.data.id,
                 fields: [
                     unfoldInfo.encodingColor
                 ]
-            },
-            {
-                dataId: `${id}-secondary-dataset`,
-                fields: [
-                    unfoldInfo.encodingColor
-                ]
-            }
-        ]
+            }))
     };
     return result;
 };

package/dist/esm/pipeline/spec/chart/pipes/color/linearColorForDualAxis.js.map

@@ -1 +1 @@
-{"version":3,"file":"pipeline/spec/chart/pipes/color/linearColorForDualAxis.js","sources":["webpack://@visactor/vseed/./src/pipeline/spec/chart/pipes/color/linearColorForDualAxis.ts"],"sourcesContent":["import type { IBarChartSpec } from '@visactor/vchart'\nimport type { Color, VChartSpecPipe } from 'src/types'\n\nexport const linearColorForDualAxis: VChartSpecPipe = (spec, context) => {\n  const result = { ...spec } as IBarChartSpec\n  const { advancedVSeed } = context\n  const { datasetReshapeInfo, chartType } = advancedVSeed\n  const { unfoldInfo, id } = datasetReshapeInfo[0]\n  const baseConfig = advancedVSeed.config[chartType] as { color: Color }\n\n  if (!baseConfig || !baseConfig.color) {\n    return result\n  }\n\n  const { color } = baseConfig\n  const { colorScheme, linearColorScheme } = color\n\n  result.color = {\n    type: 'linear',\n    range: linearColorScheme || colorScheme || [],\n    domain: [\n      {\n        dataId: `${id}-primary-dataset`,\n        fields: [unfoldInfo.encodingColor],\n      },\n      {\n        dataId: `${id}-secondary-dataset`,\n        fields: [unfoldInfo.encodingColor],\n      },\n    ],\n  }\n\n  return result\n}\n"],"names":["linearColorForDualAxis","spec","context","result","advancedVSeed","datasetReshapeInfo","chartType","unfoldInfo","id","baseConfig","color","colorScheme","linearColorScheme"],"mappings":"AAGO,MAAMA,yBAAyC,CAACC,MAAMC;IAC3D,MAAMC,SAAS;QAAE,GAAGF,IAAI;IAAC;IACzB,MAAM,EAAEG,aAAa,EAAE,GAAGF;IAC1B,MAAM,EAAEG,kBAAkB,EAAEC,SAAS,EAAE,GAAGF;IAC1C,MAAM,EAAEG,UAAU,EAAEC,EAAE,EAAE,GAAGH,kBAAkB,CAAC,EAAE;IAChD,MAAMI,aAAaL,cAAc,MAAM,CAACE,UAAU;IAElD,IAAI,CAACG,cAAc,CAACA,WAAW,KAAK,EAClC,OAAON;IAGT,MAAM,EAAEO,KAAK,EAAE,GAAGD;IAClB,MAAM,EAAEE,WAAW,EAAEC,iBAAiB,EAAE,GAAGF;IAE3CP,OAAO,KAAK,GAAG;QACb,MAAM;QACN,OAAOS,qBAAqBD,eAAe,EAAE;QAC7C,QAAQ;YACN;gBACE,QAAQ,GAAGH,GAAG,gBAAgB,CAAC;gBAC/B,QAAQ;oBAACD,WAAW,aAAa;iBAAC;YACpC;YACA;gBACE,QAAQ,GAAGC,GAAG,kBAAkB,CAAC;gBACjC,QAAQ;oBAACD,WAAW,aAAa;iBAAC;YACpC;SACD;IACH;IAEA,OAAOJ;AACT"}
+{"version":3,"file":"pipeline/spec/chart/pipes/color/linearColorForDualAxis.js","sources":["webpack://@visactor/vseed/./src/pipeline/spec/chart/pipes/color/linearColorForDualAxis.ts"],"sourcesContent":["import type { IBarChartSpec } from '@visactor/vchart'\nimport type { Color, VChartSpecPipe } from 'src/types'\n\nexport const linearColorForDualAxis: VChartSpecPipe = (spec, context) => {\n  const result = { ...spec } as IBarChartSpec\n  const { advancedVSeed } = context\n  const { datasetReshapeInfo, chartType } = advancedVSeed\n  const { unfoldInfo } = datasetReshapeInfo[0]\n  const baseConfig = advancedVSeed.config[chartType] as { color: Color }\n\n  if (!baseConfig || !baseConfig.color) {\n    return result\n  }\n\n  const { color } = baseConfig\n  const { colorScheme, linearColorScheme } = color\n\n  result.color = {\n    type: 'linear',\n    range: linearColorScheme || colorScheme || [],\n    domain: spec.series!.map((s) => {\n      return {\n        dataId: (s as any).data.id,\n        fields: [unfoldInfo.encodingColor],\n      }\n    }),\n  }\n\n  return result\n}\n"],"names":["linearColorForDualAxis","spec","context","result","advancedVSeed","datasetReshapeInfo","chartType","unfoldInfo","baseConfig","color","colorScheme","linearColorScheme","s"],"mappings":"AAGO,MAAMA,yBAAyC,CAACC,MAAMC;IAC3D,MAAMC,SAAS;QAAE,GAAGF,IAAI;IAAC;IACzB,MAAM,EAAEG,aAAa,EAAE,GAAGF;IAC1B,MAAM,EAAEG,kBAAkB,EAAEC,SAAS,EAAE,GAAGF;IAC1C,MAAM,EAAEG,UAAU,EAAE,GAAGF,kBAAkB,CAAC,EAAE;IAC5C,MAAMG,aAAaJ,cAAc,MAAM,CAACE,UAAU;IAElD,IAAI,CAACE,cAAc,CAACA,WAAW,KAAK,EAClC,OAAOL;IAGT,MAAM,EAAEM,KAAK,EAAE,GAAGD;IAClB,MAAM,EAAEE,WAAW,EAAEC,iBAAiB,EAAE,GAAGF;IAE3CN,OAAO,KAAK,GAAG;QACb,MAAM;QACN,OAAOQ,qBAAqBD,eAAe,EAAE;QAC7C,QAAQT,KAAK,MAAM,CAAE,GAAG,CAAC,CAACW,IACjB;gBACL,QAASA,EAAU,IAAI,CAAC,EAAE;gBAC1B,QAAQ;oBAACL,WAAW,aAAa;iBAAC;YACpC;IAEJ;IAEA,OAAOJ;AACT"}

package/dist/esm/pipeline/spec/chart/pipes/dataset/datasetDualAxis.d.ts

@@ -1,3 +1,2 @@
-import type { VChartSpecPipe } from '../../../../../types';
-export declare const datasetPrimary: VChartSpecPipe;
-export declare const datasetSecondary: VChartSpecPipe;
+import type { DualAxisOptions, VChartSpecPipe } from '../../../../../types';
+export declare const datasetDualAxis: (options: DualAxisOptions) => VChartSpecPipe;

package/dist/esm/pipeline/spec/chart/pipes/dataset/datasetDualAxis.js

@@ -1,84 +1,44 @@
 import { isPivotChart } from "../../../../utils/index.js";
-const datasetPrimary = (spec, context)=>{
-    const { advancedVSeed, vseed } = context;
-    const { analysis, datasetReshapeInfo } = advancedVSeed;
-    const orderMapping = analysis?.orderMapping || {};
-    const { unfoldInfo } = datasetReshapeInfo[0];
-    const x = unfoldInfo.encodingX;
-    const colorId = unfoldInfo.encodingColorId;
-    const id = datasetReshapeInfo[0].id;
-    const fields = {};
-    if (x) {
-        const order = orderMapping[x];
-        if (order) fields[x] = {
-            sortIndex: 0,
-            domain: order,
-            lockStatisticsByDomain: true
-        };
-        else fields[x] = {
-            sortIndex: 0
-        };
-    }
-    if (colorId) {
-        const order = orderMapping[colorId];
-        if (order) fields[colorId] = {
-            sortIndex: 0,
-            domain: order,
-            lockStatisticsByDomain: true
-        };
-        else fields[colorId] = {
-            sortIndex: 0
-        };
-    }
-    return {
-        ...spec,
-        data: {
-            id: `${id}-primary-dataset`,
-            values: isPivotChart(vseed) ? void 0 : advancedVSeed.dataset,
-            fields: fields
+const datasetDualAxis = (options)=>(spec, context)=>{
+        const { advancedVSeed, vseed } = context;
+        const { analysis, datasetReshapeInfo } = advancedVSeed;
+        const orderMapping = analysis?.orderMapping || {};
+        const { unfoldInfo } = datasetReshapeInfo[0];
+        const x = unfoldInfo.encodingX;
+        const colorId = unfoldInfo.encodingColorId;
+        const id = datasetReshapeInfo[0].id;
+        const fields = {};
+        if (x) {
+            const order = orderMapping[x];
+            if (order) fields[x] = {
+                sortIndex: 0,
+                domain: order,
+                lockStatisticsByDomain: true
+            };
+            else fields[x] = {
+                sortIndex: 0
+            };
         }
-    };
-};
-const datasetSecondary = (spec, context)=>{
-    const { advancedVSeed, vseed } = context;
-    const { analysis, datasetReshapeInfo } = advancedVSeed;
-    const orderMapping = analysis?.orderMapping || {};
-    const { unfoldInfo } = datasetReshapeInfo[0];
-    const x = unfoldInfo.encodingX;
-    const colorId = unfoldInfo.encodingColorId;
-    const id = datasetReshapeInfo[0].id;
-    const fields = {};
-    if (x) {
-        const order = orderMapping[x];
-        if (order) fields[x] = {
-            sortIndex: 0,
-            domain: order,
-            lockStatisticsByDomain: true
-        };
-        else fields[x] = {
-            sortIndex: 0
-        };
-    }
-    if (colorId) {
-        const order = orderMapping[colorId];
-        if (order) fields[colorId] = {
-            sortIndex: 0,
-            domain: order,
-            lockStatisticsByDomain: true
-        };
-        else fields[colorId] = {
-            sortIndex: 0
-        };
-    }
-    return {
-        ...spec,
-        data: {
-            id: `${id}-secondary-dataset`,
-            values: isPivotChart(vseed) ? void 0 : advancedVSeed.dataset,
-            fields: fields
+        if (colorId) {
+            const order = orderMapping[colorId];
+            if (order) fields[colorId] = {
+                sortIndex: 0,
+                domain: order,
+                lockStatisticsByDomain: true
+            };
+            else fields[colorId] = {
+                sortIndex: 0
+            };
         }
+        return {
+            ...spec,
+            data: {
+                id: `${id}-${options.axisType}-${options.chartType}`,
+                values: isPivotChart(vseed) ? void 0 : advancedVSeed.dataset,
+                fields: fields
+            }
+        };
     };
-};
-export { datasetPrimary, datasetSecondary };
+export { datasetDualAxis };
 
 //# sourceMappingURL=datasetDualAxis.js.map

package/dist/esm/pipeline/spec/chart/pipes/dataset/datasetDualAxis.js.map

@@ -1 +1 @@
-{"version":3,"file":"pipeline/spec/chart/pipes/dataset/datasetDualAxis.js","sources":["webpack://@visactor/vseed/./src/pipeline/spec/chart/pipes/dataset/datasetDualAxis.ts"],"sourcesContent":["import type { ISpec } from '@visactor/vchart'\nimport { isPivotChart } from 'src/pipeline/utils'\nimport type { VChartSpecPipe } from 'src/types'\n\nexport const datasetPrimary: VChartSpecPipe = (spec, context) => {\n  const { advancedVSeed, vseed } = context\n  const { analysis, datasetReshapeInfo } = advancedVSeed\n  const orderMapping = analysis?.orderMapping || {}\n\n  const { unfoldInfo } = datasetReshapeInfo[0]\n  const x = unfoldInfo.encodingX\n  const colorId = unfoldInfo.encodingColorId\n  const id = datasetReshapeInfo[0].id\n\n  const fields: Record<string, object> = {}\n\n  if (x) {\n    const order = orderMapping[x]\n    if (order) {\n      fields[x] = {\n        sortIndex: 0,\n        domain: order,\n        lockStatisticsByDomain: true,\n      }\n    } else {\n      fields[x] = {\n        sortIndex: 0,\n      }\n    }\n  }\n\n  if (colorId) {\n    const order = orderMapping[colorId]\n    if (order) {\n      fields[colorId] = {\n        sortIndex: 0,\n        domain: order,\n        lockStatisticsByDomain: true,\n      }\n    } else {\n      fields[colorId] = {\n        sortIndex: 0,\n      }\n    }\n  }\n\n  return {\n    ...spec,\n    data: {\n      id: `${id}-primary-dataset`,\n      // 透视表不使用 dataValues\n      values: isPivotChart(vseed) ? undefined : advancedVSeed.dataset,\n      fields: fields,\n    },\n  } as ISpec\n}\n\nexport const datasetSecondary: VChartSpecPipe = (spec, context) => {\n  const { advancedVSeed, vseed } = context\n  const { analysis, datasetReshapeInfo } = advancedVSeed\n  const orderMapping = analysis?.orderMapping || {}\n\n  const { unfoldInfo } = datasetReshapeInfo[0]\n  const x = unfoldInfo.encodingX\n  const colorId = unfoldInfo.encodingColorId\n  const id = datasetReshapeInfo[0].id\n\n  const fields: Record<string, object> = {}\n\n  if (x) {\n    const order = orderMapping[x]\n    if (order) {\n      fields[x] = {\n        sortIndex: 0,\n        domain: order,\n        lockStatisticsByDomain: true,\n      }\n    } else {\n      fields[x] = {\n        sortIndex: 0,\n      }\n    }\n  }\n\n  if (colorId) {\n    const order = orderMapping[colorId]\n    if (order) {\n      fields[colorId] = {\n        sortIndex: 0,\n        domain: order,\n        lockStatisticsByDomain: true,\n      }\n    } else {\n      fields[colorId] = {\n        sortIndex: 0,\n      }\n    }\n  }\n\n  return {\n    ...spec,\n    data: {\n      id: `${id}-secondary-dataset`,\n      // 透视表不使用 dataValues\n      values: isPivotChart(vseed) ? undefined : advancedVSeed.dataset,\n      fields: fields,\n    },\n  } as ISpec\n}\n"],"names":["datasetPrimary","spec","context","advancedVSeed","vseed","analysis","datasetReshapeInfo","orderMapping","unfoldInfo","x","colorId","id","fields","order","isPivotChart","undefined","datasetSecondary"],"mappings":";AAIO,MAAMA,iBAAiC,CAACC,MAAMC;IACnD,MAAM,EAAEC,aAAa,EAAEC,KAAK,EAAE,GAAGF;IACjC,MAAM,EAAEG,QAAQ,EAAEC,kBAAkB,EAAE,GAAGH;IACzC,MAAMI,eAAeF,UAAU,gBAAgB,CAAC;IAEhD,MAAM,EAAEG,UAAU,EAAE,GAAGF,kBAAkB,CAAC,EAAE;IAC5C,MAAMG,IAAID,WAAW,SAAS;IAC9B,MAAME,UAAUF,WAAW,eAAe;IAC1C,MAAMG,KAAKL,kBAAkB,CAAC,EAAE,CAAC,EAAE;IAEnC,MAAMM,SAAiC,CAAC;IAExC,IAAIH,GAAG;QACL,MAAMI,QAAQN,YAAY,CAACE,EAAE;QAC7B,IAAII,OACFD,MAAM,CAACH,EAAE,GAAG;YACV,WAAW;YACX,QAAQI;YACR,wBAAwB;QAC1B;aAEAD,MAAM,CAACH,EAAE,GAAG;YACV,WAAW;QACb;IAEJ;IAEA,IAAIC,SAAS;QACX,MAAMG,QAAQN,YAAY,CAACG,QAAQ;QACnC,IAAIG,OACFD,MAAM,CAACF,QAAQ,GAAG;YAChB,WAAW;YACX,QAAQG;YACR,wBAAwB;QAC1B;aAEAD,MAAM,CAACF,QAAQ,GAAG;YAChB,WAAW;QACb;IAEJ;IAEA,OAAO;QACL,GAAGT,IAAI;QACP,MAAM;YACJ,IAAI,GAAGU,GAAG,gBAAgB,CAAC;YAE3B,QAAQG,aAAaV,SAASW,SAAYZ,cAAc,OAAO;YAC/D,QAAQS;QACV;IACF;AACF;AAEO,MAAMI,mBAAmC,CAACf,MAAMC;IACrD,MAAM,EAAEC,aAAa,EAAEC,KAAK,EAAE,GAAGF;IACjC,MAAM,EAAEG,QAAQ,EAAEC,kBAAkB,EAAE,GAAGH;IACzC,MAAMI,eAAeF,UAAU,gBAAgB,CAAC;IAEhD,MAAM,EAAEG,UAAU,EAAE,GAAGF,kBAAkB,CAAC,EAAE;IAC5C,MAAMG,IAAID,WAAW,SAAS;IAC9B,MAAME,UAAUF,WAAW,eAAe;IAC1C,MAAMG,KAAKL,kBAAkB,CAAC,EAAE,CAAC,EAAE;IAEnC,MAAMM,SAAiC,CAAC;IAExC,IAAIH,GAAG;QACL,MAAMI,QAAQN,YAAY,CAACE,EAAE;QAC7B,IAAII,OACFD,MAAM,CAACH,EAAE,GAAG;YACV,WAAW;YACX,QAAQI;YACR,wBAAwB;QAC1B;aAEAD,MAAM,CAACH,EAAE,GAAG;YACV,WAAW;QACb;IAEJ;IAEA,IAAIC,SAAS;QACX,MAAMG,QAAQN,YAAY,CAACG,QAAQ;QACnC,IAAIG,OACFD,MAAM,CAACF,QAAQ,GAAG;YAChB,WAAW;YACX,QAAQG;YACR,wBAAwB;QAC1B;aAEAD,MAAM,CAACF,QAAQ,GAAG;YAChB,WAAW;QACb;IAEJ;IAEA,OAAO;QACL,GAAGT,IAAI;QACP,MAAM;YACJ,IAAI,GAAGU,GAAG,kBAAkB,CAAC;YAE7B,QAAQG,aAAaV,SAASW,SAAYZ,cAAc,OAAO;YAC/D,QAAQS;QACV;IACF;AACF"}
+{"version":3,"file":"pipeline/spec/chart/pipes/dataset/datasetDualAxis.js","sources":["webpack://@visactor/vseed/./src/pipeline/spec/chart/pipes/dataset/datasetDualAxis.ts"],"sourcesContent":["import type { ISpec } from '@visactor/vchart'\nimport { isPivotChart } from 'src/pipeline/utils'\nimport type { DualAxisOptions, VChartSpecPipe } from 'src/types'\n\nexport const datasetDualAxis = (options: DualAxisOptions): VChartSpecPipe => {\n  return (spec, context) => {\n    const { advancedVSeed, vseed } = context\n    const { analysis, datasetReshapeInfo } = advancedVSeed\n    const orderMapping = analysis?.orderMapping || {}\n\n    const { unfoldInfo } = datasetReshapeInfo[0]\n    const x = unfoldInfo.encodingX\n    const colorId = unfoldInfo.encodingColorId\n    const id = datasetReshapeInfo[0].id\n    const fields: Record<string, object> = {}\n\n    if (x) {\n      const order = orderMapping[x]\n      if (order) {\n        fields[x] = {\n          sortIndex: 0,\n          domain: order,\n          lockStatisticsByDomain: true,\n        }\n      } else {\n        fields[x] = {\n          sortIndex: 0,\n        }\n      }\n    }\n    if (colorId) {\n      const order = orderMapping[colorId]\n      if (order) {\n        fields[colorId] = {\n          sortIndex: 0,\n          domain: order,\n          lockStatisticsByDomain: true,\n        }\n      } else {\n        fields[colorId] = {\n          sortIndex: 0,\n        }\n      }\n    }\n\n    return {\n      ...spec,\n      data: {\n        id: `${id}-${options.axisType}-${options.chartType}`,\n        // 透视表不使用 dataValues\n        values: isPivotChart(vseed) ? undefined : advancedVSeed.dataset,\n        fields: fields,\n      },\n    } as ISpec\n  }\n}\n"],"names":["datasetDualAxis","options","spec","context","advancedVSeed","vseed","analysis","datasetReshapeInfo","orderMapping","unfoldInfo","x","colorId","id","fields","order","isPivotChart","undefined"],"mappings":";AAIO,MAAMA,kBAAkB,CAACC,UACvB,CAACC,MAAMC;QACZ,MAAM,EAAEC,aAAa,EAAEC,KAAK,EAAE,GAAGF;QACjC,MAAM,EAAEG,QAAQ,EAAEC,kBAAkB,EAAE,GAAGH;QACzC,MAAMI,eAAeF,UAAU,gBAAgB,CAAC;QAEhD,MAAM,EAAEG,UAAU,EAAE,GAAGF,kBAAkB,CAAC,EAAE;QAC5C,MAAMG,IAAID,WAAW,SAAS;QAC9B,MAAME,UAAUF,WAAW,eAAe;QAC1C,MAAMG,KAAKL,kBAAkB,CAAC,EAAE,CAAC,EAAE;QACnC,MAAMM,SAAiC,CAAC;QAExC,IAAIH,GAAG;YACL,MAAMI,QAAQN,YAAY,CAACE,EAAE;YAC7B,IAAII,OACFD,MAAM,CAACH,EAAE,GAAG;gBACV,WAAW;gBACX,QAAQI;gBACR,wBAAwB;YAC1B;iBAEAD,MAAM,CAACH,EAAE,GAAG;gBACV,WAAW;YACb;QAEJ;QACA,IAAIC,SAAS;YACX,MAAMG,QAAQN,YAAY,CAACG,QAAQ;YACnC,IAAIG,OACFD,MAAM,CAACF,QAAQ,GAAG;gBAChB,WAAW;gBACX,QAAQG;gBACR,wBAAwB;YAC1B;iBAEAD,MAAM,CAACF,QAAQ,GAAG;gBAChB,WAAW;YACb;QAEJ;QAEA,OAAO;YACL,GAAGT,IAAI;YACP,MAAM;gBACJ,IAAI,GAAGU,GAAG,CAAC,EAAEX,QAAQ,QAAQ,CAAC,CAAC,EAAEA,QAAQ,SAAS,EAAE;gBAEpD,QAAQc,aAAaV,SAASW,SAAYZ,cAAc,OAAO;gBAC/D,QAAQS;YACV;QACF;IACF"}

package/dist/esm/pipeline/spec/chart/pipes/dataset/index.d.ts

@@ -2,7 +2,7 @@ export { datasetYX } from './datasetYX';
 export { datasetXY } from './datasetXY';
 export { datasetPivot } from './datasetPivot';
 export { progressive } from './progressive';
-export { datasetPrimary, datasetSecondary } from './datasetDualAxis';
+export { datasetDualAxis } from './datasetDualAxis';
 export { datasetScatter } from './datasetScatter';
 export { datasetHistogram } from './datasetHistogram';
 export { datasetBoxplot } from './datasetBoxplot';

package/dist/esm/pipeline/spec/chart/pipes/dataset/index.js

@@ -2,8 +2,8 @@ import { datasetYX } from "./datasetYX.js";
 import { datasetXY } from "./datasetXY.js";
 import { datasetPivot } from "./datasetPivot.js";
 import { progressive } from "./progressive.js";
-import { datasetPrimary, datasetSecondary } from "./datasetDualAxis.js";
+import { datasetDualAxis } from "./datasetDualAxis.js";
 import { datasetScatter } from "./datasetScatter.js";
 import { datasetHistogram } from "./datasetHistogram.js";
 import { datasetBoxplot } from "./datasetBoxplot.js";
-export { datasetBoxplot, datasetHistogram, datasetPivot, datasetPrimary, datasetScatter, datasetSecondary, datasetXY, datasetYX, progressive };
+export { datasetBoxplot, datasetDualAxis, datasetHistogram, datasetPivot, datasetScatter, datasetXY, datasetYX, progressive };

package/dist/esm/pipeline/spec/chart/pipes/dual/dualChartType.d.ts

@@ -1,3 +1,3 @@
 import type { VChartSpecPipe } from '../../../../../types';
-export declare const dualChartTypePrimary: VChartSpecPipe;
-export declare const dualChartTypeSecondary: VChartSpecPipe;
+import type { DualAxisOptions } from '../../../../../types/properties';
+export declare const dualChartType: (options: DualAxisOptions) => VChartSpecPipe;

package/dist/esm/pipeline/spec/chart/pipes/dual/dualChartType.js

@@ -1,22 +1,5 @@
 import { DUAL_AXIS_CHART_COLUMN_Z_INDEX, DUAL_AXIS_CHART_NON_COLUMN_Z_INDEX } from "../../../../utils/constant.js";
-const DEFAULT_DUAL_CHART_TYPE = {
-    primary: 'column',
-    secondary: 'line'
-};
-const dualChartTypePrimary = (spec, context)=>{
-    const result = {
-        ...spec,
-        zIndex: DUAL_AXIS_CHART_NON_COLUMN_Z_INDEX
-    };
-    const { advancedVSeed, vseed } = context;
-    const { chartType } = vseed;
-    const { datasetReshapeInfo } = advancedVSeed;
-    const index = datasetReshapeInfo[0].index;
-    const config = advancedVSeed.config?.[chartType]?.dualChartType || DEFAULT_DUAL_CHART_TYPE;
-    const primary = (Array.isArray(config) ? config[index]?.primary || config[0]?.primary : config.primary) ?? DEFAULT_DUAL_CHART_TYPE.primary;
-    const secondary = (Array.isArray(config) ? config[index]?.secondary || config[0]?.secondary : config.secondary) ?? DEFAULT_DUAL_CHART_TYPE.secondary;
-    const bothColumn = 'column' === primary && 'column' === secondary;
-    const type = bothColumn ? 'columnParallel' : primary;
+function applyChartType(result, type, datasetReshapeInfo) {
     switch(type){
         case 'line':
             result.type = 'line';
@@ -53,64 +36,22 @@ const dualChartTypePrimary = (spec, context)=>{
             result.type = 'scatter';
             break;
         default:
-            result.type = primary;
+            result.type = type;
     }
-    return result;
-};
-const dualChartTypeSecondary = (spec, context)=>{
-    const result = {
-        ...spec,
-        zIndex: DUAL_AXIS_CHART_NON_COLUMN_Z_INDEX
+}
+const dualChartType = (options)=>(spec, context)=>{
+        const result = {
+            ...spec,
+            zIndex: DUAL_AXIS_CHART_NON_COLUMN_Z_INDEX
+        };
+        const { advancedVSeed } = context;
+        const { datasetReshapeInfo, reshapeMeasures = [] } = advancedVSeed;
+        const index = datasetReshapeInfo[0].index;
+        const chartTypes = reshapeMeasures[index].map((m)=>m.chartType);
+        const type = chartTypes.every((ct)=>'column' === ct) && reshapeMeasures[index].length > 1 && reshapeMeasures[index].some((m)=>'primaryYAxis' === m.encoding) && reshapeMeasures[index].some((m)=>'secondaryYAxis' === m.encoding) ? 'columnParallel' : options.chartType;
+        applyChartType(result, type, datasetReshapeInfo);
+        return result;
     };
-    const { advancedVSeed, vseed } = context;
-    const { chartType } = vseed;
-    const { datasetReshapeInfo } = advancedVSeed;
-    const config = advancedVSeed.config?.[chartType]?.dualChartType || DEFAULT_DUAL_CHART_TYPE;
-    const index = datasetReshapeInfo[0].index;
-    const primary = (Array.isArray(config) ? config[index]?.primary || config[0]?.primary : config.primary) ?? DEFAULT_DUAL_CHART_TYPE.primary;
-    const secondary = (Array.isArray(config) ? config[index]?.secondary || config[0]?.secondary : config.secondary) ?? DEFAULT_DUAL_CHART_TYPE.secondary;
-    const bothColumn = 'column' === primary && 'column' === secondary;
-    const type = bothColumn ? 'columnParallel' : secondary;
-    switch(type){
-        case 'line':
-            result.type = 'line';
-            break;
-        case 'column':
-            result.type = 'bar';
-            result.zIndex = DUAL_AXIS_CHART_COLUMN_Z_INDEX;
-            break;
-        case 'columnParallel':
-            {
-                const columnSpec = result;
-                if (Array.isArray(columnSpec.xField)) columnSpec.xField.push(datasetReshapeInfo[0].unfoldInfo.encodingDetail);
-                else if (columnSpec.xField) columnSpec.xField = [
-                    columnSpec.xField,
-                    datasetReshapeInfo[0].unfoldInfo.encodingDetail
-                ];
-                columnSpec.type = 'bar';
-                result.zIndex = DUAL_AXIS_CHART_COLUMN_Z_INDEX;
-                break;
-            }
-        case 'columnPercent':
-            result.type = 'bar';
-            result.percent = true;
-            result.zIndex = DUAL_AXIS_CHART_COLUMN_Z_INDEX;
-            break;
-        case 'area':
-            result.type = 'area';
-            break;
-        case 'areaPercent':
-            result.type = 'area';
-            result.percent = true;
-            break;
-        case 'scatter':
-            result.type = 'scatter';
-            break;
-        default:
-            result.type = secondary ?? DEFAULT_DUAL_CHART_TYPE.secondary;
-    }
-    return result;
-};
-export { dualChartTypePrimary, dualChartTypeSecondary };
+export { dualChartType };
 
 //# sourceMappingURL=dualChartType.js.map

package/dist/esm/pipeline/spec/chart/pipes/dual/dualChartType.js.map

@@ -1 +1 @@
-{"version":3,"file":"pipeline/spec/chart/pipes/dual/dualChartType.js","sources":["webpack://@visactor/vseed/./src/pipeline/spec/chart/pipes/dual/dualChartType.ts"],"sourcesContent":["import type { IBarSeriesSpec, ISeriesSpec } from '@visactor/vchart'\nimport { DUAL_AXIS_CHART_COLUMN_Z_INDEX, DUAL_AXIS_CHART_NON_COLUMN_Z_INDEX } from 'src/pipeline/utils/constant'\nimport type { DualChartType, VChartSpecPipe } from 'src/types'\n\nconst DEFAULT_DUAL_CHART_TYPE: DualChartType = {\n  primary: 'column',\n  secondary: 'line',\n}\n\nexport const dualChartTypePrimary: VChartSpecPipe = (spec, context) => {\n  const result = { ...spec, zIndex: DUAL_AXIS_CHART_NON_COLUMN_Z_INDEX } as ISeriesSpec\n  const { advancedVSeed, vseed } = context\n  const { chartType } = vseed\n  const { datasetReshapeInfo } = advancedVSeed\n  const index = datasetReshapeInfo[0].index\n\n  const config = advancedVSeed.config?.[chartType as 'dualAxis']?.dualChartType || DEFAULT_DUAL_CHART_TYPE\n\n  const primary =\n    (Array.isArray(config) ? config[index]?.primary || config[0]?.primary : config.primary) ??\n    DEFAULT_DUAL_CHART_TYPE.primary\n  const secondary =\n    (Array.isArray(config) ? config[index]?.secondary || config[0]?.secondary : config.secondary) ??\n    DEFAULT_DUAL_CHART_TYPE.secondary\n  const bothColumn = primary === 'column' && secondary === 'column'\n  const type = bothColumn ? 'columnParallel' : primary\n  switch (type) {\n    case 'line': {\n      result.type = 'line'\n      break\n    }\n    case 'column': {\n      result.type = 'bar'\n      result.zIndex = DUAL_AXIS_CHART_COLUMN_Z_INDEX\n      break\n    }\n    case 'columnParallel': {\n      const columnSpec = result as IBarSeriesSpec\n      if (Array.isArray(columnSpec.xField)) {\n        columnSpec.xField.push(datasetReshapeInfo[0].unfoldInfo.encodingDetail)\n      } else if (columnSpec.xField) {\n        columnSpec.xField = [columnSpec.xField, datasetReshapeInfo[0].unfoldInfo.encodingDetail]\n      }\n      columnSpec.type = 'bar'\n      result.zIndex = DUAL_AXIS_CHART_COLUMN_Z_INDEX\n      break\n    }\n    // @ts-expect-error  'columnPercent' 和 'areaPercent' 会改变轴值域为[0,1], VTable不支持.\n    case 'columnPercent': {\n      result.type = 'bar'\n      result.percent = true\n      result.zIndex = DUAL_AXIS_CHART_COLUMN_Z_INDEX\n      break\n    }\n    case 'area': {\n      result.type = 'area'\n      break\n    }\n    // @ts-expect-error  'columnPercent' 和 'areaPercent' 会改变轴值域为[0,1], VTable不支持.\n    case 'areaPercent': {\n      result.type = 'area'\n      result.percent = true\n      break\n    }\n    case 'scatter': {\n      result.type = 'scatter'\n      break\n    }\n    default:\n      result.type = primary\n  }\n\n  return result\n}\n\nexport const dualChartTypeSecondary: VChartSpecPipe = (spec, context) => {\n  const result = { ...spec, zIndex: DUAL_AXIS_CHART_NON_COLUMN_Z_INDEX } as ISeriesSpec\n  const { advancedVSeed, vseed } = context\n  const { chartType } = vseed\n  const { datasetReshapeInfo } = advancedVSeed\n  const config = advancedVSeed.config?.[chartType as 'dualAxis']?.dualChartType || DEFAULT_DUAL_CHART_TYPE\n\n  const index = datasetReshapeInfo[0].index\n  const primary =\n    (Array.isArray(config) ? config[index]?.primary || config[0]?.primary : config.primary) ??\n    DEFAULT_DUAL_CHART_TYPE.primary\n  const secondary =\n    (Array.isArray(config) ? config[index]?.secondary || config[0]?.secondary : config.secondary) ??\n    DEFAULT_DUAL_CHART_TYPE.secondary\n  const bothColumn = primary === 'column' && secondary === 'column'\n  const type = bothColumn ? 'columnParallel' : secondary\n\n  switch (type) {\n    case 'line': {\n      result.type = 'line'\n      break\n    }\n    case 'column': {\n      result.type = 'bar'\n      result.zIndex = DUAL_AXIS_CHART_COLUMN_Z_INDEX\n      break\n    }\n    case 'columnParallel': {\n      const columnSpec = result as IBarSeriesSpec\n      if (Array.isArray(columnSpec.xField)) {\n        columnSpec.xField.push(datasetReshapeInfo[0].unfoldInfo.encodingDetail)\n      } else if (columnSpec.xField) {\n        columnSpec.xField = [columnSpec.xField, datasetReshapeInfo[0].unfoldInfo.encodingDetail]\n      }\n      columnSpec.type = 'bar'\n      result.zIndex = DUAL_AXIS_CHART_COLUMN_Z_INDEX\n      break\n    }\n    // @ts-expect-error  'columnPercent' 和 'areaPercent' 会改变轴值域为[0,1], VTable不支持.\n    case 'columnPercent': {\n      result.type = 'bar'\n      result.percent = true\n      result.zIndex = DUAL_AXIS_CHART_COLUMN_Z_INDEX\n      break\n    }\n    case 'area': {\n      result.type = 'area'\n      break\n    }\n    // @ts-expect-error  'columnPercent' 和 'areaPercent' 会改变轴值域为[0,1], VTable不支持.\n    case 'areaPercent': {\n      result.type = 'area'\n      result.percent = true\n      break\n    }\n    case 'scatter': {\n      result.type = 'scatter'\n      break\n    }\n    default:\n      result.type = secondary ?? DEFAULT_DUAL_CHART_TYPE.secondary\n  }\n\n  return result\n}\n"],"names":["DEFAULT_DUAL_CHART_TYPE","dualChartTypePrimary","spec","context","result","DUAL_AXIS_CHART_NON_COLUMN_Z_INDEX","advancedVSeed","vseed","chartType","datasetReshapeInfo","index","config","primary","Array","secondary","bothColumn","type","DUAL_AXIS_CHART_COLUMN_Z_INDEX","columnSpec","dualChartTypeSecondary"],"mappings":"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"}
+{"version":3,"file":"pipeline/spec/chart/pipes/dual/dualChartType.js","sources":["webpack://@visactor/vseed/./src/pipeline/spec/chart/pipes/dual/dualChartType.ts"],"sourcesContent":["import type { IBarSeriesSpec, ISeriesSpec } from '@visactor/vchart'\nimport { DUAL_AXIS_CHART_COLUMN_Z_INDEX, DUAL_AXIS_CHART_NON_COLUMN_Z_INDEX } from 'src/pipeline/utils/constant'\nimport type { DualAxisMeasure, VChartSpecPipe } from 'src/types'\nimport type { DualAxisOptions } from 'src/types/properties'\n\n/**\n * 应用图表类型到 spec\n * @param result spec 结果对象\n * @param type 图表类型\n * @param datasetReshapeInfo 数据集重塑信息\n */\nfunction applyChartType(result: ISeriesSpec, type: string, datasetReshapeInfo: any): void {\n  switch (type) {\n    case 'line': {\n      result.type = 'line'\n      break\n    }\n    case 'column': {\n      result.type = 'bar'\n      result.zIndex = DUAL_AXIS_CHART_COLUMN_Z_INDEX\n      break\n    }\n    case 'columnParallel': {\n      const columnSpec = result as IBarSeriesSpec\n      if (Array.isArray(columnSpec.xField)) {\n        columnSpec.xField.push(datasetReshapeInfo[0].unfoldInfo.encodingDetail)\n      } else if (columnSpec.xField) {\n        columnSpec.xField = [columnSpec.xField, datasetReshapeInfo[0].unfoldInfo.encodingDetail]\n      }\n      columnSpec.type = 'bar'\n      result.zIndex = DUAL_AXIS_CHART_COLUMN_Z_INDEX\n      break\n    }\n    case 'columnPercent': {\n      result.type = 'bar'\n      result.percent = true\n      result.zIndex = DUAL_AXIS_CHART_COLUMN_Z_INDEX\n      break\n    }\n    case 'area': {\n      result.type = 'area'\n      break\n    }\n    case 'areaPercent': {\n      result.type = 'area'\n      result.percent = true\n      break\n    }\n    case 'scatter': {\n      result.type = 'scatter'\n      break\n    }\n    default:\n      result.type = type\n  }\n}\n\nexport const dualChartType = (options: DualAxisOptions): VChartSpecPipe => {\n  return (spec, context) => {\n    const result = { ...spec, zIndex: DUAL_AXIS_CHART_NON_COLUMN_Z_INDEX } as ISeriesSpec\n    const { advancedVSeed } = context\n    const { datasetReshapeInfo, reshapeMeasures = [] } = advancedVSeed\n    const index = datasetReshapeInfo[0].index\n\n    const chartTypes = reshapeMeasures[index].map((m) => (m as DualAxisMeasure).chartType) as string[]\n\n    const type =\n      chartTypes.every((ct) => ct === 'column') &&\n      reshapeMeasures[index].length > 1 &&\n      reshapeMeasures[index].some((m) => m.encoding === 'primaryYAxis') &&\n      reshapeMeasures[index].some((m) => m.encoding === 'secondaryYAxis')\n        ? 'columnParallel'\n        : options.chartType\n\n    applyChartType(result, type, datasetReshapeInfo)\n\n    return result\n  }\n}\n"],"names":["applyChartType","result","type","datasetReshapeInfo","DUAL_AXIS_CHART_COLUMN_Z_INDEX","columnSpec","Array","dualChartType","options","spec","context","DUAL_AXIS_CHART_NON_COLUMN_Z_INDEX","advancedVSeed","reshapeMeasures","index","chartTypes","m","ct"],"mappings":";AAWA,SAASA,eAAeC,MAAmB,EAAEC,IAAY,EAAEC,kBAAuB;IAChF,OAAQD;QACN,KAAK;YACHD,OAAO,IAAI,GAAG;YACd;QAEF,KAAK;YACHA,OAAO,IAAI,GAAG;YACdA,OAAO,MAAM,GAAGG;YAChB;QAEF,KAAK;YAAkB;gBACrB,MAAMC,aAAaJ;gBACnB,IAAIK,MAAM,OAAO,CAACD,WAAW,MAAM,GACjCA,WAAW,MAAM,CAAC,IAAI,CAACF,kBAAkB,CAAC,EAAE,CAAC,UAAU,CAAC,cAAc;qBACjE,IAAIE,WAAW,MAAM,EAC1BA,WAAW,MAAM,GAAG;oBAACA,WAAW,MAAM;oBAAEF,kBAAkB,CAAC,EAAE,CAAC,UAAU,CAAC,cAAc;iBAAC;gBAE1FE,WAAW,IAAI,GAAG;gBAClBJ,OAAO,MAAM,GAAGG;gBAChB;YACF;QACA,KAAK;YACHH,OAAO,IAAI,GAAG;YACdA,OAAO,OAAO,GAAG;YACjBA,OAAO,MAAM,GAAGG;YAChB;QAEF,KAAK;YACHH,OAAO,IAAI,GAAG;YACd;QAEF,KAAK;YACHA,OAAO,IAAI,GAAG;YACdA,OAAO,OAAO,GAAG;YACjB;QAEF,KAAK;YACHA,OAAO,IAAI,GAAG;YACd;QAEF;YACEA,OAAO,IAAI,GAAGC;IAClB;AACF;AAEO,MAAMK,gBAAgB,CAACC,UACrB,CAACC,MAAMC;QACZ,MAAMT,SAAS;YAAE,GAAGQ,IAAI;YAAE,QAAQE;QAAmC;QACrE,MAAM,EAAEC,aAAa,EAAE,GAAGF;QAC1B,MAAM,EAAEP,kBAAkB,EAAEU,kBAAkB,EAAE,EAAE,GAAGD;QACrD,MAAME,QAAQX,kBAAkB,CAAC,EAAE,CAAC,KAAK;QAEzC,MAAMY,aAAaF,eAAe,CAACC,MAAM,CAAC,GAAG,CAAC,CAACE,IAAOA,EAAsB,SAAS;QAErF,MAAMd,OACJa,WAAW,KAAK,CAAC,CAACE,KAAOA,AAAO,aAAPA,OACzBJ,eAAe,CAACC,MAAM,CAAC,MAAM,GAAG,KAChCD,eAAe,CAACC,MAAM,CAAC,IAAI,CAAC,CAACE,IAAMA,AAAe,mBAAfA,EAAE,QAAQ,KAC7CH,eAAe,CAACC,MAAM,CAAC,IAAI,CAAC,CAACE,IAAMA,AAAe,qBAAfA,EAAE,QAAQ,IACzC,mBACAR,QAAQ,SAAS;QAEvBR,eAAeC,QAAQC,MAAMC;QAE7B,OAAOF;IACT"}

package/dist/esm/pipeline/spec/chart/pipes/dual/index.d.ts

@@ -1 +1 @@
-export { dualChartTypePrimary, dualChartTypeSecondary } from './dualChartType';
+export { dualChartType } from './dualChartType';

package/dist/esm/pipeline/spec/chart/pipes/dual/index.js

@@ -1,2 +1,2 @@
-import { dualChartTypePrimary, dualChartTypeSecondary } from "./dualChartType.js";
-export { dualChartTypePrimary, dualChartTypeSecondary };
+import { dualChartType } from "./dualChartType.js";
+export { dualChartType };

package/dist/esm/pipeline/spec/chart/pipes/init/dualAxis.d.ts

@@ -1,3 +1,2 @@
-import type { VChartSpecPipe } from '../../../../../types';
-export declare const initDualAxisPrimary: VChartSpecPipe;
-export declare const initDualAxisSecondary: VChartSpecPipe;
+import type { DualAxisOptions, VChartSpecPipe } from '../../../../../types';
+export declare const initDualAxis: (options: DualAxisOptions) => VChartSpecPipe;

package/dist/esm/pipeline/spec/chart/pipes/init/dualAxis.js

@@ -1,36 +1,20 @@
 import { isLinearColor } from "../color/colorAdapter.js";
-const initDualAxisPrimary = (spec, context)=>{
-    const result = {
-        ...spec
+const initDualAxis = (options)=>(spec, context)=>{
+        const result = {
+            ...spec
+        };
+        const { advancedVSeed, vseed } = context;
+        const { datasetReshapeInfo } = advancedVSeed;
+        const { unfoldInfo, id } = datasetReshapeInfo[0];
+        result.id = `${id}-${options.axisType}-${options.chartType}`;
+        result.type = 'line' === options.chartType ? 'line' : 'bar';
+        result.direction = 'vertical';
+        result.xField = unfoldInfo.encodingX;
+        result.seriesField = isLinearColor(advancedVSeed, vseed) ? unfoldInfo.encodingDetail : unfoldInfo.encodingColorId;
+        result.yField = options.foldInfo.measureValue;
+        result.animation = true;
+        return result;
     };
-    const { advancedVSeed } = context;
-    const { datasetReshapeInfo } = advancedVSeed;
-    const { unfoldInfo, foldInfoList, id } = datasetReshapeInfo[0];
-    result.id = `${id}-primary-series`;
-    result.type = 'bar';
-    result.direction = 'vertical';
-    result.xField = unfoldInfo.encodingX;
-    result.seriesField = unfoldInfo.encodingColorId;
-    result.yField = foldInfoList?.[0].measureValue;
-    result.animation = true;
-    return result;
-};
-const initDualAxisSecondary = (spec, context)=>{
-    const result = {
-        ...spec
-    };
-    const { advancedVSeed, vseed } = context;
-    const { datasetReshapeInfo } = advancedVSeed;
-    const { unfoldInfo, foldInfoList, id } = datasetReshapeInfo[0];
-    result.id = `${id}-secondary-series`;
-    result.type = 'line';
-    result.direction = 'vertical';
-    result.xField = unfoldInfo.encodingX;
-    if (foldInfoList?.[1]) result.yField = foldInfoList[1].measureValue;
-    result.seriesField = isLinearColor(advancedVSeed, vseed) ? unfoldInfo.encodingDetail : unfoldInfo.encodingColorId;
-    result.animation = true;
-    return result;
-};
-export { initDualAxisPrimary, initDualAxisSecondary };
+export { initDualAxis };
 
 //# sourceMappingURL=dualAxis.js.map

package/dist/esm/pipeline/spec/chart/pipes/init/dualAxis.js.map

@@ -1 +1 @@
-{"version":3,"file":"pipeline/spec/chart/pipes/init/dualAxis.js","sources":["webpack://@visactor/vseed/./src/pipeline/spec/chart/pipes/init/dualAxis.ts"],"sourcesContent":["import type { IBarSeriesSpec, ILineSeriesSpec } from '@visactor/vchart'\nimport type { VChartSpecPipe } from 'src/types'\nimport { isLinearColor } from '../color/colorAdapter'\n\nexport const initDualAxisPrimary: VChartSpecPipe = (spec, context) => {\n  const result = { ...spec } as IBarSeriesSpec\n  const { advancedVSeed } = context\n  const { datasetReshapeInfo } = advancedVSeed\n  const { unfoldInfo, foldInfoList, id } = datasetReshapeInfo[0]\n\n  result.id = `${id}-primary-series`\n  result.type = 'bar'\n  result.direction = 'vertical'\n  result.xField = unfoldInfo.encodingX\n  result.seriesField = unfoldInfo.encodingColorId\n\n  result.yField = foldInfoList?.[0].measureValue\n  result.animation = true\n\n  return result\n}\n\nexport const initDualAxisSecondary: VChartSpecPipe = (spec, context) => {\n  const result = { ...spec } as ILineSeriesSpec\n  const { advancedVSeed, vseed } = context\n  const { datasetReshapeInfo } = advancedVSeed\n  const { unfoldInfo, foldInfoList, id } = datasetReshapeInfo[0]\n\n  result.id = `${id}-secondary-series`\n  result.type = 'line'\n  result.direction = 'vertical'\n  result.xField = unfoldInfo.encodingX\n  if (foldInfoList?.[1]) {\n    result.yField = foldInfoList[1].measureValue\n  }\n\n  result.seriesField = isLinearColor(advancedVSeed, vseed) ? unfoldInfo.encodingDetail : unfoldInfo.encodingColorId\n\n  result.animation = true\n\n  return result\n}\n"],"names":["initDualAxisPrimary","spec","context","result","advancedVSeed","datasetReshapeInfo","unfoldInfo","foldInfoList","id","initDualAxisSecondary","vseed","isLinearColor"],"mappings":";AAIO,MAAMA,sBAAsC,CAACC,MAAMC;IACxD,MAAMC,SAAS;QAAE,GAAGF,IAAI;IAAC;IACzB,MAAM,EAAEG,aAAa,EAAE,GAAGF;IAC1B,MAAM,EAAEG,kBAAkB,EAAE,GAAGD;IAC/B,MAAM,EAAEE,UAAU,EAAEC,YAAY,EAAEC,EAAE,EAAE,GAAGH,kBAAkB,CAAC,EAAE;IAE9DF,OAAO,EAAE,GAAG,GAAGK,GAAG,eAAe,CAAC;IAClCL,OAAO,IAAI,GAAG;IACdA,OAAO,SAAS,GAAG;IACnBA,OAAO,MAAM,GAAGG,WAAW,SAAS;IACpCH,OAAO,WAAW,GAAGG,WAAW,eAAe;IAE/CH,OAAO,MAAM,GAAGI,cAAc,CAAC,EAAE,CAAC;IAClCJ,OAAO,SAAS,GAAG;IAEnB,OAAOA;AACT;AAEO,MAAMM,wBAAwC,CAACR,MAAMC;IAC1D,MAAMC,SAAS;QAAE,GAAGF,IAAI;IAAC;IACzB,MAAM,EAAEG,aAAa,EAAEM,KAAK,EAAE,GAAGR;IACjC,MAAM,EAAEG,kBAAkB,EAAE,GAAGD;IAC/B,MAAM,EAAEE,UAAU,EAAEC,YAAY,EAAEC,EAAE,EAAE,GAAGH,kBAAkB,CAAC,EAAE;IAE9DF,OAAO,EAAE,GAAG,GAAGK,GAAG,iBAAiB,CAAC;IACpCL,OAAO,IAAI,GAAG;IACdA,OAAO,SAAS,GAAG;IACnBA,OAAO,MAAM,GAAGG,WAAW,SAAS;IACpC,IAAIC,cAAc,CAAC,EAAE,EACnBJ,OAAO,MAAM,GAAGI,YAAY,CAAC,EAAE,CAAC,YAAY;IAG9CJ,OAAO,WAAW,GAAGQ,cAAcP,eAAeM,SAASJ,WAAW,cAAc,GAAGA,WAAW,eAAe;IAEjHH,OAAO,SAAS,GAAG;IAEnB,OAAOA;AACT"}
+{"version":3,"file":"pipeline/spec/chart/pipes/init/dualAxis.js","sources":["webpack://@visactor/vseed/./src/pipeline/spec/chart/pipes/init/dualAxis.ts"],"sourcesContent":["import type { IBarSeriesSpec, ILineSeriesSpec } from '@visactor/vchart'\nimport type { DualAxisOptions, VChartSpecPipe } from 'src/types'\nimport { isLinearColor } from '../color/colorAdapter'\n\nexport const initDualAxis = (options: DualAxisOptions): VChartSpecPipe => {\n  return (spec, context) => {\n    const result = { ...spec } as IBarSeriesSpec | ILineSeriesSpec\n    const { advancedVSeed, vseed } = context\n    const { datasetReshapeInfo } = advancedVSeed\n    const { unfoldInfo, id } = datasetReshapeInfo[0]\n\n    result.id = `${id}-${options.axisType}-${options.chartType}`\n    result.type = options.chartType === 'line' ? 'line' : 'bar'\n    result.direction = 'vertical'\n    result.xField = unfoldInfo.encodingX\n    result.seriesField = isLinearColor(advancedVSeed, vseed) ? unfoldInfo.encodingDetail : unfoldInfo.encodingColorId\n\n    result.yField = options.foldInfo.measureValue\n\n    result.animation = true\n\n    return result\n  }\n}\n"],"names":["initDualAxis","options","spec","context","result","advancedVSeed","vseed","datasetReshapeInfo","unfoldInfo","id","isLinearColor"],"mappings":";AAIO,MAAMA,eAAe,CAACC,UACpB,CAACC,MAAMC;QACZ,MAAMC,SAAS;YAAE,GAAGF,IAAI;QAAC;QACzB,MAAM,EAAEG,aAAa,EAAEC,KAAK,EAAE,GAAGH;QACjC,MAAM,EAAEI,kBAAkB,EAAE,GAAGF;QAC/B,MAAM,EAAEG,UAAU,EAAEC,EAAE,EAAE,GAAGF,kBAAkB,CAAC,EAAE;QAEhDH,OAAO,EAAE,GAAG,GAAGK,GAAG,CAAC,EAAER,QAAQ,QAAQ,CAAC,CAAC,EAAEA,QAAQ,SAAS,EAAE;QAC5DG,OAAO,IAAI,GAAGH,AAAsB,WAAtBA,QAAQ,SAAS,GAAc,SAAS;QACtDG,OAAO,SAAS,GAAG;QACnBA,OAAO,MAAM,GAAGI,WAAW,SAAS;QACpCJ,OAAO,WAAW,GAAGM,cAAcL,eAAeC,SAASE,WAAW,cAAc,GAAGA,WAAW,eAAe;QAEjHJ,OAAO,MAAM,GAAGH,QAAQ,QAAQ,CAAC,YAAY;QAE7CG,OAAO,SAAS,GAAG;QAEnB,OAAOA;IACT"}

package/dist/esm/pipeline/spec/chart/pipes/init/index.d.ts

@@ -12,6 +12,6 @@ export { initScatter } from './scatter';
 export { initRadar } from './radar';
 export { initFunnel } from './funnel';
 export { initPivot } from './pivot';
-export { initDualAxisPrimary, initDualAxisSecondary } from './dualAxis';
+export { initDualAxis } from './dualAxis';
 export { initHistogram } from './histogram';
 export { initBoxplot } from './boxplot';

package/dist/esm/pipeline/spec/chart/pipes/init/index.js

@@ -12,7 +12,7 @@ import { initScatter } from "./scatter.js";
 import { initRadar } from "./radar.js";
 import { initFunnel } from "./funnel.js";
 import { initPivot } from "./pivot.js";
-import { initDualAxisPrimary, initDualAxisSecondary } from "./dualAxis.js";
+import { initDualAxis } from "./dualAxis.js";
 import { initHistogram } from "./histogram.js";
 import { initBoxplot } from "./boxplot.js";
-export { initArea, initBar, initBarParallel, initBoxplot, initColumn, initColumnParallel, initDonut, initDualAxisPrimary, initDualAxisSecondary, initFunnel, initHistogram, initLine, initPie, initPivot, initRadar, initRose, initRoseParallel, initScatter };
+export { initArea, initBar, initBarParallel, initBoxplot, initColumn, initColumnParallel, initDonut, initDualAxis, initFunnel, initHistogram, initLine, initPie, initPivot, initRadar, initRose, initRoseParallel, initScatter };

package/dist/esm/pipeline/spec/chart/pipes/label/index.d.ts

@@ -1,4 +1,5 @@
 export { label } from './label';
-export { labelPrimary, labelSecondary } from './labelDualAxis';
+export { labelDualAxis } from './labelDualAxis';
 export { labelScatter } from './labelScatter';
 export { labelPie } from './labelPie';
+export { labelBoxPlot } from './labelBoxPlot';

package/dist/esm/pipeline/spec/chart/pipes/label/index.js

@@ -1,5 +1,6 @@
 import { label } from "./label.js";
-import { labelPrimary, labelSecondary } from "./labelDualAxis.js";
+import { labelDualAxis } from "./labelDualAxis.js";
 import { labelScatter } from "./labelScatter.js";
 import { labelPie } from "./labelPie.js";
-export { label, labelPie, labelPrimary, labelScatter, labelSecondary };
+import { labelBoxPlot } from "./labelBoxPlot.js";
+export { label, labelBoxPlot, labelDualAxis, labelPie, labelScatter };

package/dist/esm/pipeline/spec/chart/pipes/label/label.d.ts

@@ -2,7 +2,7 @@ import type { Datum, Dimensions, Encoding, FoldInfo, Formatter, Label, Measure,
 export declare const label: VChartSpecPipe;
 export declare const generateMeasureValue: (value: number | string, measure: Measure, labelAutoFormat?: boolean, numFormat?: NumFormat) => string;
 export declare const generateMeasurePercent: (value: number | string, sum: number, formatter: Formatter) => string;
-export declare const buildLabel: (label: Label, vseedMeasures: Measures | undefined, vseedDimensions: Dimensions | undefined, advancedVSeedDimensions: Dimensions, advancedVSeedMeasures: Measures, encoding: Encoding, foldInfoList: FoldInfo[]) => {
+export declare const buildLabel: (label: Label, vseedMeasures: Measures | undefined, vseedDimensions: Dimensions | undefined, advancedVSeedDimensions: Dimensions, advancedVSeedMeasures: Measures, encoding: Encoding, foldInfoList: (Pick<FoldInfo, "measureId" | "measureValue"> & Partial<Pick<FoldInfo, "statistics">>)[]) => {
     visible: boolean;
     dataFilter: (data: Datum[]) => Record<string | number, any>[];
     formatMethod: (_: unknown, datum: Datum) => string | (string | number)[];

package/dist/esm/pipeline/spec/chart/pipes/label/label.js

@@ -59,9 +59,11 @@ const buildLabel = (label, vseedMeasures = [], vseedDimensions = [], advancedVSe
                 const measure = findMeasureById(advancedVSeedMeasures, datum[measureId]);
                 if (measure) {
                     const measureValueLabel = generateMeasureValue(datum[measureValue], measure, autoFormat, numFormat);
-                    const measurePercentLabel = isNumber(datum['__VCHART_ARC_RATIO']) ? generateMeasurePercent(datum['__VCHART_ARC_RATIO'], 1, percentFormatter) : generateMeasurePercent(datum[measureValue], statistics.sum, percentFormatter);
                     if (showValue) result.push(measureValueLabel);
-                    if (showValuePercent) result.push(measurePercentLabel);
+                    if (showValuePercent) {
+                        if (isNumber(datum['__VCHART_ARC_RATIO'])) result.push(generateMeasurePercent(datum['__VCHART_ARC_RATIO'], 1, percentFormatter));
+                        else if (statistics && isNumber(statistics.sum)) result.push(generateMeasurePercent(datum[measureValue], statistics.sum, percentFormatter));
+                    }
                 }
             });
             result.push(...meaLabels);

package/dist/esm/pipeline/spec/chart/pipes/label/label.js.map

@@ -1 +1 @@
-{"version":3,"file":"pipeline/spec/chart/pipes/label/label.js","sources":["webpack://@visactor/vseed/./src/pipeline/spec/chart/pipes/label/label.ts"],"sourcesContent":["import type { ILineChartSpec } from '@visactor/vchart'\nimport { createFormatter, createFormatterByMeasure, DATUM_HIDE_KEY, findMeasureById } from '../../../../utils'\nimport type {\n  Datum,\n  Dimension,\n  Dimensions,\n  Encoding,\n  FoldInfo,\n  Formatter,\n  Label,\n  Measure,\n  Measures,\n  NumFormat,\n  VChartSpecPipe,\n} from 'src/types'\nimport { isNumber, merge, uniqueBy } from 'remeda'\nimport { selector } from 'src/dataSelector'\nimport { MeasureId } from 'src/dataReshape/constant'\n\nexport const label: VChartSpecPipe = (spec, context) => {\n  const result = { ...spec } as ILineChartSpec\n  const { advancedVSeed, vseed } = context\n  const { datasetReshapeInfo } = advancedVSeed\n  const { chartType, encoding } = advancedVSeed\n  const baseConfig = advancedVSeed.config[chartType] as { label: Label }\n  const foldInfo = datasetReshapeInfo[0].foldInfo as FoldInfo\n\n  const { label } = baseConfig\n\n  result.label = buildLabel(\n    label,\n    vseed.measures,\n    vseed.dimensions,\n    advancedVSeed.dimensions,\n    advancedVSeed.measures,\n    encoding as Encoding,\n    [foldInfo],\n  ) as unknown as ILineChartSpec['label']\n\n  return result\n}\n\nexport const generateMeasureValue = (\n  value: number | string,\n  measure: Measure,\n  labelAutoFormat?: boolean,\n  numFormat: NumFormat = {},\n) => {\n  const format = merge(numFormat, measure.numFormat || measure.format)\n  const mergedMeasure = { ...measure, numFormat: format, autoFormat: labelAutoFormat || measure.autoFormat }\n\n  const formatter = createFormatterByMeasure(mergedMeasure)\n  return formatter(value)\n}\n\nexport const generateMeasurePercent = (value: number | string, sum: number, formatter: Formatter) => {\n  if (value === undefined || value === null) return String(value)\n  const num = Number(value)\n  if (Number.isNaN(num)) return String(value)\n\n  const percentValue = num / sum\n  return formatter(percentValue)\n}\n\nexport const buildLabel = (\n  label: Label,\n  vseedMeasures: Measures = [],\n  vseedDimensions: Dimensions = [],\n  advancedVSeedDimensions: Dimensions,\n  advancedVSeedMeasures: Measures,\n  encoding: Encoding,\n  foldInfoList: FoldInfo[],\n) => {\n  const {\n    enable,\n    wrap,\n    showValue,\n    showValuePercent,\n    showDimension,\n    labelOverlap,\n    labelColorSmartInvert,\n    labelStroke,\n    labelColor,\n    labelFontSize,\n    labelFontWeight,\n    labelBackgroundColor,\n    labelPosition,\n    autoFormat,\n    numFormat = {},\n  } = label\n\n  const hasDimLabelEncoding = vseedDimensions.some((item) => encoding.label?.includes(item.id))\n\n  const labelDims = uniqueBy(\n    hasDimLabelEncoding\n      ? vseedDimensions.filter((item) => encoding.label?.includes(item.id))\n      : showDimension\n        ? advancedVSeedDimensions.filter((d) => d.id !== MeasureId && d.encoding !== 'row' && d.encoding !== 'column')\n        : [],\n    (item: Dimension) => item.id,\n  )\n\n  const labelMeas = uniqueBy(\n    vseedMeasures.filter((item) => encoding.label?.includes(item.id)),\n    (item: Measure) => item.id,\n  )\n\n  const percentFormat: NumFormat = merge(numFormat, {\n    type: 'percent',\n  } as NumFormat)\n\n  const percentFormatter = createFormatter(percentFormat)\n\n  const result = {\n    visible: enable,\n    dataFilter: (data: Datum[]) => {\n      return data.filter((entry) => {\n        return entry.data?.[DATUM_HIDE_KEY] !== true && selector(entry.data as Datum, label.selector, 'Or')\n      })\n    },\n    formatMethod: (_: unknown, datum: Datum) => {\n      const result = []\n\n      const dimLabels = labelDims.map((item: Dimension) => {\n        const id = item.id\n        return datum[id] as number | string\n      })\n\n      const meaLabels = labelMeas.map((item: Measure) =>\n        generateMeasureValue(datum[item.id] as number | string, item, autoFormat, numFormat),\n      )\n\n      result.push(...dimLabels)\n\n      foldInfoList.forEach((foldInfo) => {\n        const { measureId, measureValue, statistics } = foldInfo\n        const measure = findMeasureById(advancedVSeedMeasures, datum[measureId] as string)\n        if (measure) {\n          const measureValueLabel = generateMeasureValue(\n            datum[measureValue] as number | string,\n            measure,\n            autoFormat,\n            numFormat,\n          )\n          // 饼图/环图需要使用实际占比数据\n          const measurePercentLabel = isNumber(datum['__VCHART_ARC_RATIO'])\n            ? generateMeasurePercent(datum['__VCHART_ARC_RATIO'], 1, percentFormatter)\n            : generateMeasurePercent(datum[measureValue] as number | string, statistics.sum, percentFormatter)\n          if (showValue) {\n            result.push(measureValueLabel)\n          }\n          if (showValuePercent) {\n            result.push(measurePercentLabel)\n          }\n        }\n      })\n\n      result.push(...meaLabels)\n\n      if (wrap) {\n        return result\n      }\n      return result.join(' ')\n    },\n    position: labelPosition,\n    style: {\n      stroke: labelStroke,\n      fill: labelColor,\n      fontSize: labelFontSize,\n      fontWeight: labelFontWeight,\n      background: labelBackgroundColor,\n    },\n    smartInvert: labelColorSmartInvert,\n  }\n\n  if (labelOverlap) {\n    ;(result as any).overlap = {\n      hideOnHit: true,\n      clampForce: true,\n    }\n  }\n\n  return result\n}\n"],"names":["label","spec","context","result","advancedVSeed","vseed","datasetReshapeInfo","chartType","encoding","baseConfig","foldInfo","buildLabel","generateMeasureValue","value","measure","labelAutoFormat","numFormat","format","merge","mergedMeasure","formatter","createFormatterByMeasure","generateMeasurePercent","sum","String","num","Number","percentValue","vseedMeasures","vseedDimensions","advancedVSeedDimensions","advancedVSeedMeasures","foldInfoList","enable","wrap","showValue","showValuePercent","showDimension","labelOverlap","labelColorSmartInvert","labelStroke","labelColor","labelFontSize","labelFontWeight","labelBackgroundColor","labelPosition","autoFormat","hasDimLabelEncoding","item","labelDims","uniqueBy","d","MeasureId","labelMeas","percentFormat","percentFormatter","createFormatter","data","entry","DATUM_HIDE_KEY","selector","_","datum","dimLabels","id","meaLabels","measureId","measureValue","statistics","findMeasureById","measureValueLabel","measurePercentLabel","isNumber"],"mappings":"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"}
+{"version":3,"file":"pipeline/spec/chart/pipes/label/label.js","sources":["webpack://@visactor/vseed/./src/pipeline/spec/chart/pipes/label/label.ts"],"sourcesContent":["import type { ILineChartSpec } from '@visactor/vchart'\nimport { createFormatter, createFormatterByMeasure, DATUM_HIDE_KEY, findMeasureById } from '../../../../utils'\nimport type {\n  Datum,\n  Dimension,\n  Dimensions,\n  Encoding,\n  FoldInfo,\n  Formatter,\n  Label,\n  Measure,\n  Measures,\n  NumFormat,\n  VChartSpecPipe,\n} from 'src/types'\nimport { isNumber, merge, uniqueBy } from 'remeda'\nimport { selector } from 'src/dataSelector'\nimport { MeasureId } from 'src/dataReshape/constant'\n\nexport const label: VChartSpecPipe = (spec, context) => {\n  const result = { ...spec } as ILineChartSpec\n  const { advancedVSeed, vseed } = context\n  const { datasetReshapeInfo } = advancedVSeed\n  const { chartType, encoding } = advancedVSeed\n  const baseConfig = advancedVSeed.config[chartType] as { label: Label }\n  const foldInfo = datasetReshapeInfo[0].foldInfo as FoldInfo\n\n  const { label } = baseConfig\n\n  result.label = buildLabel(\n    label,\n    vseed.measures,\n    vseed.dimensions,\n    advancedVSeed.dimensions!,\n    advancedVSeed.measures!,\n    encoding as Encoding,\n    [foldInfo],\n  ) as unknown as ILineChartSpec['label']\n\n  return result\n}\n\nexport const generateMeasureValue = (\n  value: number | string,\n  measure: Measure,\n  labelAutoFormat?: boolean,\n  numFormat: NumFormat = {},\n) => {\n  const format = merge(numFormat, measure.numFormat || measure.format)\n  const mergedMeasure = { ...measure, numFormat: format, autoFormat: labelAutoFormat || measure.autoFormat }\n\n  const formatter = createFormatterByMeasure(mergedMeasure)\n  return formatter(value)\n}\n\nexport const generateMeasurePercent = (value: number | string, sum: number, formatter: Formatter) => {\n  if (value === undefined || value === null) return String(value)\n  const num = Number(value)\n  if (Number.isNaN(num)) return String(value)\n\n  const percentValue = num / sum\n  return formatter(percentValue)\n}\n\nexport const buildLabel = (\n  label: Label,\n  vseedMeasures: Measures = [],\n  vseedDimensions: Dimensions = [],\n  advancedVSeedDimensions: Dimensions,\n  advancedVSeedMeasures: Measures,\n  encoding: Encoding,\n  foldInfoList: (Pick<FoldInfo, 'measureId' | 'measureValue'> & Partial<Pick<FoldInfo, 'statistics'>>)[],\n) => {\n  const {\n    enable,\n    wrap,\n    showValue,\n    showValuePercent,\n    showDimension,\n    labelOverlap,\n    labelColorSmartInvert,\n    labelStroke,\n    labelColor,\n    labelFontSize,\n    labelFontWeight,\n    labelBackgroundColor,\n    labelPosition,\n    autoFormat,\n    numFormat = {},\n  } = label\n\n  const hasDimLabelEncoding = vseedDimensions.some((item) => encoding.label?.includes(item.id))\n\n  const labelDims = uniqueBy(\n    hasDimLabelEncoding\n      ? vseedDimensions.filter((item) => encoding.label?.includes(item.id))\n      : showDimension\n        ? advancedVSeedDimensions.filter((d) => d.id !== MeasureId && d.encoding !== 'row' && d.encoding !== 'column')\n        : [],\n    (item: Dimension) => item.id,\n  )\n\n  const labelMeas = uniqueBy(\n    vseedMeasures.filter((item) => encoding.label?.includes(item.id)),\n    (item: Measure) => item.id,\n  )\n\n  const percentFormat: NumFormat = merge(numFormat, {\n    type: 'percent',\n  } as NumFormat)\n\n  const percentFormatter = createFormatter(percentFormat)\n\n  const result = {\n    visible: enable,\n    dataFilter: (data: Datum[]) => {\n      return data.filter((entry) => {\n        return entry.data?.[DATUM_HIDE_KEY] !== true && selector(entry.data as Datum, label.selector, 'Or')\n      })\n    },\n    formatMethod: (_: unknown, datum: Datum) => {\n      const result = []\n\n      const dimLabels = labelDims.map((item: Dimension) => {\n        const id = item.id\n        return datum[id] as number | string\n      })\n\n      const meaLabels = labelMeas.map((item: Measure) =>\n        generateMeasureValue(datum[item.id] as number | string, item, autoFormat, numFormat),\n      )\n\n      result.push(...dimLabels)\n\n      foldInfoList.forEach((foldInfo) => {\n        const { measureId, measureValue, statistics } = foldInfo\n        const measure = findMeasureById(advancedVSeedMeasures, datum[measureId] as string)\n        if (measure) {\n          const measureValueLabel = generateMeasureValue(\n            datum[measureValue] as number | string,\n            measure,\n            autoFormat,\n            numFormat,\n          )\n\n          if (showValue) {\n            result.push(measureValueLabel)\n          }\n          if (showValuePercent) {\n            if (isNumber(datum['__VCHART_ARC_RATIO'])) {\n              // 饼图/环图需要使用实际占比数据\n              result.push(generateMeasurePercent(datum['__VCHART_ARC_RATIO'], 1, percentFormatter))\n            } else if (statistics && isNumber(statistics.sum)) {\n              result.push(\n                generateMeasurePercent(datum[measureValue] as number | string, statistics.sum, percentFormatter),\n              )\n            }\n          }\n        }\n      })\n\n      result.push(...meaLabels)\n\n      if (wrap) {\n        return result\n      }\n      return result.join(' ')\n    },\n    position: labelPosition,\n    style: {\n      stroke: labelStroke,\n      fill: labelColor,\n      fontSize: labelFontSize,\n      fontWeight: labelFontWeight,\n      background: labelBackgroundColor,\n    },\n    smartInvert: labelColorSmartInvert,\n  }\n\n  if (labelOverlap) {\n    ;(result as any).overlap = {\n      hideOnHit: true,\n      clampForce: true,\n    }\n  }\n\n  return result\n}\n"],"names":["label","spec","context","result","advancedVSeed","vseed","datasetReshapeInfo","chartType","encoding","baseConfig","foldInfo","buildLabel","generateMeasureValue","value","measure","labelAutoFormat","numFormat","format","merge","mergedMeasure","formatter","createFormatterByMeasure","generateMeasurePercent","sum","String","num","Number","percentValue","vseedMeasures","vseedDimensions","advancedVSeedDimensions","advancedVSeedMeasures","foldInfoList","enable","wrap","showValue","showValuePercent","showDimension","labelOverlap","labelColorSmartInvert","labelStroke","labelColor","labelFontSize","labelFontWeight","labelBackgroundColor","labelPosition","autoFormat","hasDimLabelEncoding","item","labelDims","uniqueBy","d","MeasureId","labelMeas","percentFormat","percentFormatter","createFormatter","data","entry","DATUM_HIDE_KEY","selector","_","datum","dimLabels","id","meaLabels","measureId","measureValue","statistics","findMeasureById","measureValueLabel","isNumber"],"mappings":"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"}

package/dist/esm/pipeline/spec/chart/pipes/label/labelBoxPlot.d.ts

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

package/dist/esm/pipeline/spec/chart/pipes/label/labelBoxPlot.js

@@ -0,0 +1,21 @@
+import { buildLabel } from "./label.js";
+import { FoldMeasureId, MedianMeasureId } from "../../../../../dataReshape/constant.js";
+const labelBoxPlot = (spec, context)=>{
+    const result = {
+        ...spec
+    };
+    const { advancedVSeed, vseed } = context;
+    const { chartType, encoding } = advancedVSeed;
+    const baseConfig = advancedVSeed.config[chartType];
+    const { label } = baseConfig;
+    result.label = buildLabel(label, vseed.measures, vseed.dimensions, advancedVSeed.dimensions, advancedVSeed.measures, encoding, [
+        {
+            measureId: FoldMeasureId,
+            measureValue: MedianMeasureId
+        }
+    ]);
+    return result;
+};
+export { labelBoxPlot };
+
+//# sourceMappingURL=labelBoxPlot.js.map