@visactor/vseed 0.0.34 → 0.0.36

package/dist/index.js

@@ -1,4 +1,4 @@
-import { clone, groupBy, isArray, isEmpty, isNullish, isNumber, isString, mergeDeep, omit, pick, sort, unique } from "remeda";
+import { clone, groupBy, isArray, isEmpty, isNullish, isNumber, isObjectType, isString, merge, mergeDeep, omit, pick, sort, unique } from "remeda";
 import { z } from "zod";
 const execPipeline = (pipeline, context, initialValue = {})=>{
     const result = pipeline.reduce((prev, cur)=>cur(prev, context), initialValue);
@@ -297,6 +297,10 @@ const theme_theme = (advancedVSeed, context)=>{
     if (chartConfigTheme) {
         const chartConfig = result.config?.[chartType] || {};
         const mergedConfig = mergeDeep(chartConfigTheme, clone(chartConfig));
+        for(const _k in mergedConfig){
+            const key = _k;
+            if (Array.isArray(mergedConfig[key])) mergedConfig[key] = mergeArray(mergedConfig[key], chartConfigTheme[key]);
+        }
         result.config = {
             [chartType]: mergedConfig
         };
@@ -309,6 +313,11 @@ const theme_theme = (advancedVSeed, context)=>{
     };
     return result;
 };
+const mergeArray = (arr, themeItem)=>{
+    if (!Array.isArray(arr)) return arr;
+    if (arr.some((d)=>!isObjectType(d))) return arr;
+    return arr.map((item)=>merge(themeItem, item));
+};
 const tableAdvancedPipeline = [
     initAdvancedVSeed,
     autoMeasures,
@@ -4020,7 +4029,7 @@ const yBand = (spec, context)=>{
         label: {
             visible: label?.visible,
             flush: true,
-            containerAlign: 'left',
+            containerAlign: 'right',
             space: 8,
             style: {
                 maxLineWidth: labelAutoLimitLength,
@@ -5556,15 +5565,18 @@ const autoDualMeasures = (advancedVSeed, context)=>{
 };
 const dualMeasuresToMeasureTree = (dualMeasures)=>{
     const measureTree = dualMeasures.map((item, index)=>{
-        const { primaryMeasures, secondaryMeasures, primaryAlias, secondaryAlias } = item;
+        const { primaryMeasures, secondaryMeasures } = item;
         const groupChildren = [];
+        let id = '';
         if (primaryMeasures) {
             const arrPrimaryMeasures = Array.isArray(primaryMeasures) ? primaryMeasures : [
                 primaryMeasures
             ];
+            const alias = arrPrimaryMeasures.map((item)=>item.alias || item.id).toString();
+            id += alias;
             groupChildren.push({
                 id: `${index}-primary`,
-                alias: primaryAlias || arrPrimaryMeasures.map((item)=>item.alias || item.id).toString(),
+                alias: arrPrimaryMeasures.map((item)=>item.alias || item.id).toString(),
                 children: arrPrimaryMeasures
             });
         }
@@ -5572,17 +5584,14 @@ const dualMeasuresToMeasureTree = (dualMeasures)=>{
             const arrSecondaryMeasures = Array.isArray(secondaryMeasures) ? secondaryMeasures : [
                 secondaryMeasures
             ];
+            const alias = arrSecondaryMeasures.map((item)=>item.alias || item.id).toString();
+            id += alias;
             groupChildren.push({
                 id: `${index}-secondary`,
-                alias: secondaryAlias || arrSecondaryMeasures.map((item)=>item.alias || item.id).toString(),
+                alias: arrSecondaryMeasures.map((item)=>item.alias || item.id).toString(),
                 children: arrSecondaryMeasures
             });
         }
-        const id = [
-            primaryAlias,
-            secondaryAlias,
-            index
-        ].filter((d)=>!isNullish(d)).join('-');
         return {
             id,
             alias: id,
@@ -5648,12 +5657,13 @@ const dualChartTypePrimary = (spec, context)=>{
     const { advancedVSeed, vseed } = context;
     const { chartType } = vseed;
     const { datasetReshapeInfo } = advancedVSeed;
+    const index = datasetReshapeInfo[0].index;
     const config = advancedVSeed.config?.[chartType]?.dualChartType || {
         primary: 'column',
         secondary: 'line'
     };
-    if (Array.isArray(config)) return result;
-    switch(config.primary){
+    const primary = Array.isArray(config) ? config[index].primary || config[0].primary : config.primary;
+    switch(primary){
         case 'line':
             result.type = 'line';
             break;
@@ -5686,7 +5696,7 @@ const dualChartTypePrimary = (spec, context)=>{
             result.type = 'scatter';
             break;
         default:
-            result.type = config.primary;
+            result.type = primary;
     }
     return result;
 };
@@ -5701,8 +5711,9 @@ const dualChartTypeSecondary = (spec, context)=>{
         primary: 'column',
         secondary: 'line'
     };
-    if (Array.isArray(config)) return result;
-    switch(config.secondary){
+    const index = datasetReshapeInfo[0].index;
+    const secondary = Array.isArray(config) ? config[index].secondary || config[0].secondary : config.secondary;
+    switch(secondary){
         case 'line':
             result.type = 'line';
             break;
@@ -5735,7 +5746,7 @@ const dualChartTypeSecondary = (spec, context)=>{
             result.type = 'scatter';
             break;
         default:
-            result.type = config.secondary;
+            result.type = secondary;
     }
     return result;
 };
@@ -6054,7 +6065,9 @@ const yLinearPrimary = (spec, context)=>{
     const { advancedVSeed, vseed } = context;
     const { chartType } = vseed;
     const { locale, datasetReshapeInfo } = advancedVSeed;
-    const config = advancedVSeed.config?.[chartType]?.primaryYAxis;
+    const index = datasetReshapeInfo[0].index;
+    const primaryYAxis = advancedVSeed.config?.[chartType]?.primaryYAxis;
+    const config = Array.isArray(primaryYAxis) ? primaryYAxis[index] || primaryYAxis[0] : primaryYAxis;
     if (datasetReshapeInfo[0].foldInfoList?.[0] && isEmpty(datasetReshapeInfo[0].foldInfoList[0].foldMap)) return result;
     const id = `${datasetReshapeInfo[0].id}-primary-axis`;
     const seriesId = `${datasetReshapeInfo[0].id}-primary-series`;
@@ -6153,7 +6166,9 @@ const yLinearSecondary = (spec, context)=>{
     const { advancedVSeed, vseed } = context;
     const { chartType } = vseed;
     const { locale, datasetReshapeInfo } = advancedVSeed;
-    const config = advancedVSeed.config?.[chartType]?.secondaryYAxis;
+    const index = datasetReshapeInfo[0].index;
+    const secondaryYAxis = advancedVSeed.config?.[chartType]?.secondaryYAxis;
+    const config = Array.isArray(secondaryYAxis) ? secondaryYAxis[index] || secondaryYAxis[0] : secondaryYAxis;
     if (isNullish(datasetReshapeInfo[0].foldInfoList?.[1])) return result;
     const id = `${datasetReshapeInfo[0].id}-secondary-axis`;
     const seriesId = `${datasetReshapeInfo[0].id}-secondary-series`;
@@ -6281,6 +6296,7 @@ const pivotDualAxis = [
     pivotIndicators_pivotIndicators([
         series([
             initDualAxisPrimary,
+            dualChartTypePrimary,
             datasetPrimary,
             labelPrimary,
             tooltipPrimary,
@@ -6292,6 +6308,7 @@ const pivotDualAxis = [
             areaStyle_areaStyle
         ], [
             initDualAxisSecondary,
+            dualChartTypeSecondary,
             datasetSecondary,
             labelSecondary,
             tooltipSecondary,
@@ -7795,7 +7812,12 @@ const lightTheme = ()=>{
                 ...baseConfig,
                 xAxis: bandAxis,
                 primaryYAxis: linearAxis,
-                secondaryYAxis: linearAxis,
+                secondaryYAxis: {
+                    ...linearAxis,
+                    grid: {
+                        visible: false
+                    }
+                },
                 dualChartType: {
                     primary: 'column',
                     secondary: 'line'
@@ -8128,7 +8150,12 @@ const darkTheme = ()=>{
                 ...baseConfig,
                 xAxis: bandAxis,
                 primaryYAxis: linearAxis,
-                secondaryYAxis: linearAxis,
+                secondaryYAxis: {
+                    ...linearAxis,
+                    grid: {
+                        visible: false
+                    }
+                },
                 dualChartType: {
                     primary: 'column',
                     secondary: 'line'
@@ -8244,19 +8271,15 @@ const zDualChartType = z.object({
     primary: z["enum"]([
         'line',
         'column',
-        'columnPercent',
         'columnParallel',
         'area',
-        'areaPercent',
         'scatter'
     ]).default('column'),
     secondary: z["enum"]([
         'line',
         'column',
-        'columnPercent',
         'columnParallel',
         'area',
-        'areaPercent',
         'scatter'
     ]).default('line')
 });
@@ -8328,9 +8351,7 @@ const zMeasureTree = z.array(zMeasureGroup.or(zMeasure));
 const zDualMeasure = z.object({
     id: z.string(),
     primaryMeasures: z.array(zMeasure).or(zMeasure).optional(),
-    primaryAlias: z.string().optional(),
-    secondaryMeasures: z.array(zMeasure).or(zMeasure).optional(),
-    secondaryAlias: z.string().optional()
+    secondaryMeasures: z.array(zMeasure).or(zMeasure).optional()
 });
 const zDualMeasures = z.array(zDualMeasure);
 const zFoldInfo = z.object({