remove instance, generates by preset

MiRo1310 · Dec 19, 2023 · 39248d1 · 39248d1
1 parent 5034d93
commit 39248d1
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 8 deletions.
diff --git a/admin/build/index.js b/admin/build/index.js
diff --git a/admin/build/index.js.map b/admin/build/index.js.map
diff --git a/admin/src/lib/entrys.mjs b/admin/src/lib/entrys.mjs
@@ -66,9 +66,9 @@ export const tabValues = [
 		searchRoot: { root: "echarts", type: ["chart"] },
 
 		entrys: [
-			{ name: "trigger", val: "", headline: "Trigger" },
-			{ name: "echartInstance", val: "echarts.0", headline: "Echart Instance", width: "40%" },
-			{ name: "preset", val: "", headline: "Preset", width: "20%", elementGetRows: "preset", search: true },
+			{ name: "trigger", val: "", headline: "Trigger", width: "20%" },
+			// { name: "echartInstance", val: "echarts.0", headline: "Echart Instance", width: "40%" },
+			{ name: "preset", val: "", headline: "Preset", width: "40%", elementGetRows: "preset", search: true },
 			{ name: "background", val: "#FFFFFF", headline: "Background", width: "10%" },
 			{ name: "theme", val: "light", headline: "Theme", width: "10%" },
 			{ name: "filename", val: "echarts-temp-photo.jpg", headline: "Filename", width: "20%" },

diff --git a/lib/js/echarts.js b/lib/js/echarts.js
@@ -1,10 +1,12 @@
 const { sendToTelegram } = require("./telegram");
 function getChart(_this, echarts, directoryPicture, user, instanceTelegram, userListWithChatID, resize_keyboard, one_time_keyboard) {
 	try {
-		if (!echarts && !echarts[0].echartInstance) return;
+		if (!echarts) return;
 		for (const echart of echarts) {
+			const splitted = echart.preset.split(".");
+			const echartInstance = splitted[0] + "." + splitted[1];
 			_this.sendTo(
-				echart.echartInstance,
+				echartInstance,
 				{
 					preset: echart.preset,
 					renderer: "jpg",