From eaa9ec2fead136c65c7cd66685fe4d3db1499388 Mon Sep 17 00:00:00 2001
From: xue jiahao <xuejiahao@alicorns.co.jp>
Date: Fri, 24 Jan 2025 01:46:20 +0800
Subject: [PATCH] fix ts

---
 .../my-kintone-plugin/src/components/Config.vue        |  2 +-
 .../src/components/basic/PluginDropdown.vue            |  6 +++---
 .../src/components/basic/PluginInput.vue               |  5 +++--
 .../src/components/basic/PluginTableArea.vue           |  3 +--
 .../src/components/basic/PluginTableConditionRow.vue   |  2 --
 .../src/components/basic/TableCombobox.vue             |  6 +++---
 .../src/components/basic/conditions/TableCondition.vue |  5 +++--
 .../basic/conditions/TableConditionValue.vue           |  5 +++--
 .../src/js/kintone-rest-api-client.ts                  |  2 +-
 .../my-kintone-plugin/src/types/my-kintone.d.ts        | 10 ++--------
 10 files changed, 20 insertions(+), 26 deletions(-)

diff --git a/vue-project/my-kintone-plugin/src/components/Config.vue b/vue-project/my-kintone-plugin/src/components/Config.vue
index 166f8fc..2d60433 100644
--- a/vue-project/my-kintone-plugin/src/components/Config.vue
+++ b/vue-project/my-kintone-plugin/src/components/Config.vue
@@ -19,7 +19,7 @@
 </template>
 <script setup lang="ts">
 import { createEmptyJoinTable, loadApps, loadAppFieldsAndLayout, EMPTY_OPTION, getEmptyOnCondition } from '@/js/helper';
-import type { CachedData, FieldsInfo, JoinTable, SavedData } from '@/types/model';
+import type { CachedData, FieldsInfo, SavedData } from '@/types/model';
 import type { Spinner } from 'kintone-ui-component';
 
 import { onMounted, watch, provide, reactive, ref, shallowRef, nextTick } from 'vue';
diff --git a/vue-project/my-kintone-plugin/src/components/basic/PluginDropdown.vue b/vue-project/my-kintone-plugin/src/components/basic/PluginDropdown.vue
index 336588e..de182fd 100644
--- a/vue-project/my-kintone-plugin/src/components/basic/PluginDropdown.vue
+++ b/vue-project/my-kintone-plugin/src/components/basic/PluginDropdown.vue
@@ -7,7 +7,7 @@
 
 <script setup lang="ts">
 import type { KucEvent } from '@/types/my-kintone';
-import type { DropdownItem } from 'kintone-ui-component';
+import type { ComboboxChangeEventDetail, DropdownItem } from 'kintone-ui-component';
 import { defineProps, defineEmits } from 'vue';
 
 const props = defineProps<{
@@ -21,7 +21,7 @@ const emit = defineEmits<{
   (e: 'update:modelValue', value: string): void;
 }>();
 
-const updateValue = (event: KucEvent) => {
-  emit('update:modelValue', event.detail.value);
+const updateValue = ({ detail }: KucEvent<ComboboxChangeEventDetail>) => {
+  emit('update:modelValue', detail.value || '');
 };
 </script>
diff --git a/vue-project/my-kintone-plugin/src/components/basic/PluginInput.vue b/vue-project/my-kintone-plugin/src/components/basic/PluginInput.vue
index 8a33ade..5f8c742 100644
--- a/vue-project/my-kintone-plugin/src/components/basic/PluginInput.vue
+++ b/vue-project/my-kintone-plugin/src/components/basic/PluginInput.vue
@@ -7,6 +7,7 @@
 
 <script setup lang="ts">
 import type { KucEvent } from '@/types/my-kintone';
+import type { TextInputEventDetail } from 'kintone-ui-component';
 import { defineProps, defineEmits } from 'vue';
 
 const props = defineProps<{
@@ -19,7 +20,7 @@ const emit = defineEmits<{
   (e: 'update:modelValue', value: string): void;
 }>();
 
-const updateValue = (event: KucEvent) => {
-  emit('update:modelValue', event.detail.value);
+const updateValue = ({ detail }: KucEvent<TextInputEventDetail>) => {
+  emit('update:modelValue', detail.value || '');
 };
 </script>
diff --git a/vue-project/my-kintone-plugin/src/components/basic/PluginTableArea.vue b/vue-project/my-kintone-plugin/src/components/basic/PluginTableArea.vue
index 496aac0..1f984a6 100644
--- a/vue-project/my-kintone-plugin/src/components/basic/PluginTableArea.vue
+++ b/vue-project/my-kintone-plugin/src/components/basic/PluginTableArea.vue
@@ -43,7 +43,6 @@ import {
 } from '@/js/helper';
 import { types } from '@/js/kintone-rest-api-client';
 import type { CachedData, CachedSelectedAppData, FieldsInfo, JoinTable, SavedData } from '@/types/model';
-import type { KucEvent } from '@/types/my-kintone';
 import { computed, inject, provide, reactive, ref, watch } from 'vue';
 
 const savedData = inject<SavedData>('savedData') as SavedData;
@@ -92,7 +91,7 @@ watch(
   { immediate: true },
 );
 
-const selectTable = (e: KucEvent) => {
+const selectTable = () => {
   resetConditions(props.table);
 };
 
diff --git a/vue-project/my-kintone-plugin/src/components/basic/PluginTableConditionRow.vue b/vue-project/my-kintone-plugin/src/components/basic/PluginTableConditionRow.vue
index 1a9eecd..b40f4ae 100644
--- a/vue-project/my-kintone-plugin/src/components/basic/PluginTableConditionRow.vue
+++ b/vue-project/my-kintone-plugin/src/components/basic/PluginTableConditionRow.vue
@@ -7,10 +7,8 @@ import type { CachedData, CachedSelectedAppData, SavedData, WhereCondition } fro
 import { defineProps, inject, computed, render, h, reactive } from 'vue';
 import TableCombobox from './TableCombobox.vue';
 import { generateId, getFieldsDropdownItems, search } from '@/js/helper';
-import type { ConditionValue } from '@/js/conditions';
 import TableCondition from './conditions/TableCondition.vue';
 import TableConditionValue from './conditions/TableConditionValue.vue';
-import type { KucTableEvent } from '@/types/my-kintone';
 
 const props = defineProps<{
   modelValue: WhereCondition[];
diff --git a/vue-project/my-kintone-plugin/src/components/basic/TableCombobox.vue b/vue-project/my-kintone-plugin/src/components/basic/TableCombobox.vue
index 1cbb16d..13dfbc0 100644
--- a/vue-project/my-kintone-plugin/src/components/basic/TableCombobox.vue
+++ b/vue-project/my-kintone-plugin/src/components/basic/TableCombobox.vue
@@ -12,7 +12,7 @@
 import { search } from '@/js/helper';
 import type { CachedSelectedAppData } from '@/types/model';
 import type { KucEvent } from '@/types/my-kintone';
-import type { DropdownItem } from 'kintone-ui-component';
+import type { ComboboxChangeEventDetail, DropdownItem } from 'kintone-ui-component';
 import { defineProps, defineEmits, type Ref, watch, ref } from 'vue';
 
 const props = defineProps<{
@@ -45,7 +45,7 @@ const emit = defineEmits<{
   (e: 'update:modelValue', data: EmitData): void;
 }>();
 
-const updateValue = (event: KucEvent) => {
-  emit('update:modelValue', { obj: search(props.dataList, props.id), value: event.detail.value });
+const updateValue = ({ detail }: KucEvent<ComboboxChangeEventDetail>) => {
+  emit('update:modelValue', { obj: search(props.dataList, props.id), value: detail.value || '' });
 };
 </script>
diff --git a/vue-project/my-kintone-plugin/src/components/basic/conditions/TableCondition.vue b/vue-project/my-kintone-plugin/src/components/basic/conditions/TableCondition.vue
index 99b650d..b56b582 100644
--- a/vue-project/my-kintone-plugin/src/components/basic/conditions/TableCondition.vue
+++ b/vue-project/my-kintone-plugin/src/components/basic/conditions/TableCondition.vue
@@ -13,6 +13,7 @@ import { getAvailableCondition, type ConditionValue } from '@/js/conditions';
 import { search } from '@/js/helper';
 import type { CachedSelectedAppData, WhereCondition } from '@/types/model';
 import type { KucEvent } from '@/types/my-kintone';
+import type { ComboboxChangeEventDetail } from 'kintone-ui-component';
 import { defineProps, defineEmits, computed } from 'vue';
 
 const props = defineProps<{
@@ -35,7 +36,7 @@ const emit = defineEmits<{
   (e: 'update:modelValue', data: EmitData): void;
 }>();
 
-const updateValue = (event: KucEvent) => {
-  emit('update:modelValue', { obj: whereCondition.value, value: event.detail.value as ConditionValue });
+const updateValue = ({ detail }: KucEvent<ComboboxChangeEventDetail>) => {
+  emit('update:modelValue', { obj: whereCondition.value, value: detail.value as ConditionValue });
 };
 </script>
diff --git a/vue-project/my-kintone-plugin/src/components/basic/conditions/TableConditionValue.vue b/vue-project/my-kintone-plugin/src/components/basic/conditions/TableConditionValue.vue
index 40406d1..4128c61 100644
--- a/vue-project/my-kintone-plugin/src/components/basic/conditions/TableConditionValue.vue
+++ b/vue-project/my-kintone-plugin/src/components/basic/conditions/TableConditionValue.vue
@@ -18,6 +18,7 @@ import { getComponent } from '@/js/conditions';
 import { search } from '@/js/helper';
 import type { CachedSelectedAppData, WhereCondition } from '@/types/model';
 import type { KucEvent } from '@/types/my-kintone';
+import type { ComboboxChangeEventDetail, TextInputEventDetail } from 'kintone-ui-component';
 import { defineProps, defineEmits, computed } from 'vue';
 
 const props = defineProps<{
@@ -40,7 +41,7 @@ const emit = defineEmits<{
   (e: 'update:modelValue', data: EmitData): void;
 }>();
 
-const updateValue = (event: KucEvent) => {
-  emit('update:modelValue', { obj: whereCondition.value, value: event.detail.value });
+const updateValue = (event: KucEvent<ComboboxChangeEventDetail | TextInputEventDetail>) => {
+  emit('update:modelValue', { obj: whereCondition.value, value: event.detail.value || '' });
 };
 </script>
diff --git a/vue-project/my-kintone-plugin/src/js/kintone-rest-api-client.ts b/vue-project/my-kintone-plugin/src/js/kintone-rest-api-client.ts
index 43f1ad9..bf7a25a 100644
--- a/vue-project/my-kintone-plugin/src/js/kintone-rest-api-client.ts
+++ b/vue-project/my-kintone-plugin/src/js/kintone-rest-api-client.ts
@@ -10,7 +10,7 @@ export type App = {
 export type Properties = Awaited<ReturnType<typeof client.app.getFormFields>>['properties'];
 export type Layout = Awaited<ReturnType<typeof client.app.getFormLayout>>['layout'];
 
-type OneOf = Properties[string];
+export type OneOf = Properties[string];
 export type FieldType = OneOf['type'];
 
 const typeNames = [
diff --git a/vue-project/my-kintone-plugin/src/types/my-kintone.d.ts b/vue-project/my-kintone-plugin/src/types/my-kintone.d.ts
index 4ef0b26..7cbded5 100644
--- a/vue-project/my-kintone-plugin/src/types/my-kintone.d.ts
+++ b/vue-project/my-kintone-plugin/src/types/my-kintone.d.ts
@@ -1,9 +1,3 @@
-import type { TableChangeEventDetail } from 'kintone-ui-component';
-export interface KucEvent {
-  detail: {
-    value: string;
-  };
-}
-export interface KucTableEvent {
-  detail: TableChangeEventDetail;
+export interface KucEvent<T> {
+  detail: T;
 }