Commit 38bba2871fa977ce68c7a67dfc49f518071d8244
Merge branch 'fix/DEFECT-1900' into 'main_dev'
fix: 修复看板控制组件4设置密码框时下发命令重复弹出密码框 See merge request yunteng/thingskit-front!1191
Showing
2 changed files
with
3 additions
and
1 deletions
@@ -72,6 +72,7 @@ | @@ -72,6 +72,7 @@ | ||
72 | const handleAfterChange = () => { | 72 | const handleAfterChange = () => { |
73 | if (unref(getDesign).password) { | 73 | if (unref(getDesign).password) { |
74 | openModal(true, { password: unref(getDesign).password }); | 74 | openModal(true, { password: unref(getDesign).password }); |
75 | + unref(sliderElRef)?.blur(); | ||
75 | return; | 76 | return; |
76 | } | 77 | } |
77 | handleSendCommand(); | 78 | handleSendCommand(); |
@@ -238,7 +238,8 @@ export const commonDataSourceSchemas = (): FormSchema[] => { | @@ -238,7 +238,8 @@ export const commonDataSourceSchemas = (): FormSchema[] => { | ||
238 | 238 | ||
239 | if ( | 239 | if ( |
240 | unref(selectWidgetKeys).componentKey === | 240 | unref(selectWidgetKeys).componentKey === |
241 | - ControlComponentEnum.LATERAL_NUMERICAL_CONTROL | 241 | + ControlComponentEnum.LATERAL_NUMERICAL_CONTROL && |
242 | + isTcpProfile(formModel[DataSourceField.TRANSPORT_TYPE]) | ||
242 | ) { | 243 | ) { |
243 | return result.filter((item) => item.codeType === TaskTypeEnum.MODBUS_RTU); | 244 | return result.filter((item) => item.codeType === TaskTypeEnum.MODBUS_RTU); |
244 | } | 245 | } |