Commit c8ac5b67e220651990fea45095ae1042f3e070c8
Merge branch 'ft' into 'main_dev'
fix: 修改Teambitin上的问题 See merge request yunteng/thingskit-front!556
Showing
2 changed files
with
19 additions
and
11 deletions
@@ -166,7 +166,7 @@ | @@ -166,7 +166,7 @@ | ||
166 | if (Object.prototype.toString.call(e) === '[object Object]') { | 166 | if (Object.prototype.toString.call(e) === '[object Object]') { |
167 | jsonEditorRef.value?.setJsonValue(e); | 167 | jsonEditorRef.value?.setJsonValue(e); |
168 | } else { | 168 | } else { |
169 | - jsonEditorRef.value?.setJsonValue(JSON.stringify(e)); | 169 | + jsonEditorRef.value?.setJsonValue('404未找到资源'); |
170 | } | 170 | } |
171 | } | 171 | } |
172 | } | 172 | } |
@@ -247,7 +247,6 @@ | @@ -247,7 +247,6 @@ | ||
247 | } | 247 | } |
248 | ); | 248 | ); |
249 | case 'POST': | 249 | case 'POST': |
250 | - console.log(postBodyType); | ||
251 | const objPost = Object.assign( | 250 | const objPost = Object.assign( |
252 | {}, | 251 | {}, |
253 | { | 252 | { |
@@ -27,16 +27,25 @@ export const columns: BasicColumn[] = [ | @@ -27,16 +27,25 @@ export const columns: BasicColumn[] = [ | ||
27 | width: 210, | 27 | width: 210, |
28 | slots: { customRender: 'name', title: 'deviceTitle' }, | 28 | slots: { customRender: 'name', title: 'deviceTitle' }, |
29 | customRender: ({ record }) => { | 29 | customRender: ({ record }) => { |
30 | - return h( | ||
31 | - 'span', | ||
32 | - { | ||
33 | - style: { cursor: 'pointer', color: '#377dff' }, | ||
34 | - onClick: () => { | ||
35 | - handeleCopy(`${record.alias}/${record.name}`); | 30 | + return h('div', { style: 'display:flex;flex-direction:column' }, [ |
31 | + h( | ||
32 | + 'p', | ||
33 | + { | ||
34 | + style: { cursor: 'pointer', color: '#377dff' }, | ||
36 | }, | 35 | }, |
37 | - }, | ||
38 | - `${record.alias}/${record.name}` | ||
39 | - ); | 36 | + `${record.alias}` |
37 | + ), | ||
38 | + h( | ||
39 | + 'p', | ||
40 | + { | ||
41 | + style: { cursor: 'pointer', color: '#377dff' }, | ||
42 | + onClick: () => { | ||
43 | + handeleCopy(`${record.name}`); | ||
44 | + }, | ||
45 | + }, | ||
46 | + `${record.name}` | ||
47 | + ), | ||
48 | + ]); | ||
40 | }, | 49 | }, |
41 | }, | 50 | }, |
42 | { | 51 | { |