@visactor/vseed 0.4.7 → 0.4.8

package/dist/umd/index.js

@@ -3086,6 +3086,54 @@ self.R = R;
             };
             return result;
         };
+        const bottomFrozenStyle = (spec, context)=>{
+            const result = {
+                ...spec
+            };
+            const { advancedVSeed } = context;
+            const { config, chartType } = advancedVSeed;
+            const themConfig = config?.[chartType];
+            if (!result.theme || !themConfig) return result;
+            const borderColor = themConfig.borderColor || 'rgb(224, 224, 224)';
+            const backgroundColor = themConfig.headerBackgroundColor || '#EEF1F5';
+            const fontColor = themConfig.headerFontColor || '#1B1F23';
+            const fontSize = themConfig.headerFontSize || 12;
+            const hoverCellBgColor = themConfig.hoverHeaderBackgroundColor || '#bedaff';
+            const hoverInlineColor = themConfig.hoverHeaderInlineBackgroundColor || '#bedaff';
+            result.theme.bottomFrozenStyle = {
+                borderColor,
+                borderLineWidth: 1,
+                padding: [
+                    8,
+                    12,
+                    8,
+                    12
+                ],
+                textAlign: 'center',
+                hover: {
+                    cellBgColor: hoverCellBgColor,
+                    inlineRowBgColor: hoverInlineColor,
+                    inlineColumnBgColor: hoverInlineColor
+                },
+                frameStyle: {
+                    borderColor,
+                    borderLineWidth: [
+                        0,
+                        0,
+                        1,
+                        0
+                    ]
+                },
+                fontSize,
+                fontVariant: 'normal',
+                fontStyle: 'normal',
+                fontWeight: 'bold',
+                color: fontColor,
+                bgColor: backgroundColor,
+                lineHeight: 1.5 * fontSize
+            };
+            return result;
+        };
         const tableThemeStyle = (spec, context)=>{
             const result = {
                 ...spec
@@ -3213,6 +3261,7 @@ self.R = R;
             columnsAggregation,
             bodyStyle,
             headerStyle,
+            bottomFrozenStyle,
             tableThemeStyle,
             selectionStyle,
             tableBodyCell
@@ -3221,30 +3270,20 @@ self.R = R;
             Builder.registerAdvancedPipeline('table', tableAdvancedPipeline);
             Builder.registerSpecPipeline('table', tableSpecPipeline);
         };
-        const defaultMeasureId = (advancedVSeed)=>{
-            const result = {
-                ...advancedVSeed
-            };
-            const measures = findAllMeasures(advancedVSeed.measureTree);
-            if (measures.length > 1 && !findTreeNodesBy(advancedVSeed.dimensionTree, (dim)=>dim.id === MeasureId || dim.id === MeasureName).length) result.dimensionTree.push({
-                id: MeasureId,
-                alias: intl.i18n`指标名称`,
-                encoding: 'row'
-            });
-            return result;
-        };
         const encodingForPivotTable = (advancedVSeed)=>{
             const { measureTree = [], dimensionTree = [] } = advancedVSeed;
             const measures = findAllMeasures(measureTree);
-            const hasDimensionEncoding = dimensionTree.some((item)=>item.encoding);
+            const filteredDimensionTree = dimensionTree.filter((dim)=>dim.id !== MeasureId && dim.id !== MeasureName);
+            const hasDimensionEncoding = filteredDimensionTree.some((item)=>item.encoding);
             const hasMeasureEncoding = measures.some((item)=>item.encoding);
             const encoding = {};
-            if (hasDimensionEncoding) generateDimensionEncoding(dimensionTree, encoding);
-            else generateDefaultDimensionEncoding(dimensionTree, encoding);
+            if (hasDimensionEncoding) generateDimensionEncoding(filteredDimensionTree, encoding);
+            else generateDefaultDimensionEncoding(filteredDimensionTree, encoding);
             if (hasMeasureEncoding) generateMeasureEncoding(measures, encoding);
             else generateDefaultMeasureEncoding(measures, encoding);
             return {
                 ...advancedVSeed,
+                dimensionTree: filteredDimensionTree,
                 encoding
             };
         };
@@ -3279,91 +3318,6 @@ self.R = R;
             encoding.tooltip = measures.map((item)=>item.id);
             encoding.detail = chunk_QJLMYOTX_i(measures.filter((item)=>'detail' === item.encoding || !item.encoding).map((item)=>item.id));
         };
-        const foldMeasures = (dataset, measures, options)=>{
-            const { measureId, measureName, measureValue, colorMeasureId, allowEmptyFold = true, omitIds = [] } = options || {};
-            const foldInfo = {
-                measureId,
-                measureName,
-                measureValue,
-                statistics: {
-                    max: -1 / 0,
-                    min: 1 / 0,
-                    sum: 0,
-                    count: 0,
-                    colorMin: 1 / 0,
-                    colorMax: -1 / 0
-                },
-                foldMap: {}
-            };
-            if (!allowEmptyFold && 0 === measures.length) return {
-                dataset,
-                foldInfo
-            };
-            const result = new Array(dataset.length * measures.length);
-            let index = 0;
-            for(let i = 0; i < dataset.length; i++)for(let j = 0; j < measures.length; j++){
-                const datum = chunk_KI5X74E2_y({
-                    ...dataset[i]
-                }, omitIds);
-                datum[ORIGINAL_DATA] = dataset[i];
-                const measure = measures[j];
-                const { id, alias } = measure;
-                datum[id] = dataset[i][id];
-                datum[measureId] = id;
-                datum[measureName] = alias || id;
-                datum[measureValue] = dataset[i][id];
-                const valueNumber = Number(datum[id]);
-                foldInfo.statistics.min = Math.min(foldInfo.statistics.min, valueNumber);
-                foldInfo.statistics.max = Math.max(foldInfo.statistics.max, valueNumber);
-                foldInfo.statistics.sum += valueNumber;
-                foldInfo.statistics.count++;
-                if ('color' === measure.encoding) {
-                    foldInfo.statistics.colorMin = foldInfo.statistics.min;
-                    foldInfo.statistics.colorMax = foldInfo.statistics.max;
-                    datum[ColorEncoding] = valueNumber;
-                    datum[ColorIdEncoding] = measure.id;
-                } else if (colorMeasureId) {
-                    const value = datum[ORIGINAL_DATA][colorMeasureId];
-                    datum[ColorEncoding] = value;
-                    datum[ColorIdEncoding] = colorMeasureId;
-                    const valueNumber = Number(value);
-                    foldInfo.statistics.colorMin = Math.min(foldInfo.statistics.colorMin, valueNumber);
-                    foldInfo.statistics.colorMax = Math.max(foldInfo.statistics.colorMax, valueNumber);
-                }
-                foldInfo.foldMap[id] = alias;
-                result[index++] = datum;
-            }
-            return {
-                dataset: result,
-                foldInfo
-            };
-        };
-        const reshapePivotTable = (advancedVSeed, context)=>{
-            const result = {
-                ...advancedVSeed
-            };
-            const { vseed } = context;
-            const { dataset, chartType } = vseed;
-            const { measureTree } = advancedVSeed;
-            const { dataset: newDatasets, foldInfo } = foldMeasures(dataset, findAllMeasures(measureTree), {
-                measureId: FoldMeasureId,
-                measureName: FoldMeasureName,
-                measureValue: FoldMeasureValue,
-                allowEmptyFold: false
-            });
-            const datasetReshapeInfo = [
-                {
-                    id: String(chartType),
-                    index: 0,
-                    foldInfo
-                }
-            ];
-            return {
-                ...result,
-                dataset: newDatasets,
-                datasetReshapeInfo: datasetReshapeInfo
-            };
-        };
         const pivotTableConfig = (advancedVSeed, context)=>{
             const { vseed } = context;
             const { chartType } = vseed;
@@ -3397,10 +3351,9 @@ self.R = R;
             initAdvancedVSeed,
             defaultMeasures_defaultMeasures,
             defaultDimensions,
-            defaultMeasureId,
             cellStyle_cellStyle,
             encodingForPivotTable,
-            reshapePivotTable,
+            records_records,
             pivotTableConfig,
             theme_theme
         ];
@@ -3454,21 +3407,13 @@ self.R = R;
             const { encoding } = advancedVSeed;
             const dimensions = advancedVSeed.dimensionTree;
             const columns = dimensions.filter((item)=>encoding.column?.includes(item.id));
-            const allMeasures = findAllMeasures(advancedVSeed.measureTree);
             return {
                 ...spec,
-                columns: columns.map((item)=>{
-                    const res = {
+                columns: columns.map((item)=>({
                         dimensionKey: item.id,
                         title: item.alias || item.id,
                         width: 'auto'
-                    };
-                    if (item.id === MeasureId) res.headerFormat = (measureId)=>{
-                        const measure = allMeasures.find((m)=>m.id === measureId);
-                        return measure?.alias ?? measureId;
-                    };
-                    return res;
-                })
+                    }))
             };
         };
         const pivotRows = (spec, context)=>{
@@ -3476,64 +3421,52 @@ self.R = R;
             const dimensions = advancedVSeed.dimensionTree;
             const { encoding } = advancedVSeed;
             const rows = dimensions.filter((item)=>encoding.row?.includes(item.id));
-            const allMeasures = findAllMeasures(advancedVSeed.measureTree);
             return {
                 ...spec,
-                rows: rows.map((item)=>{
-                    const res = {
+                rows: rows.map((item)=>({
                         dimensionKey: item.id,
                         title: item.alias || item.id,
                         width: 'auto'
-                    };
-                    if (item.id === MeasureId) res.headerFormat = (measureId)=>{
-                        const measure = allMeasures.find((m)=>m.id === measureId);
-                        return measure?.alias ?? measureId;
-                    };
-                    return res;
-                })
-            };
-        };
-        const titleOnDimension = (spec)=>{
-            const { rows = [], columns = [] } = spec;
-            return {
-                ...spec,
-                corner: {
-                    titleOnDimension: rows.length <= 1 && columns.length >= 1 ? 'column' : 'row'
-                }
+                    }))
             };
         };
         const pivotIndicators = (spec, context)=>{
-            const { advancedVSeed } = context;
-            const { measureTree, datasetReshapeInfo } = advancedVSeed;
-            const { foldInfo } = datasetReshapeInfo[0];
-            const hasRow = spec?.rows?.length > 0;
-            const foldMapValues = Object.values(foldInfo.foldMap);
+            const { advancedVSeed, vseed } = context;
+            const { measureTree } = advancedVSeed;
+            const measures = findAllMeasures(measureTree);
+            const indicatorsAsCol = vseed.indicatorsAsCol ?? false;
             return {
                 ...spec,
                 indicatorTitle: intl.i18n`指标名称`,
-                indicatorsAsCol: hasRow,
-                hideIndicatorName: hasRow,
-                indicators: [
-                    {
+                indicatorsAsCol,
+                hideIndicatorName: measures.length <= 1,
+                indicators: measures.map((measure)=>{
+                    const formatter = createFormatterByMeasure(measure);
+                    return {
                         cellType: 'text',
-                        indicatorKey: foldInfo.measureValue,
-                        title: foldMapValues.length > 1 ? '' : foldMapValues[0],
+                        indicatorKey: measure.id,
+                        title: measure.alias || measure.id,
                         width: 'auto',
-                        format: pivotIndicators_fieldFormat(measureTree, foldInfo)
-                    }
-                ]
+                        format: (value, col, row, table)=>{
+                            if (!chunk_6GTAPB47_e(col) || !chunk_6GTAPB47_e(row) || !table) return value;
+                            const datum = table.getCellOriginRecord(col, row);
+                            if (!datum?.[0]) return value;
+                            return formatter(value);
+                        }
+                    };
+                })
             };
         };
-        const pivotIndicators_fieldFormat = (measureTree, foldInfo)=>(value, col, row, table)=>{
-                if (!chunk_6GTAPB47_e(col) || !chunk_6GTAPB47_e(row) || !table) return value;
-                const datum = table.getCellOriginRecord(col, row);
-                if (!datum[0]) return value;
-                const { measureId: foldMeasureId } = foldInfo;
-                const measureId = datum[0][foldMeasureId];
-                const measure = findMeasureById(measureTree, measureId);
-                const formatter = createFormatterByMeasure(measure);
-                return formatter(value);
+        const titleOnDimension = (spec)=>{
+            const { rows = [], columns = [], indicatorsAsCol, indicators = [] } = spec;
+            const rowsLength = rows.length + (indicatorsAsCol ? 0 : indicators?.length > 0 ? 1 : 0);
+            return {
+                ...spec,
+                corner: {
+                    titleOnDimension: rowsLength <= 1 && columns.length >= 1 && !indicatorsAsCol ? 'column' : 'row'
+                }
             };
+        };
         const rowHeaderStyle = (spec, context)=>{
             const result = {
                 ...spec
@@ -3659,7 +3592,6 @@ self.R = R;
                     headerPaths.forEach((path)=>{
                         if (path.dimensionKey) originalDatum[path.dimensionKey] = path.value;
                     });
-                    if (!chunk_JK3VNB42_n(originalDatum[MeasureId]) && !chunk_JK3VNB42_n(originalDatum[FoldMeasureValue])) originalDatum[originalDatum[MeasureId]] = originalDatum[FoldMeasureValue];
                     const currentCellData = getCellOriginalDataByDatum(datum, hasDynamicFilter, originalDatum);
                     const mergedStyle = bodyCellStyleList.reduce((result, style)=>{
                         const shouldApply = style.dynamicFilter ? selectorWithDynamicFilter(currentCellData || originalDatum, style.dynamicFilter, style.selector) : selector_selector(originalDatum, style.selector);
@@ -3694,7 +3626,7 @@ self.R = R;
             const measures = findAllMeasures(advancedVSeed.measureTree);
             const aggregationRules = measures.map((measure)=>({
                     field: measure.id,
-                    aggregationType: 'NONE',
+                    aggregationType: 'SUM',
                     indicatorKey: measure.id
                 }));
             const dataConfigObj = {
@@ -3704,9 +3636,9 @@ self.R = R;
             if (totals) {
                 const grandTotalLabel = intl.i18n`总计`;
                 const subTotalLabel = intl.i18n`小计`;
-                const dimensionIds = (advancedVSeed.dimensionTree || []).map((dim)=>dim.id);
                 dataConfigObj.totals = {};
                 if (totals.row) {
+                    const dimensionIds = (advancedVSeed.dimensionTree || []).filter((dim)=>'row' === dim.encoding).map((dim)=>dim.id);
                     const rowSubDimensions = totals.row.subTotalsDimensions?.filter((dim)=>dimensionIds.includes(dim));
                     const normalizedRowSubDimensions = totals.row.showSubTotals && (!rowSubDimensions || 0 === rowSubDimensions.length) ? dimensionIds.length > 0 ? [
                         dimensionIds[0]
@@ -3720,6 +3652,7 @@ self.R = R;
                     };
                 }
                 if (totals.column) {
+                    const dimensionIds = (advancedVSeed.dimensionTree || []).filter((dim)=>'column' === dim.encoding).map((dim)=>dim.id);
                     const columnSubDimensions = totals.column.subTotalsDimensions?.filter((dim)=>dimensionIds.includes(dim));
                     const normalizedColumnSubDimensions = totals.column.showSubTotals && (!columnSubDimensions || 0 === columnSubDimensions.length) ? dimensionIds.length > 0 ? [
                         dimensionIds[0]
@@ -3742,8 +3675,8 @@ self.R = R;
             initPivotTable,
             pivotColumns,
             pivotRows,
-            titleOnDimension,
             pivotIndicators,
+            titleOnDimension,
             bodyStyle,
             headerStyle,
             rowHeaderStyle,
@@ -3843,7 +3776,7 @@ self.R = R;
                 dimensions: newDimensions
             };
         };
-        const defaultMeasureId_defaultMeasureId = (advancedVSeed)=>{
+        const defaultMeasureId = (advancedVSeed)=>{
             const result = {
                 ...advancedVSeed
             };
@@ -3993,6 +3926,65 @@ self.R = R;
                 });
             };
         }
+        const foldMeasures = (dataset, measures, options)=>{
+            const { measureId, measureName, measureValue, colorMeasureId, allowEmptyFold = true, omitIds = [] } = options || {};
+            const foldInfo = {
+                measureId,
+                measureName,
+                measureValue,
+                statistics: {
+                    max: -1 / 0,
+                    min: 1 / 0,
+                    sum: 0,
+                    count: 0,
+                    colorMin: 1 / 0,
+                    colorMax: -1 / 0
+                },
+                foldMap: {}
+            };
+            if (!allowEmptyFold && 0 === measures.length) return {
+                dataset,
+                foldInfo
+            };
+            const result = new Array(dataset.length * measures.length);
+            let index = 0;
+            for(let i = 0; i < dataset.length; i++)for(let j = 0; j < measures.length; j++){
+                const datum = chunk_KI5X74E2_y({
+                    ...dataset[i]
+                }, omitIds);
+                datum[ORIGINAL_DATA] = dataset[i];
+                const measure = measures[j];
+                const { id, alias } = measure;
+                datum[id] = dataset[i][id];
+                datum[measureId] = id;
+                datum[measureName] = alias || id;
+                datum[measureValue] = dataset[i][id];
+                const valueNumber = Number(datum[id]);
+                foldInfo.statistics.min = Math.min(foldInfo.statistics.min, valueNumber);
+                foldInfo.statistics.max = Math.max(foldInfo.statistics.max, valueNumber);
+                foldInfo.statistics.sum += valueNumber;
+                foldInfo.statistics.count++;
+                if ('color' === measure.encoding) {
+                    foldInfo.statistics.colorMin = foldInfo.statistics.min;
+                    foldInfo.statistics.colorMax = foldInfo.statistics.max;
+                    datum[ColorEncoding] = valueNumber;
+                    datum[ColorIdEncoding] = measure.id;
+                } else if (colorMeasureId) {
+                    const value = datum[ORIGINAL_DATA][colorMeasureId];
+                    datum[ColorEncoding] = value;
+                    datum[ColorIdEncoding] = colorMeasureId;
+                    const valueNumber = Number(value);
+                    foldInfo.statistics.colorMin = Math.min(foldInfo.statistics.colorMin, valueNumber);
+                    foldInfo.statistics.colorMax = Math.max(foldInfo.statistics.colorMax, valueNumber);
+                }
+                foldInfo.foldMap[id] = alias;
+                result[index++] = datum;
+            }
+            return {
+                dataset: result,
+                foldInfo
+            };
+        };
         const unfoldDimensions = (dataset, dimensions, encoding, options)=>{
             const { separator } = options;
             const unfoldInfo = {
@@ -4283,7 +4275,7 @@ self.R = R;
             initAdvancedVSeed_initAdvancedVSeed,
             default_defaultMeasures_defaultMeasures,
             defaultDimensions_defaultDimensions,
-            defaultMeasureId_defaultMeasureId,
+            defaultMeasureId,
             encodingAdapter([
                 buildMeasures([
                     'yAxis',
@@ -6038,11 +6030,11 @@ self.R = R;
                 markArea: markArea
             };
         };
-        const isNumber = (value, fuzzy = !1)=>{
+        const isNumber_isNumber = (value, fuzzy = !1)=>{
             const type = typeof value;
             return fuzzy ? "number" === type : "number" === type || isType(value, "Number");
         };
-        const common_isNumber = isNumber;
+        const isNumber = isNumber_isNumber;
         const clamp_clamp = function(input, min, max) {
             return input < min ? min : input > max ? max : input;
         };
@@ -6224,10 +6216,10 @@ self.R = R;
             return ((value = Math.max(0, Math.min(255, Math.round(value) || 0))) < 16 ? "0" : "") + value.toString(16);
         }
         function Color_rgb(value) {
-            return common_isNumber(value) ? new RGB(value >> 16, value >> 8 & 255, 255 & value, 1) : common_isArray(value) ? new RGB(value[0], value[1], value[2]) : new RGB(255, 255, 255);
+            return isNumber(value) ? new RGB(value >> 16, value >> 8 & 255, 255 & value, 1) : common_isArray(value) ? new RGB(value[0], value[1], value[2]) : new RGB(255, 255, 255);
         }
         function rgba(value) {
-            return common_isNumber(value) ? new RGB(value >>> 24, value >>> 16 & 255, value >>> 8 & 255, 255 & value) : common_isArray(value) ? new RGB(value[0], value[1], value[2], value[3]) : new RGB(255, 255, 255, 1);
+            return isNumber(value) ? new RGB(value >>> 24, value >>> 16 & 255, value >>> 8 & 255, 255 & value) : common_isArray(value) ? new RGB(value[0], value[1], value[2], value[3]) : new RGB(255, 255, 255, 1);
         }
         function SRGBToLinear(c) {
             return c < .04045 ? .0773993808 * c : Math.pow(.9478672986 * c + .0521327014, 2.4);
@@ -7499,7 +7491,7 @@ self.R = R;
             initAdvancedVSeed_initAdvancedVSeed,
             default_defaultMeasures_defaultMeasures,
             defaultDimensions_defaultDimensions,
-            defaultMeasureId_defaultMeasureId,
+            defaultMeasureId,
             encodingAdapter([
                 buildMeasures([
                     'yAxis',
@@ -8394,7 +8386,7 @@ self.R = R;
             initAdvancedVSeed_initAdvancedVSeed,
             default_defaultMeasures_defaultMeasures,
             defaultDimensions_defaultDimensions,
-            defaultMeasureId_defaultMeasureId,
+            defaultMeasureId,
             encodingAdapter([
                 buildMeasures([
                     'yAxis',
@@ -8564,7 +8556,7 @@ self.R = R;
             initAdvancedVSeed_initAdvancedVSeed,
             default_defaultMeasures_defaultMeasures,
             defaultDimensions_defaultDimensions,
-            defaultMeasureId_defaultMeasureId,
+            defaultMeasureId,
             encodingAdapter([
                 buildMeasures([
                     'yAxis',
@@ -8750,7 +8742,7 @@ self.R = R;
             initAdvancedVSeed_initAdvancedVSeed,
             default_defaultMeasures_defaultMeasures,
             defaultDimensions_defaultDimensions,
-            defaultMeasureId_defaultMeasureId,
+            defaultMeasureId,
             encodingAdapter([
                 buildMeasures([
                     'xAxis',
@@ -9094,7 +9086,7 @@ self.R = R;
             initAdvancedVSeed_initAdvancedVSeed,
             default_defaultMeasures_defaultMeasures,
             defaultDimensions_defaultDimensions,
-            defaultMeasureId_defaultMeasureId,
+            defaultMeasureId,
             encodingAdapter([
                 buildMeasures([
                     'xAxis',
@@ -9423,7 +9415,7 @@ self.R = R;
             initAdvancedVSeed_initAdvancedVSeed,
             default_defaultMeasures_defaultMeasures,
             defaultDimensions_defaultDimensions,
-            defaultMeasureId_defaultMeasureId,
+            defaultMeasureId,
             encodingAdapter([
                 buildMeasures([
                     'yAxis',
@@ -9961,7 +9953,7 @@ self.R = R;
             initAdvancedVSeed_initAdvancedVSeed,
             default_defaultMeasures_defaultMeasures,
             defaultDimensions_defaultDimensions,
-            defaultMeasureId_defaultMeasureId,
+            defaultMeasureId,
             encodingAdapter([
                 buildMeasuresForScatter,
                 addPivotDimensionsForScatter,
@@ -10927,7 +10919,7 @@ self.R = R;
             initAdvancedVSeed_initAdvancedVSeed,
             default_defaultMeasures_defaultMeasures,
             defaultDimensions_defaultDimensions,
-            defaultMeasureId_defaultMeasureId,
+            defaultMeasureId,
             encodingAdapter([
                 buildMeasures([
                     'yAxis',
@@ -11190,7 +11182,7 @@ self.R = R;
             initAdvancedVSeed_initAdvancedVSeed,
             default_defaultMeasures_defaultMeasures,
             defaultDimensions_defaultDimensions,
-            defaultMeasureId_defaultMeasureId,
+            defaultMeasureId,
             encodingAdapter([
                 buildMeasures([
                     'angle',
@@ -11550,7 +11542,7 @@ self.R = R;
             initAdvancedVSeed_initAdvancedVSeed,
             default_defaultMeasures_defaultMeasures,
             defaultDimensions_defaultDimensions,
-            defaultMeasureId_defaultMeasureId,
+            defaultMeasureId,
             encodingAdapter([
                 buildMeasures([
                     'angle',
@@ -11621,7 +11613,7 @@ self.R = R;
             initAdvancedVSeed_initAdvancedVSeed,
             default_defaultMeasures_defaultMeasures,
             defaultDimensions_defaultDimensions,
-            defaultMeasureId_defaultMeasureId,
+            defaultMeasureId,
             encodingAdapter([
                 buildMeasures([
                     'xAxis',
@@ -11740,7 +11732,7 @@ self.R = R;
             initAdvancedVSeed_initAdvancedVSeed,
             default_defaultMeasures_defaultMeasures,
             defaultDimensions_defaultDimensions,
-            defaultMeasureId_defaultMeasureId,
+            defaultMeasureId,
             encodingAdapter([
                 buildMeasures([
                     'xAxis',
@@ -11832,7 +11824,7 @@ self.R = R;
             initAdvancedVSeed_initAdvancedVSeed,
             default_defaultMeasures_defaultMeasures,
             defaultDimensions_defaultDimensions,
-            defaultMeasureId_defaultMeasureId,
+            defaultMeasureId,
             encodingAdapter([
                 buildMeasures([
                     'yAxis',
@@ -12018,7 +12010,7 @@ self.R = R;
             initAdvancedVSeed_initAdvancedVSeed,
             default_defaultMeasures_defaultMeasures,
             defaultDimensions_defaultDimensions,
-            defaultMeasureId_defaultMeasureId,
+            defaultMeasureId,
             encodingAdapter([
                 buildMeasures([
                     'yAxis',
@@ -12191,7 +12183,7 @@ self.R = R;
             initAdvancedVSeed_initAdvancedVSeed,
             default_defaultMeasures_defaultMeasures,
             defaultDimensions_defaultDimensions,
-            defaultMeasureId_defaultMeasureId,
+            defaultMeasureId,
             encodingAdapter([
                 buildMeasuresForScatter,
                 addPivotDimensionsForScatter,
@@ -12558,7 +12550,7 @@ self.R = R;
             initAdvancedVSeed_initAdvancedVSeed,
             default_defaultMeasures_defaultMeasures,
             defaultDimensions_defaultDimensions,
-            defaultMeasureId_defaultMeasureId,
+            defaultMeasureId,
             encodingAdapter([
                 buildMeasuresForDualAxis,
                 defaultEncodingForDualAxis
@@ -12968,27 +12960,27 @@ self.R = R;
         };
         const isObjectLike = (value)=>"object" == typeof value && null !== value;
         const common_isObjectLike = isObjectLike;
-        const isPlainObject = function(value) {
+        const isPlainObject_isPlainObject = function(value) {
             if (!common_isObjectLike(value) || !isType(value, "Object")) return !1;
             if (null === Object.getPrototypeOf(value)) return !0;
             let proto = value;
             for(; null !== Object.getPrototypeOf(proto);)proto = Object.getPrototypeOf(proto);
             return Object.getPrototypeOf(value) === proto;
         };
-        const common_isPlainObject = isPlainObject;
-        const isString = (value, fuzzy = !1)=>{
+        const isPlainObject = isPlainObject_isPlainObject;
+        const isString_isString = (value, fuzzy = !1)=>{
             const type = typeof value;
             return fuzzy ? "string" === type : "string" === type || isType(value, "String");
         };
-        const common_isString = isString;
+        const isString = isString_isString;
         function pickWithout(obj, keys) {
-            if (!obj || !common_isPlainObject(obj)) return obj;
+            if (!obj || !isPlainObject(obj)) return obj;
             const result = {};
             return Object.keys(obj).forEach((k)=>{
                 const v = obj[k];
                 let match = !1;
                 keys.forEach((itKey)=>{
-                    (common_isString(itKey) && itKey === k || itKey instanceof RegExp && k.match(itKey)) && (match = !0);
+                    (isString(itKey) && itKey === k || itKey instanceof RegExp && k.match(itKey)) && (match = !0);
                 }), match || (result[k] = v);
             }), result;
         }
@@ -13165,7 +13157,7 @@ self.R = R;
             initAdvancedVSeed_initAdvancedVSeed,
             default_defaultMeasures_defaultMeasures,
             defaultDimensions_defaultDimensions,
-            defaultMeasureId_defaultMeasureId,
+            defaultMeasureId,
             encodingAdapter([
                 buildMeasures([
                     'angle',
@@ -13260,7 +13252,7 @@ self.R = R;
             initAdvancedVSeed_initAdvancedVSeed,
             default_defaultMeasures_defaultMeasures,
             defaultDimensions_defaultDimensions,
-            defaultMeasureId_defaultMeasureId,
+            defaultMeasureId,
             encodingAdapter([
                 buildMeasures([
                     'angle',
@@ -13408,7 +13400,7 @@ self.R = R;
             initAdvancedVSeed_initAdvancedVSeed,
             default_defaultMeasures_defaultMeasures,
             defaultDimensions_defaultDimensions,
-            defaultMeasureId_defaultMeasureId,
+            defaultMeasureId,
             encodingAdapter([
                 buildMeasures([
                     'angle',
@@ -13564,7 +13556,7 @@ self.R = R;
             initAdvancedVSeed_initAdvancedVSeed,
             default_defaultMeasures_defaultMeasures,
             defaultDimensions_defaultDimensions,
-            defaultMeasureId_defaultMeasureId,
+            defaultMeasureId,
             encodingAdapter([
                 buildMeasures([
                     'radius',
@@ -13762,7 +13754,7 @@ self.R = R;
             initAdvancedVSeed_initAdvancedVSeed,
             default_defaultMeasures_defaultMeasures,
             defaultDimensions_defaultDimensions,
-            defaultMeasureId_defaultMeasureId,
+            defaultMeasureId,
             encodingAdapter([
                 buildMeasures([
                     'radius',
@@ -13979,7 +13971,7 @@ self.R = R;
             initAdvancedVSeed_initAdvancedVSeed,
             default_defaultMeasures_defaultMeasures,
             defaultDimensions_defaultDimensions,
-            defaultMeasureId_defaultMeasureId,
+            defaultMeasureId,
             encodingAdapter([
                 buildMeasures([
                     'size',
@@ -14230,7 +14222,7 @@ self.R = R;
             initAdvancedVSeed_initAdvancedVSeed,
             default_defaultMeasures_defaultMeasures,
             defaultDimensions_defaultDimensions,
-            defaultMeasureId_defaultMeasureId,
+            defaultMeasureId,
             encodingAdapter([
                 buildMeasures([
                     'color',
@@ -14841,7 +14833,7 @@ self.R = R;
             initAdvancedVSeed_initAdvancedVSeed,
             default_defaultMeasures_defaultMeasures,
             defaultDimensions_defaultDimensions,
-            defaultMeasureId_defaultMeasureId,
+            defaultMeasureId,
             boxplotConfig,
             encodingAdapter([
                 buildMeasures([
@@ -15318,7 +15310,7 @@ self.R = R;
                     const length = objValue.length;
                     for(; ++index < length;)newValue[index] = objValue[index];
                 }
-            } else common_isPlainObject(srcValue) ? (newValue = null != objValue ? objValue : {}, "function" != typeof objValue && "object" == typeof objValue || (newValue = {})) : isCommon = !1;
+            } else isPlainObject(srcValue) ? (newValue = null != objValue ? objValue : {}, "function" != typeof objValue && "object" == typeof objValue || (newValue = {})) : isCommon = !1;
             isCommon && baseMerge(newValue, srcValue, shallowArray, skipTargetArray), assignMergeValue(target, key, newValue);
         }
         function assignMergeValue(target, key, value) {
@@ -16584,7 +16576,7 @@ self.R = R;
             initAdvancedVSeed_initAdvancedVSeed,
             default_defaultMeasures_defaultMeasures,
             defaultDimensions_defaultDimensions,
-            defaultMeasureId_defaultMeasureId,
+            defaultMeasureId,
             encodingAdapter([
                 buildMeasures([
                     'size',
@@ -17056,7 +17048,7 @@ self.R = R;
             initAdvancedVSeed_initAdvancedVSeed,
             default_defaultMeasures_defaultMeasures,
             defaultDimensions_defaultDimensions,
-            defaultMeasureId_defaultMeasureId,
+            defaultMeasureId,
             encodingAdapter([
                 buildMeasures([
                     'size',
@@ -17283,7 +17275,7 @@ self.R = R;
             initAdvancedVSeed_initAdvancedVSeed,
             default_defaultMeasures_defaultMeasures,
             defaultDimensions_defaultDimensions,
-            defaultMeasureId_defaultMeasureId,
+            defaultMeasureId,
             encodingAdapter([
                 buildMeasures([
                     'size',
@@ -24120,6 +24112,7 @@ self.R = R;
             selectedBorderColor: schemas_string().nullish(),
             selectedBackgroundColor: schemas_string().nullish(),
             bodyCellStyle: schemas_array(zBodyCellStyle).or(zBodyCellStyle).nullish(),
+            indicatorsAsCol: schemas_boolean().nullish(),
             totals: zPivotTableTotals.nullish(),
             theme: zTheme.nullish(),
             locale: zLocale.nullish()