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 4128c61..21ecb83 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
@@ -6,16 +6,28 @@
     :disabled="selectedAppData.loading == undefined ? false : selectedAppData.loading"
   />
   <kuc-combobox
-    v-if="type == 'kuc-combobox'"
+    v-else-if="type == 'kuc-combobox'"
     :value="modelValue"
     @change="updateValue"
     :disabled="selectedAppData.loading == undefined ? false : selectedAppData.loading"
   />
+  <kuc-time-picker
+    v-else-if="type == 'kuc-time'"
+    :value="modelValue"
+    @change="updateValue"
+    :disabled="selectedAppData.loading == undefined ? false : selectedAppData.loading"
+  />
+  <!-- <table-condition-value-date-time
+    v-else-if="type == 'time'|type == 'date"
+    :value="modelValue"
+    @change="updateValue"
+    :disabled="selectedAppData.loading == undefined ? false : selectedAppData.loading"
+  /> -->
 </template>
 
 <script setup lang="ts">
 import { getComponent } from '@/js/conditions';
-import { search } from '@/js/helper';
+import { getFieldObj, 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';
@@ -30,7 +42,10 @@ const props = defineProps<{
 
 const whereCondition = computed(() => search(props.whereConditions, props.id) as WhereCondition | undefined);
 
-const type = computed(() => getComponent(whereCondition.value?.condition || ''));
+const type = computed(() => {
+  const field = getFieldObj(whereCondition.value?.field || '', props.selectedAppData.appFields, '');
+  return getComponent(whereCondition.value?.condition || '', field);
+});
 
 type EmitData = {
   obj?: WhereCondition;
diff --git a/vue-project/my-kintone-plugin/src/js/conditions.ts b/vue-project/my-kintone-plugin/src/js/conditions.ts
index 4c28f29..ac26c23 100644
--- a/vue-project/my-kintone-plugin/src/js/conditions.ts
+++ b/vue-project/my-kintone-plugin/src/js/conditions.ts
@@ -24,10 +24,6 @@ export const conditionList: ConditionItem[] = [
   { value: 'not_contain', label: '次のいずれも含まない', type: 'input' },
 ];
 
-export const isDateTimeType = (field: OneOf) => {
-  return isType.DATETIME(field) || isType.TIME(field) || isType.DATE(field) || isType.CREATED_TIME(field) || isType.UPDATED_TIME(field);
-}
-
 // search from conditionList
 // conditionItem = conditionMap[conditionValue]
 export const conditionMap: Record<ConditionValue, ConditionItem> = conditionList.reduce(
@@ -42,7 +38,7 @@ type FieldConditions = Partial<Record<FieldType, ConditionValue[]>>;
 
 const textCondition: ConditionValue[] = ['eq', 'ne', 'contains', 'not_contain'];
 const numberCondition: ConditionValue[] = ['eq', 'ne', 'le', 'ge'];
-const timeCondition: ConditionValue[] = [...numberCondition, 'lt', 'gt'];
+const timeCondition: ConditionValue[] = ['eq', 'ne', 'le', 'lt', 'ge', 'gt'];
 const containsCondition: ConditionValue[] = ['contains', 'not_contain'];
 
 // FieldType -> ConditionValue[]
@@ -87,11 +83,15 @@ export const getAvailableCondition = (fieldCode: string, fieldsInfo: FieldsInfo,
 const component = {
   input: 'kuc-text',
   select: 'kuc-combobox',
-  time: 'time',
+  time: 'kuc-time',
   date: 'date',
   datetime: 'datetime',
 };
 
+export const isDateTimeType = (field: OneOf) => {
+  return field.type in dateTimeComponent;
+}
+
 const dateTimeComponent: Partial<Record<FieldType, ComponentType>> = {
   TIME: 'time',
   DATE: 'date',
@@ -101,7 +101,8 @@ const dateTimeComponent: Partial<Record<FieldType, ComponentType>> = {
 }
 
 export type ComponentType = keyof typeof component;
-export const getComponent = (value: ConditionValue) => {
+export const getComponent = (value: ConditionValue, fieldObj: OneOf) => {
   if (!value) return;
-  return component[conditionMap[value].type];
+  const condition = conditionMap[value].type;
+  return component[typeof condition === 'function' ? condition(fieldObj) : condition];
 };
diff --git a/vue-project/my-kintone-plugin/src/js/helper.ts b/vue-project/my-kintone-plugin/src/js/helper.ts
index 2848fe1..47d43e9 100644
--- a/vue-project/my-kintone-plugin/src/js/helper.ts
+++ b/vue-project/my-kintone-plugin/src/js/helper.ts
@@ -63,12 +63,27 @@ export const loadApps = async (offset = 0, _apps: DropdownItem[] = []): Promise<
 };
 
 export const loadAppFieldsAndLayout = async (appId: string | number = kintone.app.getId() as number) => {
+  const fields = (await client.app.getFormFields({ app: appId })).properties;
   return {
-    fields: (await client.app.getFormFields({ app: appId })).properties,
+    fields: flatFields(fields),
     layout: (await client.app.getFormLayout({ app: appId })).layout,
   } as FieldsInfo;
 };
 
+function flatFields(fields: Properties) {
+  const subtableFields = {} as Properties;
+  Object.values(fields).forEach((field) => {
+    if (isType.SUBTABLE(field)) {
+      Object.values(field.fields).forEach((subField) => {
+        const copy = JSON.parse(JSON.stringify(subField)) as typeof subField;
+        copy.label = '[' + field.code + '].' + field.label;
+        subtableFields[subField.code] = copy;
+      })
+    }
+  });
+  return { ...fields, ...subtableFields };
+}
+
 type FilterType = Array<FieldType | SpecialType>;
 type Param = {
   subTableCode: string | undefined;
@@ -77,10 +92,19 @@ type Param = {
   dependFilterField?: OneOf;
   defaultLabel?: string;
   defaultDisableCallback?: (field: OneOf) => boolean;
+  needSubTableField?: boolean;
 };
 export const getFieldsDropdownItems = (
   { fields, layout }: FieldsInfo,
-  { subTableCode, filterType, baseFilter, dependFilterField, defaultLabel, defaultDisableCallback }: Param,
+  {
+    subTableCode,
+    filterType,
+    baseFilter,
+    dependFilterField,
+    defaultLabel,
+    defaultDisableCallback,
+    needSubTableField = true,
+  }: Param,
 ) => {
   // get used field codes
   let fieldOrder: string[];
@@ -96,7 +120,7 @@ export const getFieldsDropdownItems = (
     const subTableFieldMap = fieldMap[subTableCode] as { fields: Record<string, any> } | undefined;
     fieldMap = subTableFieldMap?.fields || {};
   } else {
-    fieldOrder = extractNoSubTableFields(layout, baseFilter);
+    fieldOrder = extractNoSubTableFields(layout, baseFilter, !!needSubTableField);
   }
 
   // create labels
@@ -145,19 +169,18 @@ export const getTableFieldsDropdownItems = ({ fields }: FieldsInfo, filterType?:
   );
 };
 
-const extractNoSubTableFields = (layout: Layout, baseFilter: FieldType[] | undefined) => {
+const extractNoSubTableFields = (layout: Layout, baseFilter: FieldType[] | undefined, needSubTableField: boolean) => {
   return layout.reduce((acc, each) => {
-    if (each.type === 'SUBTABLE') {
-      return acc;
-    } else if (each.type === 'ROW') {
+    if (each.type === 'GROUP') {
+      acc.push(...extractNoSubTableFields(each.layout, baseFilter, needSubTableField));
+    } else if (each.type === 'ROW' || (needSubTableField && each.type === 'SUBTABLE')) {
       acc.push(
-        ...each.fields.map((field: any) => {
+        ...each.fields.map((field) => {
+          if (!('code' in field)) return '';
           if (!baseFilter) return field.code;
           return baseFilter.find((t) => t === field.type) ? field?.code || '' : '';
         }),
       );
-    } else if (each.type === 'GROUP') {
-      acc.push(...extractNoSubTableFields(each.layout, baseFilter));
     }
     return acc;
   }, [] as string[]);