@shwfed/config 2.0.3 → 2.1.0

package/dist/runtime/components/config/blocks/2026-05-17/{com.shwfed.block.chart.line → com.shwfed.block.chart.xy}/runtime.vue

@@ -4,12 +4,23 @@ import { useI18n } from "vue-i18n";
 import { Effect, Option } from "effect";
 import { Fetch } from "fx-fetch";
 import { CurveType } from "@unovis/ts";
-import { VisAxis, VisBulletLegend, VisCrosshair, VisLine, VisTooltip, VisXYContainer } from "@unovis/vue";
+import {
+  VisArea,
+  VisAxis,
+  VisBulletLegend,
+  VisCrosshair,
+  VisGroupedBar,
+  VisLine,
+  VisScatter,
+  VisStackedBar,
+  VisTooltip,
+  VisXYContainer
+} from "@unovis/vue";
 import { Markdown } from "../../../../ui/markdown";
 import { cel } from "../../../../../utils/cel";
 import { celBindings, injectCELContext } from "../../../../../utils/cel-context";
 import { getLocalizedText } from "../../../../../share/locale";
-defineOptions({ name: "ShwfedBlockChartLineRuntime" });
+defineOptions({ name: "ShwfedBlockChartXyRuntime" });
 const block = defineModel("block", { type: null, ...{ required: true } });
 const { locale } = useI18n();
 const inheritedContext = injectCELContext();
@@ -39,7 +50,7 @@ const PALETTE = [
   "#9c755f",
   "#bab0ac"
 ];
-const lineColors = computed(
+const seriesColors = computed(
   () => block.value.y.map(
     (s, i) => s.color && s.color.length > 0 ? s.color : PALETTE[i % PALETTE.length]
   )
@@ -67,7 +78,7 @@ async function fetchAll() {
     try {
       out[ds.name] = await Effect.runPromise(Effect.provide(program, Fetch.layer));
     } catch (e) {
-      console.warn("[shwfed-chart-line] data source failed", ds.name, e);
+      console.warn("[shwfed-chart-xy] data source failed", ds.name, e);
       failed.push(ds.name);
       out[ds.name] = [];
     }
@@ -104,10 +115,22 @@ function evalList(expression, ctx) {
     return [];
   }
 }
+function evalNumber(expression, ctx) {
+  try {
+    return toY(Effect.runSync(cel(expression, ctx)));
+  } catch {
+    return void 0;
+  }
+}
+const dataCtx = computed(() => ({
+  ...baseContext(),
+  ...dataValues.value
+}));
 const chartData = computed(() => {
-  const ctx = { ...baseContext(), ...dataValues.value };
+  const ctx = dataCtx.value;
   const xRaw = evalList(block.value.x, ctx);
   const yLists = block.value.y.map((s) => evalList(s.value, ctx));
+  const sizeLists = block.value.y.map((s) => s.size ? evalList(s.size, ctx) : null);
   const xMode = xRaw.length === 0 ? "ordinal" : xRaw.every((v) => v instanceof Date) ? "time" : xRaw.every((v) => isFiniteNum(v)) ? "number" : "ordinal";
   const xLabels = /* @__PURE__ */ new Map();
   const records = xRaw.map((xv, i) => {
@@ -118,19 +141,53 @@ const chartData = computed(() => {
     yLists.forEach((list, k) => {
       rec[`y${k}`] = toY(list[i]);
     });
+    sizeLists.forEach((list, k) => {
+      if (list) rec[`sz${k}`] = toY(list[i]);
+    });
     return rec;
   });
   return { records, xMode, xLabels };
 });
+const seriesDash = computed(
+  () => block.value.y.map((s) => {
+    if (!s.dash) return void 0;
+    const arr = evalList(s.dash, dataCtx.value).filter(isFiniteNum);
+    return arr.length > 0 ? arr : void 0;
+  })
+);
+const seriesWidth = computed(
+  () => block.value.y.map((s) => s.width ? evalNumber(s.width, dataCtx.value) : void 0)
+);
 const xAccessor = (d) => d.__x;
 const yAccessors = computed(
   () => block.value.y.map((_, k) => (d) => d[`y${k}`])
 );
+const sizeAccessors = computed(
+  () => block.value.y.map((s, k) => s.size ? (d) => d[`sz${k}`] : void 0)
+);
+const seriesEntries = computed(
+  () => block.value.y.map((s, k) => ({ k, s, color: seriesColors.value[k] }))
+);
+const lineSeries = computed(() => seriesEntries.value.filter((e) => e.s.chart === "line"));
+const areaSeries = computed(() => seriesEntries.value.filter((e) => e.s.chart === "area"));
+const scatterSeries = computed(() => seriesEntries.value.filter((e) => e.s.chart === "scatter"));
+function barGroup(chart) {
+  const entries = seriesEntries.value.filter((e) => e.s.chart === chart);
+  return {
+    entries,
+    accessors: entries.map((e) => yAccessors.value[e.k]),
+    colors: entries.map((e) => e.color),
+    // One width per merged component — take it from the first such series.
+    width: entries[0] ? seriesWidth.value[entries[0].k] : void 0
+  };
+}
+const groupedBars = computed(() => barGroup("groupedBar"));
+const stackedBars = computed(() => barGroup("stackedBar"));
 const legendItems = computed(() => {
   const items = [];
   block.value.y.forEach((s, i) => {
     const label = seriesLabel(s);
-    if (label) items.push({ name: label, color: lineColors.value[i] });
+    if (label) items.push({ name: label, color: seriesColors.value[i] });
   });
   return items;
 });
@@ -165,7 +222,7 @@ function crosshairTemplate(d) {
     if (!label) return;
     const v = d[`y${k}`];
     rows.push(
-      `<div style="display:flex;align-items:center;gap:6px;padding:1px 0"><span style="width:8px;height:8px;border-radius:9999px;background:${lineColors.value[k]}"></span><span style="color:#3f3f46">${escapeHtml(label)}</span><span style="margin-left:auto;font-variant-numeric:tabular-nums;color:#18181b">${v === void 0 ? "\u2014" : formatNumber(v)}</span></div>`
+      `<div style="display:flex;align-items:center;gap:6px;padding:1px 0"><span style="width:8px;height:8px;border-radius:9999px;background:${seriesColors.value[k]}"></span><span style="color:#3f3f46">${escapeHtml(label)}</span><span style="margin-left:auto;font-variant-numeric:tabular-nums;color:#18181b">${v === void 0 ? "\u2014" : formatNumber(v)}</span></div>`
     );
   });
   const lines = rows.join("");
@@ -193,12 +250,47 @@ const placeholder = computed(() => {
         :margin="{ top: 8, right: 16, bottom: 4, left: 8 }"
         class="min-h-0 flex-1"
       >
+        <VisStackedBar
+          v-if="stackedBars.entries.length > 0"
+          :x="xAccessor"
+          :y="stackedBars.accessors"
+          :color="stackedBars.colors"
+          :bar-width="stackedBars.width"
+        />
+        <VisGroupedBar
+          v-if="groupedBars.entries.length > 0"
+          :x="xAccessor"
+          :y="groupedBars.accessors"
+          :color="groupedBars.colors"
+          :group-width="groupedBars.width"
+        />
+        <VisArea
+          v-for="e in areaSeries"
+          :key="e.s.id"
+          :x="xAccessor"
+          :y="yAccessors[e.k]"
+          :color="e.color"
+          :line="true"
+          :line-color="e.s.lineColor || e.color"
+          :line-width="e.s.lineWidth"
+        />
         <VisLine
+          v-for="e in lineSeries"
+          :key="e.s.id"
           :x="xAccessor"
-          :y="yAccessors"
-          :color="lineColors"
-          :curve-type="CURVE[block.curveType]"
-          :line-width="block.lineWidth"
+          :y="yAccessors[e.k]"
+          :color="e.color"
+          :curve-type="CURVE[e.s.curveType]"
+          :line-width="e.s.lineWidth"
+          :line-dash-array="seriesDash[e.k]"
+        />
+        <VisScatter
+          v-for="e in scatterSeries"
+          :key="e.s.id"
+          :x="xAccessor"
+          :y="yAccessors[e.k]"
+          :color="e.color"
+          :size="sizeAccessors[e.k]"
         />
         <VisAxis
           type="x"
@@ -211,7 +303,7 @@ const placeholder = computed(() => {
         <VisCrosshair
           :x="xAccessor"
           :y="yAccessors"
-          :color="lineColors"
+          :color="seriesColors"
           :template="crosshairTemplate"
         />
         <VisTooltip />

package/dist/runtime/components/config/blocks/2026-05-17/{com.shwfed.block.chart.line → com.shwfed.block.chart.xy}/runtime.vue.d.ts

@@ -4,7 +4,7 @@ type __VLS_ModelProps = {
 };
 declare const __VLS_export: import("vue").DefineComponent<__VLS_ModelProps, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
     "update:block": (value: {
-        readonly type: "com.shwfed.block.chart.line";
+        readonly type: "com.shwfed.block.chart.xy";
         readonly id: string;
         readonly caption?: readonly [{
             readonly locale: "zh";
@@ -22,9 +22,16 @@ declare const __VLS_export: import("vue").DefineComponent<__VLS_ModelProps, {},
                 readonly locale: "en" | "ja" | "ko";
                 readonly message: string;
             }[]] | undefined;
+            readonly size?: string | undefined;
             readonly id: string;
             readonly color?: string | undefined;
+            readonly width?: string | undefined;
             readonly value: string;
+            readonly chart: "area" | "line" | "groupedBar" | "scatter" | "stackedBar";
+            readonly curveType: "linear" | "step" | "monotoneX" | "natural" | "basis" | "cardinal" | "catmullRom" | "stepAfter" | "stepBefore";
+            readonly lineWidth: number;
+            readonly dash?: string | undefined;
+            readonly lineColor?: string | undefined;
         }[];
         readonly displayName?: string | undefined;
         readonly compatibilityDate: "2026-05-17";
@@ -34,12 +41,10 @@ declare const __VLS_export: import("vue").DefineComponent<__VLS_ModelProps, {},
             readonly id: string;
             readonly request?: string | undefined;
         }[];
-        readonly curveType: "linear" | "step" | "monotoneX" | "natural" | "basis" | "cardinal" | "catmullRom" | "stepAfter" | "stepBefore";
-        readonly lineWidth: number;
     }) => any;
 }, string, import("vue").PublicProps, Readonly<__VLS_ModelProps> & Readonly<{
     "onUpdate:block"?: ((value: {
-        readonly type: "com.shwfed.block.chart.line";
+        readonly type: "com.shwfed.block.chart.xy";
         readonly id: string;
         readonly caption?: readonly [{
             readonly locale: "zh";
@@ -57,9 +62,16 @@ declare const __VLS_export: import("vue").DefineComponent<__VLS_ModelProps, {},
                 readonly locale: "en" | "ja" | "ko";
                 readonly message: string;
             }[]] | undefined;
+            readonly size?: string | undefined;
             readonly id: string;
             readonly color?: string | undefined;
+            readonly width?: string | undefined;
             readonly value: string;
+            readonly chart: "area" | "line" | "groupedBar" | "scatter" | "stackedBar";
+            readonly curveType: "linear" | "step" | "monotoneX" | "natural" | "basis" | "cardinal" | "catmullRom" | "stepAfter" | "stepBefore";
+            readonly lineWidth: number;
+            readonly dash?: string | undefined;
+            readonly lineColor?: string | undefined;
         }[];
         readonly displayName?: string | undefined;
         readonly compatibilityDate: "2026-05-17";
@@ -69,8 +81,6 @@ declare const __VLS_export: import("vue").DefineComponent<__VLS_ModelProps, {},
             readonly id: string;
             readonly request?: string | undefined;
         }[];
-        readonly curveType: "linear" | "step" | "monotoneX" | "natural" | "basis" | "cardinal" | "catmullRom" | "stepAfter" | "stepBefore";
-        readonly lineWidth: number;
     }) => any) | undefined;
 }>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;
 declare const _default: typeof __VLS_export;

package/dist/runtime/components/config/blocks/2026-05-17/{com.shwfed.block.chart.line → com.shwfed.block.chart.xy}/schema.d.ts

@@ -3,11 +3,11 @@ import type { Environment } from '../../../../../vendor/cel-js/lib/index.js';
 export { getStructFieldDescription, getStructFieldTitle } from '../../../../table/utils/schema-meta.js';
 type AnySchema = Schema.Schema<any, any, never>;
 type Configure = (env: Environment) => void;
-export declare const type: "com.shwfed.block.chart.line";
+export declare const type: "com.shwfed.block.chart.xy";
 export declare const compatibilityDate: "2026-05-17";
 export declare const metadata: {
-    readonly name: "折线图";
-    readonly icon: "fluent:data-line-20-regular";
+    readonly name: "图表";
+    readonly icon: "fluent:chart-multiple-20-regular";
     readonly w: {
         readonly initial: 20;
         readonly min: 8;
@@ -20,6 +20,7 @@ export declare const metadata: {
     };
 };
 export declare const CurveType: Schema.Literal<["linear", "monotoneX", "natural", "basis", "cardinal", "catmullRom", "step", "stepAfter", "stepBefore"]>;
+export declare const ChartType: Schema.Literal<["line", "area", "groupedBar", "scatter", "stackedBar"]>;
 /**
  * A named data source. Exported so the config editor can read field
  * `title` / `description` annotations without rebuilding the whole schema.
@@ -31,8 +32,10 @@ export declare function dataSourceSchema(configure: Configure): Schema.Struct<{
     data: Schema.Schema<string, string, never>;
 }>;
 /**
- * One Y series. Exported so the config editor can read field
- * `title` / `description` annotations off it.
+ * One Y series. A flat struct: `chart` selects how the series renders, and the
+ * variant-specific fields below it apply only to the matching chart type
+ * (others are ignored at render time). Exported so the config editor can read
+ * field `title` / `description` annotations off it.
  */
 export declare function ySeriesSchema(configure: Configure): Schema.Struct<{
     id: Schema.refine<string, typeof Schema.String>;
@@ -44,10 +47,23 @@ export declare function ySeriesSchema(configure: Configure): Schema.Struct<{
         locale: Schema.Literal<["ja", "en", "ko"]>;
         message: Schema.SchemaClass<string, string, never>;
     }>]>>;
+    chart: Schema.optionalWith<Schema.Literal<["line", "area", "groupedBar", "scatter", "stackedBar"]>, {
+        default: () => "line";
+    }>;
     color: Schema.optional<typeof Schema.String>;
+    curveType: Schema.optionalWith<Schema.Literal<["linear", "monotoneX", "natural", "basis", "cardinal", "catmullRom", "step", "stepAfter", "stepBefore"]>, {
+        default: () => "monotoneX";
+    }>;
+    lineWidth: Schema.optionalWith<Schema.filter<typeof Schema.Number>, {
+        default: () => number;
+    }>;
+    dash: Schema.optional<Schema.Schema<string, string, never>>;
+    lineColor: Schema.optional<typeof Schema.String>;
+    width: Schema.optional<Schema.Schema<string, string, never>>;
+    size: Schema.optional<Schema.Schema<string, string, never>>;
 }>;
 export declare function schema(configure: Configure, _blockRef?: AnySchema): Schema.refine<{
-    readonly type: "com.shwfed.block.chart.line";
+    readonly type: "com.shwfed.block.chart.xy";
     readonly id: string;
     readonly caption?: readonly [{
         readonly locale: "zh";
@@ -65,9 +81,16 @@ export declare function schema(configure: Configure, _blockRef?: AnySchema): Sch
             readonly locale: "en" | "ja" | "ko";
             readonly message: string;
         }[]] | undefined;
+        readonly size?: string | undefined;
         readonly id: string;
         readonly color?: string | undefined;
+        readonly width?: string | undefined;
         readonly value: string;
+        readonly chart: "area" | "line" | "groupedBar" | "scatter" | "stackedBar";
+        readonly curveType: "linear" | "step" | "monotoneX" | "natural" | "basis" | "cardinal" | "catmullRom" | "stepAfter" | "stepBefore";
+        readonly lineWidth: number;
+        readonly dash?: string | undefined;
+        readonly lineColor?: string | undefined;
     }[];
     readonly displayName?: string | undefined;
     readonly compatibilityDate: "2026-05-17";
@@ -77,11 +100,9 @@ export declare function schema(configure: Configure, _blockRef?: AnySchema): Sch
         readonly id: string;
         readonly request?: string | undefined;
     }[];
-    readonly curveType: "linear" | "step" | "monotoneX" | "natural" | "basis" | "cardinal" | "catmullRom" | "stepAfter" | "stepBefore";
-    readonly lineWidth: number;
 }, Schema.Struct<{
     id: Schema.refine<string, typeof Schema.String>;
-    type: Schema.tag<"com.shwfed.block.chart.line">;
+    type: Schema.tag<"com.shwfed.block.chart.xy">;
     compatibilityDate: Schema.tag<"2026-05-17">;
     displayName: Schema.optional<Schema.SchemaClass<string, string, never>>;
     caption: Schema.optional<Schema.TupleType<readonly [Schema.Struct<{
@@ -106,9 +127,16 @@ export declare function schema(configure: Configure, _blockRef?: AnySchema): Sch
             readonly locale: "en" | "ja" | "ko";
             readonly message: string;
         }[]] | undefined;
+        readonly size?: string | undefined;
         readonly id: string;
         readonly color?: string | undefined;
+        readonly width?: string | undefined;
         readonly value: string;
+        readonly chart: "area" | "line" | "groupedBar" | "scatter" | "stackedBar";
+        readonly curveType: "linear" | "step" | "monotoneX" | "natural" | "basis" | "cardinal" | "catmullRom" | "stepAfter" | "stepBefore";
+        readonly lineWidth: number;
+        readonly dash?: string | undefined;
+        readonly lineColor?: string | undefined;
     }[], Schema.Array$<Schema.Struct<{
         id: Schema.refine<string, typeof Schema.String>;
         value: Schema.Schema<string, string, never>;
@@ -119,16 +147,24 @@ export declare function schema(configure: Configure, _blockRef?: AnySchema): Sch
             locale: Schema.Literal<["ja", "en", "ko"]>;
             message: Schema.SchemaClass<string, string, never>;
         }>]>>;
+        chart: Schema.optionalWith<Schema.Literal<["line", "area", "groupedBar", "scatter", "stackedBar"]>, {
+            default: () => "line";
+        }>;
         color: Schema.optional<typeof Schema.String>;
+        curveType: Schema.optionalWith<Schema.Literal<["linear", "monotoneX", "natural", "basis", "cardinal", "catmullRom", "step", "stepAfter", "stepBefore"]>, {
+            default: () => "monotoneX";
+        }>;
+        lineWidth: Schema.optionalWith<Schema.filter<typeof Schema.Number>, {
+            default: () => number;
+        }>;
+        dash: Schema.optional<Schema.Schema<string, string, never>>;
+        lineColor: Schema.optional<typeof Schema.String>;
+        width: Schema.optional<Schema.Schema<string, string, never>>;
+        size: Schema.optional<Schema.Schema<string, string, never>>;
     }>>>;
-    curveType: Schema.optionalWith<Schema.Literal<["linear", "monotoneX", "natural", "basis", "cardinal", "catmullRom", "step", "stepAfter", "stepBefore"]>, {
-        default: () => "monotoneX";
-    }>;
-    lineWidth: Schema.optionalWith<Schema.filter<typeof Schema.Number>, {
-        default: () => number;
-    }>;
 }>>;
 export declare function defaultBody(): Record<string, unknown>;
 export type Value = Schema.Schema.Type<ReturnType<typeof schema>>;
 export type YSeriesValue = Value['y'][number];
 export type DataSourceValue = Value['dataSources'][number];
+export type ChartTypeValue = Schema.Schema.Type<typeof ChartType>;

package/dist/runtime/components/config/blocks/2026-05-17/{com.shwfed.block.chart.line → com.shwfed.block.chart.xy}/schema.js

@@ -2,11 +2,11 @@ import { Schema } from "effect";
 import { Expression } from "../../../../../share/expression.js";
 import { Locale } from "../../../../../share/locale.js";
 export { getStructFieldDescription, getStructFieldTitle } from "../../../../table/utils/schema-meta.js";
-export const type = "com.shwfed.block.chart.line";
+export const type = "com.shwfed.block.chart.xy";
 export const compatibilityDate = "2026-05-17";
 export const metadata = {
-  name: "\u6298\u7EBF\u56FE",
-  icon: "fluent:data-line-20-regular",
+  name: "\u56FE\u8868",
+  icon: "fluent:chart-multiple-20-regular",
   w: { initial: 20, min: 8, max: Infinity },
   h: { initial: 9, min: 5, max: Infinity }
 };
@@ -21,7 +21,15 @@ export const CurveType = Schema.Literal(
   "stepAfter",
   "stepBefore"
 );
+export const ChartType = Schema.Literal(
+  "line",
+  "area",
+  "groupedBar",
+  "scatter",
+  "stackedBar"
+);
 const isListType = (t) => t === "dyn" || t.startsWith("list") || t.startsWith("optional");
+const isNumberType = (t) => t === "dyn" || t === "number" || t.startsWith("optional");
 function listExpression(configure) {
   return Expression({
     configure,
@@ -29,6 +37,13 @@ function listExpression(configure) {
     unlistedVariablesAreDyn: true
   });
 }
+function numberExpression(configure) {
+  return Expression({
+    configure,
+    resultType: isNumberType,
+    unlistedVariablesAreDyn: true
+  });
+}
 export function dataSourceSchema(configure) {
   const CelRequest = Expression({
     configure: (env) => {
@@ -75,11 +90,48 @@ export function ySeriesSchema(configure) {
       title: "\u6807\u7B7E",
       description: "\u56FE\u4F8B\u4E0E\u63D0\u793A\u6846\u4E2D\u663E\u793A\u7684\u7CFB\u5217\u540D\uFF1B\u7559\u7A7A\u5219\u7528\u8868\u8FBE\u5F0F\u539F\u6587"
     }),
+    chart: Schema.optionalWith(ChartType, { default: () => "line" }).annotations({
+      title: "\u56FE\u8868\u7C7B\u578B",
+      description: "\u8BE5\u7CFB\u5217\u7684\u6E32\u67D3\u65B9\u5F0F\uFF1A\u6298\u7EBF / \u9762\u79EF / \u5206\u7EC4\u67F1 / \u6563\u70B9 / \u5806\u53E0\u67F1"
+    }),
     color: Schema.optional(Schema.String).annotations({
       title: "\u989C\u8272",
-      description: "\u7EBF\u6761\u989C\u8272\uFF08CSS \u989C\u8272\u503C\uFF09\uFF1B\u7559\u7A7A\u5219\u6309\u8C03\u8272\u677F\u81EA\u52A8\u53D6\u8272"
+      description: "\u7CFB\u5217\u4E3B\u8272\uFF08CSS \u989C\u8272\u503C\uFF09\u2014\u2014\u6298\u7EBF\u63CF\u8FB9 / \u9762\u79EF\u586B\u5145 / \u67F1\u4F53 / \u6563\u70B9\uFF1B\u7559\u7A7A\u5219\u6309\u8C03\u8272\u677F\u81EA\u52A8\u53D6\u8272"
+    }),
+    // line
+    curveType: Schema.optionalWith(CurveType, { default: () => "monotoneX" }).annotations({
+      title: "\u66F2\u7EBF\u7C7B\u578B",
+      description: "\u6298\u7EBF\u5728\u76F8\u90BB\u6570\u636E\u70B9\u4E4B\u95F4\u7684\u63D2\u503C\u65B9\u5F0F\uFF08\u5BF9\u5E94 unovis `CurveType`\uFF09\uFF1B\u4EC5\u6298\u7EBF\u7C7B\u578B\u751F\u6548"
+    }),
+    // line / area
+    lineWidth: Schema.optionalWith(
+      Schema.Number.pipe(Schema.positive()),
+      { default: () => 2 }
+    ).annotations({
+      title: "\u7EBF\u5BBD",
+      description: "\u7EBF\u6761\u5BBD\u5EA6\uFF08\u50CF\u7D20\uFF09\uFF1B\u6298\u7EBF\u7C7B\u578B\u4E3A\u6298\u7EBF\u672C\u8EAB\uFF0C\u9762\u79EF\u7C7B\u578B\u4E3A\u9876\u90E8\u63CF\u8FB9\u7EBF"
+    }),
+    // line
+    dash: Schema.optional(listExpression(configure)).annotations({
+      title: "\u865A\u7EBF",
+      description: "\u8FD4\u56DE\u4E00\u4E2A\u6570\u5B57\u5217\u8868\u4F5C\u4E3A\u300C\u7EBF\u6BB5 / \u7A7A\u767D\u300D\u865A\u7EBF\u6A21\u5F0F\uFF08\u5982 `[4, 4]`\uFF09\uFF1B\u7559\u7A7A\u4E3A\u5B9E\u7EBF\u3002\u4EC5\u6298\u7EBF\u7C7B\u578B\u751F\u6548"
+    }),
+    // area
+    lineColor: Schema.optional(Schema.String).annotations({
+      title: "\u63CF\u8FB9\u989C\u8272",
+      description: "\u9762\u79EF\u56FE\u9876\u90E8\u63CF\u8FB9\u7EBF\u989C\u8272\uFF08CSS \u989C\u8272\u503C\uFF09\uFF1B\u7559\u7A7A\u5219\u4E0E\u586B\u5145\u540C\u8272\u3002\u4EC5\u9762\u79EF\u7C7B\u578B\u751F\u6548"
+    }),
+    // groupedBar / stackedBar
+    width: Schema.optional(numberExpression(configure)).annotations({
+      title: "\u67F1\u5BBD",
+      description: "\u8FD4\u56DE\u67F1 / \u67F1\u7EC4\u5BBD\u5EA6\uFF08\u50CF\u7D20\uFF09\u7684 CEL \u8868\u8FBE\u5F0F\uFF1B\u7559\u7A7A\u5219\u81EA\u52A8\u3002\u4EC5\u5206\u7EC4\u67F1\u3001\u5806\u53E0\u67F1\u7C7B\u578B\u751F\u6548"
+    }),
+    // scatter
+    size: Schema.optional(listExpression(configure)).annotations({
+      title: "\u70B9\u5927\u5C0F",
+      description: "\u8FD4\u56DE\u6BCF\u4E2A\u70B9\u76F4\u5F84\uFF08\u50CF\u7D20\uFF09\u7684\u6570\u5B57\u5217\u8868\uFF0C\u4E0E Y \u6309\u4E0B\u6807\u5BF9\u9F50\uFF1B\u7559\u7A7A\u5219\u7528\u9ED8\u8BA4\u5927\u5C0F\u3002\u4EC5\u6563\u70B9\u7C7B\u578B\u751F\u6548"
     })
-  }).annotations({ title: "Y \u7CFB\u5217", description: "\u4E00\u4E2A Y \u7CFB\u5217\u5BF9\u5E94\u4E00\u6761\u6298\u7EBF" });
+  }).annotations({ title: "Y \u7CFB\u5217", description: "\u4E00\u4E2A Y \u7CFB\u5217\uFF0C\u53EF\u72EC\u7ACB\u9009\u62E9\u56FE\u8868\u7C7B\u578B" });
 }
 export function schema(configure, _blockRef) {
   return Schema.Struct({
@@ -104,18 +156,7 @@ export function schema(configure, _blockRef) {
     }),
     y: Schema.Array(ySeriesSchema(configure)).pipe(Schema.minItems(1)).annotations({
       title: "Y",
-      description: "\u6BCF\u4E2A\u7CFB\u5217\u753B\u4E00\u6761\u7EBF\uFF0C\u8FD4\u56DE\u7684\u5217\u8868\u4E0E X \u6309\u4E0B\u6807\u5BF9\u9F50\uFF1B\u81F3\u5C11\u914D\u7F6E\u4E00\u6761"
-    }),
-    curveType: Schema.optionalWith(CurveType, { default: () => "monotoneX" }).annotations({
-      title: "\u66F2\u7EBF\u7C7B\u578B",
-      description: "\u6298\u7EBF\u5728\u76F8\u90BB\u6570\u636E\u70B9\u4E4B\u95F4\u7684\u63D2\u503C\u65B9\u5F0F\uFF08\u5BF9\u5E94 unovis `CurveType`\uFF09"
-    }),
-    lineWidth: Schema.optionalWith(
-      Schema.Number.pipe(Schema.positive()),
-      { default: () => 2 }
-    ).annotations({
-      title: "\u7EBF\u5BBD",
-      description: "\u6298\u7EBF\u5BBD\u5EA6\uFF08\u50CF\u7D20\uFF09"
+      description: "\u6BCF\u4E2A\u7CFB\u5217\u4E00\u6761\u6570\u636E\uFF0C\u6309\u6240\u9009\u56FE\u8868\u7C7B\u578B\u6E32\u67D3\uFF0C\u8FD4\u56DE\u7684\u5217\u8868\u4E0E X \u6309\u4E0B\u6807\u5BF9\u9F50\uFF1B\u81F3\u5C11\u914D\u7F6E\u4E00\u6761"
     })
   }).pipe(
     Schema.filter((value) => {
@@ -127,16 +168,20 @@ export function schema(configure, _blockRef) {
       return true;
     })
   ).annotations({
-    title: "\u6298\u7EBF\u56FE\u5757",
-    description: "\u4ECE\u547D\u540D\u6570\u636E\u6E90\u53D6\u6570\uFF0C\u628A X / Y \u5217\u8868\u6E32\u67D3\u4E3A\u6298\u7EBF\u56FE"
+    title: "XY \u56FE\u8868\u5757",
+    description: "\u4ECE\u547D\u540D\u6570\u636E\u6E90\u53D6\u6570\uFF0C\u628A X / Y \u5217\u8868\u6E32\u67D3\u4E3A\u6298\u7EBF / \u9762\u79EF / \u67F1 / \u6563\u70B9\u56FE"
   });
 }
 export function defaultBody() {
   return {
     dataSources: [],
     x: "[]",
-    y: [{ id: crypto.randomUUID(), value: "[]" }],
-    curveType: "monotoneX",
-    lineWidth: 2
+    y: [{
+      id: crypto.randomUUID(),
+      value: "[]",
+      chart: "line",
+      curveType: "monotoneX",
+      lineWidth: 2
+    }]
   };
 }