From 7577e0d40354021d70b78d58b712ff8c2e8ad485 Mon Sep 17 00:00:00 2001
From: ludc <ludc@vci-tech.com>
Date: 星期五, 03 一月 2025 10:47:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-ui/src/util/func.js | 24 +++++++++++++++++-------
1 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/Source/plt-web/plt-web-ui/src/util/func.js b/Source/plt-web/plt-web-ui/src/util/func.js
index adc21af..aa606d5 100644
--- a/Source/plt-web/plt-web-ui/src/util/func.js
+++ b/Source/plt-web/plt-web-ui/src/util/func.js
@@ -328,22 +328,32 @@
let iconList = getStore({name: 'icons'});
if (iconList && iconList.length > 0) {
let libName = name.split(':')[0];
- let currentLic = iconList.find(item => item.label == libName);
- if (currentLic.list) {
+ let currentLic = iconList.find(item => item.lable == libName);
+ if (currentLic && currentLic.list) {
currentLic.list.find(item => {
if (item.name == name) {
- svgHtml = item.svg;
+ svgHtml = item.content;
}
return item.name == name;
})
}
}else {
getIcons().then(res => {
- this.iconList=res.data.data;
- store.dispatch("setIcons", this.iconList);
- if(this.iconList.length>0) {
- this.activeName=this.iconList[0].label;
+ store.dispatch("setIcons", res.data.data);
+ let iconList = res.data.data;
+ if (iconList && iconList.length > 0) {
+ let libName = name.split(':')[0];
+ let currentLic = iconList.find(item => item.lable == libName);
+ if (currentLic.list) {
+ currentLic.list.find(item => {
+ if (item.name == name) {
+ svgHtml = item.content;
+ }
+ return item.name == name;
+ })
+ }
}
+ return svgHtml;
})
}
}
--
Gitblit v1.9.3