Commit 43cd2f98c46922984a5cc51627014ae526ac90e5
Merge branch 'perf/device-position/08-22' into 'main_dev'
perf: 优化设备分布地图,弹窗可自定义显示内容,解除只能新增10个字段的限制 See merge request yunteng/thingskit-view!284
Showing
2 changed files
with
15 additions
and
12 deletions
@@ -36,7 +36,6 @@ | @@ -36,7 +36,6 @@ | ||
36 | <setting-item-box :alone="true"> | 36 | <setting-item-box :alone="true"> |
37 | <setting-item> | 37 | <setting-item> |
38 | <n-button | 38 | <n-button |
39 | - v-if="optionData.dialogConfigField.length < 9" | ||
40 | size="small" | 39 | size="small" |
41 | @click=" | 40 | @click=" |
42 | optionData.dialogConfigField.push({ | 41 | optionData.dialogConfigField.push({ |
@@ -83,6 +83,7 @@ const initMap = (newData: any) => { | @@ -83,6 +83,7 @@ const initMap = (newData: any) => { | ||
83 | skyColor: skyColor.value, | 83 | skyColor: skyColor.value, |
84 | viewMode: viewMode.value, // 地图模式 | 84 | viewMode: viewMode.value, // 地图模式 |
85 | willReadFrequently: true, | 85 | willReadFrequently: true, |
86 | + // zoomEnable: false, | ||
86 | WebGLParams: { | 87 | WebGLParams: { |
87 | preserveDrawingBuffer: true | 88 | preserveDrawingBuffer: true |
88 | } | 89 | } |
@@ -172,10 +173,11 @@ const createInfoWindow = async (extraInfo: dataExtraInfoType) => { | @@ -172,10 +173,11 @@ const createInfoWindow = async (extraInfo: dataExtraInfoType) => { | ||
172 | // | 173 | // |
173 | 174 | ||
174 | const dialogStyles = { | 175 | const dialogStyles = { |
175 | - textOverflowStyle: `width:15rem;text-overflow:ellipsis;overflow:hidden;word-break:break-all;white-space:nowrap;`, | ||
176 | - customFieldBox: `display:flex;flex-wrap:wrap;align-items:center;justify-content:space-between;color:white;`, | 176 | + textOverflowStyle: `width:18rem;text-overflow:ellipsis;overflow:hidden;word-break:break-all;white-space:nowrap;`, |
177 | + customFieldBox: `display:flex;flex-wrap:wrap;align-items:center;justify-content:space-between;color:white;gap:4px;`, | ||
177 | defaultFieldHeaderBox: `display:flex;justify-content:space-between;align-items:center;color:white;`, | 178 | defaultFieldHeaderBox: `display:flex;justify-content:space-between;align-items:center;color:white;`, |
178 | defaultFieldHeaderBoldText: `width:12rem;text-overflow:ellipsis;overflow:hidden;word-break:break-all;white-space:nowrap;font-size:15px;font-weight:bold;`, | 179 | defaultFieldHeaderBoldText: `width:12rem;text-overflow:ellipsis;overflow:hidden;word-break:break-all;white-space:nowrap;font-size:15px;font-weight:bold;`, |
180 | + fieldBox: 'height: 11rem; overflow: hidden; overflow-y: auto;', | ||
179 | defaultFieldBox: `display:flex;flex-direction:column;justify-content:space-between;color:white;margin-top:1rem;gap:0.95rem;`, | 181 | defaultFieldBox: `display:flex;flex-direction:column;justify-content:space-between;color:white;margin-top:1rem;gap:0.95rem;`, |
180 | iconSize: `width:1.2rem;height:1.2rem;`, | 182 | iconSize: `width:1.2rem;height:1.2rem;`, |
181 | textStatus: `margin-left:0.6rem;font-weight:bold;`, | 183 | textStatus: `margin-left:0.6rem;font-weight:bold;`, |
@@ -189,15 +191,17 @@ const createInfoWindow = async (extraInfo: dataExtraInfoType) => { | @@ -189,15 +191,17 @@ const createInfoWindow = async (extraInfo: dataExtraInfoType) => { | ||
189 | dialogCustomField.value | 191 | dialogCustomField.value |
190 | ? ` | 192 | ? ` |
191 | <div style="position: absolute;top: 135px;left:110px;width:20rem"> | 193 | <div style="position: absolute;top: 135px;left:110px;width:20rem"> |
192 | - <div style="${dialogStyles.customFieldBox}"> | ||
193 | - ${realDialogConfigFieldValue?.map((item: { label: string; value: string; realValue: any }) => { | ||
194 | - const { label, realValue } = item | ||
195 | - return ` | ||
196 | - <div style="${dialogStyles.textOverflowStyle}"> | ||
197 | - <span >${label}:${realValue}</span> | ||
198 | - </div> | ||
199 | - ` | ||
200 | - })} | 194 | + <div style="${dialogStyles.fieldBox}"> |
195 | + <div style="${dialogStyles.customFieldBox}"> | ||
196 | + ${realDialogConfigFieldValue?.map((item: { label: string; value: string; realValue: any }) => { | ||
197 | + const { label, realValue } = item | ||
198 | + return ` | ||
199 | + <div style="${dialogStyles.textOverflowStyle}"> | ||
200 | + <span >${label}:${realValue}</span> | ||
201 | + </div> | ||
202 | + ` | ||
203 | + })} | ||
204 | + </div> | ||
201 | </div> | 205 | </div> |
202 | </div> | 206 | </div> |
203 | ` | 207 | ` |