fix auto run bug

CHANGELOG.md

@@ -1,3 +1,8 @@
+# 1.0.11
+
+1. 修复网页端无法自动拉起服务端的问题
+2. 修复批量出库页面 server-host 默认值错误的问题
+
 # 1.0.10
 
 1. 查看库存界面新增右键菜单，支持快速跳转到立创商城、查看数据手册等功能

extension.json

@@ -3,7 +3,7 @@
 	"uuid": "944f7c94a8ca485e848f1118effcbb9a",
 	"displayName": "LEYE",
 	"description": "LEYE 电子元器件库存管理系统 EDA 联动扩展",
-	"version": "1.0.10",
+	"version": "1.0.11",
 	"publisher": "Mr_Fang",
 	"engines": {
 		"eda": "^3.2.80"

iframe/export.html

@@ -297,7 +297,7 @@
 						return eda.sys_Message.showToastMessage('请先勾选要出库的器件', ESYS_ToastMessageType.WARNING);
 					}
 
-					const SERVER = (await eda.sys_Storage.getExtensionUserConfig('server-host')) ?? 'http://localhost:21816';
+					const SERVER = (await eda.sys_Storage.getExtensionUserConfig('server-host')) ?? 'http://localhost:21816/api';
 					const AUTO_RUN = (await eda.sys_Storage.getExtensionUserConfig('server-auto-run')) ?? true;
 					let successCount = 0;
 					let failItems = [];
@@ -306,18 +306,29 @@
 
 					for (const item of selectedItems) {
 						try {
-							let getRes = await eda.sys_ClientUrl.request(`${SERVER}/getLeyeList?lcscId=${item.lcscId}`, 'GET');
+							let getResult;
-							let getResult = await getRes.json();
+							try {
+								const getRes = await eda.sys_ClientUrl.request(`${SERVER}/getLeyeList?lcscId=${item.lcscId}`, 'GET');
+								getResult = await getRes.json();
+							} catch (e) {
+								getResult = { success: false };
+							}
 
 							if (AUTO_RUN && !getResult.success) {
 								window.open('leye://open');
 								for (let i = 0; i < 3 && !getResult.success; i++) {
 									eda.sys_Message.showToastMessage('等待拉起本地服务端...', ESYS_ToastMessageType.INFO);
-									getRes = await eda.sys_ClientUrl.request(`${SERVER}/getLeyeList?lcscId=${item.lcscId}`, 'GET');
+									try {
+										const getRes = await eda.sys_ClientUrl.request(`${SERVER}/getLeyeList?lcscId=${item.lcscId}`, 'GET');
 										getResult = await getRes.json();
+									} catch (e) {
+										getResult = { success: false };
+									}
+									if (!getResult.success) {
 										await new Promise((resolve) => setTimeout(resolve, 1500));
 									}
 								}
+							}
 
 							if (getResult.success && getResult.data && getResult.data.length > 0) {
 								const remoteData = getResult.data[0];

iframe/import.html

@@ -572,23 +572,33 @@
 								quantity: item.quantity,
 							});
 
-							let res = await eda.sys_ClientUrl.request(SERVER + '/addLeyeList', 'POST', postData, {
+							let result;
-								headers: { 'Content-Type': 'application/json' },
+							try {
-							});
+								const res = await eda.sys_ClientUrl.request(SERVER + '/addLeyeList', 'POST', postData, {
-
-							let result = await res.json();
-
-							if (AUTO_RUN && !result.success) {
-								window.open('leye://open');
-								for (let i = 0; i < 3 && !result.success; i++) {
-									eda.sys_Message.showToastMessage('等待拉起本地服务端...', ESYS_ToastMessageType.INFO);
-									res = await eda.sys_ClientUrl.request(SERVER + '/addLeyeList', 'POST', postData, {
 									headers: { 'Content-Type': 'application/json' },
 								});
 								result = await res.json();
+							} catch (e) {
+								result = { success: false };
+							}
+
+							if (AUTO_RUN && !result.success) {
+								eda.sys_Window.open('leye://open');
+								for (let i = 0; i < 3 && !result.success; i++) {
+									eda.sys_Message.showToastMessage('等待拉起本地服务端...', ESYS_ToastMessageType.INFO);
+									try {
+										const res = await eda.sys_ClientUrl.request(SERVER + '/addLeyeList', 'POST', postData, {
+											headers: { 'Content-Type': 'application/json' },
+										});
+										result = await res.json();
+									} catch (e) {
+										result = { success: false };
+									}
+									if (!result.success) {
 										await new Promise((resolve) => setTimeout(resolve, 1500));
 									}
 								}
+							}
 
 							if (result.success) {
 								successCount++;

iframe/newLeye.html

@@ -296,17 +296,32 @@
 							cachedDetails = [];
 						}
 
-						let listRes = await eda.sys_ClientUrl.request(SERVER + '/getLeyeList?pageSize=1000&current=1');
+						let listResult;
-						let listResult = await listRes.json();
+						try {
+							const listRes = await eda.sys_ClientUrl.request(SERVER + '/getLeyeList?pageSize=1000&current=1');
+							listResult = await listRes.json();
+						} catch (e) {
+							listResult = { success: false };
+						}
+
 						if (AUTO_RUN && !listResult.success) {
-							window.open('leye://open');
+							eda.sys_Window.open('leye://open');
 							for (let i = 0; i < 3 && !listResult.success; i++) {
 								eda.sys_Message.showToastMessage('等待拉起本地服务端...', ESYS_ToastMessageType.INFO);
-								listRes = await eda.sys_ClientUrl.request(SERVER + '/getLeyeList?pageSize=1000&current=1');
+
+								try {
+									const listRes = await eda.sys_ClientUrl.request(SERVER + '/getLeyeList?pageSize=1000&current=1');
 									listResult = await listRes.json();
+								} catch (e) {
+									listResult = { success: false };
+								}
+
+								if (!listResult.success) {
 									await new Promise((resolve) => setTimeout(resolve, 1500));
 								}
 							}
+						}
+
 						if (!listResult.success || !listResult.data) {
 							throw new Error('同步失败');
 						}
@@ -365,7 +380,7 @@
 					} catch (error) {
 						tableBody.innerHTML = `<tr><td colspan="8" class="text-center py-6 text-red-500">加载失败: ${error.message}</td></tr>`;
 						console.log('加载失败: ', error);
-						eda.sys_Log.add('加载失败: ', error.message);
+						eda.sys_Log.add('加载失败: ' + error.message, ESYS_LogType.ERROR);
 					}
 				}