From 57fe87e60e2788dd519e622da698bf6591062473 Mon Sep 17 00:00:00 2001
From: Seeridia <i@seeridia.top>
Date: Thu, 2 Jul 2026 21:11:22 +0800
Subject: [PATCH 1/3] feat(Switch): support shape prop

---
 .../__snapshots__/switch.test.tsx.snap        | 22 ++++-----
 .../components/switch/__tests__/base.test.tsx | 48 +++++++++++++++++++
 packages/components/switch/_example/shape.vue | 13 +++++
 packages/components/switch/_usage/props.json  | 21 +++++++-
 packages/components/switch/props.ts           |  9 ++++
 packages/components/switch/switch.en-US.md    |  1 +
 packages/components/switch/switch.md          |  1 +
 packages/components/switch/switch.tsx         |  5 +-
 packages/components/switch/type.ts            |  5 ++
 9 files changed, 111 insertions(+), 14 deletions(-)
 create mode 100644 packages/components/switch/_example/shape.vue

diff --git a/packages/components/switch/__tests__/__snapshots__/switch.test.tsx.snap b/packages/components/switch/__tests__/__snapshots__/switch.test.tsx.snap
index bc1d69520b..dbeb7a9d4c 100644
--- a/packages/components/switch/__tests__/__snapshots__/switch.test.tsx.snap
+++ b/packages/components/switch/__tests__/__snapshots__/switch.test.tsx.snap
@@ -2,7 +2,7 @@
 
 exports[`Switch > :props > :customValue 1`] = `
 <div
-  class="t-switch t-size-m"
+  class="t-switch t-switch--shape-circle t-size-m"
 >
   <span
     class="t-switch__handle"
@@ -19,7 +19,7 @@ exports[`Switch > :props > :customValue 1`] = `
 
 exports[`Switch > :props > :defaultValue 1`] = `
 <div
-  class="t-switch t-size-m"
+  class="t-switch t-switch--shape-circle t-size-m"
 >
   <span
     class="t-switch__handle"
@@ -36,7 +36,7 @@ exports[`Switch > :props > :defaultValue 1`] = `
 
 exports[`Switch > :props > :disabled 1`] = `
 <div
-  class="t-switch t-size-m t-is-disabled"
+  class="t-switch t-switch--shape-circle t-size-m t-is-disabled"
 >
   <span
     class="t-switch__handle t-is-disabled"
@@ -53,7 +53,7 @@ exports[`Switch > :props > :disabled 1`] = `
 
 exports[`Switch > :props > :label 1`] = `
 <div
-  class="t-switch t-size-m"
+  class="t-switch t-switch--shape-circle t-size-m"
 >
   <span
     class="t-switch__handle"
@@ -70,7 +70,7 @@ exports[`Switch > :props > :label 1`] = `
 
 exports[`Switch > :props > :loading 1`] = `
 <div
-  class="t-switch t-size-m t-is-loading"
+  class="t-switch t-switch--shape-circle t-size-m t-is-loading"
 >
   <span
     class="t-switch__handle t-is-loading"
@@ -110,7 +110,7 @@ exports[`Switch > :props > :loading 1`] = `
 
 exports[`Switch > :props > :modelValue 1`] = `
 <div
-  class="t-switch t-size-m"
+  class="t-switch t-switch--shape-circle t-size-m"
 >
   <span
     class="t-switch__handle"
@@ -127,7 +127,7 @@ exports[`Switch > :props > :modelValue 1`] = `
 
 exports[`Switch > :props > :onChange 1`] = `
 <div
-  class="t-switch t-size-m"
+  class="t-switch t-switch--shape-circle t-size-m"
 >
   <span
     class="t-switch__handle"
@@ -144,7 +144,7 @@ exports[`Switch > :props > :onChange 1`] = `
 
 exports[`Switch > :props > :size 1`] = `
 <div
-  class="t-switch t-size-s"
+  class="t-switch t-switch--shape-circle t-size-s"
 >
   <span
     class="t-switch__handle"
@@ -161,7 +161,7 @@ exports[`Switch > :props > :size 1`] = `
 
 exports[`Switch > :props > :value 1`] = `
 <div
-  class="t-switch t-size-m"
+  class="t-switch t-switch--shape-circle t-size-m"
 >
   <span
     class="t-switch__handle"
@@ -178,7 +178,7 @@ exports[`Switch > :props > :value 1`] = `
 
 exports[`Switch > <slot> > <label> 1`] = `
 <div
-  class="t-switch t-size-m"
+  class="t-switch t-switch--shape-circle t-size-m"
 >
   <span
     class="t-switch__handle"
@@ -197,7 +197,7 @@ exports[`Switch > <slot> > <label> 1`] = `
 
 exports[`Switch > @event > Event passthrough: change 1`] = `
 <div
-  class="t-switch t-size-m"
+  class="t-switch t-switch--shape-circle t-size-m"
 >
   <span
     class="t-switch__handle"
diff --git a/packages/components/switch/__tests__/base.test.tsx b/packages/components/switch/__tests__/base.test.tsx
index f525fde6c1..fa0c7e0e29 100644
--- a/packages/components/switch/__tests__/base.test.tsx
+++ b/packages/components/switch/__tests__/base.test.tsx
@@ -137,6 +137,54 @@ describe('switch', () => {
         expect(eleCls.includes('t-size-s')).toBe(true);
       });
     });
+    // test props shape
+    describe(':props.shape', () => {
+      it('shape default value is circle', () => {
+        const wrapper = mount(Switch);
+        const ele = wrapper.find('.t-switch');
+        const eleCls = ele.classes();
+        expect(eleCls.includes('t-switch--shape-circle')).toBe(true);
+      });
+      it('shape={round} works find', () => {
+        const wrapper = mount({
+          render() {
+            return <Switch shape="round" />;
+          },
+        });
+        const ele = wrapper.find('.t-switch');
+        const eleCls = ele.classes();
+        expect(eleCls.includes('t-switch--shape-round')).toBe(true);
+      });
+      it('shape={line} works find', () => {
+        const label = vi.fn(() => 'open');
+        const wrapper = mount({
+          render() {
+            return <Switch shape="line" label={label} />;
+          },
+        });
+        const ele = wrapper.find('.t-switch');
+        const eleCls = ele.classes();
+        expect(eleCls.includes('t-switch--shape-line')).toBe(true);
+        expect(ele.find('.t-switch__content').exists()).toBe(false);
+        expect(label).not.toBeCalled();
+        expect(eleCls.includes('t-is-disabled')).toBe(false);
+        expect(eleCls.includes('t-is-loading')).toBe(false);
+      });
+      it('shape={line} works with size and status', () => {
+        const wrapper = mount({
+          render() {
+            return <Switch shape="line" size="small" defaultValue disabled loading />;
+          },
+        });
+        const ele = wrapper.find('.t-switch');
+        const eleCls = ele.classes();
+        expect(eleCls.includes('t-switch--shape-line')).toBe(true);
+        expect(eleCls.includes('t-size-s')).toBe(true);
+        expect(eleCls.includes('t-is-checked')).toBe(true);
+        expect(eleCls.includes('t-is-disabled')).toBe(true);
+        expect(eleCls.includes('t-is-loading')).toBe(true);
+      });
+    });
     // test props beforeChange
     describe(':props.beforeChange', () => {
       it('beforeChange resolve', async () => {
diff --git a/packages/components/switch/_example/shape.vue b/packages/components/switch/_example/shape.vue
new file mode 100644
index 0000000000..16c52d874f
--- /dev/null
+++ b/packages/components/switch/_example/shape.vue
@@ -0,0 +1,13 @@
+<template>
+  <t-space>
+    <t-switch v-model="checked" shape="circle" />
+    <t-switch v-model="checked" shape="round" />
+    <t-switch v-model="checked" shape="line" />
+  </t-space>
+</template>
+
+<script lang="ts" setup>
+import { ref } from 'vue';
+
+const checked = ref(true);
+</script>
diff --git a/packages/components/switch/_usage/props.json b/packages/components/switch/_usage/props.json
index 881604decd..decc3290bb 100644
--- a/packages/components/switch/_usage/props.json
+++ b/packages/components/switch/_usage/props.json
@@ -11,6 +11,25 @@
     "defaultValue": false,
     "options": []
   },
+  {
+    "name": "shape",
+    "type": "enum",
+    "defaultValue": "circle",
+    "options": [
+      {
+        "label": "circle",
+        "value": "circle"
+      },
+      {
+        "label": "round",
+        "value": "round"
+      },
+      {
+        "label": "line",
+        "value": "line"
+      }
+    ]
+  },
   {
     "name": "size",
     "type": "enum",
@@ -30,4 +49,4 @@
       }
     ]
   }
-]
\ No newline at end of file
+]
diff --git a/packages/components/switch/props.ts b/packages/components/switch/props.ts
index 233173bd12..c818bf3cf5 100644
--- a/packages/components/switch/props.ts
+++ b/packages/components/switch/props.ts
@@ -28,6 +28,15 @@ export default {
   },
   /** 是否处于加载中状态 */
   loading: Boolean,
+  /** 开关形状。`line` 形态不展示开关内容 `label` */
+  shape: {
+    type: String as PropType<TdSwitchProps['shape']>,
+    default: 'circle' as TdSwitchProps['shape'],
+    validator(val: TdSwitchProps['shape']): boolean {
+      if (!val) return true;
+      return ['circle', 'round', 'line'].includes(val);
+    },
+  },
   /** 开关尺寸 */
   size: {
     type: String as PropType<TdSwitchProps['size']>,
diff --git a/packages/components/switch/switch.en-US.md b/packages/components/switch/switch.en-US.md
index ac48c1a82d..3f34a8ab1e 100644
--- a/packages/components/switch/switch.en-US.md
+++ b/packages/components/switch/switch.en-US.md
@@ -10,6 +10,7 @@ customValue | Array | - | Typescript：`Array<SwitchValue>` | N
 disabled | Boolean | undefined | \- | N
 label | Array / Slot / Function | [] | Typescript：`Array<string \| TNode> \| TNode<{ value: SwitchValue }>`。[see more ts definition](https://github.com/Tencent/tdesign-vue-next/blob/develop/packages/components/common.ts) | N
 loading | Boolean | false | \- | N
+shape | String | circle | Switch shape. `label` is not rendered when shape is `line`. Options: circle/round/line | N
 size | String | medium | options: small/medium/large | N
 value | String / Number / Boolean | - | `v-model` and `v-model:value` is supported。Typescript：`T` `type SwitchValue = string \| number \| boolean`。[see more ts definition](https://github.com/Tencent/tdesign-vue-next/blob/develop/packages/components/switch/type.ts) | N
 defaultValue | String / Number / Boolean | - | uncontrolled property。Typescript：`T` `type SwitchValue = string \| number \| boolean`。[see more ts definition](https://github.com/Tencent/tdesign-vue-next/blob/develop/packages/components/switch/type.ts) | N
diff --git a/packages/components/switch/switch.md b/packages/components/switch/switch.md
index c71c696f28..6b5c6890b6 100644
--- a/packages/components/switch/switch.md
+++ b/packages/components/switch/switch.md
@@ -10,6 +10,7 @@ customValue | Array | - | 用于自定义开关的值，[打开时的值，关
 disabled | Boolean | undefined | 是否禁用组件。优先级：Switch.disabled > Form.disabled | N
 label | Array / Slot / Function | [] | 开关内容，[开启时内容，关闭时内容]。示例：['开', '关'] 或 (value) => value ? '开' : '关'。TS 类型：`Array<string \| TNode> \| TNode<{ value: SwitchValue }>`。[通用类型定义](https://github.com/Tencent/tdesign-vue-next/blob/develop/packages/components/common.ts) | N
 loading | Boolean | false | 是否处于加载中状态 | N
+shape | String | circle | 开关形状。`line` 形态不展示开关内容 `label`。可选项：circle/round/line | N
 size | String | medium | 开关尺寸。可选项：small/medium/large | N
 value | String / Number / Boolean | - | 开关值。支持语法糖 `v-model` 或 `v-model:value`。TS 类型：`T` `type SwitchValue = string \| number \| boolean`。[详细类型定义](https://github.com/Tencent/tdesign-vue-next/blob/develop/packages/components/switch/type.ts) | N
 defaultValue | String / Number / Boolean | - | 开关值。非受控属性。TS 类型：`T` `type SwitchValue = string \| number \| boolean`。[详细类型定义](https://github.com/Tencent/tdesign-vue-next/blob/develop/packages/components/switch/type.ts) | N
diff --git a/packages/components/switch/switch.tsx b/packages/components/switch/switch.tsx
index 65d9f84d89..cafe1a9f64 100755
--- a/packages/components/switch/switch.tsx
+++ b/packages/components/switch/switch.tsx
@@ -61,6 +61,7 @@ export default defineComponent({
     // classes
     const classes = computed(() => [
       `${COMPONENT_NAME.value}`,
+      `${COMPONENT_NAME.value}--shape-${props.shape}`,
       SIZE.value[props.size],
       {
         [STATUS.value.disabled]: disabled.value,
@@ -126,14 +127,14 @@ export default defineComponent({
       let loadingContent: TNodeReturnValue;
       if (props.loading) {
         loadingContent = <TLoading size="small" />;
-      } else if (content.value) {
+      } else if (props.shape !== 'line' && content.value) {
         switchContent = content.value;
       }
 
       return (
         <div class={classes.value} onClick={toggle}>
           <span class={nodeClasses.value}>{loadingContent}</span>
-          <div class={contentClasses.value}>{switchContent}</div>
+          {props.shape !== 'line' && <div class={contentClasses.value}>{switchContent}</div>}
         </div>
       );
     };
diff --git a/packages/components/switch/type.ts b/packages/components/switch/type.ts
index 3308048a92..05031ca0d1 100644
--- a/packages/components/switch/type.ts
+++ b/packages/components/switch/type.ts
@@ -29,6 +29,11 @@ export interface TdSwitchProps<T = SwitchValue> {
    * @default false
    */
   loading?: boolean;
+  /**
+   * 开关形状。`line` 形态不展示开关内容 `label`
+   * @default circle
+   */
+  shape?: 'circle' | 'round' | 'line';
   /**
    * 开关尺寸
    * @default medium

From 030d5d447bffa32dd20c2760c43d353fd732542c Mon Sep 17 00:00:00 2001
From: Seeridia <i@seeridia.top>
Date: Thu, 2 Jul 2026 21:54:56 +0800
Subject: [PATCH 2/3] fix(Switch): normalize shape prop

---
 packages/components/switch/_example/shape.vue | 10 ++++++----
 packages/components/switch/props.ts           |  2 +-
 packages/components/switch/switch.tsx         | 10 +++++++---
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/packages/components/switch/_example/shape.vue b/packages/components/switch/_example/shape.vue
index 16c52d874f..2c38721f21 100644
--- a/packages/components/switch/_example/shape.vue
+++ b/packages/components/switch/_example/shape.vue
@@ -1,13 +1,15 @@
 <template>
   <t-space>
-    <t-switch v-model="checked" shape="circle" />
-    <t-switch v-model="checked" shape="round" />
-    <t-switch v-model="checked" shape="line" />
+    <t-switch v-model="circleChecked" shape="circle" />
+    <t-switch v-model="roundChecked" shape="round" />
+    <t-switch v-model="lineChecked" shape="line" />
   </t-space>
 </template>
 
 <script lang="ts" setup>
 import { ref } from 'vue';
 
-const checked = ref(true);
+const circleChecked = ref(true);
+const roundChecked = ref(true);
+const lineChecked = ref(true);
 </script>
diff --git a/packages/components/switch/props.ts b/packages/components/switch/props.ts
index c818bf3cf5..d7ecfb9ad3 100644
--- a/packages/components/switch/props.ts
+++ b/packages/components/switch/props.ts
@@ -33,7 +33,7 @@ export default {
     type: String as PropType<TdSwitchProps['shape']>,
     default: 'circle' as TdSwitchProps['shape'],
     validator(val: TdSwitchProps['shape']): boolean {
-      if (!val) return true;
+      if (val === undefined) return true;
       return ['circle', 'round', 'line'].includes(val);
     },
   },
diff --git a/packages/components/switch/switch.tsx b/packages/components/switch/switch.tsx
index cafe1a9f64..0d34b0203a 100755
--- a/packages/components/switch/switch.tsx
+++ b/packages/components/switch/switch.tsx
@@ -8,6 +8,8 @@ import { TNodeReturnValue } from '../common';
 
 import { isArray, isString, isFunction } from 'lodash-es';
 
+const SWITCH_SHAPES = ['circle', 'round', 'line'];
+
 export default defineComponent({
   name: 'TSwitch',
   props,
@@ -58,10 +60,12 @@ export default defineComponent({
         });
     }
 
+    const shape = computed(() => (SWITCH_SHAPES.includes(props.shape) ? props.shape : 'circle'));
+
     // classes
     const classes = computed(() => [
       `${COMPONENT_NAME.value}`,
-      `${COMPONENT_NAME.value}--shape-${props.shape}`,
+      `${COMPONENT_NAME.value}--shape-${shape.value}`,
       SIZE.value[props.size],
       {
         [STATUS.value.disabled]: disabled.value,
@@ -127,14 +131,14 @@ export default defineComponent({
       let loadingContent: TNodeReturnValue;
       if (props.loading) {
         loadingContent = <TLoading size="small" />;
-      } else if (props.shape !== 'line' && content.value) {
+      } else if (shape.value !== 'line' && content.value) {
         switchContent = content.value;
       }
 
       return (
         <div class={classes.value} onClick={toggle}>
           <span class={nodeClasses.value}>{loadingContent}</span>
-          {props.shape !== 'line' && <div class={contentClasses.value}>{switchContent}</div>}
+          {shape.value !== 'line' && <div class={contentClasses.value}>{switchContent}</div>}
         </div>
       );
     };

From 8cf2d621dc13880cad1dc3b0c31e0b4111cb4f19 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Wed, 29 Jul 2026 10:59:32 +0000
Subject: [PATCH 3/3] chore: update common to PR 2604

---
 packages/common | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/common b/packages/common
index 5aedfdf7ab..9d5ab177c4 160000
--- a/packages/common
+++ b/packages/common
@@ -1 +1 @@
-Subproject commit 5aedfdf7ab0457141b0a886d2126e22bbdb42cae
+Subproject commit 9d5ab177c4fa927d1c9be79c33cbcb2be85c245c