Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 4 additions & 6 deletions ui/src/components/ai-chat/component/inline-params/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
import { ref, watch, computed, onMounted } from 'vue'
import type { FormField } from '@/components/dynamics-form/type'
import type { Dict } from '@/api/type/common'
import { evaluateVisibility } from '@/components/dynamics-form/visibility'
import { computeVisibilityMap } from '@/components/dynamics-form/visibility'
import InlineFormItem from './InlineFormItem.vue'
import { t } from '@/locales'
import _ from 'lodash'
Expand Down Expand Up @@ -169,6 +169,8 @@ const dialogFields = computed(() => {
return fieldList.value.filter((f) => !setting.value.exposed_fields.includes(f.field))
})

const visibilityMap = computed(() => computeVisibilityMap(fieldList.value, formValue.value))

const show = (field: FormField) => {
if (field.relation_show_field_dict) {
const keys = Object.keys(field.relation_show_field_dict)
Expand All @@ -188,11 +190,7 @@ const show = (field: FormField) => {
}
}
if (field.visibility_rules?.node_id) {
return evaluateVisibility(field.visibility_rules, {
formValue: formValue.value,
currentNodeId: field.visibility_rules.node_id,
currentNodeName: field.visibility_rules.node_name || '',
})
return visibilityMap.value[field.field] ?? true
}
return true
}
Expand Down
13 changes: 6 additions & 7 deletions ui/src/components/dynamics-form/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,12 @@
import type { Dict } from '@/api/type/common'
import FormItem from '@/components/dynamics-form/FormItem.vue'
import type { FormField } from '@/components/dynamics-form/type'
import { ref, onBeforeMount, watch, type Ref, nextTick } from 'vue'
import { ref, onBeforeMount, watch, type Ref, nextTick, computed } from 'vue'
import type { FormInstance } from 'element-plus'
import type Result from '@/request/Result'
import _ from 'lodash'
import { get, post, put, del } from '@/request/index'
import { evaluateVisibility } from './visibility'
import { computeVisibilityMap } from './visibility'
const request = {
get,
post,
Expand Down Expand Up @@ -81,6 +81,9 @@ const formFieldList = ref<Array<FormField>>([])
const ruleFormRef = ref<FormInstance>()

const formFieldRef = ref<Array<InstanceType<typeof FormItem>>>([])

const visibilityMap = computed(() => computeVisibilityMap(formFieldList.value, formValue.value))

/**
* 当前 field是否展示
* @param field
Expand All @@ -106,11 +109,7 @@ const show = (field: FormField) => {

// new
if (field.visibility_rules?.node_id) {
return evaluateVisibility(field.visibility_rules, {
formValue: formValue.value,
currentNodeId: field.visibility_rules.node_id,
currentNodeName: field.visibility_rules.node_name || '',
})
return visibilityMap.value[field.field] ?? true
}

return true
Expand Down
32 changes: 32 additions & 0 deletions ui/src/components/dynamics-form/visibility/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -154,3 +154,35 @@ export function evaluateVisibility(

return rules.action === 'show' ? matched : !matched
}

/**
* 单向扫描计算整个字段列表的显隐表。
* @param fields
* @param formValue
* @returns { 字段名: 是否可见 } 的 map
*/
export function computeVisibilityMap(
fields: Array<{ field: string; visibility_rules?: VisibilityRules }>,
formValue: Record<string, any>,
): Record<string, boolean> {
const copy: Record<string, any> = { ...formValue }
const map: Record<string, boolean> = {}

for (const f of fields) {
if (!f.visibility_rules?.node_id) {
map[f.field] = true
continue
}

const visible = evaluateVisibility(f.visibility_rules, {
formValue: copy,
currentNodeId: f.visibility_rules.node_id,
currentNodeName: f.visibility_rules.node_name || '',
})
map[f.field] = visible
if (!visible) {
copy[f.field] = null
}
}
return map
}
Loading