feat(oa): add initiator system field to condition branches

Allow __initiator__ contains matching in publish validation and the
flow designer candidate list, excluding it from form useInCondition locks.

Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
zlwuandCursor committed 2026-07-30 13:07:44 +08:00
1 parent 3d88f52e2e
commit 22be6d8b36
7 files changed
+103 -23

No files matched your search

@@ -46,9 +46,6 @@
上传
</el-button>
</el-upload>
<el-button class="btn-ghost" @click="basic.iconUrl = pickRandomOaAppIconUrl()">
换默认
</el-button>
</div>
</el-form-item>
<el-form-item label="应用名称">
@@ -126,11 +123,11 @@
import { createDefaultFlow, ensureFlowRoot } from '@/components/oa-approval/flow-tree/types'
import OaFormDesignerEmbed from '@/components/oa-approval/OaFormDesignerEmbed.vue'
import {
collectConditionReferencedFields,
collectFormConditionReferencedFields,
listConditionCandidates,
normalizeSchemaConditionRequired
} from '@/components/oa-approval/oa-condition-fields'
import { pickRandomOaAppIconUrl, resolveOaAppIconUrl } from '@/utils/oa-app-icons'
import { resolveOaAppIconUrl } from '@/utils/oa-app-icons'
defineOptions({ name: 'OaApprovalDesigner' })
@@ -175,7 +172,7 @@
const flowTreeJson = ref(createDefaultFlow())
const flowConditionFields = computed(() =>
Array.from(collectConditionReferencedFields(flowTreeJson.value))
Array.from(collectFormConditionReferencedFields(flowTreeJson.value))
)
const conditionCandidates = computed(() => listConditionCandidates(formSchema.value))
@@ -447,10 +444,10 @@
.oa-designer__icon-preview {
display: block;
width: 48px;
height: 48px;
width: 80px;
height: 80px;
overflow: hidden;
border-radius: 10px;
border-radius: 16px;
img {
display: block;