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 @@ 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 @@ 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') 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/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) => { + emit('update:modelValue', { obj: whereCondition.value, value: detail.value as ConditionValue }); }; 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..a69a8c2 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<{ @@ -33,14 +34,14 @@ const type = computed(() => getComponent(whereCondition.value?.condition || '')) type EmitData = { obj?: WhereCondition; - value: string; + value: string | ''; }; 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) => { + emit('update:modelValue', { obj: whereCondition.value, value: event.detail.value || '' }); }; 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>['properties']; export type Layout = Awaited>['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 { + detail: T; }