@visactor/vseed 0.0.35 → 0.0.36

package/dist/types/chartType/dualAxis/dualAxis.d.ts

@@ -150,8 +150,34 @@ export interface DualAxis {
      * @description 提示信息配置, 用于定义图表的提示信息, 包括提示信息的位置, 格式, 样式等.
      */
     tooltip?: Tooltip;
+    /**
+     * 垂直提示框
+     * @description 垂直提示框配置, 用于定义图表的垂直提示框, 包括垂直提示框的颜色、标签样式等.
+     */
     crosshairRect?: CrosshairRect;
+    /**
+     * @description X轴排序配置, 支持根据维度或指标排序, 以及自定义排序顺序
+     * @example
+     * sort: {
+     *   orderBy: 'profit',
+     *   order: 'asc',
+     * }
+     * sort: {
+     *   customOrder:['2019', '2020', '2021']
+     * }
+     */
     sort?: Sort;
+    /**
+     * @description 图例排序配置, 支持根据维度或指标排序, 以及自定义排序顺序
+     * @example
+     * sortLegend: {
+     *   orderBy: 'profit',
+     *   order: 'asc',
+     * }
+     * sortLegend: {
+     *   customOrder:['2019', '2020', '2021']
+     * }
+     */
     sortLegend?: SortLegend;
     /**
      * @description 图表的主题, 主题是优先级较低的功能配置, 包含所有图表类型共用的通用配置, 与单类图表类型共用的图表配置, 内置light与dark两种主题, 用户可以通过Builder自定义主题
@@ -161,9 +187,41 @@ export interface DualAxis {
      * @example 'customThemeName'
      */
     theme?: Theme;
+    /**
+     * 矩形图元样式
+     * @description 条形图样式配置, 用于定义图表的条形图样式, 包括条形图的颜色, 边框, 圆角等.
+     * 支持全局样式或条件样式配置
+     * 数据筛选器
+     * 若配置selector, 提供数值 selector, 局部数据 selector, 条件维度 selector, 条件指标 selector 共四类数据匹配能力
+     * 若未配置selector, 则样式全局生效.
+     */
     barStyle?: BarStyle | BarStyle[];
+    /**
+     * 线图元样式
+     * @description 线图元样式配置, 用于定义图表的线图元样式, 包括线图元的颜色, 透明度, 曲线等.
+     * 支持全局样式或条件样式配置
+     * 数据筛选器
+     * 若配置selector, 提供数值 selector, 局部数据 selector, 条件维度 selector, 条件指标 selector 共四类数据匹配能力
+     * 若未配置selector, 则样式全局生效.
+     */
     lineStyle?: LineStyle | LineStyle[];
+    /**
+     * 点图元样式
+     * @description 点图元样式配置, 用于定义图表的点图元样式, 包括点图元的颜色, 边框等.
+     * 支持全局样式或条件样式配置
+     * 数据筛选器
+     * 若配置selector, 提供数值 selector, 局部数据 selector, 条件维度 selector, 条件指标 selector 共四类数据匹配能力
+     * 若未配置selector, 则样式全局生效.
+     */
     pointStyle?: PointStyle | PointStyle[];
+    /**
+     * 面积图元样式
+     * @description 面积图元样式配置, 用于定义图表的面积图元样式, 包括面积图元的颜色, 透明度, 边框等.
+     * 支持全局样式或条件样式配置
+     * 数据筛选器
+     * 若配置selector, 提供数值 selector, 局部数据 selector, 条件维度 selector, 条件指标 selector 共四类数据匹配能力
+     * 若未配置selector, 则样式全局生效.
+     */
     areaStyle?: AreaStyle | AreaStyle[];
     /**
      * @description 标注点配置, 根据选择的数据, 定义图表的标注点, 包括标注点的位置, 格式, 样式等.

package/dist/types/chartType/dualAxis/zDualAxis.d.ts

@@ -117,7 +117,6 @@ export declare const zDualAxis: z.ZodObject<{
                 }>>>;
             }, z.core.$strip>>>;
         }, z.core.$strip>]>>;
-        primaryAlias: z.ZodOptional<z.ZodString>;
         secondaryMeasures: z.ZodOptional<z.ZodUnion<[z.ZodArray<z.ZodObject<{
             id: z.ZodString;
             alias: z.ZodOptional<z.ZodString>;
@@ -187,7 +186,6 @@ export declare const zDualAxis: z.ZodObject<{
                 }>>>;
             }, z.core.$strip>>>;
         }, z.core.$strip>]>>;
-        secondaryAlias: z.ZodOptional<z.ZodString>;
     }, z.core.$strip>>>;
     dualChartType: z.ZodOptional<z.ZodUnion<[z.ZodArray<z.ZodObject<{
         primary: z.ZodDefault<z.ZodEnum<{

package/dist/types/properties/config/axes/axis.d.ts

@@ -45,7 +45,7 @@ export type Axis = {
      */
     inverse?: boolean;
     /**
-     * 是否在坐标轴上显示 0 值,
+     * 是否在坐标轴上强制显示 0 值,
      * @description 当配置了 min 和 max, 该配置项失效, 仅对数值轴生效
      * @default true
      * @example true

package/dist/types/properties/measures/dualMeasures.d.ts

@@ -1,8 +1,6 @@
 import type { Measure } from './measures';
 export type DualMeasure = {
-    primaryAlias?: string;
     primaryMeasures?: Measure | Measure[];
-    secondaryAlias?: string;
     secondaryMeasures?: Measure | Measure[];
 };
 export type DualMeasures = DualMeasure[];

package/dist/types/properties/measures/zDualMeasures.d.ts

@@ -70,7 +70,6 @@ export declare const zDualMeasure: z.ZodObject<{
             }>>>;
         }, z.core.$strip>>>;
     }, z.core.$strip>]>>;
-    primaryAlias: z.ZodOptional<z.ZodString>;
     secondaryMeasures: z.ZodOptional<z.ZodUnion<[z.ZodArray<z.ZodObject<{
         id: z.ZodString;
         alias: z.ZodOptional<z.ZodString>;
@@ -140,7 +139,6 @@ export declare const zDualMeasure: z.ZodObject<{
             }>>>;
         }, z.core.$strip>>>;
     }, z.core.$strip>]>>;
-    secondaryAlias: z.ZodOptional<z.ZodString>;
 }, z.core.$strip>;
 export declare const zDualMeasures: z.ZodArray<z.ZodObject<{
     id: z.ZodString;
@@ -213,7 +211,6 @@ export declare const zDualMeasures: z.ZodArray<z.ZodObject<{
             }>>>;
         }, z.core.$strip>>>;
     }, z.core.$strip>]>>;
-    primaryAlias: z.ZodOptional<z.ZodString>;
     secondaryMeasures: z.ZodOptional<z.ZodUnion<[z.ZodArray<z.ZodObject<{
         id: z.ZodString;
         alias: z.ZodOptional<z.ZodString>;
@@ -283,5 +280,4 @@ export declare const zDualMeasures: z.ZodArray<z.ZodObject<{
             }>>>;
         }, z.core.$strip>>>;
     }, z.core.$strip>]>>;
-    secondaryAlias: z.ZodOptional<z.ZodString>;
 }, z.core.$strip>>;

package/dist/types/vseed.d.ts

@@ -14294,7 +14294,6 @@ export declare const zVSeed: z.ZodDiscriminatedUnion<[z.ZodObject<{
                 }>>>;
             }, z.core.$strip>>>;
         }, z.core.$strip>]>>;
-        primaryAlias: z.ZodOptional<z.ZodString>;
         secondaryMeasures: z.ZodOptional<z.ZodUnion<[z.ZodArray<z.ZodObject<{
             id: z.ZodString;
             alias: z.ZodOptional<z.ZodString>;
@@ -14364,7 +14363,6 @@ export declare const zVSeed: z.ZodDiscriminatedUnion<[z.ZodObject<{
                 }>>>;
             }, z.core.$strip>>>;
         }, z.core.$strip>]>>;
-        secondaryAlias: z.ZodOptional<z.ZodString>;
     }, z.core.$strip>>>;
     dualChartType: z.ZodOptional<z.ZodUnion<[z.ZodArray<z.ZodObject<{
         primary: z.ZodDefault<z.ZodEnum<{

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,
@@ -6503,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`;
@@ -6602,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`;
@@ -12068,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({