Commit b933fdf5b07d7fd703fa658900159999ef79b854
Merge branch 'ft_local_dev' into 'main'
pref:优化转换函数启用后可以测试 See merge request huang/yun-teng-iot-front!420
Showing
3 changed files
with
8 additions
and
6 deletions
| ... | ... | @@ -46,8 +46,8 @@ |
| 46 | 46 | isText.value = data.isText; |
| 47 | 47 | isTitle.value = data.isTitle; |
| 48 | 48 | editData.data = data.record; |
| 49 | - converScriptRef.value?.initEditor(); | |
| 50 | 49 | setModalProps({ loading: false }); |
| 50 | + converScriptRef.value?.initEditor(); | |
| 51 | 51 | if (!unref(isViewDetail)) { |
| 52 | 52 | const title = |
| 53 | 53 | unref(isTitle) == 'edit' | ... | ... |
| ... | ... | @@ -59,19 +59,22 @@ export const searchFormSchema: FormSchema[] = [ |
| 59 | 59 | ]; |
| 60 | 60 | |
| 61 | 61 | export const defaultTitle = h('div', { style: 'background:#404040' }, [ |
| 62 | - h('h3', { style: 'color:white' }, '示例:'), | |
| 63 | - h('h3', { style: 'color:white' }, '输入参数:0103040150008D3BBB'), | |
| 62 | + h('h3', { style: 'color:white' }, '示例'), | |
| 63 | + h('h3', { style: 'color:white' }, '输入参数:'), | |
| 64 | + h('h3', { style: 'color:white' }, '0103040150008D3BBB'), | |
| 64 | 65 | h('h3', { style: 'color:white' }, [ |
| 66 | + h('h3', { style: 'color:white' }, '脚本内容:'), | |
| 65 | 67 | h( |
| 66 | 68 | 'h3', |
| 67 | 69 | { style: 'color:white' }, |
| 68 | - "脚本内容:out.humidity = (parseInt('0x'+params.substr(6, 4))*0.1).toFixed(2);" | |
| 70 | + "out.humidity = (parseInt('0x'+params.substr(6, 4))*0.1).toFixed(2);" | |
| 69 | 71 | ), |
| 70 | 72 | h( |
| 71 | 73 | 'h3', |
| 72 | 74 | { style: 'color:white' }, |
| 73 | 75 | "out.temperature = (parseInt('0x'+params.substr(10, 4))*0.1).toFixed(2);" |
| 74 | 76 | ), |
| 75 | - h('h3', { style: 'color:white' }, "输出参数:{'humidity':'33.60','temperature':'14.10'}"), | |
| 77 | + h('h3', { style: 'color:white' }, '输出参数:'), | |
| 78 | + h('h3', { style: 'color:white' }, "{'humidity':'33.60','temperature':'14.10'}"), | |
| 76 | 79 | ]), |
| 77 | 80 | ]); | ... | ... |