Commit b3c02e4ff15acea0388d64446faf9634516ded01
Merge branch 'cherry-pick-56c76212' into 'main'
Merge branch 'fix/rule-script-chain' into 'main_dev' See merge request yunteng/thingskit-front!1078
Showing
2 changed files
with
2 additions
and
6 deletions
| @@ -148,6 +148,7 @@ export const formSchema: FormSchema[] = [ | @@ -148,6 +148,7 @@ export const formSchema: FormSchema[] = [ | ||
| 148 | component: 'JavascriptEditorWithTestModal', | 148 | component: 'JavascriptEditorWithTestModal', |
| 149 | label: '转换函数', | 149 | label: '转换函数', |
| 150 | changeEvent: 'update:value', | 150 | changeEvent: 'update:value', |
| 151 | + defaultValue: 'return {msg: msg, metadata: metadata, msgType: msgType};', | ||
| 151 | componentProps: { | 152 | componentProps: { |
| 152 | javaScriptEditorProps: { | 153 | javaScriptEditorProps: { |
| 153 | functionName: 'Details', | 154 | functionName: 'Details', |
| @@ -117,7 +117,7 @@ | @@ -117,7 +117,7 @@ | ||
| 117 | <DeviceName :config="config" /> | 117 | <DeviceName :config="config" /> |
| 118 | 118 | ||
| 119 | <div v-for="item in percentList" :key="item.id" class="flex flex-col ml-3 mr-3 items-stretch"> | 119 | <div v-for="item in percentList" :key="item.id" class="flex flex-col ml-3 mr-3 items-stretch"> |
| 120 | - <div class="flex justify-between"> | 120 | + <div class="flex justify-between items-center"> |
| 121 | <div | 121 | <div |
| 122 | class="text-gray-500 flex w-7/10" | 122 | class="text-gray-500 flex w-7/10" |
| 123 | :style="{ | 123 | :style="{ |
| @@ -125,11 +125,6 @@ | @@ -125,11 +125,6 @@ | ||
| 125 | fontSize: (getRatios ? getRatios * item.fontSize : item.fontSize) + 'px', | 125 | fontSize: (getRatios ? getRatios * item.fontSize : item.fontSize) + 'px', |
| 126 | }" | 126 | }" |
| 127 | > | 127 | > |
| 128 | - <!-- {{ | ||
| 129 | - `${item.deviceName} | ||
| 130 | - - | ||
| 131 | - ${item.attributeName || item.attribute || '温度'}` | ||
| 132 | - }} --> | ||
| 133 | <div class="max-w-4/6 overflow-ellipsis overflow-hidden whitespace-nowrap">{{ | 128 | <div class="max-w-4/6 overflow-ellipsis overflow-hidden whitespace-nowrap">{{ |
| 134 | item.deviceName | 129 | item.deviceName |
| 135 | }}</div> | 130 | }}</div> |