@visactor/vseed 0.0.34 → 0.0.36

package/dist/umd/index.js

@@ -667,6 +667,16 @@
             for (let [e, c] of n.entries())r[e] = chunk_BCBB46UE_u(c, o, t);
             return r;
         }
+        function chunk_NMC53JVB_o(e) {
+            return "object" == typeof e && null !== e;
+        }
+        function chunk_5S4PYKVY_t(...e) {
+            return chunk_WIMGWYZL_u(chunk_5S4PYKVY_u, e);
+        }
+        var chunk_5S4PYKVY_u = (e, o)=>({
+                ...e,
+                ...o
+            });
         const theme_theme = (advancedVSeed, context)=>{
             const { customTheme, vseed } = context;
             const { theme = 'light', chartType } = vseed;
@@ -678,6 +688,10 @@
             if (chartConfigTheme) {
                 const chartConfig = result.config?.[chartType] || {};
                 const mergedConfig = D(chartConfigTheme, chunk_BCBB46UE_d(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
                 };
@@ -690,6 +704,11 @@
             };
             return result;
         };
+        const mergeArray = (arr, themeItem)=>{
+            if (!Array.isArray(arr)) return arr;
+            if (arr.some((d)=>!chunk_NMC53JVB_o(d))) return arr;
+            return arr.map((item)=>chunk_5S4PYKVY_t(themeItem, item));
+        };
         const tableAdvancedPipeline = [
             initAdvancedVSeed,
             autoMeasures,
@@ -4467,7 +4486,7 @@
                 label: {
                     visible: label?.visible,
                     flush: true,
-                    containerAlign: 'left',
+                    containerAlign: 'right',
                     space: 8,
                     style: {
                         maxLineWidth: labelAutoLimitLength,
@@ -6003,15 +6022,18 @@
         };
         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
                     });
                 }
@@ -6019,17 +6041,14 @@
                     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)=>!chunk_JK3VNB42_n(d)).join('-');
                 return {
                     id,
                     alias: id,
@@ -6095,12 +6114,13 @@
             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;
@@ -6133,7 +6153,7 @@
                     result.type = 'scatter';
                     break;
                 default:
-                    result.type = config.primary;
+                    result.type = primary;
             }
             return result;
         };
@@ -6148,8 +6168,9 @@
                 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;
@@ -6182,7 +6203,7 @@
                     result.type = 'scatter';
                     break;
                 default:
-                    result.type = config.secondary;
+                    result.type = secondary;
             }
             return result;
         };
@@ -6501,7 +6522,9 @@
             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] && chunk_VCYTMP4D_n(datasetReshapeInfo[0].foldInfoList[0].foldMap)) return result;
             const id = `${datasetReshapeInfo[0].id}-primary-axis`;
             const seriesId = `${datasetReshapeInfo[0].id}-primary-series`;
@@ -6600,7 +6623,9 @@
             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 (chunk_JK3VNB42_n(datasetReshapeInfo[0].foldInfoList?.[1])) return result;
             const id = `${datasetReshapeInfo[0].id}-secondary-axis`;
             const seriesId = `${datasetReshapeInfo[0].id}-secondary-series`;
@@ -6728,6 +6753,7 @@
             pivotIndicators_pivotIndicators([
                 series([
                     initDualAxisPrimary,
+                    dualChartTypePrimary,
                     datasetPrimary,
                     labelPrimary,
                     tooltipPrimary,
@@ -6739,6 +6765,7 @@
                     areaStyle_areaStyle
                 ], [
                     initDualAxisSecondary,
+                    dualChartTypeSecondary,
                     datasetSecondary,
                     labelSecondary,
                     tooltipSecondary,
@@ -8242,7 +8269,12 @@
                         ...baseConfig,
                         xAxis: bandAxis,
                         primaryYAxis: linearAxis,
-                        secondaryYAxis: linearAxis,
+                        secondaryYAxis: {
+                            ...linearAxis,
+                            grid: {
+                                visible: false
+                            }
+                        },
                         dualChartType: {
                             primary: 'column',
                             secondary: 'line'
@@ -8575,7 +8607,12 @@
                         ...baseConfig,
                         xAxis: bandAxis,
                         primaryYAxis: linearAxis,
-                        secondaryYAxis: linearAxis,
+                        secondaryYAxis: {
+                            ...linearAxis,
+                            grid: {
+                                visible: false
+                            }
+                        },
                         dualChartType: {
                             primary: 'column',
                             secondary: 'line'
@@ -11974,19 +12011,15 @@
             primary: schemas_enum([
                 'line',
                 'column',
-                'columnPercent',
                 'columnParallel',
                 'area',
-                'areaPercent',
                 'scatter'
             ]).default('column'),
             secondary: schemas_enum([
                 'line',
                 'column',
-                'columnPercent',
                 'columnParallel',
                 'area',
-                'areaPercent',
                 'scatter'
             ]).default('line')
         });
@@ -12058,9 +12091,7 @@
         const zDualMeasure = schemas_object({
             id: schemas_string(),
             primaryMeasures: schemas_array(zMeasure).or(zMeasure).optional(),
-            primaryAlias: schemas_string().optional(),
-            secondaryMeasures: schemas_array(zMeasure).or(zMeasure).optional(),
-            secondaryAlias: schemas_string().optional()
+            secondaryMeasures: schemas_array(zMeasure).or(zMeasure).optional()
         });
         const zDualMeasures = schemas_array(zDualMeasure);
         const zFoldInfo = schemas_object({