Fix load apps

vue-project/my-kintone-plugin/components.d.ts

@@ -17,5 +17,6 @@ declare module 'vue' {
     PluginTableArea: typeof import('./src/components/basic/PluginTableArea.vue')['default']
     PluginTableConditionRow: typeof import('./src/components/basic/PluginTableConditionRow.vue')['default']
     PluginTableConnectRow: typeof import('./src/components/basic/PluginTableConnectRow.vue')['default']
+    TableCombobox: typeof import('./src/components/basic/TableCombobox.vue')['default']
   }
 }

vue-project/my-kintone-plugin/src/components/Config.vue

@@ -18,9 +18,9 @@
   <kuc-spinner :container="mainArea" ref="spinner"></kuc-spinner>
 </template>
 <script setup lang="ts">
-import { createEmptyJoinTable, fetchApps } from '@/js/helper';
-import type { JoinTable, SavedData } from '@/types/model';
-import type { KucSpinnerEl } from '@/types/my-kintone';
+import { createEmptyJoinTable, loadApps, loadAppFieldsAndLayout, EMPTY_OPTION } from '@/js/helper';
+import type { CachedData, FieldsInfo, JoinTable, SavedData } from '@/types/model';
+import type { KucDropdownItem, KucSpinnerEl } from '@/types/my-kintone';
 
 import { onMounted, watch, provide, reactive, ref, shallowRef, nextTick } from 'vue';
 
@@ -31,19 +31,26 @@ const data: SavedData = reactive({
   joinTables: [] as JoinTable[],
 });
 
+const cachedData: CachedData = reactive({
+  apps: [EMPTY_OPTION],
+  currentAppFields: { fields: [], layout: [] } as FieldsInfo,
+});
+
 provide('savedData', data);
+provide('cachedData', cachedData);
 
 const mainArea = shallowRef<HTMLElement | null>(null);
 const spinner = shallowRef<KucSpinnerEl | null>(null);
 
 onMounted(async () => {
+  spinner.value?.close(); // 修复不自动挂载到节点的 bug
   const savedData = kintone.plugin.app.getConfig(props.pluginId);
   data.buttonName = savedData?.buttonName || '集約';
   data.joinTables = savedData?.joinTables ? JSON.parse(savedData.joinTables) : [createEmptyJoinTable()];
   nextTick(async () => {
-    spinner.value?.close(); // 修复不自动挂载到节点的 bug
     loading.value = true;
-    await fetchApps();
+    cachedData.apps = await loadApps();
+    cachedData.currentAppFields = await loadAppFieldsAndLayout();
     loading.value = false;
   });
 });
@@ -55,8 +62,9 @@ watch(loading, (load) => {
 watch(
   () => data.joinTables.length,
   (newLength) => {
+    console.log(data.joinTables);
     if (newLength === 1) {
-      data.joinTables[0].onConditions = [];
+      data.joinTables[0].onConditions = [{ leftField: '', rightField: '' }];
     }
   },
 );

vue-project/my-kintone-plugin/src/components/basic/PluginTableArea.vue

@@ -1,23 +1,23 @@
 <template>
   <plugin-row class="table-area flex-row border">
-    <div class="table-main-area ">
+    <div class="table-main-area">
       <plugin-row>
-        <plugin-dropdown :disabled="false" label="取得元アプリ" :items="apps" v-model="table.app" @change="selectApp"/>
+        <plugin-dropdown :disabled="false" label="取得元アプリ" :items="apps" v-model="table.app" @change="selectApp" />
       </plugin-row>
       <plugin-row>
-        <plugin-dropdown :disabled="!table.app" label="テーブル" :items="tables" v-model="table.table"  @change="select"/>
+        <plugin-dropdown :disabled="selectedAppData.loading" label="テーブル" :items="tableOptions" v-model="table.table" />
       </plugin-row>
       <plugin-row class="flex-row" v-if="isJoinConditionShown(table)">
         <plugin-label label="連結条件" />
-        <plugin-table-connect-row connector="=" :disabled="!table.app" v-model="table.onConditions" />
+        <plugin-table-connect-row connector="=" v-model="table.onConditions" />
       </plugin-row>
       <plugin-row class="flex-row">
         <plugin-label label="取得フィールド" />
-        <plugin-table-connect-row connector="→" :disabled="!table.app" v-model="table.fieldsMapping" />
+        <plugin-table-connect-row connector="→" v-model="table.fieldsMapping" />
       </plugin-row>
       <plugin-row class="flex-row">
         <plugin-label label="絞込条件" />
-        <plugin-table-condition-row :disabled="!table.app" v-model="table.whereConditions" />
+        <plugin-table-condition-row v-model="table.whereConditions" />
       </plugin-row>
     </div>
     <div class="table-action-area">
@@ -27,30 +27,42 @@
 </template>
 
 <script setup lang="ts">
-import { fetchApps, fetchFields, getField, resetTable } from '@/js/helper';
-import { types } from '@/js/kintone-rest-api-client';
-import type { JoinTable, SavedData } from '@/types/model';
+import { EMPTY_OPTION, getFieldsDropdownItems, getTableFieldsDropdownItems, loadAppFieldsAndLayout, resetTable } from '@/js/helper';
+import { types, type Layout, type Properties } from '@/js/kintone-rest-api-client';
+import type { CachedData, CachedSelectedAppData, FieldsInfo, JoinTable, SavedData } from '@/types/model';
 import type { KucDropdownItem, KucEvent } from '@/types/my-kintone';
-import { inject, onMounted, ref } from 'vue';
+import { computed, inject, onMounted, provide, reactive, ref, watch } from 'vue';
 
 const savedData = inject<SavedData>('savedData') as SavedData;
+const cachedData = inject<CachedData>('cachedData') as CachedData;
 
 const props = defineProps<{ table: JoinTable }>();
-const apps = ref([] as KucDropdownItem[]);
-const tables = ref([] as KucDropdownItem[]);
+const apps = computed(() => cachedData.apps);
+const tableOptions = ref([EMPTY_OPTION]);
+const loading = ref(true);
 
-onMounted(async () => {
-  apps.value = await fetchApps();
+const selectedAppData: CachedSelectedAppData = reactive({
+  appFields: { fields: [], layout: [] } as FieldsInfo,
+  table: props.table,
+  loading: false,
 });
+provide('selectedAppData', selectedAppData);
 
 const selectApp = async (e: KucEvent) => {
+  loading.value = true;
+  const fields = await loadAppFieldsAndLayout(e.detail.value);
+  tableOptions.value = getTableFieldsDropdownItems(fields, types.SUBTABLE);
   resetTable(props.table);
-  tables.value = await fetchFields(e.detail.value, types.SUBTABLE);
-}
+  selectedAppData.appFields = fields;
+  loading.value = false;
+};
 
-const select = async (e: KucEvent) => {
-  console.log(getField(e.detail.value));
-}
+watch(
+  () => !props.table.app || loading.value,
+  (val) => {
+    selectedAppData.loading = val;
+  },
+);
 
 const isJoinConditionShown = (table: JoinTable) => {
   return savedData.joinTables[0].id !== table.id;

vue-project/my-kintone-plugin/src/components/basic/PluginTableConditionRow.vue

@@ -4,17 +4,20 @@
 
 <script setup lang="ts">
 import type { KucDropdownItem } from '@/types/my-kintone';
-import type { WhereCondition } from '@/types/model';
-import { defineProps, defineEmits } from 'vue';
-import { Dropdown } from 'kintone-ui-component/lib/dropdown';
+import type { CachedData, CachedSelectedAppData, SavedData, WhereCondition } from '@/types/model';
+import { defineProps, defineEmits, inject } from 'vue';
+import { Combobox } from 'kintone-ui-component/lib/combobox';
 
 const props = defineProps<{
   modelValue: WhereCondition[];
-  disabled: boolean;
 }>();
 
+const savedData = inject<SavedData>('savedData') as SavedData;
+const cachedData = inject<CachedData>('cachedData') as CachedData;
+const selectedAppData = inject<CachedSelectedAppData>('selectedAppData') as CachedSelectedAppData;
+
 const renderDropdown = (cellData: string) => {
-  const dropdown = new Dropdown({
+  const dropdown = new Combobox({
     items: [
       { label: 'John Brown', value: 'john' },
       { label: 'Steven Gerard', value: 'steven' },
@@ -25,7 +28,7 @@ const renderDropdown = (cellData: string) => {
 };
 
 const renderCondition = (cellData: string) => {
-  const dropdown = new Dropdown({
+  const dropdown = new Combobox({
     items: [
       { label: 'John Brown', value: 'john' },
       { label: 'Steven Gerard', value: 'steven' },
@@ -36,7 +39,7 @@ const renderCondition = (cellData: string) => {
 };
 
 const renderDynamicData = (cellData: string) => {
-  const dropdown = new Dropdown({
+  const dropdown = new Combobox({
     items: [
       { label: 'John Brown', value: 'john' },
       { label: 'Steven Gerard', value: 'steven' },

vue-project/my-kintone-plugin/src/components/basic/PluginTableConnectRow.vue

@@ -1,60 +1,74 @@
 <template>
-  <kuc-table :class-name.camel="['plugin-kuc-table']" :columns="columns" :data="modelValue" @change="changeRow"/>
+  <kuc-table :class-name.camel="['plugin-kuc-table']" :columns="columns" :data="modelValue" @change="changeRow" />
 </template>
 
 <script setup lang="ts">
 import type { KucDropdownItem } from '@/types/my-kintone';
-import type { FieldsJoinMapping } from '@/types/model';
-import { defineProps, defineEmits } from 'vue';
-import { Dropdown } from 'kintone-ui-component/lib/dropdown';
+import type { CachedData, CachedSelectedAppData, SavedData, FieldsJoinMapping, FieldsInfo } from '@/types/model';
+import { defineProps, defineEmits, inject, computed, ref, reactive, render, h, watch, onMounted } from 'vue';
+import { Combobox } from 'kintone-ui-component/lib/combobox';
+import { getFieldsDropdownItems } from '@/js/helper';
+import TableCombobox from './TableCombobox.vue';
 
 const props = defineProps<{
   connector: string;
   modelValue: FieldsJoinMapping[];
-  disabled: boolean;
 }>();
 
-const renderDropdown = (cellData: string) => {
-  const dropdown = new Dropdown({
-    items: [
-      { label: 'John Brown', value: 'john' },
-      { label: 'Steven Gerard', value: 'steven' },
-    ],
-    value: cellData,
-  });
-  return dropdown;
-};
-const renderConnector = () => {
-  return props.connector;
-};
+const savedData = inject<SavedData>('savedData') as SavedData;
+const cachedData = inject<CachedData>('cachedData') as CachedData;
+const selectedAppData = inject<CachedSelectedAppData>('selectedAppData') as CachedSelectedAppData;
+const table = computed(() => selectedAppData.table.table);
 
-const columns = [
+const columns = reactive([
   {
     title: '取得元アプリのフィールド',
     field: 'leftField',
-    render: renderDropdown,
+    render: (cellData: string, rowData: any, rowIndex: number) => {
+      const container = document.createElement('div');
+      const vnode = h(TableCombobox, {
+        items: getFieldsDropdownItems(selectedAppData.appFields, table.value),
+        modelValue: '',
+        selectedAppData,
+        'onUpdate:modelValue': (newValue: string) => {
+          props.modelValue[rowIndex].leftField = newValue;
+        },
+      });
+      render(vnode, container);
+      return container;
+    },
   },
   {
     title: '',
     field: 'connector',
-    render: renderConnector,
+    render: () => {
+      return props.connector;
+    },
   },
   {
     title: 'このアプリのフィールド',
     field: 'rightField',
-    render: renderDropdown,
+    render: (cellData: string, rowData: any, rowIndex: number) => {
+      const container = document.createElement('div');
+      const vnode = h(TableCombobox, {
+        items: getFieldsDropdownItems(cachedData.currentAppFields, table.value),
+        modelValue: '',
+        selectedAppData,
+        'onUpdate:modelValue': (newValue: string) => {
+          props.modelValue[rowIndex].rightField = newValue;
         },
-];
-
-const leftFields = [] as KucDropdownItem[];
-const rightFields = [] as KucDropdownItem[];
+      });
+      render(vnode, container);
+      return container;
+    },
+  },
+]);
 
 const emit = defineEmits<{
   (e: 'update:modelValue', value: FieldsJoinMapping[]): void;
 }>();
 
-const changeRow = (item: FieldsJoinMapping, key: keyof FieldsJoinMapping, value: string) => {
-};
+const changeRow = (item: FieldsJoinMapping, key: keyof FieldsJoinMapping, value: string) => {};
 
 const changeField = (item: FieldsJoinMapping, key: keyof FieldsJoinMapping, value: string) => {
   item[key] = value;

vue-project/my-kintone-plugin/src/components/basic/TableCombobox.vue

@@ -0,0 +1,24 @@
+<template>
+  <kuc-combobox :items="items" :value="modelValue" @change="updateValue" :disabled="selectedAppData.loading == undefined ? false : selectedAppData.loading" />
+</template>
+
+<script setup lang="ts">
+import type { CachedData, CachedSelectedAppData, SavedData } from '@/types/model';
+import type { KucEvent } from '@/types/my-kintone';
+import type { DropdownItem } from 'kintone-ui-component';
+import { defineProps, defineEmits, ref, inject, watch, onMounted } from 'vue';
+
+const props = defineProps<{
+  items: DropdownItem[];
+  modelValue: string;
+  selectedAppData: CachedSelectedAppData;
+}>();
+
+const emit = defineEmits<{
+  (e: 'update:modelValue', value: string): void;
+}>();
+
+const updateValue = (event: KucEvent) => {
+  emit('update:modelValue', event.detail.value);
+};
+</script>

vue-project/my-kintone-plugin/src/js/helper.ts

@@ -1,6 +1,6 @@
-import type { JoinTable } from '@/types/model';
+import type { FieldsInfo, JoinTable } from '@/types/model';
 import type { KucDropdownItem } from '@/types/my-kintone';
-import { client, isType, type App, type Properties, type OneOf } from './kintone-rest-api-client';
+import { client, isType, type OneOf, type App, type Layout } from './kintone-rest-api-client';
 
 export const condition = {
   unset: '',
@@ -18,50 +18,87 @@ export function createEmptyJoinTable(id = Number(new Date())) {
 }
 
 export function resetTable(table: JoinTable) {
+  table.table = '';
   table.whereConditions = [{ field: '', condition: condition.unset, data: '' }];
   table.onConditions = [{ leftField: '', rightField: '' }];
   table.fieldsMapping = [{ leftField: '', rightField: '' }];
 }
 
+export const EMPTY_OPTION = {
+  value: "",
+  label: "--------",
+} as KucDropdownItem;
+
 const LIMIT = 100; // 每次请求的最大应用数量
-let allAppsCache: KucDropdownItem[] = [];
-let allFieldsCache: Properties = {};
-export const fetchApps = async (offset = 0, _apps: KucDropdownItem[] = []): Promise<KucDropdownItem[]> => {
-  if (allAppsCache.length) return allAppsCache;
+export const loadApps = async (offset = 0, _apps: KucDropdownItem[] = []): Promise<KucDropdownItem[]> => {
   const { apps } = await client.app.getApps({ limit: LIMIT, offset });
   const allApps: KucDropdownItem[] = [
     ..._apps,
     ...apps.map((app: App) => ({ value: app.appId, label: app.name + '（ID: ' + app.appId + '）' })),
   ];
   if (apps.length === LIMIT) {
-    return fetchApps(offset + LIMIT, allApps);
+    return loadApps(offset + LIMIT, allApps);
   }
-  allAppsCache = allApps.sort((a, b) => Number(b.value) - Number(a.value));
+  allApps.sort((a, b) => Number(b.value) - Number(a.value));
+  allApps.unshift(EMPTY_OPTION);
   return allApps;
 };
 
-export const fetchFields = async (appId: string, filter: OneOf['type']) => {
-  let properties = allFieldsCache;
-  if (!allFieldsCache.length) {
-    properties = (await client.app.getFormFields({ app: appId })).properties;
-    allFieldsCache = properties;
+export const loadAppFieldsAndLayout = async (appId: string | number = kintone.app.getId() as number) => {
+  return {
+    fields: (await client.app.getFormFields({ app: appId })).properties,
+    layout: (await client.app.getFormLayout({ app: appId })).layout,
+  } as FieldsInfo;
+};
+
+export const getFieldsDropdownItems = (
+  { fields, layout }: FieldsInfo,
+  subTable?: string,
+  filterType?: OneOf['type'],
+) => {
+  let fieldOrder: string[];
+  if (subTable) {
+    const subTableFields = layout.find((each) => each.type === 'SUBTABLE' && each.code === subTable) as any;
+    fieldOrder = subTableFields?.fields.map((field: { code: string }) => field.code) || [];
+  } else {
+    fieldOrder = extractNoSubTableFields(layout);
   }
-  const labels = Object.keys(properties).reduce((acc, fieldCode) => {
-    const field = properties[fieldCode];
-    if (filter && !isType[filter](field)) return acc;
+  return fieldOrder.reduce((acc, fieldCode) => {
+    const field = fields[fieldCode];
+    if (filterType && !isType[filterType](field)) return acc;
     acc.push({
       value: fieldCode,
       label: field.label + '（FC: ' + fieldCode + '）',
     });
     return acc;
-  }, [] as KucDropdownItem[]);
-  return labels;
+  }, [EMPTY_OPTION]);
 };
 
-export const getField = (fieldCode: string) => {
-  const field = allFieldsCache[fieldCode];
-  if (isType.SUBTABLE(field)) {
-    console.log(field.fields);
-  }
-  return field;
+export const getTableFieldsDropdownItems = ({ fields }: FieldsInfo, filterType?: OneOf['type']) => {
+  return Object.keys(fields).reduce((acc, fieldCode) => {
+    const field = fields[fieldCode];
+    if (filterType && !isType[filterType](field)) return acc;
+    acc.push({
+      value: fieldCode,
+      label: field.label + '（FC: ' + fieldCode + '）',
+    });
+    return acc;
+  }, [EMPTY_OPTION]);
 };
+
+const extractNoSubTableFields = (layout: Layout) => {
+  return layout.reduce((acc, each) => {
+    if (each.type === 'SUBTABLE') {
+      return acc;
+    } else if (each.type === 'ROW') {
+      acc.push(...each.fields.map((field: any) => field.code));
+    } else if (each.type === 'GROUP') {
+      acc.push(...extractNoSubTableFields(each.layout));
+    }
+    return acc;
+  }, [] as string[]);
+};
+
+// if (isType.SUBTABLE(field)) {
+//   console.log(field.fields);
+// }

vue-project/my-kintone-plugin/src/js/kintone-rest-api-client.ts

@@ -8,6 +8,7 @@ export type App = {
 };
 
 export type Properties = Awaited<ReturnType<typeof client.app.getFormFields>>['properties'];
+export type Layout = Awaited<ReturnType<typeof client.app.getFormLayout>>['layout'];
 export type OneOf = Properties[string];
 
 const typeNames = [

vue-project/my-kintone-plugin/src/types/model.d.ts

@@ -1,4 +1,7 @@
+import { Layout } from './../js/kintone-rest-api-client';
+import type { Layout } from '@/js/kintone-rest-api-client';
 import { condition } from './helper';
+import type { KucDropdownItem } from './my-kintone';
 
 export interface FieldsJoinMapping {
   leftField: string;
@@ -25,3 +28,19 @@ export interface SavedData {
   buttonName: string;
   joinTables: JoinTable[];
 }
+
+export interface FieldsInfo {
+  fields: Properties;
+  layout: Layout;
+}
+
+export interface CachedData {
+  apps: KucDropdownItem[],
+  currentAppFields: FieldsInfo,
+}
+
+export interface CachedSelectedAppData {
+  appFields: FieldsInfo,
+  loading: boolean,
+  table: JoinTable,
+}

vue-project/my-kintone-plugin/vite.config.ts

@@ -66,6 +66,7 @@ export default defineConfig({
     },
   },
   build: {
+    sourcemap: 'inline',
     rollupOptions: {
       input: {
         config: path.resolve(__dirname, 'index.html'),