From c6afc61c94b3f3f18217443af722f12e5b0ccadb Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sat, 23 Oct 2021 11:17:41 +0900
Subject: fix(client): ウィジェットを追加できない問題を修正
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fix #7905
---
 src/client/components/form/select.vue | 33 ++++++++++++++++++---------------
 1 file changed, 18 insertions(+), 15 deletions(-)

(limited to 'src')

diff --git a/src/client/components/form/select.vue b/src/client/components/form/select.vue
index 30ccfd312b..9efaf02697 100644
--- a/src/client/components/form/select.vue
+++ b/src/client/components/form/select.vue
@@ -24,7 +24,7 @@
 </template>
 
 <script lang="ts">
-import { defineComponent, onMounted, onUnmounted, nextTick, ref, watch, computed, toRefs } from 'vue';
+import { defineComponent, onMounted, onUnmounted, nextTick, ref, watch, computed, toRefs, VNode } from 'vue';
 import MkButton from '@client/components/ui/button.vue';
 import * as os from '@client/os';
 
@@ -140,6 +140,16 @@ export default defineComponent({
 			const menu = [];
 			let options = context.slots.default();
 
+			const pushOption = (option: VNode) => {
+				menu.push({
+					text: option.children,
+					active: v.value === option.props.value,
+					action: () => {
+						v.value = option.props.value;
+					},
+				});
+			};
+
 			for (const optionOrOptgroup of options) {
 				if (optionOrOptgroup.type === 'optgroup') {
 					const optgroup = optionOrOptgroup;
@@ -148,23 +158,16 @@ export default defineComponent({
 						text: optgroup.props.label,
 					});
 					for (const option of optgroup.children) {
-						menu.push({
-							text: option.children,
-							active: v.value === option.props.value,
-							action: () => {
-								v.value = option.props.value;
-							},
-						});
+						pushOption(option);
+					}
+				} else if (Array.isArray(optionOrOptgroup.children)) { // 何故かフラグメントになってくることがある
+					const fragment = optionOrOptgroup;
+					for (const option of fragment.children) {
+						pushOption(option);
 					}
 				} else {
 					const option = optionOrOptgroup;
-					menu.push({
-						text: option.children,
-						active: v.value === option.props.value,
-						action: () => {
-							v.value = option.props.value;
-						},
-					});
+					pushOption(option);
 				}
 			}
 
-- 
cgit v1.2.3-freya