Commit a1933a78 by Lesan

fix: ConditionRule后端无type、opName字段

parent 77756467
...@@ -439,8 +439,6 @@ export enum OperationButtonType { ...@@ -439,8 +439,6 @@ export enum OperationButtonType {
* 条件规则结构定义 * 条件规则结构定义
*/ */
export type ConditionRule = { export type ConditionRule = {
type: number
opName: string
opCode: string opCode: string
leftSide: string leftSide: string
rightSide: string rightSide: string
......
...@@ -319,8 +319,6 @@ const conditionGroups = ref<ConditionGroup>({ ...@@ -319,8 +319,6 @@ const conditionGroups = ref<ConditionGroup>({
and: true, and: true,
rules: [ rules: [
{ {
type: 1,
opName: '等于',
opCode: '==', opCode: '==',
leftSide: '', leftSide: '',
rightSide: '' rightSide: ''
...@@ -353,8 +351,6 @@ const deleteConditionGroup = (idx: number) => { ...@@ -353,8 +351,6 @@ const deleteConditionGroup = (idx: number) => {
// 添加条件规则 // 添加条件规则
const addConditionRule = (condition: Condition, idx: number) => { const addConditionRule = (condition: Condition, idx: number) => {
const rule: ConditionRule = { const rule: ConditionRule = {
type: 1,
opName: '等于',
opCode: '==', opCode: '==',
leftSide: '', leftSide: '',
rightSide: '' rightSide: ''
......
<!-- TODO @lesan:其它路由条件,可以使用这个哇? --> <!-- TODO @lesan:其它路由条件,可以使用这个哇? -->
<template> <template>
<el-form ref="formRef" :model="condition" :rules="formRules" label-position="top"> <el-form ref="formRef" :model="condition" :rules="formRules" label-position="top">
<!-- TODO @lesan:1)默认选中 条件规则;2)条件规则放前面,因为更常用!-->
<el-form-item label="配置方式" prop="conditionType"> <el-form-item label="配置方式" prop="conditionType">
<el-radio-group v-model="condition.conditionType"> <el-radio-group v-model="condition.conditionType">
<el-radio <el-radio
...@@ -14,18 +13,6 @@ ...@@ -14,18 +13,6 @@
</el-radio> </el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item
v-if="condition.conditionType === ConditionType.EXPRESSION"
label="条件表达式"
prop="conditionExpression"
>
<el-input
type="textarea"
v-model="condition.conditionExpression"
clearable
style="width: 100%"
/>
</el-form-item>
<el-form-item v-if="condition.conditionType === ConditionType.RULE" label="条件规则"> <el-form-item v-if="condition.conditionType === ConditionType.RULE" label="条件规则">
<div class="condition-group-tool"> <div class="condition-group-tool">
<div class="flex items-center"> <div class="flex items-center">
...@@ -114,6 +101,18 @@ ...@@ -114,6 +101,18 @@
/> />
</div> </div>
</el-form-item> </el-form-item>
<el-form-item
v-if="condition.conditionType === ConditionType.EXPRESSION"
label="条件表达式"
prop="conditionExpression"
>
<el-input
type="textarea"
v-model="condition.conditionExpression"
clearable
style="width: 100%"
/>
</el-form-item>
</el-form> </el-form>
</template> </template>
...@@ -181,8 +180,6 @@ const deleteConditionRule = (condition, index) => { ...@@ -181,8 +180,6 @@ const deleteConditionRule = (condition, index) => {
const addConditionRule = (condition, index) => { const addConditionRule = (condition, index) => {
const rule = { const rule = {
type: 1,
opName: '等于',
opCode: '==', opCode: '==',
leftSide: '', leftSide: '',
rightSide: '' rightSide: ''
...@@ -195,8 +192,6 @@ const addConditionGroup = (conditions) => { ...@@ -195,8 +192,6 @@ const addConditionGroup = (conditions) => {
and: true, and: true,
rules: [ rules: [
{ {
type: 1, // TODO @lesan:枚举~
opName: '等于',
opCode: '==', opCode: '==',
leftSide: '', leftSide: '',
rightSide: '' rightSide: ''
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment