Commit 0c81eb9e88949802a4c42cdeb4b3f02811acae76
Merge branch 'dev_by_ft' into 'main_dev'
pref: DEFECT-1897 去掉复制后面~号 See merge request yunteng/thingskit-front!1194
Showing
5 changed files
with
8 additions
and
8 deletions
@@ -68,7 +68,7 @@ | @@ -68,7 +68,7 @@ | ||
68 | const handleCopy = async () => { | 68 | const handleCopy = async () => { |
69 | await copy(unref(link)); | 69 | await copy(unref(link)); |
70 | if (unref(copied)) { | 70 | if (unref(copied)) { |
71 | - createMessage.success('复制成功~'); | 71 | + createMessage.success('复制成功'); |
72 | } | 72 | } |
73 | }; | 73 | }; |
74 | </script> | 74 | </script> |
@@ -182,7 +182,7 @@ | @@ -182,7 +182,7 @@ | ||
182 | const copyTbDeviceId = async () => { | 182 | const copyTbDeviceId = async () => { |
183 | await copy(props.deviceDetail.tbDeviceId); | 183 | await copy(props.deviceDetail.tbDeviceId); |
184 | if (unref(copied)) { | 184 | if (unref(copied)) { |
185 | - createMessage.success('复制成功~'); | 185 | + createMessage.success('复制成功'); |
186 | } | 186 | } |
187 | }; | 187 | }; |
188 | const copyDeviceToken = async () => { | 188 | const copyDeviceToken = async () => { |
@@ -193,7 +193,7 @@ | @@ -193,7 +193,7 @@ | ||
193 | await copy(token.credentialsValue); | 193 | await copy(token.credentialsValue); |
194 | } | 194 | } |
195 | if (unref(copied)) { | 195 | if (unref(copied)) { |
196 | - createMessage.success('复制成功~'); | 196 | + createMessage.success('复制成功'); |
197 | } | 197 | } |
198 | }; | 198 | }; |
199 | const [registerModal, { openModal }] = useModal(); | 199 | const [registerModal, { openModal }] = useModal(); |
@@ -35,8 +35,8 @@ const handleCopy = async (value: string) => { | @@ -35,8 +35,8 @@ const handleCopy = async (value: string) => { | ||
35 | const { createMessage } = useMessage(); | 35 | const { createMessage } = useMessage(); |
36 | const { copied, copy } = useClipboard({ legacy: true }); | 36 | const { copied, copy } = useClipboard({ legacy: true }); |
37 | await copy(value); | 37 | await copy(value); |
38 | - if (unref(copied)) createMessage.success('复制成功~'); | ||
39 | - else createMessage.error('复制失败~'); | 38 | + if (unref(copied)) createMessage.success('复制成功'); |
39 | + else createMessage.error('复制失败'); | ||
40 | }; | 40 | }; |
41 | 41 | ||
42 | export const columnsDrawer: BasicColumn[] = [ | 42 | export const columnsDrawer: BasicColumn[] = [ |
@@ -54,8 +54,8 @@ const handleCopy = async (value: string) => { | @@ -54,8 +54,8 @@ const handleCopy = async (value: string) => { | ||
54 | const { createMessage } = useMessage(); | 54 | const { createMessage } = useMessage(); |
55 | const { copied, copy } = useClipboard({ legacy: true }); | 55 | const { copied, copy } = useClipboard({ legacy: true }); |
56 | await copy(value); | 56 | await copy(value); |
57 | - if (unref(copied)) createMessage.success('复制成功~'); | ||
58 | - else createMessage.error('复制失败~'); | 57 | + if (unref(copied)) createMessage.success('复制成功'); |
58 | + else createMessage.error('复制失败'); | ||
59 | }; | 59 | }; |
60 | 60 | ||
61 | export const steps = [ | 61 | export const steps = [ |
@@ -68,7 +68,7 @@ export const deviceTableColumn: BasicColumn[] = [ | @@ -68,7 +68,7 @@ export const deviceTableColumn: BasicColumn[] = [ | ||
68 | class: 'cursor-pointer', | 68 | class: 'cursor-pointer', |
69 | onClick: async () => { | 69 | onClick: async () => { |
70 | await copy(record.name); | 70 | await copy(record.name); |
71 | - if (unref(copied)) createMessage.success('复制成功~'); | 71 | + if (unref(copied)) createMessage.success('复制成功'); |
72 | }, | 72 | }, |
73 | }, | 73 | }, |
74 | [ | 74 | [ |