From 0700ca7c691d6f90beacc6f50306e70c7c386a44 Mon Sep 17 00:00:00 2001
From: dataeaseShu <106045316+dataeaseShu@users.noreply.github.com>
Date: Thu, 15 Dec 2022 15:09:30 +0800
Subject: [PATCH 1/2] =?UTF-8?q?feat:=20=E4=BB=AA=E8=A1=A8=E6=9D=BF?=
 =?UTF-8?q?=E9=A2=84=E8=A7=88=E6=B7=BB=E5=8A=A0=E5=88=9B=E5=BB=BA=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/components/deDrag/index.vue      | 24 ++++--
 frontend/src/views/panel/edit/index.vue       | 18 ++---
 .../src/views/panel/list/PanelViewShow.vue    | 76 +++++++++++++------
 .../views/system/datasource/DsFormContent.vue |  8 +-
 .../src/views/system/datasource/DsTree.vue    |  4 +-
 5 files changed, 87 insertions(+), 43 deletions(-)

diff --git a/frontend/src/components/deDrag/index.vue b/frontend/src/components/deDrag/index.vue
index 44cd7a11b2..18d983d94d 100644
--- a/frontend/src/components/deDrag/index.vue
+++ b/frontend/src/components/deDrag/index.vue
@@ -66,24 +66,36 @@
         @mousedown.stop.prevent="handleDown(handlei, $event)"
         @touchstart.stop.prevent="handleTouchDown(handlei, $event)"
       >
-        <slot :name="handlei"/>
+        <slot :name="handlei" />
       </div>
       <div
         :id="componentCanvasId"
         :style="mainSlotStyleInner"
         class="main-background"
       >
-        <div @mousedown="elementMouseDown" class="de-drag-area de-drag-top"></div>
-        <div @mousedown="elementMouseDown" class="de-drag-area de-drag-right"></div>
-        <div @mousedown="elementMouseDown" class="de-drag-area de-drag-bottom"></div>
-        <div @mousedown="elementMouseDown" class="de-drag-area de-drag-left"></div>
+        <div
+          class="de-drag-area de-drag-top"
+          @mousedown="elementMouseDown"
+        />
+        <div
+          class="de-drag-area de-drag-right"
+          @mousedown="elementMouseDown"
+        />
+        <div
+          class="de-drag-area de-drag-bottom"
+          @mousedown="elementMouseDown"
+        />
+        <div
+          class="de-drag-area de-drag-left"
+          @mousedown="elementMouseDown"
+        />
         <svg-icon
           v-if="svgInnerEnable"
           :style="{'color':element.commonBackground.innerImageColor}"
           class="svg-background"
           :icon-class="mainSlotSvgInner"
         />
-        <slot/>
+        <slot />
       </div>
     </div>
   </div>
diff --git a/frontend/src/views/panel/edit/index.vue b/frontend/src/views/panel/edit/index.vue
index bfb9fa9dcb..2714259e1c 100644
--- a/frontend/src/views/panel/edit/index.vue
+++ b/frontend/src/views/panel/edit/index.vue
@@ -165,12 +165,12 @@
               v-show=" show &&showIndex===1"
               :canvas-id="canvasId"
             />
-            <subject-setting v-show=" show &&showIndex===2"/>
-            <assist-component v-show=" show &&showIndex===3"/>
+            <subject-setting v-show=" show &&showIndex===2" />
+            <assist-component v-show=" show &&showIndex===3" />
           </div>
         </el-drawer>
         <!--PC端画布区域-->
-        <canvas-opt-bar v-if="!previewVisible&&!mobileLayoutStatus"/>
+        <canvas-opt-bar v-if="!previewVisible&&!mobileLayoutStatus" />
         <de-canvas
           v-if="!previewVisible&&!mobileLayoutStatus"
           ref="canvasMainRef"
@@ -196,7 +196,7 @@
               :style="customCanvasMobileStyle"
               class="this_mobile_canvas"
             >
-              <el-row class="this_mobile_canvas_top"/>
+              <el-row class="this_mobile_canvas_top" />
               <el-row class="this_mobile_canvas_inner_top">
                 {{ panelInfo.name }}
               </el-row>
@@ -205,7 +205,7 @@
                 class="this_mobile_canvas_main"
                 :style="mobileCanvasStyle"
               >
-                <canvas-opt-bar v-if="!previewVisible&&mobileLayoutStatus"/>
+                <canvas-opt-bar v-if="!previewVisible&&mobileLayoutStatus" />
                 <de-canvas
                   v-if="!previewVisible&&mobileLayoutStatus"
                   ref="canvasMainRef"
@@ -243,14 +243,14 @@
                   />
                 </el-col>
               </el-row>
-              <el-row class="this_mobile_canvas_bottom"/>
+              <el-row class="this_mobile_canvas_bottom" />
             </div>
           </el-col>
           <el-col
             :span="16"
             class="this_mobile_canvas_cell this_mobile_canvas_wait_cell"
           >
-            <component-wait/>
+            <component-wait />
           </el-col>
         </el-row>
       </de-main-container>
@@ -268,7 +268,7 @@
           />
         </div>
         <div v-if="showBatchViewToolsAside">
-          <chart-style-batch-set/>
+          <chart-style-batch-set />
         </div>
         <div v-if="!showViewToolsAside&&!showBatchViewToolsAside">
           <el-row style="height: 40px">
@@ -287,7 +287,7 @@
             >{{ $t('panel.position_adjust') }}</span>
           </el-row>
           <el-row>
-            <position-adjust v-if="curComponent&&!curComponent.auxiliaryMatrix"/>
+            <position-adjust v-if="curComponent&&!curComponent.auxiliaryMatrix" />
             <div
               v-else
               class="view-selected-message-class"
diff --git a/frontend/src/views/panel/list/PanelViewShow.vue b/frontend/src/views/panel/list/PanelViewShow.vue
index e189d3cb5a..ee08f313f2 100644
--- a/frontend/src/views/panel/list/PanelViewShow.vue
+++ b/frontend/src/views/panel/list/PanelViewShow.vue
@@ -17,7 +17,7 @@
         style="border-bottom: 1px solid;border-bottom-color:#E6E6E6;"
       >
         <div style="height: 100%;">
-          <share-head/>
+          <share-head />
         </div>
       </el-row>
       <el-row
@@ -31,7 +31,7 @@
             :span="12"
             style="text-overflow:ellipsis;overflow: hidden;white-space: nowrap;font-size: 14px"
           >
-            <span>{{ panelInfo.name || '测试仪表板' }}</span>
+            <span class="panel-name">{{ panelInfo.name || '测试仪表板' }}</span>
             <span
               v-if="panelInfo.isDefault"
               style="color: green;font-size: 12px"
@@ -40,15 +40,46 @@
               v-if="panelInfo.sourcePanelName"
               style="color: green;font-size: 12px"
             >&nbsp;({{ $t('panel.source_panel_name') }}:{{ panelInfo.sourcePanelName }})</span>
+            <span
+              v-if="!hasStar && panelInfo && showType !== 1&&panelInfo.status==='publish'"
+              style="margin-left: 9px"
+            >
+              <el-tooltip :content="$t('panel.store')">
+                <i
+                  class="el-icon-star-off"
+                  @click="star"
+                />
+              </el-tooltip>
+            </span>
+            <span
+              v-if="hasStar && panelInfo && showType !== 1&&panelInfo.status==='publish'"
+              style="margin-left: 9px"
+            >
+              <el-tooltip :content="$t('commons.cancel') + $t('panel.store')">
+                <i
+                  class="el-icon-star-on"
+                  @click="unstar"
+                />
+              </el-tooltip>
+            </span>
+            <template v-if="panelInfo.creatorName">
+              <el-divider
+                style="margin: 0 16px;"
+                direction="vertical"
+              />
+              <span class="panel-create">
+                {{ $t('panel.create_by') + ':' + panelInfo.creatorName }}
+              </span>
+            </template>
             <el-popover
               placement="right-start"
               width="400"
               trigger="click"
             >
-              <panel-detail-info/>
+              <panel-detail-info />
               <i
                 slot="reference"
-                class="el-icon-warning icon-class"
+                class="el-icon-warning-outline icon-class"
                 style="margin-left: 4px;cursor: pointer;font-size: 14px;"
               />
             </el-popover>
@@ -119,22 +150,6 @@
                     {{ $t('panel.new_tab_preview') }}
                   </el-dropdown-item>
 
-                  <el-dropdown-item
-                    v-if="!hasStar && panelInfo && showType !== 1&&panelInfo.status==='publish'"
-                    icon="el-icon-star-off"
-                    @click.native="star"
-                  >
-                    {{ $t('panel.store') }}
-                  </el-dropdown-item>
-
-                  <el-dropdown-item
-                    v-if="hasStar && panelInfo && showType !== 1&&panelInfo.status==='publish'"
-                    icon="el-icon-star-on"
-                    @click.native="unstar"
-                  >
-                    {{ $t('commons.cancel') + $t('panel.store') }}
-                  </el-dropdown-item>
-
                   <el-dropdown-item
                     v-if="hasStar && panelInfo && showType !== 1&&panelInfo.status==='publish'"
                     icon="el-icon-refresh"
@@ -374,9 +389,9 @@ import GrantAuth from '../grantAuth'
 import msgCfm from '@/components/msgCfm/index'
 
 export default {
-  mixins: [msgCfm],
   name: 'PanelViewShow',
   components: { AppExportForm, PanelDetailInfo, Preview, SaveToTemplate, PDFPreExport, ShareHead, GrantAuth },
+  mixins: [msgCfm],
   props: {
     activeTab: {
       type: String,
@@ -767,7 +782,7 @@ export default {
 }
 </script>
 
-<style>
+<style lang="less">
 .view-list {
   height: 100%;
   width: 20%;
@@ -801,6 +816,23 @@ export default {
   background-color: var(--SiderBG, white);
   padding: 0 10px;
   line-height: 40px;
+
+  .panel-name {
+    font-family: PingFang SC;
+    font-size: 16px;
+    font-weight: 500;
+    line-height: 24px;
+    color: var(--deTextPrimary, #1F2329);
+
+  }
+
+  .panel-create {
+    font-family: PingFang SC;
+    font-size: 14px;
+    font-weight: 400;
+    line-height: 22px;
+    color: var(--deTextSecondary, #646A73);
+  }
 }
 
 .panel-share-head {
diff --git a/frontend/src/views/system/datasource/DsFormContent.vue b/frontend/src/views/system/datasource/DsFormContent.vue
index 1c61d82349..1ecf59ff10 100644
--- a/frontend/src/views/system/datasource/DsFormContent.vue
+++ b/frontend/src/views/system/datasource/DsFormContent.vue
@@ -708,10 +708,10 @@ export default {
     getDatasourceDetail(id, showModel) {
       this.$emit('update:formLoading', true)
       return getDatasourceDetail(id).then((res) => {
-        if(res.data.configuration){
+        if (res.data.configuration) {
           res.data.configuration = Base64.decode(res.data.configuration)
         }
-        if(res.data.apiConfigurationStr){
+        if (res.data.apiConfigurationStr) {
           res.data.apiConfiguration = JSON.parse(Base64.decode(res.data.apiConfigurationStr))
         }
         this.params = { ...res.data, showModel }
@@ -733,10 +733,10 @@ export default {
       const newArr = []
       for (let index = 0; index < array.length; index++) {
         const element = array[index]
-        if(element.configuration){
+        if (element.configuration) {
           element.configuration = Base64.decode(element.configuration)
         }
-        if(element.apiConfigurationStr){
+        if (element.apiConfigurationStr) {
           element.apiConfiguration = Base64.decode(element.apiConfigurationStr)
         }
         if (this.msgNodeId) {
diff --git a/frontend/src/views/system/datasource/DsTree.vue b/frontend/src/views/system/datasource/DsTree.vue
index de2a068049..a115725a0e 100644
--- a/frontend/src/views/system/datasource/DsTree.vue
+++ b/frontend/src/views/system/datasource/DsTree.vue
@@ -538,10 +538,10 @@ export default {
       const newArr = []
       for (let index = 0; index < array.length; index++) {
         const element = array[index]
-        if(element.configuration){
+        if (element.configuration) {
           element.configuration = Base64.decode(element.configuration)
         }
-        if(element.apiConfigurationStr){
+        if (element.apiConfigurationStr) {
           element.apiConfiguration = JSON.parse(Base64.decode(element.apiConfigurationStr))
         }
         if (this.msgNodeId) {

From 6429f903675a91757ac8c3487befa981f06fde48 Mon Sep 17 00:00:00 2001
From: dataeaseShu <106045316+dataeaseShu@users.noreply.github.com>
Date: Thu, 15 Dec 2022 15:33:16 +0800
Subject: [PATCH 2/2] =?UTF-8?q?feat:=20=E4=BD=BF=E7=94=A8simple=E6=A8=A1?=
 =?UTF-8?q?=E5=BC=8F=E5=AE=89=E8=A3=85=E5=90=8E=EF=BC=8C=E5=9C=A8=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E9=9B=86=E5=88=9B=E5=BB=BA=E7=95=8C=E9=9D=A2=E5=8E=BB?=
 =?UTF-8?q?=E6=8E=89=E5=AE=9A=E6=97=B6=E5=90=8C=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/views/dataset/add/AddDB.vue  | 1 +
 frontend/src/views/dataset/add/AddSQL.vue | 1 +
 2 files changed, 2 insertions(+)

diff --git a/frontend/src/views/dataset/add/AddDB.vue b/frontend/src/views/dataset/add/AddDB.vue
index 07b73ccf18..92ca2c14a1 100644
--- a/frontend/src/views/dataset/add/AddDB.vue
+++ b/frontend/src/views/dataset/add/AddDB.vue
@@ -129,6 +129,7 @@
           <el-option
             :label="$t('dataset.sync_data')"
             value="1"
+            v-if="engineMode !== 'simple'"
             :disabled="disabledSync"
           />
         </el-select>
diff --git a/frontend/src/views/dataset/add/AddSQL.vue b/frontend/src/views/dataset/add/AddSQL.vue
index abab83dd20..27146e2883 100644
--- a/frontend/src/views/dataset/add/AddSQL.vue
+++ b/frontend/src/views/dataset/add/AddSQL.vue
@@ -50,6 +50,7 @@
           >
             <el-option
               :label="$t('dataset.sync_now')"
+              v-if="engineMode !== 'simple'"
               value="sync_now"
               :disabled="engineMode === 'simple'"
             />