Commit 3a45419b536e63b97440e9d2b42f5c401614d166
Merge branch 'fix/DEFECT-1656' into 'main_dev'
fix: 修复编辑数据流转修改了名称点击上一步在返回,名称没有保存上 See merge request yunteng/thingskit-front!937
Showing
4 changed files
with
8 additions
and
5 deletions
| @@ -40,7 +40,7 @@ export const columns: BasicColumn[] = [ | @@ -40,7 +40,7 @@ export const columns: BasicColumn[] = [ | ||
| 40 | placement: 'topLeft', | 40 | placement: 'topLeft', |
| 41 | title: `${record.alias}`, | 41 | title: `${record.alias}`, |
| 42 | }, | 42 | }, |
| 43 | - `${record.alias}` | 43 | + () => `${record.alias}` |
| 44 | ) | 44 | ) |
| 45 | ), | 45 | ), |
| 46 | h( | 46 | h( |
| @@ -57,7 +57,7 @@ export const columns: BasicColumn[] = [ | @@ -57,7 +57,7 @@ export const columns: BasicColumn[] = [ | ||
| 57 | placement: 'topLeft', | 57 | placement: 'topLeft', |
| 58 | title: `${record.name}`, | 58 | title: `${record.name}`, |
| 59 | }, | 59 | }, |
| 60 | - `${record.name}` | 60 | + () => `${record.name}` |
| 61 | ) | 61 | ) |
| 62 | ), | 62 | ), |
| 63 | ]); | 63 | ]); |
| @@ -25,7 +25,7 @@ | @@ -25,7 +25,7 @@ | ||
| 25 | listField: 'data', | 25 | listField: 'data', |
| 26 | }, | 26 | }, |
| 27 | formConfig: { | 27 | formConfig: { |
| 28 | - labelWidth: 120, | 28 | + labelWidth: 80, |
| 29 | schemas: formSchemas, | 29 | schemas: formSchemas, |
| 30 | fieldMapToTime: [['dateRange', ['startTime', 'endTime'], 'YYYY-MM-DD HH:mm:ss']], | 30 | fieldMapToTime: [['dateRange', ['startTime', 'endTime'], 'YYYY-MM-DD HH:mm:ss']], |
| 31 | }, | 31 | }, |
| @@ -61,6 +61,7 @@ | @@ -61,6 +61,7 @@ | ||
| 61 | </span> | 61 | </span> |
| 62 | </template> | 62 | </template> |
| 63 | </BasicTable> | 63 | </BasicTable> |
| 64 | + <BasicTable /> | ||
| 64 | <BasicModal title="输出参数" @register="registerModal" @ok="closeModal"> | 65 | <BasicModal title="输出参数" @register="registerModal" @ok="closeModal"> |
| 65 | <Input.TextArea v-model:value="outputData" :autosize="true" /> | 66 | <Input.TextArea v-model:value="outputData" :autosize="true" /> |
| 66 | </BasicModal> | 67 | </BasicModal> |
| @@ -159,7 +159,6 @@ | @@ -159,7 +159,6 @@ | ||
| 159 | dataFlowParamsRef.value?.setValue({ | 159 | dataFlowParamsRef.value?.setValue({ |
| 160 | ...record, | 160 | ...record, |
| 161 | ...record?.configuration, | 161 | ...record?.configuration, |
| 162 | - name: record?.name, | ||
| 163 | description: record?.configuration.description || record?.additionalInfo?.description, | 162 | description: record?.configuration.description || record?.additionalInfo?.description, |
| 164 | }); | 163 | }); |
| 165 | }; | 164 | }; |
| @@ -7,7 +7,10 @@ | @@ -7,7 +7,10 @@ | ||
| 7 | </script> | 7 | </script> |
| 8 | 8 | ||
| 9 | <template> | 9 | <template> |
| 10 | - <div v-if="config.option?.componentInfo?.showDeviceName" class="h-8 font-semibold"> | 10 | + <div |
| 11 | + v-if="config.option?.componentInfo?.showDeviceName" | ||
| 12 | + class="h-8 font-semibold w-1/2 overflow-hidden overflow-ellipsis whitespace-nowrap" | ||
| 13 | + > | ||
| 11 | {{ config.option.deviceRename || config.option.deviceName }} | 14 | {{ config.option.deviceRename || config.option.deviceName }} |
| 12 | </div> | 15 | </div> |
| 13 | </template> | 16 | </template> |