From cc0e34a6513b292272fa77181d9a208e47d88e4d Mon Sep 17 00:00:00 2001
From: xue jiahao <xuejiahao@alicorns.co.jp>
Date: Thu, 6 Feb 2025 21:44:13 +0800
Subject: [PATCH] bugfix

---
 vue-project/my-kintone-plugin/src/components/Config.vue    | 2 +-
 .../basic/conditions/TableConditionValueDateTime.vue       | 6 ++----
 .../basic/conditions/TableConditionValueMultiInput.vue     | 7 ++-----
 vue-project/my-kintone-plugin/src/js/helper.ts             | 4 ++--
 4 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/vue-project/my-kintone-plugin/src/components/Config.vue b/vue-project/my-kintone-plugin/src/components/Config.vue
index 8519e6c..6243ffd 100644
--- a/vue-project/my-kintone-plugin/src/components/Config.vue
+++ b/vue-project/my-kintone-plugin/src/components/Config.vue
@@ -127,7 +127,7 @@ function save() {
   const currentAppMeta = cachedData.currentAppFields.fields;
   const convertJoinTables = JSON.parse(JSON.stringify(data.joinTables)) as JoinTable<OneOf | string>[];
   convertJoinTables.forEach((item) => {
-    const meta = getMeta(item.meta as Properties, item.table, true);
+    const meta = getMeta(item.meta as Properties, item.table);
     if (!meta) return;
 
     // Process onConditions
diff --git a/vue-project/my-kintone-plugin/src/components/basic/conditions/TableConditionValueDateTime.vue b/vue-project/my-kintone-plugin/src/components/basic/conditions/TableConditionValueDateTime.vue
index e7dd993..b429a6f 100644
--- a/vue-project/my-kintone-plugin/src/components/basic/conditions/TableConditionValueDateTime.vue
+++ b/vue-project/my-kintone-plugin/src/components/basic/conditions/TableConditionValueDateTime.vue
@@ -57,11 +57,9 @@
 </template>
 
 <script setup lang="ts">
-import { dateFuncList, dateFuncMap, getComponent, getDateFuncList, type DateFuncKey } from '@/js/conditions';
-import { getFieldObj, search } from '@/js/helper';
-import type { CachedSelectedAppData, WhereCondition } from '@/types/model';
+import { dateFuncMap, getDateFuncList, type DateFuncKey } from '@/js/conditions';
 import type { KucEvent } from '@/types/my-kintone';
-import type { ComboboxChangeEventDetail, TextInputEventDetail } from 'kintone-ui-component';
+import type { ComboboxChangeEventDetail } from 'kintone-ui-component';
 import { defineProps, defineEmits, computed, ref, watch, inject, type Ref } from 'vue';
 
 const props = defineProps<{
diff --git a/vue-project/my-kintone-plugin/src/components/basic/conditions/TableConditionValueMultiInput.vue b/vue-project/my-kintone-plugin/src/components/basic/conditions/TableConditionValueMultiInput.vue
index 4dd0e4b..148b309 100644
--- a/vue-project/my-kintone-plugin/src/components/basic/conditions/TableConditionValueMultiInput.vue
+++ b/vue-project/my-kintone-plugin/src/components/basic/conditions/TableConditionValueMultiInput.vue
@@ -10,12 +10,9 @@
   </template>
   
   <script setup lang="ts">
-  import { dateFuncList, dateFuncMap, getComponent, getDateFuncList, type DateFuncKey } from '@/js/conditions';
-  import { getFieldObj, isStringArray, search } from '@/js/helper';
-  import type { CachedSelectedAppData, StringValue, WhereCondition } from '@/types/model';
   import type { KucEvent } from '@/types/my-kintone';
-  import { Table, Text, type ComboboxChangeEventDetail, type TableChangeEventDetail, type TextInputEventDetail } from 'kintone-ui-component';
-  import { defineProps, defineEmits, computed, ref, watch, inject, type Ref, onMounted, reactive, watchEffect,h, render, onUnmounted } from 'vue';
+  import { Table, Text, type TableChangeEventDetail } from 'kintone-ui-component';
+  import { defineProps, defineEmits, computed, ref, watch, inject, type Ref, onMounted, onUnmounted } from 'vue';
  interface MuiltItem{
     value:string
   } 
diff --git a/vue-project/my-kintone-plugin/src/js/helper.ts b/vue-project/my-kintone-plugin/src/js/helper.ts
index 9f02d56..656f6a5 100644
--- a/vue-project/my-kintone-plugin/src/js/helper.ts
+++ b/vue-project/my-kintone-plugin/src/js/helper.ts
@@ -181,7 +181,7 @@ export function getFieldObj(fieldCode: string, { fields }: FieldsInfo, subTableC
   return meta[fieldCode];
 }
 
-export function getMeta(fields: Properties, subTableCode?: string ,allField?:boolean) {
+export function getMeta(fields: Properties, subTableCode?: string ,withNoSubTableField = true) {
   if (!fields || !subTableCode) {
     return fields;
   }
@@ -194,7 +194,7 @@ export function getMeta(fields: Properties, subTableCode?: string ,allField?:boo
         (field as Record<string, any>).subField = true; 
       }
     });
-    if(allField){
+    if(withNoSubTableField){
       meta={ ...fields, ...subFields };
     }else{
       meta=subFields;