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

src/components/FormCreate/src/utils/index.ts

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

src/components/SimpleProcessDesignerV2/src/nodes-config/components/Condition.vue

@@ -12,7 +12,10 @@
         </el-radio>
       </el-radio-group>
     </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="flex items-center">
           <div class="mr-4">条件组关系</div>
@@ -67,7 +70,7 @@
                   trigger: 'change'
                 }"
               >
-                <el-select style="width: 160px" v-model="rule.leftSide">
+                <el-select style="width: 160px" v-model="rule.leftSide" clearable>
                   <el-option
                     v-for="(field, fIdx) in fieldOptions"
                     :key="fIdx"