1、修改报表设计静态数据图表和动态图表的生成判断

industry-system/industry-da/src/main/resources/static/reportSheet/js/Luckysheet-2.1.13/luckysheet.umd.js

@@ -69522,7 +69522,7 @@
 	}
 	
 	function Lp3(fun) {
-		console.log('Lp3')
+		//console.log('Lp3')
 		var n = luckysheet.getluckysheet_select_save();
 		1 == n.length && n[0].row[0] == n[0].row[1] && n[0].column[0] == n[0].column[1] && (Ed("right",
 			"rangeOfSelect"), Ed("down", "rangeOfSelect"), n = luckysheet.getluckysheet_select_save());
@@ -79032,8 +79032,8 @@
 	var ay = Object.freeze({
 			__proto__: null,
 			showChart: function(params) {
-				console.log('lucky-showChart')
-				console.log(params)
+				//console.log('lucky-showChart')
+				//console.log(params)
 				Lp3({
 					chartId: params.chartId,
 					option: params.option,
@@ -79054,7 +79054,7 @@
 				})
 			},
 			showHistoryChart: function(params) {
-				console.log('showHistoryChart')
+				//console.log('showHistoryChart')
 				Lp4({
 					chartId: params.chartId,
 					option: params.option,
@@ -79452,6 +79452,23 @@
 					Fm.info("The range is invalid, please check range parameter.", "")
 				}
 			},
+			// getSelectSave:function(){
+			// 	//lry7
+				
+			// 	var n = luckysheet.getluckysheet_select_save();
+			// 	1 == n.length && n[0].row[0] == n[0].row[1] && n[0].column[0] == n[0].column[1] && (Ed("right",
+			// 		"rangeOfSelect"), Ed("down", "rangeOfSelect"), n = luckysheet.getluckysheet_select_save());
+			// 	for (var l = -1, i = n[0].row[1] - n[0].row[0], o = n[0].row[0]; o <= n[0].row[1]; o++) {
+			// 		for (var s = n[0].column[0]; s <= n[0].column[1]; s++) {
+			// 			if (null != (d = vu(o, s, luckysheet.flowdata())) && d.toString().length > 0) {
+			// 				l = o;
+			// 				break
+			// 			}
+			// 		}
+			// 		if (-1 !== l) break
+			// 	}
+			// 	console.log(n)
+			// },
 			getRangeHtml: function() {
 				var e = arguments.length > 0 && void 0 !== arguments[0] ? arguments[0] : {},
 					t = un({}, e),
@@ -83416,6 +83433,8 @@
 							style: a,
 							range: $.extend(!0, [], Zr.luckysheet_select_save)
 						};
+						//lry7
+						//console.log(Zr.luckysheet_select_save)
 						if (r.borderInfo.push(n), Zr.clearjfundo) {
 							Zr.jfundo.length = 0;
 							var l = [];

industry-system/industry-da/src/main/resources/static/reportSheet/js/src/model/right-menu.js

@@ -432,7 +432,9 @@ layui.define(['layer', 'util', 'jquery', 'form', 'sheetTypew', 'chartRightw', 'i
 						pRange.range.column.push(column_end)
 						pRange.range.column.push(column_focus)
 					}
+					//console.log(pRange)
 					let rangeValue = luckysheet.getRangeValue(pRange)
+					//console.log(rangeValue)
 					const range = luckysheet.getRange(pRange);
 					let chartType = 0
 					if(rangeValue.length==1){
@@ -451,6 +453,9 @@ layui.define(['layer', 'util', 'jquery', 'form', 'sheetTypew', 'chartRightw', 'i
 					}else{
 						chartType=1//静态图表
 					}
+					if(luckysheet.getCellValue(row_focus,column_focus)==null){
+						chartType=0//动态图表
+					}
 					//console.log(chartType)
 					//初始图表类型
 					let option = chartOption.bar
@@ -677,6 +682,7 @@ layui.define(['layer', 'util', 'jquery', 'form', 'sheetTypew', 'chartRightw', 'i
 					layer.confirm('应用模板将会覆盖当前报表，是否继续操作？', {
 						btn: ['确认', '取消']
 					}, function(idx) {
+						layui.rightMenu.data.chart = []
 						luckysheet.destroy()
 						layui.api.getSysTableTemplateById(data.templateId).then(json => {
 							//console.log(JSON.parse(json.data.templateData).data)