From 1882adb780ceaedc633953d427c33d83753e074d Mon Sep 17 00:00:00 2001
From: Bang <15622356989@163.com>
Date: Wed, 4 Jan 2023 19:06:15 +0800
Subject: [PATCH] =?UTF-8?q?chore:=20=E6=8B=86=E5=88=86radio,=20radio-group?=
 =?UTF-8?q?=E8=87=B3=E4=B8=8D=E5=90=8C=E6=96=87=E4=BB=B6=E5=A4=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../opendesign/src/components/_shared/utils.ts |  2 +-
 packages/opendesign/src/components/index.scss  |  1 +
 packages/opendesign/src/components/index.ts    |  2 ++
 .../{radio => radio-group}/ORadioGroup.vue     |  0
 .../src/components/radio-group/index.ts        | 13 +++++++++++++
 .../{radio => radio-group}/provide.ts          |  2 +-
 .../components/radio-group/style/index.scss    | 18 ++++++++++++++++++
 .../src/components/radio-group/style/index.ts  |  1 +
 .../src/components/radio-group/style/var.scss  |  3 +++
 .../components/{radio => radio-group}/types.ts |  0
 .../opendesign/src/components/radio/ORadio.vue |  2 +-
 .../components/radio/__demo__/IndexRadio.vue   |  1 +
 .../components/radio/__demo__/RadioGroup.vue   |  3 ++-
 .../opendesign/src/components/radio/index.ts   | 11 ++---------
 .../src/components/radio/style/var.scss        |  4 ----
 15 files changed, 46 insertions(+), 17 deletions(-)
 rename packages/opendesign/src/components/{radio => radio-group}/ORadioGroup.vue (100%)
 create mode 100644 packages/opendesign/src/components/radio-group/index.ts
 rename packages/opendesign/src/components/{radio => radio-group}/provide.ts (85%)
 create mode 100644 packages/opendesign/src/components/radio-group/style/index.scss
 create mode 100644 packages/opendesign/src/components/radio-group/style/index.ts
 create mode 100644 packages/opendesign/src/components/radio-group/style/var.scss
 rename packages/opendesign/src/components/{radio => radio-group}/types.ts (100%)

diff --git a/packages/opendesign/src/components/_shared/utils.ts b/packages/opendesign/src/components/_shared/utils.ts
index 7419a67e..e4b00010 100644
--- a/packages/opendesign/src/components/_shared/utils.ts
+++ b/packages/opendesign/src/components/_shared/utils.ts
@@ -4,7 +4,7 @@ import type { ThrottleSettings, DebounceSettings } from 'lodash-es';
 export function isBoolean(val: unknown): val is boolean {
   return typeof val === 'boolean';
 }
-export function isString(val: unknown) {
+export function isString(val: unknown): val is string {
   return typeof val === 'string';
 }
 export function isNumber(val: unknown): val is number {
diff --git a/packages/opendesign/src/components/index.scss b/packages/opendesign/src/components/index.scss
index 9164cf53..98357b32 100644
--- a/packages/opendesign/src/components/index.scss
+++ b/packages/opendesign/src/components/index.scss
@@ -2,3 +2,4 @@
 @import './button/style/index.scss';
 @import './switch/style/index.scss';
 @import './radio/style/index.scss';
+@import './radio-group/style/index.scss';
diff --git a/packages/opendesign/src/components/index.ts b/packages/opendesign/src/components/index.ts
index 4fadf1dd..08d57631 100644
--- a/packages/opendesign/src/components/index.ts
+++ b/packages/opendesign/src/components/index.ts
@@ -7,3 +7,5 @@ export * from './button';
 export * from './switch';
 
 export * from './radio';
+
+export * from './radio-group';
\ No newline at end of file
diff --git a/packages/opendesign/src/components/radio/ORadioGroup.vue b/packages/opendesign/src/components/radio-group/ORadioGroup.vue
similarity index 100%
rename from packages/opendesign/src/components/radio/ORadioGroup.vue
rename to packages/opendesign/src/components/radio-group/ORadioGroup.vue
diff --git a/packages/opendesign/src/components/radio-group/index.ts b/packages/opendesign/src/components/radio-group/index.ts
new file mode 100644
index 00000000..87e33385
--- /dev/null
+++ b/packages/opendesign/src/components/radio-group/index.ts
@@ -0,0 +1,13 @@
+import type { App } from 'vue';
+
+import _ORadioGroup from './ORadioGroup.vue';
+
+export * from './types';
+
+const ORadioGroup = Object.assign(_ORadioGroup, {
+  install(app: App) {
+    app.component(_ORadioGroup.name, _ORadioGroup);
+  },
+});
+
+export { ORadioGroup };
diff --git a/packages/opendesign/src/components/radio/provide.ts b/packages/opendesign/src/components/radio-group/provide.ts
similarity index 85%
rename from packages/opendesign/src/components/radio/provide.ts
rename to packages/opendesign/src/components/radio-group/provide.ts
index e0d9ab18..93ae861c 100644
--- a/packages/opendesign/src/components/radio/provide.ts
+++ b/packages/opendesign/src/components/radio-group/provide.ts
@@ -4,4 +4,4 @@ export const radioGroupInjectKey: InjectionKey<{
   modelValue: Ref<string | number | boolean>;
   disabled: Ref<boolean>;
   onChange: (val: string | number | boolean) => void;
-}> = Symbol('provide-radiogroup');
+}> = Symbol('provide-radio-group');
diff --git a/packages/opendesign/src/components/radio-group/style/index.scss b/packages/opendesign/src/components/radio-group/style/index.scss
new file mode 100644
index 00000000..d69427ce
--- /dev/null
+++ b/packages/opendesign/src/components/radio-group/style/index.scss
@@ -0,0 +1,18 @@
+@import './var.scss';
+
+.o-radio-group {
+  display: inline-flex;
+  flex-wrap: wrap;
+  &.is-horizontal {
+    .o-radio + .o-radio {
+      margin-left: var(--radio-group-gap);
+    }
+  }
+
+  &.is-vertical {
+    flex-direction: column;
+    .o-radio + .o-radio {
+      margin-top: var(--radio-group-gap);
+    }
+  }
+}
diff --git a/packages/opendesign/src/components/radio-group/style/index.ts b/packages/opendesign/src/components/radio-group/style/index.ts
new file mode 100644
index 00000000..67aac616
--- /dev/null
+++ b/packages/opendesign/src/components/radio-group/style/index.ts
@@ -0,0 +1 @@
+import './index.scss';
diff --git a/packages/opendesign/src/components/radio-group/style/var.scss b/packages/opendesign/src/components/radio-group/style/var.scss
new file mode 100644
index 00000000..520e6ea9
--- /dev/null
+++ b/packages/opendesign/src/components/radio-group/style/var.scss
@@ -0,0 +1,3 @@
+.o-radio-group {
+  --radio-group-gap: var(--o-gap-2);
+}
diff --git a/packages/opendesign/src/components/radio/types.ts b/packages/opendesign/src/components/radio-group/types.ts
similarity index 100%
rename from packages/opendesign/src/components/radio/types.ts
rename to packages/opendesign/src/components/radio-group/types.ts
diff --git a/packages/opendesign/src/components/radio/ORadio.vue b/packages/opendesign/src/components/radio/ORadio.vue
index 4422834a..8a83b484 100644
--- a/packages/opendesign/src/components/radio/ORadio.vue
+++ b/packages/opendesign/src/components/radio/ORadio.vue
@@ -1,6 +1,6 @@
 <script lang="ts" setup>
 import { computed, inject, watch } from 'vue';
-import { radioGroupInjectKey } from './provide';
+import { radioGroupInjectKey } from '../radio-group/provide';
 
 interface RadioPropT {
   value: string | boolean | number;
diff --git a/packages/opendesign/src/components/radio/__demo__/IndexRadio.vue b/packages/opendesign/src/components/radio/__demo__/IndexRadio.vue
index 94ba632f..26a3a621 100644
--- a/packages/opendesign/src/components/radio/__demo__/IndexRadio.vue
+++ b/packages/opendesign/src/components/radio/__demo__/IndexRadio.vue
@@ -1,5 +1,6 @@
 <script setup lang="ts">
 import '../style';
+import '../../radio-group/style';
 import RadioBasic from './RadioBasic.vue';
 import RadioDisabled from './RadioDisabled.vue';
 import RadioGroup from './RadioGroup.vue';
diff --git a/packages/opendesign/src/components/radio/__demo__/RadioGroup.vue b/packages/opendesign/src/components/radio/__demo__/RadioGroup.vue
index b58b4168..b1fb3306 100644
--- a/packages/opendesign/src/components/radio/__demo__/RadioGroup.vue
+++ b/packages/opendesign/src/components/radio/__demo__/RadioGroup.vue
@@ -1,6 +1,7 @@
 <script setup lang="ts">
 import { ref } from 'vue';
-import { ORadio, ORadioGroup } from '../index';
+import { ORadio } from '../index';
+import { ORadioGroup } from '../../radio-group';
 const radioVal1 = ref(1);
 const radioVal2 = ref('a');
 const handleChange = (val: string | number | boolean) => {
diff --git a/packages/opendesign/src/components/radio/index.ts b/packages/opendesign/src/components/radio/index.ts
index db101b1d..5d3de57f 100644
--- a/packages/opendesign/src/components/radio/index.ts
+++ b/packages/opendesign/src/components/radio/index.ts
@@ -1,9 +1,8 @@
 import type { App } from 'vue';
 
 import _ORadio from './ORadio.vue';
-import _ORadioGroup from '../radio/ORadioGroup.vue';
 
-export * from './types';
+export * from '../radio-group/types';
 
 const ORadio = Object.assign(_ORadio, {
   install(app: App) {
@@ -11,10 +10,4 @@ const ORadio = Object.assign(_ORadio, {
   },
 });
 
-const ORadioGroup = Object.assign(_ORadioGroup, {
-  install(app: App) {
-    app.component(_ORadioGroup.name, _ORadioGroup);
-  },
-});
-
-export { ORadio, ORadioGroup };
+export { ORadio };
diff --git a/packages/opendesign/src/components/radio/style/var.scss b/packages/opendesign/src/components/radio/style/var.scss
index 35832ff4..e4fe24b6 100644
--- a/packages/opendesign/src/components/radio/style/var.scss
+++ b/packages/opendesign/src/components/radio/style/var.scss
@@ -8,7 +8,3 @@
   --radio-icon-checked: var(--o-color-primary1);
   --radio-icon-checked_disabled: var(--o-color-primary4);
 }
-
-.o-radio-group {
-  --radio-group-gap: var(--o-gap-2);
-}
-- 
Gitee