Commit 6aeaaf2bf8766658c6618b40e771e1a25360b5d1
Merge branch 'fix/rule/linkedge-is-edge' into 'main_dev'
feat: 边端创建的场景联动云端不能进行编辑操作 See merge request yunteng/thingskit-front!1426
Showing
1 changed file
with
3 additions
and
2 deletions
| @@ -30,7 +30,7 @@ | @@ -30,7 +30,7 @@ | ||
| 30 | auth: 'api:yt:sceneLinkage:update', | 30 | auth: 'api:yt:sceneLinkage:update', |
| 31 | icon: 'clarity:note-edit-line', | 31 | icon: 'clarity:note-edit-line', |
| 32 | onClick: handleEdit.bind(null, record), | 32 | onClick: handleEdit.bind(null, record), |
| 33 | - ifShow: record.status !== 1, | 33 | + ifShow: record.status !== 1 && record.isEdge !== 1, |
| 34 | }, | 34 | }, |
| 35 | ]" | 35 | ]" |
| 36 | :drop-down-actions="[ | 36 | :drop-down-actions="[ |
| @@ -39,7 +39,7 @@ | @@ -39,7 +39,7 @@ | ||
| 39 | auth: 'api:yt:sceneLinkage:delete', | 39 | auth: 'api:yt:sceneLinkage:delete', |
| 40 | icon: 'ant-design:delete-outlined', | 40 | icon: 'ant-design:delete-outlined', |
| 41 | color: 'error', | 41 | color: 'error', |
| 42 | - ifShow: record.status !== 1, | 42 | + ifShow: record.status !== 1 && record.isEdge !== 1, |
| 43 | popConfirm: { | 43 | popConfirm: { |
| 44 | title: '是否确认删除', | 44 | title: '是否确认删除', |
| 45 | confirm: handleDeleteOrBatchDelete.bind(null, record), | 45 | confirm: handleDeleteOrBatchDelete.bind(null, record), |
| @@ -56,6 +56,7 @@ | @@ -56,6 +56,7 @@ | ||
| 56 | :loading="record.pendingStatus" | 56 | :loading="record.pendingStatus" |
| 57 | checkedChildren="启用" | 57 | checkedChildren="启用" |
| 58 | unCheckedChildren="禁用" | 58 | unCheckedChildren="禁用" |
| 59 | + :disabled="record.isEdge === 1" | ||
| 59 | @change="(checked:boolean)=>statusChange(checked,record)" | 60 | @change="(checked:boolean)=>statusChange(checked,record)" |
| 60 | /> | 61 | /> |
| 61 | </Authority> | 62 | </Authority> |