@visactor/vseed 0.0.35 → 0.0.36

package/dist/index.cjs

@@ -531,6 +531,10 @@ const theme_theme = (advancedVSeed, context)=>{
     if (chartConfigTheme) {
         const chartConfig = result.config?.[chartType] || {};
         const mergedConfig = (0, external_remeda_namespaceObject.mergeDeep)(chartConfigTheme, (0, external_remeda_namespaceObject.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
         };
@@ -543,6 +547,11 @@ const theme_theme = (advancedVSeed, context)=>{
     };
     return result;
 };
+const mergeArray = (arr, themeItem)=>{
+    if (!Array.isArray(arr)) return arr;
+    if (arr.some((d)=>!(0, external_remeda_namespaceObject.isObjectType)(d))) return arr;
+    return arr.map((item)=>(0, external_remeda_namespaceObject.merge)(themeItem, item));
+};
 const tableAdvancedPipeline = [
     initAdvancedVSeed,
     autoMeasures,
@@ -4254,7 +4263,7 @@ const yBand = (spec, context)=>{
         label: {
             visible: label?.visible,
             flush: true,
-            containerAlign: 'left',
+            containerAlign: 'right',
             space: 8,
             style: {
                 maxLineWidth: labelAutoLimitLength,
@@ -5790,15 +5799,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
             });
         }
@@ -5806,17 +5818,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)=>!(0, external_remeda_namespaceObject.isNullish)(d)).join('-');
         return {
             id,
             alias: id,
@@ -6290,7 +6299,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] && (0, external_remeda_namespaceObject.isEmpty)(datasetReshapeInfo[0].foldInfoList[0].foldMap)) return result;
     const id = `${datasetReshapeInfo[0].id}-primary-axis`;
     const seriesId = `${datasetReshapeInfo[0].id}-primary-series`;
@@ -6389,7 +6400,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 ((0, external_remeda_namespaceObject.isNullish)(datasetReshapeInfo[0].foldInfoList?.[1])) return result;
     const id = `${datasetReshapeInfo[0].id}-secondary-axis`;
     const seriesId = `${datasetReshapeInfo[0].id}-secondary-series`;
@@ -8573,9 +8586,7 @@ const zMeasureTree = external_zod_namespaceObject.z.array(zMeasureGroup.or(zMeas
 const zDualMeasure = external_zod_namespaceObject.z.object({
     id: external_zod_namespaceObject.z.string(),
     primaryMeasures: external_zod_namespaceObject.z.array(zMeasure).or(zMeasure).optional(),
-    primaryAlias: external_zod_namespaceObject.z.string().optional(),
-    secondaryMeasures: external_zod_namespaceObject.z.array(zMeasure).or(zMeasure).optional(),
-    secondaryAlias: external_zod_namespaceObject.z.string().optional()
+    secondaryMeasures: external_zod_namespaceObject.z.array(zMeasure).or(zMeasure).optional()
 });
 const zDualMeasures = external_zod_namespaceObject.z.array(zDualMeasure);
 const zFoldInfo = external_zod_namespaceObject.z.object({