Merge branch 'fix/chart-nest-not-render' into 'main_dev'

fix: 修复图表嵌套不渲染图表

See merge request yunteng/thingskit-scada!102

@@ -228,7 +228,7 @@ AlarmListComponent.createAlarmItem = function (record) {
 	}
 	}
 
 
 	return (record || []).map(item => {
 	return (record || []).map(item => {
-		var { deviceName, status, startTs } = item || {}
+		var { alias, deviceName, status, startTs } = item || {}
 
 
 		var stateStyle = {
 		var stateStyle = {
 			CLEARED_UNACK: 'color: #cf1322;background: #fff1f0;border-color: #ffa39e;',
 			CLEARED_UNACK: 'color: #cf1322;background: #fff1f0;border-color: #ffa39e;',
@@ -248,7 +248,7 @@ AlarmListComponent.createAlarmItem = function (record) {
 	<div class="alarm-list-item"	style="height: ${itemHeight}px; box-sizing: border-box; display: flex; flex-direction: column; justify-content: center; border-bottom: 1px solid black; text-align: left; min-width: 280px; width: 100%;">
 	<div class="alarm-list-item"	style="height: ${itemHeight}px; box-sizing: border-box; display: flex; flex-direction: column; justify-content: center; border-bottom: 1px solid black; text-align: left; min-width: 280px; width: 100%;">
 		<div style="padding: 0 10px;">
 		<div style="padding: 0 10px;">
 			<span style="margin-right: 5px;">设备:</span>
 			<span style="margin-right: 5px;">设备:</span>
-			<span>${deviceName}</span>
+			<span>${alias || deviceName}</span>
 		</div>
 		</div>
 		<div style="padding: 5px 10px;">
 		<div style="padding: 5px 10px;">
 			<span style="margin-right: 5px;">时间:</span>
 			<span style="margin-right: 5px;">时间:</span>

@@ -352,7 +352,7 @@
 	 */
 	 */
 	Sidebar.prototype.initChartInstance = function (graph) {
 	Sidebar.prototype.initChartInstance = function (graph) {
 		const basicAttr = this.enumCellBasicAttribute
 		const basicAttr = this.enumCellBasicAttribute
-		const allCell = graph.getDefaultParent().children || []
+		const allCell = Object.entries(graph?.getModel()?.cells || {}).map(([_, item]) => item) || []
 		const domIdMapping = new Map()
 		const domIdMapping = new Map()
 		for (const cell of allCell) {
 		for (const cell of allCell) {
 			const chartInstanceId = graph.getAttributeForCell(cell, basicAttr.CHART_INSTANCE_ID)
 			const chartInstanceId = graph.getAttributeForCell(cell, basicAttr.CHART_INSTANCE_ID)
@@ -363,6 +363,7 @@
 				domIdMapping.set(chartInstanceId, { width, height, chartType })
 				domIdMapping.set(chartInstanceId, { width, height, chartType })
 			}
 			}
 		}
 		}
+
 		const chartsDomList = document.querySelectorAll(`.${enumConst.CHART_CONTAINER_CLS}`)
 		const chartsDomList = document.querySelectorAll(`.${enumConst.CHART_CONTAINER_CLS}`)
 		for (const chartDom of chartsDomList) {
 		for (const chartDom of chartsDomList) {
 			const id = chartDom.getAttribute('id')
 			const id = chartDom.getAttribute('id')
@@ -421,17 +422,26 @@
 	// 	}
 	// 	}
 	// }
 	// }
 	function getLineChartDefaultOption() {
 	function getLineChartDefaultOption() {
+		var isLightBox = !!(urlParams || {})['lightbox']
 		return {
 		return {
+			title: isLightBox ? {
+				text: '暂无数据',
+				x: 'center',
+				y: 'center',
+				subtextStyle: {
+					fontSize: 16
+				}
+			} : {},
 			xAxis: {
 			xAxis: {
 				type: 'category',
 				type: 'category',
-				data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'],
+				data: isLightBox ? [] : ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'],
 			},
 			},
 			yAxis: {
 			yAxis: {
 				type: 'value',
 				type: 'value',
 			},
 			},
 			series: [
 			series: [
 				{
 				{
-					data: [150, 230, 224, 218, 135, 147, 260],
+					data: isLightBox ? [] : [150, 230, 224, 218, 135, 147, 260],
 					type: 'line',
 					type: 'line',
 				},
 				},
 			],
 			],
@@ -439,17 +449,26 @@
 	}
 	}
 
 
 	function getBarChartDefaultOption() {
 	function getBarChartDefaultOption() {
+		var isLightBox = !!(urlParams || {})['lightbox']
 		return {
 		return {
+			title: isLightBox ? {
+				text: '暂无数据',
+				x: 'center',
+				y: 'center',
+				subtextStyle: {
+					fontSize: 16
+				}
+			} : {},
 			xAxis: {
 			xAxis: {
 				type: 'category',
 				type: 'category',
-				data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'],
+				data: isLightBox ? [] : ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'],
 			},
 			},
 			yAxis: {
 			yAxis: {
 				type: 'value',
 				type: 'value',
 			},
 			},
 			series: [
 			series: [
 				{
 				{
-					data: [120, 200, 150, 80, 70, 110, 130],
+					data: isLightBox ? [] : [120, 200, 150, 80, 70, 110, 130],
 					type: 'bar',
 					type: 'bar',
 					showBackground: true,
 					showBackground: true,
 					backgroundStyle: {
 					backgroundStyle: {