feat: Visibility rules

zhanweizhang7 · zhanweizhang7 · commit 4948bbbd8893 · 2026-05-18T14:38:54.000+08:00
diff --git a/apps/application/flow/step_node/form_node/impl/base_form_node.py b/apps/application/flow/step_node/form_node/impl/base_form_node.py
@@ -16,7 +16,9 @@
 from application.flow.common import Answer
 from application.flow.i_step_node import NodeResult
 from application.flow.step_node.form_node.i_form_node import IFormNode
+import re
 
+_TEMPLATE_RE = re.compile(r'\{\{([^.\s}]+)\.([^.\s}]+)\}\}')
 multi_select_list = [
     'MultiSelect',
     'MultiRow'
@@ -106,8 +108,63 @@ def reset_field(self, field):
                 field['default_value'] = self.workflow_manage.get_reference_field(field.get('default_value')[0],
                                                                                   field.get('default_value')[1:])
 
+        visibility_rules = field.get('visibility_rules')
+        if visibility_rules and isinstance(visibility_rules.get('conditions'), list):
+            for cond in visibility_rules['conditions']:
+                cond_field = cond.get('field')
+                if not cond_field or len(cond_field) < 2 or not cond_field[0] or not cond_field[1]:
+                    continue
+
+                # cross node -------> _left
+                if cond_field[0] != self.node.id:
+                    cond['_left'] = self.workflow_manage.get_reference_field(cond_field[0], cond_field[1:])
+                # 右值 {{}}
+                cond_value = cond.get("value")
+                if isinstance(cond_value, str) and _TEMPLATE_RE.search(cond_value):
+                    cond['value'] = self._render_cond_value(cond_value)
+
         return field
 
+    def _render_cond_value(self, value):
+        """
+        render cross-node/global/chat {{}} to literal, preserve same-form {{}}
+        match.group(0)  →  "{{开始.question}}"    # 完整匹配
+        match.group(1)  →  "开始"                  # 第一个 () 捕获的
+        match.group(2)  →  "question"             # 第二个 () 捕获的
+        match.start()   →  3                      # 匹配起始位置
+        match.end()     →  16                     # 匹配结束位置
+        """
+        def replacer(match):
+            node_display = match.group(1)
+            field_name = match.group(2)
+
+            # field_list: cross_node
+            for f in self.workflow_manage.field_list:
+                if f.get('node_name') == node_display and f.get('value') == field_name:
+                    if f.get('node_id') == self.node.id:
+                        return match.group(0) # same node
+                    ref = self.workflow_manage.get_reference_field(f.get('node_id'),[field_name])
+                    return str(ref) if ref is not None else ''
+
+            # global
+            if node_display in ('全局变量', 'global'):
+                for f in self.workflow_manage.global_field_list:
+                    if f.get('value') == field_name:
+                        ref = self.workflow_manage.get_reference_field('global', [field_name])
+                        return str(ref) if ref is not None else ''
+
+            # chat
+            if node_display == 'chat':
+                for f in self.workflow_manage.chat_field_list:
+                    if f.get("value") == field_name:
+                        ref = self.workflow_manage.get_reference_field('chat', [field_name])
+                        return str(ref) if ref is not None else ''
+            return match.group(0)
+        try:
+            return _TEMPLATE_RE.sub(replacer, value)
+        except Exception:
+            return value
+
     def execute(self, form_field_list, form_content_format, form_data, **kwargs) -> NodeResult:
         if form_data is not None:
             self.context['is_submit'] = True
diff --git a/ui/src/components/dynamics-form/index.vue b/ui/src/components/dynamics-form/index.vue
@@ -109,7 +109,7 @@ const show = (field: FormField) => {
     return evaluateVisibility(field.visibility_rules, {
       formValue: formValue.value,
       currentNodeId: field.visibility_rules.node_id,
-      currentNodeName: '',
+      currentNodeName: field.visibility_rules.node_name || '',
     })
   }
 
diff --git a/ui/src/components/dynamics-form/visibility/ConditionRow.vue b/ui/src/components/dynamics-form/visibility/ConditionRow.vue
@@ -1,40 +1,72 @@
 <template>
   <el-row :gutter="8">
     <el-col :span="8">
-      <FieldSelector
-        :nodeModel="nodeModel"
-        v-model="cond.field"
-        @change="onFieldChange"
-        :currentNodeFields="currentNodeFields"
-        :currentEditingIndex="currentEditingIndex"
-        class="w-full"
-      />
+      <el-form-item :error="cond._fieldError">
+        <FieldSelector
+          :nodeModel="nodeModel"
+          v-model="cond.field"
+          @change="onFieldChange"
+          :currentNodeFields="currentNodeFields"
+          :currentEditingIndex="currentEditingIndex"
+          class="w-full"
+        />
+      </el-form-item>
     </el-col>
     <el-col :span="6">
-      <el-select v-model="cond.compare" clearable>
-        <el-option
-          v-for="op in cond._ops || compareList"
-          :key="op.value"
-          :label="op.label"
-          :value="op.value"
-        />
-      </el-select>
+      <el-form-item :error="cond._compareError">
+        <el-select v-model="cond.compare" @change="cond._compareError = ''" clearable>
+          <el-option
+            v-for="op in cond._ops || compareList"
+            :key="op.value"
+            :label="op.label"
+            :value="op.value"
+          />
+        </el-select>
+      </el-form-item>
     </el-col>
     <el-col :span="8" v-if="!['is_true', 'is_not_true'].includes(cond.compare)">
-      <el-select
-        v-if="['SingleSelect', 'RadioCard', 'RadioRow'].includes(cond._fieldType || '')"
-        v-model="cond.value"
-        clearable
-      >
-        <el-option
-          v-for="o in cond._options || []"
-          :key="o.value"
-          :label="`${o.label} (${o.value})`"
-          :value="o.value"
+      <el-form-item :error="cond._valueError">
+        <el-select
+          v-if="['SingleSelect', 'RadioCard', 'RadioRow'].includes(cond._fieldType || '')"
+          v-model="cond.value"
+          @change="cond._valueError = ''"
+          clearable
+        >
+          <el-option
+            v-for="o in cond._options || []"
+            :key="o.value"
+            :label="`${o.label} (${o.value})`"
+            :value="o.value"
+          />
+        </el-select>
+
+        <el-select
+          v-else-if="cond._fieldType === 'MultiSelect'"
+          v-model="cond.value"
+          @change="cond._valueError = ''"
+          multiple
+          clearable
+        >
+          <el-option
+            v-for="o in cond._options || []"
+            :key="o.value"
+            :label="`${o.label} (${o.value})`"
+            :value="o.value"
+          />
+        </el-select>
+
+        <el-tree-select
+          v-else-if="cond._fieldType === 'TreeSelect'"
+          v-model="cond.value"
+          @change="cond._valueError = ''"
+          :data="cond._treeData || []"
+          :multiple="cond._treeMultiple"
+          :render-after-expand="false"
+          clearable
         />
-      </el-select>
 
-      <el-input v-else v-model="cond.value" />
+        <el-input v-else v-model="cond.value" @input="cond._valueError = ''" />
+      </el-form-item>
     </el-col>
     <el-col :span="2">
       <el-button link type="info" @click="$emit('delete')">
@@ -62,17 +94,28 @@ defineEmits<{
 }>()
 
 function onFieldChange() {
+  props.cond._fieldError = ''
+  props.cond._compareError = ''
+  props.cond._valueError = ''
+
   const fieldType = inferFieldType(props.cond.field, props.nodeModel, props.currentNodeFields)
-  const allowed = getAllowedOps(fieldType)
   const fieldConfig = getFieldConfig(props.cond.field, props.nodeModel, props.currentNodeFields)
 
+  const isTreeMultiple = fieldType === 'TreeSelect' && fieldConfig?.attrs?.multiple
+  const allowed = isTreeMultiple ? ['contain', 'not_contain'] : getAllowedOps(fieldType)
+
   props.cond._ops = compareList.filter((op) => allowed.includes(op.value))
   props.cond._fieldType = fieldType
   props.cond._options = fieldConfig?.option_list ?? []
+  props.cond._treeData = fieldConfig?.attrs?.data ?? []
+  props.cond._treeMultiple = isTreeMultiple
+
+  // 类型切换时重置 value
+  const isMultiple = ['MultiSelect'].includes(fieldType || '') || isTreeMultiple
 
   if (!allowed.includes(props.cond.compare)) {
     props.cond.compare = ''
-    props.cond.value = ''
+    props.cond.value = isMultiple ? [] : ''
   }
 }
 </script>
diff --git a/ui/src/components/dynamics-form/visibility/Constructor.vue b/ui/src/components/dynamics-form/visibility/Constructor.vue
@@ -67,20 +67,32 @@ function removeCondition(idx: number) {
 }
 
 function validate(): Promise<void> {
+  let hasError = false
+  for (const cond of formData.value.conditions) {
+    cond._fieldError = ''
+    cond._compareError = ''
+    cond._valueError = ''
+  }
   for (const cond of formData.value.conditions) {
     const hasAny = cond.field[0] || cond.field[1] || cond.compare
     if (!hasAny) continue
     if (!cond.field[0] || !cond.field[1]) {
-      return Promise.reject('请选择变量')
+      cond._fieldError = '请选择变量'
+      hasError = true
     }
     if (!cond.compare) {
-      return Promise.reject('请选择运算符')
+      cond._compareError = '请选择运算符'
+      hasError = true
     }
-    if (!['is_true', 'is_not_true'].includes(cond.compare) && !cond.value && cond.value !== 0) {
-      return Promise.reject('请填写匹配值')
+    const isEmpty = Array.isArray(cond.value)
+      ? cond.value.length === 0
+      : !cond.value && cond.value !== 0
+    if (!['is_true', 'is_not_true'].includes(cond.compare) && isEmpty) {
+      cond._valueError = '请填写匹配值'
+      hasError = true
     }
   }
-  return Promise.resolve()
+  return hasError ? Promise.reject() : Promise.resolve()
 }
 
 function getData(): VisibilityRules | null {
@@ -91,13 +103,16 @@ function getData(): VisibilityRules | null {
     action: formData.value.action,
     condition: formData.value.condition,
     node_id: props.nodeModel?.id,
-    conditions: conds.map((c) => ({
-      id: c.id,
-      field: c.field,
-      compare: c.compare,
-      value: c.value,
-      // _ops, _fieldType, _options 不持久化
-    })),
+    node_name: props.nodeModel?.properties?.stepName,
+    conditions: conds
+      .filter((c) => c.field[0] && c.field[1] && c.compare)
+      .map((c) => ({
+        id: c.id,
+        field: c.field,
+        compare: c.compare,
+        value: c.value,
+        // _ops, _fieldType, _options 不持久化
+      })),
   }
 }
 
@@ -114,11 +129,20 @@ function restore(rules: VisibilityRules | null) {
     formData.value.conditions.forEach((cond) => {
       if (cond.field && cond.field[0] && cond.field[1]) {
         const fieldType = inferFieldType(cond.field, props.nodeModel, props.currentNodeFields)
-        const allowed = getAllowedOps(fieldType)
         const fieldConfig = getFieldConfig(cond.field, props.nodeModel, props.currentNodeFields)
+        const isTreeMultiple = fieldType === 'TreeSelect' && fieldConfig?.attrs?.multiple
+        const allowed = isTreeMultiple ? ['contain', 'not_contain'] : getAllowedOps(fieldType)
         cond._ops = compareList.filter((op) => allowed.includes(op.value))
         cond._fieldType = fieldType
         cond._options = fieldConfig?.option_list ?? []
+        cond._treeData = fieldConfig?.attrs?.data ?? []
+        cond._treeMultiple = isTreeMultiple
+        const isMultiple = ['MultiSelect'].includes(fieldType || '') || isTreeMultiple
+        // 清理脏数据
+        if (cond.compare && !allowed.includes(cond.compare)) {
+          cond.compare = ''
+          cond.value = isMultiple ? [] : ''
+        }
       }
     })
   }
diff --git a/ui/src/components/dynamics-form/visibility/FieldSelector.vue b/ui/src/components/dynamics-form/visibility/FieldSelector.vue
@@ -115,10 +115,31 @@ const injectDraftSiblings = (rawList: Array<any>) => {
     }))
   // 将 draft parameter 转换成 cascader 适配的 {label, value} 格式
 
+  // base-node
+  const excludeSet = new Set(
+    (props.currentNodeFields ?? [])
+      .filter((f: any, idx: number) => {
+        if (props.currentEditingIndex != null && idx >= props.currentEditingIndex) return true
+        if (props.excludeFieldName && f.field === props.excludeFieldName) return true
+        return false
+      })
+      .map((f: any) => f.field),
+  )
+
   return rawList
-    .map((entry: any) =>
-      entry.value === currentNodeId ? { ...entry, children: draftSiblings } : entry,
-    )
+    .map((entry: any) => {
+      const isCurrentNode =
+        entry.value === currentNodeId || (currentNodeId === 'base-node' && entry.value === 'global')
+      if (!isCurrentNode) return entry
+
+      return {
+        ...entry,
+        children:
+          currentNodeId === 'base-node'
+            ? (entry.children || []).filter((c: any) => !excludeSet.has(c.value))
+            : draftSiblings,
+      }
+    })
     .filter((entry: any) => entry.children && entry.children.length > 0)
 }
 
diff --git a/ui/src/components/dynamics-form/visibility/index.ts b/ui/src/components/dynamics-form/visibility/index.ts
@@ -22,6 +22,7 @@ export interface VisibilityRules {
   action: 'show' | 'hide'
   condition: 'and' | 'or'
   node_id?: string
+  node_name?: string
   conditions: VisibilityCondition[]
 }
 
@@ -42,12 +43,12 @@ export interface VisibilityCtx {
  * 预渲染为字面量，前端不会再看到这些形态。
  */
 export function resolveValue(raw: string, ctx: VisibilityCtx): string {
-  return raw.replace(/\{\{\s*([^.\s}]+)\.([^.\s}]+)\s*\}\}/g, (match, nodeName, fieldName) => {
+  return raw.replace(/\{\{([^.\s}]+)\.([^.\s}]+)\}\}/g, (match, nodeName, fieldName) => {
     if (nodeName !== ctx.currentNodeName) {
       return match // 非同表单，前置node 引用
     }
     const v = ctx.formValue?.[fieldName]
-    return v == null ? '' : String(v)
+    return v == null ? match : String(v)
   })
 }
 
@@ -105,6 +106,9 @@ export function compareByOp(left: any, op: CompareOptions, right: any): boolean
 }
 
 function containImpl(source: any, target: any): boolean {
+  if (Array.isArray(target)) {
+    return target.every((t) => containImpl(source, t))
+  }
   const t = String(target)
   if (typeof source === 'string') return source.includes(t)
   if (Array.isArray(source)) return source.some((item) => String(item) === t)
@@ -137,6 +141,11 @@ export function evaluateVisibility(
 
   const results = rules.conditions.map((cond) => {
     const left = lookupLeft(cond, ctx)
+
+    if (left == null && cond.compare !== 'is_true' && cond.compare !== 'is_not_true') {
+      return false
+    }
+
     const right = typeof cond.value === 'string' ? resolveValue(cond.value, ctx) : cond.value
     return compareByOp(left, cond.compare as CompareOptions, right)
   })
diff --git a/ui/src/workflow/nodes/base-node/index.vue b/ui/src/workflow/nodes/base-node/index.vue
diff --git a/ui/src/workflow/nodes/form-node/index.vue b/ui/src/workflow/nodes/form-node/index.vue

Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ const show = (field: FormField) => {`
`109`	`109`	`return evaluateVisibility(field.visibility_rules, {`
`110`	`110`	`formValue: formValue.value,`
`111`	`111`	`currentNodeId: field.visibility_rules.node_id,`
`112`		`- currentNodeName: '',`
	`112`	`+ currentNodeName: field.visibility_rules.node_name \|\| '',`
`113`	`113`	`})`
`114`	`114`	`}`
`115`	`115`