diff --git a/src/assets/images/tips/Integral-activity.png b/src/assets/images/tips/Integral-activity.png new file mode 100644 index 00000000..2f972815 Binary files /dev/null and b/src/assets/images/tips/Integral-activity.png differ diff --git a/src/plugins/icon.ts b/src/plugins/icon.ts index 22a149c8..6d31a1f4 100644 --- a/src/plugins/icon.ts +++ b/src/plugins/icon.ts @@ -58,6 +58,7 @@ import { Search as SearchIcon, ChevronUpOutline as ChevronUpOutlineIcon, ChevronDownOutline as ChevronDownOutlineIcon, + ChevronForward as ChevronForwardIcon, Pulse as PulseIcon, Folder as FolderIcon, FolderOpen as FolderOpenIcon, @@ -244,7 +245,9 @@ const ionicons5 = { // 分析 AnalyticsIcon, // 飞机 - AirPlaneOutlineIcon + AirPlaneOutlineIcon, + // 向右 + ChevronForwardIcon } const carbon = { diff --git a/src/utils/utils.ts b/src/utils/utils.ts index 70cf7be9..48bef70c 100644 --- a/src/utils/utils.ts +++ b/src/utils/utils.ts @@ -324,13 +324,17 @@ export const evalFn = (fn: string) => { * @param data */ export const JSONParse = (data: string) => { + if (data.trim() === '') return return JSON.parse(data, (k, v) => { - // 过滤函数字符串 - if (excludeParseEventKeyList.includes(k)) return v - // 过滤函数值表达式 - if (typeof v === 'string') { - const someValue = excludeParseEventValueList.some(excludeValue => v.indexOf(excludeValue) > -1) - if (someValue) return v + // // 过滤函数字符串 + // if (excludeParseEventKeyList.includes(k)) return v + // // 过滤函数值表达式 + // if (typeof v === 'string') { + // const someValue = excludeParseEventValueList.some(excludeValue => v.indexOf(excludeValue) > -1) + // if (someValue) return v + // } + if (k !== 'formatter') { + return v } // 还原函数值 if (typeof v === 'string' && v.indexOf && (v.indexOf('function') > -1 || v.indexOf('=>') > -1)) { diff --git a/src/views/project/layout/components/ProjectLayoutAsideFooter/index.vue b/src/views/project/layout/components/ProjectLayoutAsideFooter/index.vue index 731796c1..a67931e6 100644 --- a/src/views/project/layout/components/ProjectLayoutAsideFooter/index.vue +++ b/src/views/project/layout/components/ProjectLayoutAsideFooter/index.vue @@ -1,10 +1,26 @@