bugfix
This commit is contained in:
@@ -127,7 +127,7 @@ function save() {
|
|||||||
const currentAppMeta = cachedData.currentAppFields.fields;
|
const currentAppMeta = cachedData.currentAppFields.fields;
|
||||||
const convertJoinTables = JSON.parse(JSON.stringify(data.joinTables)) as JoinTable<OneOf | string>[];
|
const convertJoinTables = JSON.parse(JSON.stringify(data.joinTables)) as JoinTable<OneOf | string>[];
|
||||||
convertJoinTables.forEach((item) => {
|
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;
|
if (!meta) return;
|
||||||
|
|
||||||
// Process onConditions
|
// Process onConditions
|
||||||
|
|||||||
@@ -57,11 +57,9 @@
|
|||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
import { dateFuncList, dateFuncMap, getComponent, getDateFuncList, type DateFuncKey } from '@/js/conditions';
|
import { dateFuncMap, getDateFuncList, type DateFuncKey } from '@/js/conditions';
|
||||||
import { getFieldObj, search } from '@/js/helper';
|
|
||||||
import type { CachedSelectedAppData, WhereCondition } from '@/types/model';
|
|
||||||
import type { KucEvent } from '@/types/my-kintone';
|
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';
|
import { defineProps, defineEmits, computed, ref, watch, inject, type Ref } from 'vue';
|
||||||
|
|
||||||
const props = defineProps<{
|
const props = defineProps<{
|
||||||
|
|||||||
@@ -10,12 +10,9 @@
|
|||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script setup lang="ts">
|
<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 type { KucEvent } from '@/types/my-kintone';
|
||||||
import { Table, Text, type ComboboxChangeEventDetail, type TableChangeEventDetail, type TextInputEventDetail } from 'kintone-ui-component';
|
import { Table, Text, type TableChangeEventDetail } from 'kintone-ui-component';
|
||||||
import { defineProps, defineEmits, computed, ref, watch, inject, type Ref, onMounted, reactive, watchEffect,h, render, onUnmounted } from 'vue';
|
import { defineProps, defineEmits, computed, ref, watch, inject, type Ref, onMounted, onUnmounted } from 'vue';
|
||||||
interface MuiltItem{
|
interface MuiltItem{
|
||||||
value:string
|
value:string
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -181,7 +181,7 @@ export function getFieldObj(fieldCode: string, { fields }: FieldsInfo, subTableC
|
|||||||
return meta[fieldCode];
|
return meta[fieldCode];
|
||||||
}
|
}
|
||||||
|
|
||||||
export function getMeta(fields: Properties, subTableCode?: string ,allField?:boolean) {
|
export function getMeta(fields: Properties, subTableCode?: string ,withNoSubTableField = true) {
|
||||||
if (!fields || !subTableCode) {
|
if (!fields || !subTableCode) {
|
||||||
return fields;
|
return fields;
|
||||||
}
|
}
|
||||||
@@ -194,7 +194,7 @@ export function getMeta(fields: Properties, subTableCode?: string ,allField?:boo
|
|||||||
(field as Record<string, any>).subField = true;
|
(field as Record<string, any>).subField = true;
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
if(allField){
|
if(withNoSubTableField){
|
||||||
meta={ ...fields, ...subFields };
|
meta={ ...fields, ...subFields };
|
||||||
}else{
|
}else{
|
||||||
meta=subFields;
|
meta=subFields;
|
||||||
|
|||||||
Reference in New Issue
Block a user