@visactor/vseed 0.0.34 → 0.0.36
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/builder/builder/builder.d.ts +24 -24
- package/dist/index.cjs +47 -26
- package/dist/index.cjs.map +1 -1
- package/dist/index.js +48 -27
- package/dist/index.js.map +1 -1
- package/dist/types/advancedVSeed.d.ts +0 -16
- package/dist/types/chartType/dualAxis/dualAxis.d.ts +58 -0
- package/dist/types/chartType/dualAxis/zDualAxis.d.ts +0 -10
- package/dist/types/properties/chartType/dualChartType.d.ts +0 -4
- package/dist/types/properties/config/axes/axis.d.ts +1 -1
- package/dist/types/properties/config/config.d.ts +0 -16
- package/dist/types/properties/measures/dualMeasures.d.ts +0 -2
- package/dist/types/properties/measures/zDualMeasures.d.ts +0 -4
- package/dist/types/properties/theme/customTheme.d.ts +0 -16
- package/dist/types/vseed.d.ts +0 -10
- package/dist/umd/index.js +57 -26
- package/dist/umd/index.js.map +1 -1
- package/package.json +1 -1
|
@@ -1362,11 +1362,11 @@ export declare class Builder implements VSeedBuilder {
|
|
|
1362
1362
|
labelFontWeight?: string | number | undefined;
|
|
1363
1363
|
} | undefined;
|
|
1364
1364
|
dualChartType?: {
|
|
1365
|
-
primary: "line" | "column" | "
|
|
1366
|
-
secondary: "line" | "column" | "
|
|
1365
|
+
primary: "line" | "column" | "columnParallel" | "area" | "scatter";
|
|
1366
|
+
secondary: "line" | "column" | "columnParallel" | "area" | "scatter";
|
|
1367
1367
|
} | {
|
|
1368
|
-
primary: "line" | "column" | "
|
|
1369
|
-
secondary: "line" | "column" | "
|
|
1368
|
+
primary: "line" | "column" | "columnParallel" | "area" | "scatter";
|
|
1369
|
+
secondary: "line" | "column" | "columnParallel" | "area" | "scatter";
|
|
1370
1370
|
}[] | undefined;
|
|
1371
1371
|
primaryYAxis?: {
|
|
1372
1372
|
visible?: boolean | undefined;
|
|
@@ -3220,11 +3220,11 @@ export declare class Builder implements VSeedBuilder {
|
|
|
3220
3220
|
labelFontWeight?: string | number | undefined;
|
|
3221
3221
|
} | undefined;
|
|
3222
3222
|
dualChartType?: {
|
|
3223
|
-
primary: "line" | "column" | "
|
|
3224
|
-
secondary: "line" | "column" | "
|
|
3223
|
+
primary: "line" | "column" | "columnParallel" | "area" | "scatter";
|
|
3224
|
+
secondary: "line" | "column" | "columnParallel" | "area" | "scatter";
|
|
3225
3225
|
} | {
|
|
3226
|
-
primary: "line" | "column" | "
|
|
3227
|
-
secondary: "line" | "column" | "
|
|
3226
|
+
primary: "line" | "column" | "columnParallel" | "area" | "scatter";
|
|
3227
|
+
secondary: "line" | "column" | "columnParallel" | "area" | "scatter";
|
|
3228
3228
|
}[] | undefined;
|
|
3229
3229
|
primaryYAxis?: {
|
|
3230
3230
|
visible?: boolean | undefined;
|
|
@@ -5250,11 +5250,11 @@ export declare class Builder implements VSeedBuilder {
|
|
|
5250
5250
|
labelFontWeight?: string | number | undefined;
|
|
5251
5251
|
} | undefined;
|
|
5252
5252
|
dualChartType?: {
|
|
5253
|
-
primary: "line" | "column" | "
|
|
5254
|
-
secondary: "line" | "column" | "
|
|
5253
|
+
primary: "line" | "column" | "columnParallel" | "area" | "scatter";
|
|
5254
|
+
secondary: "line" | "column" | "columnParallel" | "area" | "scatter";
|
|
5255
5255
|
} | {
|
|
5256
|
-
primary: "line" | "column" | "
|
|
5257
|
-
secondary: "line" | "column" | "
|
|
5256
|
+
primary: "line" | "column" | "columnParallel" | "area" | "scatter";
|
|
5257
|
+
secondary: "line" | "column" | "columnParallel" | "area" | "scatter";
|
|
5258
5258
|
}[] | undefined;
|
|
5259
5259
|
primaryYAxis?: {
|
|
5260
5260
|
visible?: boolean | undefined;
|
|
@@ -7108,11 +7108,11 @@ export declare class Builder implements VSeedBuilder {
|
|
|
7108
7108
|
labelFontWeight?: string | number | undefined;
|
|
7109
7109
|
} | undefined;
|
|
7110
7110
|
dualChartType?: {
|
|
7111
|
-
primary: "line" | "column" | "
|
|
7112
|
-
secondary: "line" | "column" | "
|
|
7111
|
+
primary: "line" | "column" | "columnParallel" | "area" | "scatter";
|
|
7112
|
+
secondary: "line" | "column" | "columnParallel" | "area" | "scatter";
|
|
7113
7113
|
} | {
|
|
7114
|
-
primary: "line" | "column" | "
|
|
7115
|
-
secondary: "line" | "column" | "
|
|
7114
|
+
primary: "line" | "column" | "columnParallel" | "area" | "scatter";
|
|
7115
|
+
secondary: "line" | "column" | "columnParallel" | "area" | "scatter";
|
|
7116
7116
|
}[] | undefined;
|
|
7117
7117
|
primaryYAxis?: {
|
|
7118
7118
|
visible?: boolean | undefined;
|
|
@@ -9115,11 +9115,11 @@ export declare class Builder implements VSeedBuilder {
|
|
|
9115
9115
|
labelFontWeight?: string | number | undefined;
|
|
9116
9116
|
} | undefined;
|
|
9117
9117
|
dualChartType?: {
|
|
9118
|
-
primary: "line" | "column" | "
|
|
9119
|
-
secondary: "line" | "column" | "
|
|
9118
|
+
primary: "line" | "column" | "columnParallel" | "area" | "scatter";
|
|
9119
|
+
secondary: "line" | "column" | "columnParallel" | "area" | "scatter";
|
|
9120
9120
|
} | {
|
|
9121
|
-
primary: "line" | "column" | "
|
|
9122
|
-
secondary: "line" | "column" | "
|
|
9121
|
+
primary: "line" | "column" | "columnParallel" | "area" | "scatter";
|
|
9122
|
+
secondary: "line" | "column" | "columnParallel" | "area" | "scatter";
|
|
9123
9123
|
}[] | undefined;
|
|
9124
9124
|
primaryYAxis?: {
|
|
9125
9125
|
visible?: boolean | undefined;
|
|
@@ -10755,11 +10755,11 @@ export declare class Builder implements VSeedBuilder {
|
|
|
10755
10755
|
labelFontWeight?: string | number | undefined;
|
|
10756
10756
|
} | undefined;
|
|
10757
10757
|
dualChartType?: {
|
|
10758
|
-
primary: "line" | "column" | "
|
|
10759
|
-
secondary: "line" | "column" | "
|
|
10758
|
+
primary: "line" | "column" | "columnParallel" | "area" | "scatter";
|
|
10759
|
+
secondary: "line" | "column" | "columnParallel" | "area" | "scatter";
|
|
10760
10760
|
} | {
|
|
10761
|
-
primary: "line" | "column" | "
|
|
10762
|
-
secondary: "line" | "column" | "
|
|
10761
|
+
primary: "line" | "column" | "columnParallel" | "area" | "scatter";
|
|
10762
|
+
secondary: "line" | "column" | "columnParallel" | "area" | "scatter";
|
|
10763
10763
|
}[] | undefined;
|
|
10764
10764
|
primaryYAxis?: {
|
|
10765
10765
|
visible?: boolean | undefined;
|
package/dist/index.cjs
CHANGED
|
@@ -531,6 +531,10 @@ const theme_theme = (advancedVSeed, context)=>{
|
|
|
531
531
|
if (chartConfigTheme) {
|
|
532
532
|
const chartConfig = result.config?.[chartType] || {};
|
|
533
533
|
const mergedConfig = (0, external_remeda_namespaceObject.mergeDeep)(chartConfigTheme, (0, external_remeda_namespaceObject.clone)(chartConfig));
|
|
534
|
+
for(const _k in mergedConfig){
|
|
535
|
+
const key = _k;
|
|
536
|
+
if (Array.isArray(mergedConfig[key])) mergedConfig[key] = mergeArray(mergedConfig[key], chartConfigTheme[key]);
|
|
537
|
+
}
|
|
534
538
|
result.config = {
|
|
535
539
|
[chartType]: mergedConfig
|
|
536
540
|
};
|
|
@@ -543,6 +547,11 @@ const theme_theme = (advancedVSeed, context)=>{
|
|
|
543
547
|
};
|
|
544
548
|
return result;
|
|
545
549
|
};
|
|
550
|
+
const mergeArray = (arr, themeItem)=>{
|
|
551
|
+
if (!Array.isArray(arr)) return arr;
|
|
552
|
+
if (arr.some((d)=>!(0, external_remeda_namespaceObject.isObjectType)(d))) return arr;
|
|
553
|
+
return arr.map((item)=>(0, external_remeda_namespaceObject.merge)(themeItem, item));
|
|
554
|
+
};
|
|
546
555
|
const tableAdvancedPipeline = [
|
|
547
556
|
initAdvancedVSeed,
|
|
548
557
|
autoMeasures,
|
|
@@ -4254,7 +4263,7 @@ const yBand = (spec, context)=>{
|
|
|
4254
4263
|
label: {
|
|
4255
4264
|
visible: label?.visible,
|
|
4256
4265
|
flush: true,
|
|
4257
|
-
containerAlign: '
|
|
4266
|
+
containerAlign: 'right',
|
|
4258
4267
|
space: 8,
|
|
4259
4268
|
style: {
|
|
4260
4269
|
maxLineWidth: labelAutoLimitLength,
|
|
@@ -5790,15 +5799,18 @@ const autoDualMeasures = (advancedVSeed, context)=>{
|
|
|
5790
5799
|
};
|
|
5791
5800
|
const dualMeasuresToMeasureTree = (dualMeasures)=>{
|
|
5792
5801
|
const measureTree = dualMeasures.map((item, index)=>{
|
|
5793
|
-
const { primaryMeasures, secondaryMeasures
|
|
5802
|
+
const { primaryMeasures, secondaryMeasures } = item;
|
|
5794
5803
|
const groupChildren = [];
|
|
5804
|
+
let id = '';
|
|
5795
5805
|
if (primaryMeasures) {
|
|
5796
5806
|
const arrPrimaryMeasures = Array.isArray(primaryMeasures) ? primaryMeasures : [
|
|
5797
5807
|
primaryMeasures
|
|
5798
5808
|
];
|
|
5809
|
+
const alias = arrPrimaryMeasures.map((item)=>item.alias || item.id).toString();
|
|
5810
|
+
id += alias;
|
|
5799
5811
|
groupChildren.push({
|
|
5800
5812
|
id: `${index}-primary`,
|
|
5801
|
-
alias:
|
|
5813
|
+
alias: arrPrimaryMeasures.map((item)=>item.alias || item.id).toString(),
|
|
5802
5814
|
children: arrPrimaryMeasures
|
|
5803
5815
|
});
|
|
5804
5816
|
}
|
|
@@ -5806,17 +5818,14 @@ const dualMeasuresToMeasureTree = (dualMeasures)=>{
|
|
|
5806
5818
|
const arrSecondaryMeasures = Array.isArray(secondaryMeasures) ? secondaryMeasures : [
|
|
5807
5819
|
secondaryMeasures
|
|
5808
5820
|
];
|
|
5821
|
+
const alias = arrSecondaryMeasures.map((item)=>item.alias || item.id).toString();
|
|
5822
|
+
id += alias;
|
|
5809
5823
|
groupChildren.push({
|
|
5810
5824
|
id: `${index}-secondary`,
|
|
5811
|
-
alias:
|
|
5825
|
+
alias: arrSecondaryMeasures.map((item)=>item.alias || item.id).toString(),
|
|
5812
5826
|
children: arrSecondaryMeasures
|
|
5813
5827
|
});
|
|
5814
5828
|
}
|
|
5815
|
-
const id = [
|
|
5816
|
-
primaryAlias,
|
|
5817
|
-
secondaryAlias,
|
|
5818
|
-
index
|
|
5819
|
-
].filter((d)=>!(0, external_remeda_namespaceObject.isNullish)(d)).join('-');
|
|
5820
5829
|
return {
|
|
5821
5830
|
id,
|
|
5822
5831
|
alias: id,
|
|
@@ -5882,12 +5891,13 @@ const dualChartTypePrimary = (spec, context)=>{
|
|
|
5882
5891
|
const { advancedVSeed, vseed } = context;
|
|
5883
5892
|
const { chartType } = vseed;
|
|
5884
5893
|
const { datasetReshapeInfo } = advancedVSeed;
|
|
5894
|
+
const index = datasetReshapeInfo[0].index;
|
|
5885
5895
|
const config = advancedVSeed.config?.[chartType]?.dualChartType || {
|
|
5886
5896
|
primary: 'column',
|
|
5887
5897
|
secondary: 'line'
|
|
5888
5898
|
};
|
|
5889
|
-
|
|
5890
|
-
switch(
|
|
5899
|
+
const primary = Array.isArray(config) ? config[index].primary || config[0].primary : config.primary;
|
|
5900
|
+
switch(primary){
|
|
5891
5901
|
case 'line':
|
|
5892
5902
|
result.type = 'line';
|
|
5893
5903
|
break;
|
|
@@ -5920,7 +5930,7 @@ const dualChartTypePrimary = (spec, context)=>{
|
|
|
5920
5930
|
result.type = 'scatter';
|
|
5921
5931
|
break;
|
|
5922
5932
|
default:
|
|
5923
|
-
result.type =
|
|
5933
|
+
result.type = primary;
|
|
5924
5934
|
}
|
|
5925
5935
|
return result;
|
|
5926
5936
|
};
|
|
@@ -5935,8 +5945,9 @@ const dualChartTypeSecondary = (spec, context)=>{
|
|
|
5935
5945
|
primary: 'column',
|
|
5936
5946
|
secondary: 'line'
|
|
5937
5947
|
};
|
|
5938
|
-
|
|
5939
|
-
|
|
5948
|
+
const index = datasetReshapeInfo[0].index;
|
|
5949
|
+
const secondary = Array.isArray(config) ? config[index].secondary || config[0].secondary : config.secondary;
|
|
5950
|
+
switch(secondary){
|
|
5940
5951
|
case 'line':
|
|
5941
5952
|
result.type = 'line';
|
|
5942
5953
|
break;
|
|
@@ -5969,7 +5980,7 @@ const dualChartTypeSecondary = (spec, context)=>{
|
|
|
5969
5980
|
result.type = 'scatter';
|
|
5970
5981
|
break;
|
|
5971
5982
|
default:
|
|
5972
|
-
result.type =
|
|
5983
|
+
result.type = secondary;
|
|
5973
5984
|
}
|
|
5974
5985
|
return result;
|
|
5975
5986
|
};
|
|
@@ -6288,7 +6299,9 @@ const yLinearPrimary = (spec, context)=>{
|
|
|
6288
6299
|
const { advancedVSeed, vseed } = context;
|
|
6289
6300
|
const { chartType } = vseed;
|
|
6290
6301
|
const { locale, datasetReshapeInfo } = advancedVSeed;
|
|
6291
|
-
const
|
|
6302
|
+
const index = datasetReshapeInfo[0].index;
|
|
6303
|
+
const primaryYAxis = advancedVSeed.config?.[chartType]?.primaryYAxis;
|
|
6304
|
+
const config = Array.isArray(primaryYAxis) ? primaryYAxis[index] || primaryYAxis[0] : primaryYAxis;
|
|
6292
6305
|
if (datasetReshapeInfo[0].foldInfoList?.[0] && (0, external_remeda_namespaceObject.isEmpty)(datasetReshapeInfo[0].foldInfoList[0].foldMap)) return result;
|
|
6293
6306
|
const id = `${datasetReshapeInfo[0].id}-primary-axis`;
|
|
6294
6307
|
const seriesId = `${datasetReshapeInfo[0].id}-primary-series`;
|
|
@@ -6387,7 +6400,9 @@ const yLinearSecondary = (spec, context)=>{
|
|
|
6387
6400
|
const { advancedVSeed, vseed } = context;
|
|
6388
6401
|
const { chartType } = vseed;
|
|
6389
6402
|
const { locale, datasetReshapeInfo } = advancedVSeed;
|
|
6390
|
-
const
|
|
6403
|
+
const index = datasetReshapeInfo[0].index;
|
|
6404
|
+
const secondaryYAxis = advancedVSeed.config?.[chartType]?.secondaryYAxis;
|
|
6405
|
+
const config = Array.isArray(secondaryYAxis) ? secondaryYAxis[index] || secondaryYAxis[0] : secondaryYAxis;
|
|
6391
6406
|
if ((0, external_remeda_namespaceObject.isNullish)(datasetReshapeInfo[0].foldInfoList?.[1])) return result;
|
|
6392
6407
|
const id = `${datasetReshapeInfo[0].id}-secondary-axis`;
|
|
6393
6408
|
const seriesId = `${datasetReshapeInfo[0].id}-secondary-series`;
|
|
@@ -6515,6 +6530,7 @@ const pivotDualAxis = [
|
|
|
6515
6530
|
pivotIndicators_pivotIndicators([
|
|
6516
6531
|
series([
|
|
6517
6532
|
initDualAxisPrimary,
|
|
6533
|
+
dualChartTypePrimary,
|
|
6518
6534
|
datasetPrimary,
|
|
6519
6535
|
labelPrimary,
|
|
6520
6536
|
tooltipPrimary,
|
|
@@ -6526,6 +6542,7 @@ const pivotDualAxis = [
|
|
|
6526
6542
|
areaStyle_areaStyle
|
|
6527
6543
|
], [
|
|
6528
6544
|
initDualAxisSecondary,
|
|
6545
|
+
dualChartTypeSecondary,
|
|
6529
6546
|
datasetSecondary,
|
|
6530
6547
|
labelSecondary,
|
|
6531
6548
|
tooltipSecondary,
|
|
@@ -8029,7 +8046,12 @@ const lightTheme = ()=>{
|
|
|
8029
8046
|
...baseConfig,
|
|
8030
8047
|
xAxis: bandAxis,
|
|
8031
8048
|
primaryYAxis: linearAxis,
|
|
8032
|
-
secondaryYAxis:
|
|
8049
|
+
secondaryYAxis: {
|
|
8050
|
+
...linearAxis,
|
|
8051
|
+
grid: {
|
|
8052
|
+
visible: false
|
|
8053
|
+
}
|
|
8054
|
+
},
|
|
8033
8055
|
dualChartType: {
|
|
8034
8056
|
primary: 'column',
|
|
8035
8057
|
secondary: 'line'
|
|
@@ -8362,7 +8384,12 @@ const darkTheme = ()=>{
|
|
|
8362
8384
|
...baseConfig,
|
|
8363
8385
|
xAxis: bandAxis,
|
|
8364
8386
|
primaryYAxis: linearAxis,
|
|
8365
|
-
secondaryYAxis:
|
|
8387
|
+
secondaryYAxis: {
|
|
8388
|
+
...linearAxis,
|
|
8389
|
+
grid: {
|
|
8390
|
+
visible: false
|
|
8391
|
+
}
|
|
8392
|
+
},
|
|
8366
8393
|
dualChartType: {
|
|
8367
8394
|
primary: 'column',
|
|
8368
8395
|
secondary: 'line'
|
|
@@ -8479,19 +8506,15 @@ const zDualChartType = external_zod_namespaceObject.z.object({
|
|
|
8479
8506
|
primary: external_zod_namespaceObject.z["enum"]([
|
|
8480
8507
|
'line',
|
|
8481
8508
|
'column',
|
|
8482
|
-
'columnPercent',
|
|
8483
8509
|
'columnParallel',
|
|
8484
8510
|
'area',
|
|
8485
|
-
'areaPercent',
|
|
8486
8511
|
'scatter'
|
|
8487
8512
|
]).default('column'),
|
|
8488
8513
|
secondary: external_zod_namespaceObject.z["enum"]([
|
|
8489
8514
|
'line',
|
|
8490
8515
|
'column',
|
|
8491
|
-
'columnPercent',
|
|
8492
8516
|
'columnParallel',
|
|
8493
8517
|
'area',
|
|
8494
|
-
'areaPercent',
|
|
8495
8518
|
'scatter'
|
|
8496
8519
|
]).default('line')
|
|
8497
8520
|
});
|
|
@@ -8563,9 +8586,7 @@ const zMeasureTree = external_zod_namespaceObject.z.array(zMeasureGroup.or(zMeas
|
|
|
8563
8586
|
const zDualMeasure = external_zod_namespaceObject.z.object({
|
|
8564
8587
|
id: external_zod_namespaceObject.z.string(),
|
|
8565
8588
|
primaryMeasures: external_zod_namespaceObject.z.array(zMeasure).or(zMeasure).optional(),
|
|
8566
|
-
|
|
8567
|
-
secondaryMeasures: external_zod_namespaceObject.z.array(zMeasure).or(zMeasure).optional(),
|
|
8568
|
-
secondaryAlias: external_zod_namespaceObject.z.string().optional()
|
|
8589
|
+
secondaryMeasures: external_zod_namespaceObject.z.array(zMeasure).or(zMeasure).optional()
|
|
8569
8590
|
});
|
|
8570
8591
|
const zDualMeasures = external_zod_namespaceObject.z.array(zDualMeasure);
|
|
8571
8592
|
const zFoldInfo = external_zod_namespaceObject.z.object({
|