fix: 修复导入xml为多页时,剩余页失效&&设备详情接口调用逻辑修改

@@ -4324,7 +4324,9 @@ App.prototype.loadFile = function (id, sameWindow, file, success, force) {
 
       if (success != null)
         success()
-
+      // TODO Thingskkit socket连接
+      const lightboxWebsocketService = useLightboxModeService(this)
+      this.lightboxWebsocketService = lightboxWebsocketService
       this.lightboxWebsocketService?.init?.()
     }
 

@@ -482,14 +482,12 @@ EditorUi.prototype.initPages = function () {
 		this.editor.addListener('pageMoved', pagesChanged);
 		this.editor.addListener('fileLoaded', pagesChanged);
 
-		// TODO Thingskit 预览模式连接socket
-		const lightboxWebsocketService = useLightboxModeService(this)
-		this.lightboxWebsocketService = lightboxWebsocketService
 		this.editor.addListener('pageSelected', mxUtils.bind(this, function (sender, evt) {
 			this.scrollToPage();
 			this.updateHashObject();
 			this.updateTabContainer();
 			this.updateDocumentTitle();
+			// TODO Thingskit 预览模式连接socket 切换页面时取消数据订阅
 			this.lightboxWebsocketService?.onSelectPageChange?.()
 
 			if (this.toolbar != null) {
@@ -923,6 +921,8 @@ EditorUi.prototype.selectPage = function (page, quiet, viewState) {
 
 			var change = new SelectPage(this, page, viewState);
 			change.execute();
+			const cells = this.editor.graph.createCellLookup([change.page.root])
+			this.editor.fitOldConfigurationByCellsIds(Object.values(cells))
 			edit.add(change);
 			edit.notify();
 

@@ -960,6 +960,25 @@ Editor.prototype.fitOldConfiguration = function (cells) {
 		if (componentType === 'default') {
 			// 处理就版本的图片路径
 			var style = cell?.getStyle?.() || ''
+
+			if (style.includes('img/lib/thingskit')) {
+				cell?.setStyle?.(style.replace('img/lib/thingskit', `${getProxyPrefix()}/webapp/images/thingskit/libs`))
+			}
+		}
+	}
+}
+
+Editor.prototype.fitOldConfigurationByCellsIds = function (cellsIds) {
+	for (const cellId of cellsIds) {
+		 const [cell] =  this.graph.getCellsById([cellId])
+		 if (!cell) continue
+		var componentType = cell.getAttribute('componentType')
+		if (!componentType) continue
+		this.transformOldConfigurationKey(cell, componentType)
+		if (componentType === 'default') {
+			// 处理就版本的图片路径
+			var style = cell?.getStyle?.() || ''
+
 			if (style.includes('img/lib/thingskit')) {
 				cell?.setStyle?.(style.replace('img/lib/thingskit', `${getProxyPrefix()}/webapp/images/thingskit/libs`))
 			}
@@ -976,7 +995,7 @@ Editor.prototype.setGraphXml = function (node) {
 
 		if (node.nodeName == 'mxGraphModel') {
 			this.graph.model.beginUpdate();
-
+			console.log(dec)
 			try {
 				this.graph.model.clear();
 				this.graph.view.scale = 1;

 import type { DeviceAttributeItemType, DeviceItemType, DeviceProfileItemType, OrganizationItemType, RpcCommandType, SendValue, ThingsModel, ThingsModelItemType } from './model'
 import type { CommandWayEnum } from '@/enums/commandEnum'
 import type { DeviceTypeEnum } from '@/enums/datasource'
+import { isShareMode } from '@/utils/env'
 import { defHttp } from '@/utils/http'
 
 enum Api {
@@ -125,7 +126,7 @@ export const getDeviceActiveTime = (entityId: string) => {
 export const getDeviceInfo = (deviceId: string) => {
   return defHttp.get(
     {
-      url: `${Api.GET_DEVICE_DETAIL}${deviceId}`,
+      url: isShareMode() ? `${Api.GET_DEVICE_DETAIL}public/${deviceId}` : `${Api.GET_DEVICE_DETAIL}${deviceId}`,
     },
   )
 }

@@ -3,19 +3,32 @@ import { isLightboxMode } from '@/utils/env'
 
 export const getDefaultOption = (): EChartsOption => {
   return {
-    legend: [],
-    xAxis: {
-      type: 'category',
-      data: isLightboxMode() ? [] : ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'],
+    tooltip: {
+      trigger: 'axis',
     },
-    yAxis: {
-      type: 'value',
+    grid: {
+      left: '3%',
+      right: '4%',
+      bottom: '3%',
+      containLabel: true,
     },
+    dataset: {
+      source: isLightboxMode()
+        ? []
+        : [
+            ['product', '2015', '2016', '2017'],
+            ['Matcha Latte', 43.3, 85.8, 93.7],
+            ['Milk Tea', 83.1, 73.4, 55.1],
+            ['Cheese Cocoa', 86.4, 65.2, 82.5],
+            ['Walnut Brownie', 72.4, 53.9, 39.1],
+          ],
+    },
+    xAxis: { type: 'category' },
+    yAxis: {},
+    // Declare several bar series, each will be mapped
+    // to a column of dataset.source by default.
     series: [
-      {
-        data: isLightboxMode() ? [] : [150, 230, 224, 218, 135, 147, 260],
-        type: 'line',
-      },
+      { type: 'line' },
     ],
   }
 }

 <script lang="ts" setup>
 import { computed, onMounted, onUnmounted, ref, unref } from 'vue'
-import type { ECharts, EChartsOption, SeriesOption, XAXisComponentOption } from 'echarts'
+import type { DatasetComponentOption, ECharts, EChartsOption, SeriesOption, XAXisComponentOption } from 'echarts'
 import { init } from 'echarts'
 import { getDefaultOption } from './index.config'
 import type { CreateComponentType, RenderComponentExposeType } from '@/core/Library/types'
@@ -56,16 +56,32 @@ const handlerTimeSeriesData = (commandSource: CommandSource, message: Subscripti
   const { deviceName } = deviceInfo || {}
   const { ts, latestValue } = useLatestMessageValue(message, attr)
   const option = unref(chartInstance)?.getOption() as EChartsOption
-  const xAxisData = ((option.xAxis as XAXisComponentOption[])?.[0] as { data: string[] }).data
-  const seriesData = ((option.series as SeriesOption[])?.[0].data) as number[]
-  xAxisData.push(formatToDateTime(ts))
-  seriesData.push(latestValue)
+  const oldDataset = (option.dataset as DatasetComponentOption[])?.[0].source
+  // const xAxisData = ((option.xAxis as XAXisComponentOption[])?.[0] as { data: string[] }).data
+  // const seriesData = ((option.series as SeriesOption[])?.[0].data) as SeriesOption[]
+  // console.log(option)
+  // oldDataset.
+  // xAxisData.push(formatToDateTime(ts))
+  // seriesData.push({
+  //   name: attrInfo.name,
+  //   data: [],
+  // })
+
   unref(chartInstance)?.setOption({
     title: {
       text: `${deviceName}-${attrInfo.name}`,
     },
-    xAxis: { data: sliceData(xAxisData) },
-    series: { data: sliceData(seriesData) },
+    dataset: {
+      dimensions: ['ts', attr],
+      source: [
+        { ts, [attr]: latestValue },
+      ],
+    },
+    // legend: {
+    //   data: [attrInfo.name],
+    // },
+    // xAxis: { data: sliceData(xAxisData) },
+    // series: { data: sliceData(seriesData) },
   } as EChartsOption)
 }
 
@@ -97,8 +113,7 @@ defineExpose<RenderComponentExposeType>({ onMessage })
 <template>
   <div class="w-full h-full justify-center flex items-center">
     <div
-      ref="chartElRef"
-      :style="{ width: `${getCellBounds.width}px`, height: `${getCellBounds.height}px` }"
+      ref="chartElRef" :style="{ width: `${getCellBounds.width}px`, height: `${getCellBounds.height}px` }"
       class="w-full h-full"
     />
   </div>

@@ -76,6 +76,7 @@ export abstract class WebsocketService<T extends WsSubscriber, D = any> implemen
         }
       },
     })
+
     this.data = data
     this.status = status
     this.ws = ws

@@ -36,15 +36,13 @@ export class LightboxModeWebsocketService extends TelemetryWebsockerService {
     super()
     this.nodeUtils = new NodeUtils(App)
     this.dataSource = []
-    this.openSocket()
     this.messageHandler = new MessageHandler(this)
     this.eventHandler = new EventHandler(this)
   }
 
   init() {
-    this.unsubscribeCurrentPageData()
-    this.getSelectPageNodeData()
-    this.getAllDataSubscribers()
+    this.openSocket()
+    this.onSelectPageChange()
   }
 
   getAllDataSubscribers() {
@@ -123,7 +121,9 @@ export class LightboxModeWebsocketService extends TelemetryWebsockerService {
   }
 
   onSelectPageChange() {
-    this.init()
+    this.unsubscribeCurrentPageData()
+    this.getSelectPageNodeData()
+    this.getAllDataSubscribers()
   }
 
   checkDataSourceNeedSubscribe(dataSource?: NodeDataDataSourceJsonType): dataSource is NodeDataDataSourceJsonType {

@@ -32,20 +32,20 @@ export function checkStatus(
 
       break
     case 403:
-      errMessage = ErrorEnum.ERR_MSG_403
+      errMessage = msg || ErrorEnum.ERR_MSG_403
       break
     // 404请求不存在
     case 404:
-      errMessage = ErrorEnum.ERR_MSG_404
+      errMessage = msg || ErrorEnum.ERR_MSG_404
       break
     case 405:
-      errMessage = ErrorEnum.ERR_MSG_405
+      errMessage = msg || ErrorEnum.ERR_MSG_405
       break
     case 408:
       errMessage = ErrorEnum.ERR_MSG_408
       break
     case 500:
-      errMessage = ErrorEnum.ERR_MSG_500
+      errMessage = msg || ErrorEnum.ERR_MSG_500
       break
     case 501:
       errMessage = ErrorEnum.ERR_MSG_501

@@ -10,7 +10,7 @@ export enum ErrorEnum {
   NETWORK_EXCEPTION = '网络异常',
   NETWORK_EXCEPTION_MSG = '网络异常，请检查您的网络连接是否正常!',
   ERR_MSG_401 = '用户没有权限（令牌、用户名、密码错误）!',
-  ERR_MSG_403 = '用户得到授权，但是访问是被禁止的。!',
+  ERR_MSG_403 = '用户得到授权，但是访问是被禁止的 !',
   ERR_MSG_404 = '网络请求错误,未找到该资源!',
   ERR_MSG_405 = '网络请求错误,请求方法未允许!',
   ERR_MSG_408 = '网络请求超时!',

@@ -131,7 +131,7 @@ const transform: AxiosTransform = {
   responseInterceptorsCatch: (_axiosInstance: AxiosInstance, error: any) => {
     const { response, code, message, config } = error || {}
     const errorMessageMode = config?.requestOptions?.errorMessageMode || 'none'
-    const msg: string = response?.data?.error?.message ?? ''
+    const msg: string = response?.data?.message ?? ''
     const err: string = error?.toString?.() ?? ''
     let errMessage = ''
     if (axios.isCancel(error))
@@ -157,7 +157,6 @@ const transform: AxiosTransform = {
     catch (error) {
       throw new Error(error as unknown as string)
     }
-
     checkStatus(error?.response?.status, msg, errorMessageMode)
 
     // 添加自动重试机制 保险起见 只针对GET请求