Commit a0d716d5ac1cef97537e21e9d61d1180350efbf0
Merge branch 'fix/DEFECT-1458' into 'main_dev'
fix: 修改看板管理复制组件后直接编辑选择控制组件时出现的问题 See merge request yunteng/thingskit-front!774
Showing
1 changed file
with
14 additions
and
1 deletions
... | ... | @@ -256,7 +256,7 @@ export const commonDataSourceSchemas = (): FormSchema[] => { |
256 | 256 | api: async () => { |
257 | 257 | try { |
258 | 258 | if (deviceProfileId) { |
259 | - return await getDeviceAttribute({ | |
259 | + const option = await getDeviceAttribute({ | |
260 | 260 | deviceProfileId, |
261 | 261 | dataType: |
262 | 262 | (isControlComponent(category!) && |
... | ... | @@ -265,6 +265,19 @@ export const commonDataSourceSchemas = (): FormSchema[] => { |
265 | 265 | ? DataTypeEnum.IS_BOOL |
266 | 266 | : undefined, |
267 | 267 | }); |
268 | + | |
269 | + // 当我们通过复制组件在进行编辑的时候选择控制组件会使不是bool属性的值进行赋值 | |
270 | + if ( | |
271 | + (!option?.length && | |
272 | + isControlComponent(category!) && | |
273 | + unref(selectWidgetKeys).componentKey !== 'LateralNumericalControl') || | |
274 | + isBooleanComponent(unref(selectWidgetKeys)) | |
275 | + ) { | |
276 | + setFieldsValue({ | |
277 | + [DataSourceField.ATTRIBUTE]: null, | |
278 | + }); | |
279 | + } | |
280 | + return option; | |
268 | 281 | } |
269 | 282 | } catch (error) {} |
270 | 283 | return []; | ... | ... |