@shwfed/config 2.0.2 → 2.1.0

package/dist/module.json

@@ -1,7 +1,7 @@
 {
   "name": "shwfed",
   "configKey": "shwfed",
-  "version": "2.0.2",
+  "version": "2.1.0",
   "builder": {
     "@nuxt/module-builder": "1.0.2",
     "unbuild": "unknown"

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

@@ -4,7 +4,7 @@ type __VLS_ModelProps = {
 };
 declare const __VLS_export: import("vue").DefineComponent<__VLS_ModelProps, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
     "update:modelValue": (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:modelValue"?: ((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}/config.vue

@@ -29,7 +29,7 @@ import {
   schema,
   ySeriesSchema
 } from "./schema";
-defineOptions({ name: "ShwfedBlockChartLineConfig" });
+defineOptions({ name: "ShwfedBlockChartXyConfig" });
 const block = defineModel({ type: null, ...{ required: true } });
 const blockSchema = schema(() => {
 });
@@ -43,6 +43,13 @@ const dsTitle = (f) => getStructFieldTitle(dsSchema, f) ?? f;
 const dsDescription = (f) => getStructFieldDescription(dsSchema, f);
 const yTitle = (f) => getStructFieldTitle(ySchema, f) ?? f;
 const yDescription = (f) => getStructFieldDescription(ySchema, f);
+const CHART_TYPE_OPTIONS = [
+  { value: "line", label: "\u6298\u7EBF" },
+  { value: "area", label: "\u9762\u79EF" },
+  { value: "groupedBar", label: "\u5206\u7EC4\u67F1" },
+  { value: "scatter", label: "\u6563\u70B9" },
+  { value: "stackedBar", label: "\u5806\u53E0\u67F1" }
+];
 const CURVE_OPTIONS = [
   { value: "linear", label: "\u76F4\u7EBF (linear)" },
   { value: "monotoneX", label: "\u5355\u8C03\u5E73\u6ED1 (monotoneX)" },
@@ -112,12 +119,6 @@ function setCaption(v) {
 function setX(v) {
   block.value = { ...block.value, x: v };
 }
-function setCurveType(v) {
-  block.value = { ...block.value, curveType: v };
-}
-function setLineWidth(v) {
-  block.value = { ...block.value, lineWidth: typeof v === "number" && v > 0 ? v : 2 };
-}
 function writeY(next) {
   block.value = { ...block.value, y: next };
 }
@@ -130,11 +131,38 @@ function setYValue(i, v) {
 function setYLabel(i, v) {
   patchYItem(i, { label: v });
 }
+function setYChart(i, v) {
+  patchYItem(i, { chart: v });
+}
 function setYColor(i, v) {
   patchYItem(i, { color: v.length > 0 ? v : void 0 });
 }
+function setYCurveType(i, v) {
+  patchYItem(i, { curveType: v });
+}
+function setYLineWidth(i, v) {
+  patchYItem(i, { lineWidth: typeof v === "number" && v > 0 ? v : 2 });
+}
+function setYDash(i, v) {
+  patchYItem(i, { dash: v.length > 0 ? v : void 0 });
+}
+function setYLineColor(i, v) {
+  patchYItem(i, { lineColor: v.length > 0 ? v : void 0 });
+}
+function setYWidth(i, v) {
+  patchYItem(i, { width: v.length > 0 ? v : void 0 });
+}
+function setYSize(i, v) {
+  patchYItem(i, { size: v.length > 0 ? v : void 0 });
+}
 function addY() {
-  writeY([...block.value.y, { id: crypto.randomUUID(), value: "[]" }]);
+  writeY([...block.value.y, {
+    id: crypto.randomUUID(),
+    value: "[]",
+    chart: "line",
+    curveType: "monotoneX",
+    lineWidth: 2
+  }]);
 }
 function removeY(i) {
   if (block.value.y.length <= 1) return;
@@ -412,7 +440,7 @@ function removeY(i) {
                   :model-value="s.value"
                   result-type="list"
                   :extra-vars="dataSourceVars"
-                  :placeholder="`\u7B2C ${i + 1} \u6761\u7EBF\uFF0C\u5982 source1.map(r, r.value)`"
+                  :placeholder="`\u7B2C ${i + 1} \u4E2A\u7CFB\u5217\uFF0C\u5982 source1.map(r, r.value)`"
                   @update:model-value="(v) => setYValue(i, v)"
                 />
               </Field>
@@ -421,22 +449,34 @@ function removeY(i) {
                 <Field orientation="vertical">
                   <FieldLabel class="text-xs text-zinc-500">
                     <template
-                      v-if="yDescription('label')"
+                      v-if="yDescription('chart')"
                       #tooltip
                     >
                       <Markdown
-                        :source="yDescription('label')"
+                        :source="yDescription('chart')"
                         block
                         class="prose prose-sm prose-zinc"
                       />
                     </template>
-                    {{ yTitle("label") }}
+                    {{ yTitle("chart") }}
                   </FieldLabel>
-                  <LocaleField
-                    translate-hint="chart series label"
-                    :model-value="s.label"
-                    @update:model-value="(v) => setYLabel(i, v)"
-                  />
+                  <Select
+                    :model-value="s.chart"
+                    @update:model-value="(v) => setYChart(i, v)"
+                  >
+                    <SelectTrigger class="w-full">
+                      <SelectValue />
+                    </SelectTrigger>
+                    <SelectContent>
+                      <SelectItem
+                        v-for="opt in CHART_TYPE_OPTIONS"
+                        :key="opt.value"
+                        :value="opt.value"
+                      >
+                        {{ opt.label }}
+                      </SelectItem>
+                    </SelectContent>
+                  </Select>
                 </Field>
                 <Field orientation="vertical">
                   <FieldLabel class="text-xs text-zinc-500">
@@ -459,6 +499,212 @@ function removeY(i) {
                   />
                 </Field>
               </div>
+
+              <!-- line -->
+              <template v-if="s.chart === 'line'">
+                <div class="grid grid-cols-2 gap-3">
+                  <Field orientation="vertical">
+                    <FieldLabel class="text-xs text-zinc-500">
+                      <template
+                        v-if="yDescription('curveType')"
+                        #tooltip
+                      >
+                        <Markdown
+                          :source="yDescription('curveType')"
+                          block
+                          class="prose prose-sm prose-zinc"
+                        />
+                      </template>
+                      {{ yTitle("curveType") }}
+                    </FieldLabel>
+                    <Select
+                      :model-value="s.curveType"
+                      @update:model-value="(v) => setYCurveType(i, v)"
+                    >
+                      <SelectTrigger class="w-full">
+                        <SelectValue />
+                      </SelectTrigger>
+                      <SelectContent>
+                        <SelectItem
+                          v-for="opt in CURVE_OPTIONS"
+                          :key="opt.value"
+                          :value="opt.value"
+                        >
+                          {{ opt.label }}
+                        </SelectItem>
+                      </SelectContent>
+                    </Select>
+                  </Field>
+                  <Field orientation="vertical">
+                    <FieldLabel class="text-xs text-zinc-500">
+                      <template
+                        v-if="yDescription('lineWidth')"
+                        #tooltip
+                      >
+                        <Markdown
+                          :source="yDescription('lineWidth')"
+                          block
+                          class="prose prose-sm prose-zinc"
+                        />
+                      </template>
+                      {{ yTitle("lineWidth") }}
+                    </FieldLabel>
+                    <InputGroup>
+                      <InputGroupNumberField
+                        :model-value="s.lineWidth"
+                        :min="1"
+                        @update:model-value="(v) => setYLineWidth(i, v)"
+                      />
+                    </InputGroup>
+                  </Field>
+                </div>
+                <Field orientation="vertical">
+                  <FieldLabel class="text-xs text-zinc-500">
+                    <template
+                      v-if="yDescription('dash')"
+                      #tooltip
+                    >
+                      <Markdown
+                        :source="yDescription('dash')"
+                        block
+                        class="prose prose-sm prose-zinc"
+                      />
+                    </template>
+                    {{ yTitle("dash") }}
+                  </FieldLabel>
+                  <ExpressionEditor
+                    :model-value="s.dash ?? ''"
+                    result-type="list"
+                    :extra-vars="dataSourceVars"
+                    placeholder="留空为实线，如 [4, 4]"
+                    @update:model-value="(v) => setYDash(i, v)"
+                  />
+                </Field>
+              </template>
+
+              <!-- area -->
+              <div
+                v-else-if="s.chart === 'area'"
+                class="grid grid-cols-2 gap-3"
+              >
+                <Field orientation="vertical">
+                  <FieldLabel class="text-xs text-zinc-500">
+                    <template
+                      v-if="yDescription('lineColor')"
+                      #tooltip
+                    >
+                      <Markdown
+                        :source="yDescription('lineColor')"
+                        block
+                        class="prose prose-sm prose-zinc"
+                      />
+                    </template>
+                    {{ yTitle("lineColor") }}
+                  </FieldLabel>
+                  <ColorPicker
+                    :model-value="s.lineColor ?? ''"
+                    placeholder="同填充色"
+                    @update:model-value="(v) => setYLineColor(i, v)"
+                  />
+                </Field>
+                <Field orientation="vertical">
+                  <FieldLabel class="text-xs text-zinc-500">
+                    <template
+                      v-if="yDescription('lineWidth')"
+                      #tooltip
+                    >
+                      <Markdown
+                        :source="yDescription('lineWidth')"
+                        block
+                        class="prose prose-sm prose-zinc"
+                      />
+                    </template>
+                    {{ yTitle("lineWidth") }}
+                  </FieldLabel>
+                  <InputGroup>
+                    <InputGroupNumberField
+                      :model-value="s.lineWidth"
+                      :min="1"
+                      @update:model-value="(v) => setYLineWidth(i, v)"
+                    />
+                  </InputGroup>
+                </Field>
+              </div>
+
+              <!-- grouped / stacked bar -->
+              <Field
+                v-else-if="s.chart === 'groupedBar' || s.chart === 'stackedBar'"
+                orientation="vertical"
+              >
+                <FieldLabel class="text-xs text-zinc-500">
+                  <template
+                    v-if="yDescription('width')"
+                    #tooltip
+                  >
+                    <Markdown
+                      :source="yDescription('width')"
+                      block
+                      class="prose prose-sm prose-zinc"
+                    />
+                  </template>
+                  {{ yTitle("width") }}
+                </FieldLabel>
+                <ExpressionEditor
+                  :model-value="s.width ?? ''"
+                  result-type="number"
+                  :extra-vars="dataSourceVars"
+                  placeholder="留空自动，如 24"
+                  @update:model-value="(v) => setYWidth(i, v)"
+                />
+              </Field>
+
+              <!-- scatter -->
+              <Field
+                v-else-if="s.chart === 'scatter'"
+                orientation="vertical"
+              >
+                <FieldLabel class="text-xs text-zinc-500">
+                  <template
+                    v-if="yDescription('size')"
+                    #tooltip
+                  >
+                    <Markdown
+                      :source="yDescription('size')"
+                      block
+                      class="prose prose-sm prose-zinc"
+                    />
+                  </template>
+                  {{ yTitle("size") }}
+                </FieldLabel>
+                <ExpressionEditor
+                  :model-value="s.size ?? ''"
+                  result-type="list"
+                  :extra-vars="dataSourceVars"
+                  placeholder="留空用默认大小，如 source1.map(r, r.weight)"
+                  @update:model-value="(v) => setYSize(i, v)"
+                />
+              </Field>
+
+              <Field orientation="vertical">
+                <FieldLabel class="text-xs text-zinc-500">
+                  <template
+                    v-if="yDescription('label')"
+                    #tooltip
+                  >
+                    <Markdown
+                      :source="yDescription('label')"
+                      block
+                      class="prose prose-sm prose-zinc"
+                    />
+                  </template>
+                  {{ yTitle("label") }}
+                </FieldLabel>
+                <LocaleField
+                  translate-hint="chart series label"
+                  :model-value="s.label"
+                  @update:model-value="(v) => setYLabel(i, v)"
+                />
+              </Field>
             </div>
             <Button
               type="button"
@@ -470,65 +716,6 @@ function removeY(i) {
             </Button>
           </div>
         </Field>
-
-        <Separator />
-
-        <div class="grid grid-cols-2 gap-x-6 gap-y-3">
-          <Field orientation="vertical">
-            <FieldLabel class="text-xs text-zinc-500">
-              <template
-                v-if="fieldDescription('curveType')"
-                #tooltip
-              >
-                <Markdown
-                  :source="fieldDescription('curveType')"
-                  block
-                  class="prose prose-sm prose-zinc"
-                />
-              </template>
-              {{ fieldTitle("curveType") }}
-            </FieldLabel>
-            <Select
-              :model-value="block.curveType"
-              @update:model-value="setCurveType"
-            >
-              <SelectTrigger class="w-full">
-                <SelectValue />
-              </SelectTrigger>
-              <SelectContent>
-                <SelectItem
-                  v-for="opt in CURVE_OPTIONS"
-                  :key="opt.value"
-                  :value="opt.value"
-                >
-                  {{ opt.label }}
-                </SelectItem>
-              </SelectContent>
-            </Select>
-          </Field>
-          <Field orientation="vertical">
-            <FieldLabel class="text-xs text-zinc-500">
-              <template
-                v-if="fieldDescription('lineWidth')"
-                #tooltip
-              >
-                <Markdown
-                  :source="fieldDescription('lineWidth')"
-                  block
-                  class="prose prose-sm prose-zinc"
-                />
-              </template>
-              {{ fieldTitle("lineWidth") }}
-            </FieldLabel>
-            <InputGroup>
-              <InputGroupNumberField
-                :model-value="block.lineWidth"
-                :min="1"
-                @update:model-value="setLineWidth"
-              />
-            </InputGroup>
-          </Field>
-        </div>
       </div>
     </div>
   </div>

package/dist/runtime/components/config/blocks/2026-05-17/{com.shwfed.block.chart.line → com.shwfed.block.chart.xy}/config.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:modelValue": (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:modelValue"?: ((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}/runtime.d.vue.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;