From 822de40487ba1fe3a6c16c7022426cde85c8cab9 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Tue, 29 Nov 2022 10:33:53 +0800
Subject: [PATCH] =?UTF-8?q?refactor(=E5=BA=94=E7=94=A8):=20=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E5=BA=94=E7=94=A8=E6=97=A5=E5=BF=97=E5=8B=BE=E9=80=89?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E7=9B=B8=E5=85=B3=E8=B5=84=E6=BA=90=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E6=B8=85=E7=90=86=E6=8E=89=E6=B5=8F=E8=A7=88=E5=99=A8?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3=E8=B5=84=E6=BA=90=E7=9A=84=E7=BC=93=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/panel/PanelGroupService.java      |  4 +-
 .../panel/appTemplateMarket/log/index.vue     | 48 +++++++++++--------
 2 files changed, 31 insertions(+), 21 deletions(-)

diff --git a/backend/src/main/java/io/dataease/service/panel/PanelGroupService.java b/backend/src/main/java/io/dataease/service/panel/PanelGroupService.java
index 225e37213d..35d2293ad3 100644
--- a/backend/src/main/java/io/dataease/service/panel/PanelGroupService.java
+++ b/backend/src/main/java/io/dataease/service/panel/PanelGroupService.java
@@ -314,7 +314,9 @@ public class PanelGroupService {
             panelGroup.setPanelStyle(sourcePanel.getPanelStyle());
             panelGroup.setSourcePanelName(sourcePanel.getName());
         }
-        panelGroup.setWatermarkInfo(panelWatermarkMapper.selectByPrimaryKey("system_default"));
+        if (panelGroup != null) {
+            panelGroup.setWatermarkInfo(panelWatermarkMapper.selectByPrimaryKey("system_default"));
+        }
         return panelGroup;
     }
 
diff --git a/frontend/src/views/panel/appTemplateMarket/log/index.vue b/frontend/src/views/panel/appTemplateMarket/log/index.vue
index 543045c5ea..307ca921e1 100644
--- a/frontend/src/views/panel/appTemplateMarket/log/index.vue
+++ b/frontend/src/views/panel/appTemplateMarket/log/index.vue
@@ -2,6 +2,7 @@
   <el-row
     style="text-align: left"
     class="de-search-table"
+    v-loading="$store.getters.loadingMap[$store.getters.currentPath]"
   >
     <el-row class="top-operate">
       <el-col :span="12">
@@ -35,8 +36,8 @@
           icon="iconfont icon-icon-filter"
           @click="filterShow"
         >{{
-           $t('user.filter')
-         }}
+            $t('user.filter')
+          }}
           <template v-if="filterTexts.length">
             ({{ cacheCondition.length }})
           </template>
@@ -49,7 +50,7 @@
     >
       <span class="sum">{{ paginationConfig.total }}</span>
       <span class="title">{{ $t('user.result_one') }}</span>
-      <el-divider direction="vertical" />
+      <el-divider direction="vertical"/>
       <i
         v-if="showScroll"
         class="el-icon-arrow-left arrow-filter"
@@ -62,9 +63,9 @@
           class="text"
         >
           {{ ele }} <i
-            class="el-icon-close"
-            @click="clearOneFilter(index)"
-          />
+          class="el-icon-close"
+          @click="clearOneFilter(index)"
+        />
         </p>
       </div>
       <i
@@ -87,7 +88,6 @@
     >
       <grid-table
         :ref="'grid-table'"
-        v-loading="$store.getters.loadingMap[$store.getters.currentPath]"
         :table-data="data"
         :columns="[]"
         :pagination="paginationConfig"
@@ -101,12 +101,7 @@
           :label="$t('app_template.datasource')"
         >
           <template #default="{ row }">
-            <span
-              v-if="row.datasourceId && hasDataPermission('use',row.datasourcePrivileges)"
-              class="link-span"
-              @click="goToDatasource(row)"
-            >{{ row.datasourceName }}</span>
-            <span v-else>{{ row.datasourceName }}</span>
+            <span>{{ row.datasourceName }}</span>
           </template>
         </el-table-column>
         <el-table-column
@@ -189,6 +184,7 @@
       :visible.sync="deleteConfirmDialog"
       :show-close="true"
       width="420px"
+      v-loading="$store.getters.loadingMap[$store.getters.currentPath]"
     >
       <el-row>
         <el-checkbox
@@ -217,10 +213,7 @@ import GridTable from '@/components/gridTable/index.vue'
 import filterUser from './FilterUser'
 import _ from 'lodash'
 import keyEnter from '@/components/msgCfm/keyEnter.js'
-import {
-  addOrder,
-  formatOrders
-} from '@/utils/index'
+import { addOrder, formatOrders } from '@/utils/index'
 import { deleteLogAndResource, logGrid } from '@/api/appTemplateMarket/log'
 import { findOneWithParent } from '@/api/panel/panel'
 import AppTemplateApply from '@/views/panel/appTemplate/component/AppTemplateApply'
@@ -288,9 +281,24 @@ export default {
       this.deleteConfirmDialog = false
     },
     confirmDel() {
-      deleteLogAndResource(this.deleteItemInfo).then(() => {
-        this.closeDel()
-        this.search()
+      const _this = this
+      deleteLogAndResource(_this.deleteItemInfo).then(() => {
+        if (_this.deleteItemInfo.deleteResource) {
+          _this.clearLocalStorage()
+        }
+        _this.closeDel()
+        _this.search()
+      })
+    },
+    clearLocalStorage() {
+      const clearParams = [
+        'panel-main-tree',
+        'panel-default-tree',
+        'chart-tree',
+        'dataset-tree'
+      ]
+      clearParams.forEach(item => {
+        localStorage.removeItem(item)
       })
     },
     closeDraw() {