Commit 86ff743690c024002663256ee3159463210da8fc
Merge branch 'perf/delete-from-edge-device-confirm' into 'main_dev'
fix: 优化删除来自边端设备提示 See merge request yunteng/thingskit-front!1433
Showing
4 changed files
with
4 additions
and
3 deletions
@@ -124,6 +124,7 @@ export interface ProfileRecord { | @@ -124,6 +124,7 @@ export interface ProfileRecord { | ||
124 | image: string; | 124 | image: string; |
125 | type: string; | 125 | type: string; |
126 | default: boolean; | 126 | default: boolean; |
127 | + isEdge?: boolean; | ||
127 | 128 | ||
128 | checked?: boolean; | 129 | checked?: boolean; |
129 | } | 130 | } |
@@ -49,7 +49,7 @@ | @@ -49,7 +49,7 @@ | ||
49 | FINISH = '完成', | 49 | FINISH = '完成', |
50 | } | 50 | } |
51 | 51 | ||
52 | - const currentStep = ref<StepsEnum>(StepsEnum.BASIC_INFO); | 52 | + const currentStep = ref<StepsEnum>(StepsEnum.CREATE_ENTITY); |
53 | 53 | ||
54 | const goNextStep = () => { | 54 | const goNextStep = () => { |
55 | if (unref(currentStep) >= StepsEnum.FINISH) return; | 55 | if (unref(currentStep) >= StepsEnum.FINISH) return; |
@@ -199,7 +199,7 @@ | @@ -199,7 +199,7 @@ | ||
199 | auth: ProductPermission.DELETE, | 199 | auth: ProductPermission.DELETE, |
200 | icon: 'ant-design:delete-outlined', | 200 | icon: 'ant-design:delete-outlined', |
201 | popconfirm: { | 201 | popconfirm: { |
202 | - title: '是否确认删除操作?', | 202 | + title: !!item.isEdge ? '此设备来自边端,请谨慎删除' : '是否确认删除', |
203 | onConfirm: handleDelete.bind(null, [item.id]), | 203 | onConfirm: handleDelete.bind(null, [item.id]), |
204 | disabled: item.default || item.name == 'default', | 204 | disabled: item.default || item.name == 'default', |
205 | }, | 205 | }, |
@@ -79,7 +79,7 @@ | @@ -79,7 +79,7 @@ | ||
79 | icon: 'ant-design:delete-outlined', | 79 | icon: 'ant-design:delete-outlined', |
80 | color: 'error', | 80 | color: 'error', |
81 | popConfirm: { | 81 | popConfirm: { |
82 | - title: '是否确认删除', | 82 | + title: !!record.isEdge ? '此设备来自边端,请谨慎删除' : '是否确认删除', |
83 | confirm: handleDeleteOrBatchDelete.bind(null, record), | 83 | confirm: handleDeleteOrBatchDelete.bind(null, record), |
84 | }, | 84 | }, |
85 | ifShow: () => { | 85 | ifShow: () => { |