File tree Expand file tree Collapse file tree 3 files changed +12
-23
lines changed
src/components/SimpleProcessDesignerV2/src Expand file tree Collapse file tree 3 files changed +12
-23
lines changed Original file line number Diff line number Diff line change @@ -439,8 +439,6 @@ export enum OperationButtonType {
439
439
* 条件规则结构定义
440
440
*/
441
441
export type ConditionRule = {
442
- type : number
443
- opName : string
444
442
opCode : string
445
443
leftSide : string
446
444
rightSide : string
Original file line number Diff line number Diff line change @@ -319,8 +319,6 @@ const conditionGroups = ref<ConditionGroup>({
319
319
and: true ,
320
320
rules: [
321
321
{
322
- type: 1 ,
323
- opName: ' 等于' ,
324
322
opCode: ' ==' ,
325
323
leftSide: ' ' ,
326
324
rightSide: ' '
@@ -353,8 +351,6 @@ const deleteConditionGroup = (idx: number) => {
353
351
// 添加条件规则
354
352
const addConditionRule = (condition : Condition , idx : number ) => {
355
353
const rule: ConditionRule = {
356
- type: 1 ,
357
- opName: ' 等于' ,
358
354
opCode: ' ==' ,
359
355
leftSide: ' ' ,
360
356
rightSide: ' '
Original file line number Diff line number Diff line change 1
1
<!-- TODO @lesan:其它路由条件,可以使用这个哇? -->
2
2
<template >
3
3
<el-form ref =" formRef" :model =" condition" :rules =" formRules" label-position =" top" >
4
- <!-- TODO @lesan:1)默认选中 条件规则;2)条件规则放前面,因为更常用!-->
5
4
<el-form-item label =" 配置方式" prop =" conditionType" >
6
5
<el-radio-group v-model =" condition.conditionType" >
7
6
<el-radio
14
13
</el-radio >
15
14
</el-radio-group >
16
15
</el-form-item >
17
- <el-form-item
18
- v-if =" condition.conditionType === ConditionType.EXPRESSION"
19
- label =" 条件表达式"
20
- prop =" conditionExpression"
21
- >
22
- <el-input
23
- type =" textarea"
24
- v-model =" condition.conditionExpression"
25
- clearable
26
- style =" width : 100% "
27
- />
28
- </el-form-item >
29
16
<el-form-item v-if =" condition.conditionType === ConditionType.RULE" label =" 条件规则" >
30
17
<div class =" condition-group-tool" >
31
18
<div class =" flex items-center" >
114
101
/>
115
102
</div >
116
103
</el-form-item >
104
+ <el-form-item
105
+ v-if =" condition.conditionType === ConditionType.EXPRESSION"
106
+ label =" 条件表达式"
107
+ prop =" conditionExpression"
108
+ >
109
+ <el-input
110
+ type =" textarea"
111
+ v-model =" condition.conditionExpression"
112
+ clearable
113
+ style =" width : 100% "
114
+ />
115
+ </el-form-item >
117
116
</el-form >
118
117
</template >
119
118
@@ -181,8 +180,6 @@ const deleteConditionRule = (condition, index) => {
181
180
182
181
const addConditionRule = (condition , index ) => {
183
182
const rule = {
184
- type: 1 ,
185
- opName: ' 等于' ,
186
183
opCode: ' ==' ,
187
184
leftSide: ' ' ,
188
185
rightSide: ' '
@@ -195,8 +192,6 @@ const addConditionGroup = (conditions) => {
195
192
and: true ,
196
193
rules: [
197
194
{
198
- type: 1 , // TODO @lesan:枚举~
199
- opName: ' 等于' ,
200
195
opCode: ' ==' ,
201
196
leftSide: ' ' ,
202
197
rightSide: ' '
You can’t perform that action at this time.
0 commit comments