From 2034078e45eda082fb982852adf7e666fd6113ad Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Mon, 23 Sep 2024 10:38:44 +0800
Subject: [PATCH 1/3] =?UTF-8?q?feat(=E5=B5=8C=E5=85=A5=E5=BC=8F):=20?=
 =?UTF-8?q?=E5=9B=BE=E8=A1=A8=E3=80=81=E4=BB=AA=E8=A1=A8=E6=9D=BF=E3=80=81?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=A4=A7=E5=B1=8F=E5=B0=86=E8=B5=84=E6=BA=90?=
 =?UTF-8?q?id=E6=94=BE=E5=87=BA=E6=9D=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/chart/components/editor/index.vue   | 31 ++++++++++++++-----
 .../src/views/common/DvDetailInfo.vue         |  2 ++
 .../views/data-visualization/PreviewHead.vue  |  2 +-
 3 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/core/core-frontend/src/views/chart/components/editor/index.vue b/core/core-frontend/src/views/chart/components/editor/index.vue
index a2ccde6641..93beb437c6 100644
--- a/core/core-frontend/src/views/chart/components/editor/index.vue
+++ b/core/core-frontend/src/views/chart/components/editor/index.vue
@@ -1,4 +1,5 @@
 <script lang="ts" setup>
+import dvInfoSvg from '@/assets/svg/dv-info.svg'
 import icon_down_outlined1 from '@/assets/svg/icon_down_outlined-1.svg'
 import icon_deleteTrash_outlined from '@/assets/svg/icon_delete-trash_outlined.svg'
 import icon_info_outlined from '@/assets/svg/icon_info_outlined.svg'
@@ -1752,13 +1753,28 @@ const deleteChartFieldItem = id => {
         </div>
         <div v-if="!canvasCollapse.chartAreaCollapse" style="width: 240px" class="view-panel-row">
           <el-row class="editor-title">
-            <span
-              id="component-name"
-              class="name-area"
-              :class="{ 'component-name-dark': themes === 'dark' }"
-              @dblclick="editComponentName"
-              >{{ view.title }}</span
-            >
+            <div style="display: flex; align-items: center; width: calc(100% - 24px)">
+              <div
+                id="component-name"
+                class="name-area"
+                style="max-width: 180px; text-overflow: ellipsis; white-space: nowrap"
+                :style="{ width: componentNameEdit ? '300px' : 'auto' }"
+                :class="{ 'component-name-dark': themes === 'dark' }"
+                @dblclick="editComponentName"
+              >
+                {{ view.title }}
+              </div>
+              <el-popover show-arrow :offset="8" placement="bottom" width="200" trigger="click">
+                <template #reference>
+                  <el-icon
+                    v-show="route.path !== '/dvCanvas'"
+                    style="margin-left: 4px; cursor: pointer"
+                    ><Icon><dvInfoSvg class="svg-icon" /></Icon
+                  ></el-icon>
+                </template>
+                {{ view.id }}
+              </el-popover>
+            </div>
           </el-row>
 
           <el-row style="height: calc(100vh - 110px); overflow-y: auto">
@@ -4784,7 +4800,6 @@ span {
   line-height: 24px;
   height: 24px;
   font-size: 14px !important;
-  width: 300px;
   overflow: hidden;
   cursor: pointer;
   input {
diff --git a/core/core-frontend/src/views/common/DvDetailInfo.vue b/core/core-frontend/src/views/common/DvDetailInfo.vue
index f6319c69f6..71e4f667c2 100644
--- a/core/core-frontend/src/views/common/DvDetailInfo.vue
+++ b/core/core-frontend/src/views/common/DvDetailInfo.vue
@@ -1,5 +1,7 @@
 <template>
   <div class="info-card">
+    <div v-if="dvInfo.type === 'dashboard'" class="info-title">仪表板ID</div>
+    <div v-if="dvInfo.type === 'dashboard'" class="info-content">{{ dvInfo.id }}</div>
     <div v-if="dvInfo.creatorName" class="info-title">{{ t('visualization.create_by') }}</div>
     <div v-if="dvInfo.creatorName" class="info-content">{{ dvInfo.creatorName }}</div>
     <div class="info-title">{{ t('visualization.create_time') }}</div>
diff --git a/core/core-frontend/src/views/data-visualization/PreviewHead.vue b/core/core-frontend/src/views/data-visualization/PreviewHead.vue
index bd650d5748..d596ce58c9 100644
--- a/core/core-frontend/src/views/data-visualization/PreviewHead.vue
+++ b/core/core-frontend/src/views/data-visualization/PreviewHead.vue
@@ -169,7 +169,7 @@ const initOpenHandler = newWindow => {
           <el-dropdown-menu style="width: 130px">
             <el-dropdown-item icon="Refresh" @click="reload()">刷新数据 </el-dropdown-item>
             <el-dropdown
-              style="width: 100%"
+              style="width: 100%; overflow: hidden"
               trigger="hover"
               placement="left-start"
               v-if="dvInfo.weight > 3"

From 93e8d47afa0c282b35edd793d071fe74623d84f7 Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Mon, 23 Sep 2024 11:21:17 +0800
Subject: [PATCH 2/3] =?UTF-8?q?feat(=E6=9F=A5=E8=AF=A2=E7=BB=84=E4=BB=B6):?=
 =?UTF-8?q?=20=E6=9F=A5=E8=AF=A2=E7=BB=84=E4=BB=B6=E5=9C=A8=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0=E6=98=AF=E5=B9=B4=E6=9C=88=E6=97=A5=E7=9A=84=E6=83=85?=
 =?UTF-8?q?=E5=86=B5=E4=B8=8B=EF=BC=8C=E6=97=B6=E9=97=B4=E7=B2=92=E5=BA=A6?=
 =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E9=80=89=E6=8B=A9=E5=B9=B4=E6=9C=88=E6=88=96?=
 =?UTF-8?q?=E8=80=85=E5=B9=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../v-query/QueryConditionConfiguration.vue           | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue b/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue
index 5374899e90..051d81047b 100644
--- a/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue
+++ b/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue
@@ -415,7 +415,16 @@ const timeParameterList = computed(() => {
   const [year, y] = curComponent.value.parameters?.filter(
     ele => ele.deType === 1 && !!ele.variableName
   )[0].type
-  return timeList.filter(ele => ele.value === (typeTimeMap[y] || typeTimeMap[year]))
+  let stopPush = false
+  return timeList.reduce((pre, ele) => {
+    if (ele.value === (typeTimeMap[y] || typeTimeMap[year])) {
+      stopPush = true
+      pre.push(ele)
+    } else if (!stopPush) {
+      pre.push(ele)
+    }
+    return pre
+  }, [])
 })
 
 const cancelClick = () => {

From 50386ab3899d055a1c5d78f7757f7614a3854eaa Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Mon, 23 Sep 2024 14:02:56 +0800
Subject: [PATCH 3/3] =?UTF-8?q?feat(=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6):?=
 =?UTF-8?q?=20=E6=96=B0=E5=A2=9E=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?=
 =?UTF-8?q?=E6=97=B6=EF=BC=8C=E8=87=AA=E5=8A=A8=E5=AE=9A=E4=BD=8D=E5=88=B0?=
 =?UTF-8?q?=E8=AF=A5=E6=96=B0=E5=A2=9E=E6=9D=A1=E4=BB=B6=EF=BC=8C=E5=B9=B6?=
 =?UTF-8?q?=E5=A4=84=E4=BA=8E=E9=80=89=E4=B8=AD=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../v-query/QueryConditionConfiguration.vue                | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue b/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue
index 051d81047b..efcdd0bf0d 100644
--- a/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue
+++ b/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue
@@ -1440,6 +1440,11 @@ const addQueryCriteria = () => {
   conditions.value.push(addQueryCriteriaConfig())
 }
 
+const addQueryCriteriaAndSelect = () => {
+  addQueryCriteria()
+  handleCondition(conditions.value[conditions.value.length - 1])
+}
+
 const addCriteriaConfig = () => {
   addQueryCriteria()
   return conditions.value[conditions.value.length - 1].id
@@ -1467,7 +1472,7 @@ defineExpose({
       <div class="query-condition-list">
         <div class="title">
           查询条件
-          <el-icon @click="addQueryCriteria">
+          <el-icon @click="addQueryCriteriaAndSelect">
             <Icon name="icon_add_outlined"><icon_add_outlined class="svg-icon" /></Icon>
           </el-icon>
         </div>