yudao
/
admin-vue3
mirror of https://gitee.com/yudaocode/yudao-ui-admin-vue3.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Pre Merge pull request !728 from SamllNorth_Lee/fix-simple-condition

pull/728/MERGE
SamllNorth_Lee 2025-03-12 22:54:08 +00:00 committed by Gitee
parent 77a0801a37 92a1033b06
commit 6d8bb94486
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/components/FormCreate/src/utils/index.ts
View File

@ -35,10 +35,11 @@ export const parseFormFields = (
if (parentTitle) { if (parentTitle) {
title = `${parentTitle}.${tempTitle}` title = `${parentTitle}.${tempTitle}`
} }
let required = false // TODO @芋艿 simple设计器，只显示必填字段时，会出现流程配置问题。场景：某个字段非发起时必填，而是在某个审批节点必填并且作为条件分支参数
if ($required) { // let required = false
required = true // if ($required) {
} // required = true
// }
fields.push({ fields.push({
field, field,
title, title,

7
src/components/SimpleProcessDesignerV2/src/nodes-config/components/Condition.vue
View File

@ -12,7 +12,10 @@
</el-radio> </el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item v-if="condition.conditionType === ConditionType.RULE && condition.conditionGroups" label="条件规则"> <el-form-item
v-if="condition.conditionType === ConditionType.RULE && condition.conditionGroups"
label="条件规则"
>
<div class="condition-group-tool"> <div class="condition-group-tool">
<div class="flex items-center"> <div class="flex items-center">
<div class="mr-4">条件组关系</div> <div class="mr-4">条件组关系</div>
@ -67,7 +70,7 @@
trigger: 'change' trigger: 'change'
}" }"
> >
<el-select style="width: 160px" v-model="rule.leftSide"> <el-select style="width: 160px" v-model="rule.leftSide" clearable>
<el-option <el-option
v-for="(field, fIdx) in fieldOptions" v-for="(field, fIdx) in fieldOptions"
:key="fIdx" :key="fIdx"