Merge branch 'dev'

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 = {

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 (excludeParseEventKeyList.includes(k)) return v
-    // 过滤函数值表达式
+    // // 过滤函数值表达式
-    if (typeof v === 'string') {
+    // if (typeof v === 'string') {
-      const someValue = excludeParseEventValueList.some(excludeValue => v.indexOf(excludeValue) > -1)
+    //   const someValue = excludeParseEventValueList.some(excludeValue => v.indexOf(excludeValue) > -1)
-      if (someValue) return v
+    //   if (someValue) return v
+    // }
+    if (k !== 'formatter') {
+      return v
     }
     // 还原函数值
     if (typeof v === 'string' && v.indexOf && (v.indexOf('function') > -1 || v.indexOf('=>') > -1)) {

src/views/project/layout/components/ProjectLayoutAsideFooter/index.vue

@@ -1,10 +1,26 @@
 <template>
   <div class="go-aside-footer">
+    <div class="pointer-invest-btn" :class="{ collapsed }" @click="clickHandle">
+      <div class="btn-left">
+        <img class="main-img" src="~@/assets/images/tips/Integral-activity.png" title="新用户免费送会员~"/>
+        <div v-if="!collapsed" class="btn-left-title">
+          <span class="title-top">
+            速看!
+            <span style="color: #e86b6b; text-decoration: underline; font-weight: bold">GoViewPro</span>
+            有活动
+          </span>
+          <span class="title-bottom">新用户免费送会员~</span>
+        </div>
+      </div>
+      <n-icon v-if="!collapsed" :size="18" color="#3E8CF2">
+        <ChevronForwardIcon></ChevronForwardIcon>
+      </n-icon>
+    </div>
     <n-divider class="go-mt-0"></n-divider>
-    <n-space justify="space-around">
+    <n-space justify="space-around" :vertical="collapsed">
       <n-tooltip v-if="collapsed" placement="right" trigger="hover">
         <template #trigger>
-          <n-button secondary @click="handleDoc">
+          <n-button class="go-ml-2" secondary @click="handleDoc">
             <template #icon>
               <n-icon size="18">
                 <document-text-icon></document-text-icon>
@@ -28,7 +44,7 @@
 
       <n-tooltip v-if="collapsed" placement="right" trigger="hover">
         <template #trigger>
-          <n-button secondary @click="handleDoc">
+          <n-button class="go-ml-2" secondary @click="handleDoc">
             <template #icon>
               <n-icon size="18">
                 <code-slash-icon></code-slash-icon>
@@ -53,10 +69,10 @@
   </div>
 </template>
 <script setup lang="ts">
-import { openDoc, openGiteeSourceCode } from '@/utils'
+import { openDoc, openGiteeSourceCode, openNewWindow } from '@/utils'
 
 import { icon } from '@/plugins'
-const { DocumentTextIcon, CodeSlashIcon } = icon.ionicons5
+const { DocumentTextIcon, CodeSlashIcon, ChevronForwardIcon } = icon.ionicons5
 
 const props = defineProps({
   collapsed: Boolean
@@ -65,13 +81,92 @@ const props = defineProps({
 const handleDoc = () => {
   openDoc()
 }
+
 const handleCode = () => {
   openGiteeSourceCode()
 }
+
+const clickHandle = () => {
+  openNewWindow('https://ai.goviewlink.com/saas/')
+}
 </script>
 
 <style lang="scss" scoped>
 @include go('aside-footer') {
   padding-bottom: 20px;
+  .pointer-invest-btn {
+    position: relative;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    margin: 10px;
+    padding: 7px;
+    cursor: pointer;
+    background-color: #f1f1f1;
+    border: 1px solid #e2e2ef;
+    border-radius: 6px;
+    overflow: hidden;
+    .btn-left {
+      display: flex;
+      align-items: center;
+      img.main-img {
+        width: 32px;
+        border-radius: 4px;
+        overflow: hidden;
+      }
+      .btn-left-title {
+        margin-left: 6px;
+        row-gap: 4px;
+        display: flex;
+        flex-direction: column;
+        .title-top,
+        .title-bottom {
+          font-size: 12px;
+          line-height: 15px;
+          font-weight: 400;
+        }
+        .title-top {
+          color: #444444;
+        }
+        .title-bottom {
+          color: #5e5e5e;
+        }
+      }
+    }
+    &.collapsed {
+      padding: 3px;
+      .btn-left {
+      }
+    }
+    &::after {
+      content: '';
+      position: absolute;
+      width: 140px;
+      height: 26px;
+      bottom: 14px;
+      top: 0;
+      left: -100px;
+      background: linear-gradient(120deg, hsla(0, 0%, 100%, 0.05) 10%, hsla(0, 0%, 100%, 0.1) 126%);
+      transform: rotate(-45deg);
+      animation: blink-quick-3bcb41e9 3s ease-in 0s infinite;
+    }
+  }
+}
+
+@include dark() {
+  @include go('aside-footer') {
+    .pointer-invest-btn {
+      background-color: #2a2a2e;
+      border: 1px solid #3e3f43;
+      .btn-left-title {
+        .title-top {
+          color: #c1c1c2;
+        }
+        .title-bottom {
+          color: #959698;
+        }
+      }
+    }
+  }
 }
 </style>

src/views/project/templateMarket/index.vue

@@ -4,7 +4,7 @@
       <n-space vertical>
         <img src="https://goviewpro.goviewlink.com/charts-img-db/charts-img-db_id_5pimyysnnh8000.png" style="width: 100%" />
         <img src="https://goviewpro.goviewlink.com/charts-img-db/charts-img-db_id_izetnl0654w00.png" style="height: 400px" />
-        <n-button text tag="a" href="https://ai.goviewlink.com/saas/" target="_blank" type="primary">
+        <n-button text tag="a" href="https://ai.goviewlink.com/saas/?channel=mayun" target="_blank" type="primary">
           前往 GoViewPro 查看 👆
         </n-button>
       </n-space>