Commit fcf8a84e9ad3069e8e886df124389e35039c097f
Merge branch 'perf/rule-linkedge/06-05' into 'main_dev'
perf: 优化场景联动，执行条件开启后不可删除 See merge request yunteng/thingskit-front!1367
Showing
2 changed files
with
11 additions
and
6 deletions
| @@ -247,11 +247,11 @@ export const alarmSchemasForm: FormSchema[] = [ | @@ -247,11 +247,11 @@ export const alarmSchemasForm: FormSchema[] = [ | ||
| 247 | disabled: true, | 247 | disabled: true, |
| 248 | }, | 248 | }, |
| 249 | }, | 249 | }, |
| 250 | - { | ||
| 251 | - field: 'details', | ||
| 252 | - label: '详情', | ||
| 253 | - component: 'InputTextArea', | ||
| 254 | - }, | 250 | + // { |
| 251 | + // field: 'details', | ||
| 252 | + // label: '详情', | ||
| 253 | + // component: 'InputTextArea', | ||
| 254 | + // }, | ||
| 255 | ]; | 255 | ]; |
| 256 | 256 | ||
| 257 | export function getAlarmStatus({ | 257 | export function getAlarmStatus({ |
| @@ -143,7 +143,12 @@ | @@ -143,7 +143,12 @@ | ||
| 143 | </div> | 143 | </div> |
| 144 | <Tooltip title="删除"> | 144 | <Tooltip title="删除"> |
| 145 | <Icon | 145 | <Icon |
| 146 | - v-if="!disabledDrawer && flipFlopListElRef.length > 1" | 146 | + v-if=" |
| 147 | + !disabledDrawer && | ||
| 148 | + (type === FlipFlopComponentTypeEnum.FLIP_FLOP | ||
| 149 | + ? flipFlopListElRef.length > 1 | ||
| 150 | + : true) | ||
| 151 | + " | ||
| 147 | class="ml-2 cursor-pointer" | 152 | class="ml-2 cursor-pointer" |
| 148 | icon="fluent:delete-off-20-regular" | 153 | icon="fluent:delete-off-20-regular" |
| 149 | size="20" | 154 | size="20" |