From 70dfafe86c45b4c0e1f11d9e55937fe6b165ab1c Mon Sep 17 00:00:00 2001
From: wisonic-s <shaochuan.wu@fit2cloud.com>
Date: Mon, 15 Apr 2024 18:47:51 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E7=BB=84=E4=BB=B6=E5=A2=9E=E5=8A=A0=E6=8E=92=E5=BA=8F?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../v-query/QueryConditionConfiguration.vue   | 79 ++++++++++++++++++-
 .../src/custom-component/v-query/options.ts   |  4 +
 2 files changed, 79 insertions(+), 4 deletions(-)

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 ceba793d87..fd833d481d 100644
--- a/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue
+++ b/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue
@@ -9,7 +9,7 @@ import { getThisStart, getLastStart, getAround } from './time-format-dayjs'
 import { snapshotStoreWithOut } from '@/store/modules/data-visualization/snapshot'
 import { useI18n } from '@/hooks/web/useI18n'
 import { fieldType } from '@/utils/attr'
-import { ElMessage } from 'element-plus-secondary'
+import { ElMessage, ElSelect } from 'element-plus-secondary'
 import type { DatasetDetail } from '@/api/dataset'
 import { getDsDetailsWithPerm, getSqlParams, listFieldsWithPermissions } from '@/api/dataset'
 import EmptyBackground from '@/components/empty-background/src/EmptyBackground.vue'
@@ -694,7 +694,6 @@ const parameterCompletion = () => {
     arbitraryTimeRange: new Date(),
     setTimeRange: false,
     showEmpty: false,
-    conditionType: 0,
     timeRange: {
       intervalType: 'none',
       dynamicWindow: false,
@@ -744,6 +743,10 @@ const handleCondition = item => {
     valueSource.value.push('')
     valueSource.value.push('')
   }
+  curComponent.value.sortField = curComponent.value.sortField ?? {
+    id: '',
+    sortType: 'asc'
+  }
   parameterCompletion()
   nextTick(() => {
     curComponent.value.showError = showError.value
@@ -1327,7 +1330,7 @@ defineExpose({
                 <div class="value">
                   <el-select
                     @change="handleFieldChange"
-                    placeholder="请选择字段"
+                    placeholder="请选择展示字段"
                     v-model="curComponent.field.id"
                   >
                     <template v-if="curComponent.field.id" #prefix>
@@ -1370,6 +1373,66 @@ defineExpose({
                     </el-option>
                   </el-select>
                 </div>
+                <div class="value">
+                  <el-select
+                    clearable
+                    placeholder="请选择排序字段"
+                    v-model="curComponent.sortField.id"
+                    class="sort-field"
+                    @change="handleFieldChange"
+                  >
+                    <template v-if="curComponent.sortField.id" #prefix>
+                      <el-icon>
+                        <Icon
+                          :name="`field_${
+                            fieldType[
+                              getDetype(curComponent.sortField.id, curComponent.dataset.fields)
+                            ]
+                          }`"
+                          :className="`field-icon-${
+                            fieldType[
+                              getDetype(curComponent.sortField.id, curComponent.dataset.fields)
+                            ]
+                          }`"
+                        ></Icon>
+                      </el-icon>
+                    </template>
+                    <el-option
+                      v-for="ele in curComponent.dataset.fields.filter(
+                        ele =>
+                          ele.deType === +curComponent.displayType ||
+                          ([3, 4].includes(ele.deType) && +curComponent.displayType === 2)
+                      )"
+                      :key="ele.id"
+                      :label="ele.name"
+                      :value="ele.id"
+                      :disabled="ele.desensitized"
+                    >
+                      <div
+                        class="flex-align-center icon"
+                        :title="ele.desensitized ? '脱敏字段，不能被设置为查询条件' : ''"
+                      >
+                        <el-icon>
+                          <Icon
+                            :name="`field_${fieldType[ele.deType]}`"
+                            :className="`field-icon-${fieldType[ele.deType]}`"
+                          ></Icon>
+                        </el-icon>
+                        <span>
+                          {{ ele.name }}
+                        </span>
+                      </div>
+                    </el-option>
+                  </el-select>
+                  <el-select
+                    class="sort-type"
+                    v-model="curComponent.sortField.sortType"
+                    @change="handleFieldChange"
+                  >
+                    <el-option label="升序" value="asc" />
+                    <el-option label="降序" value="desc" />
+                  </el-select>
+                </div>
               </template>
               <div v-if="curComponent.optionValueSource === 2" class="value flex-align-center">
                 <el-popover
@@ -2177,7 +2240,15 @@ defineExpose({
               }
             }
           }
-
+          .value {
+            .sort-field {
+              width: 240px;
+            }
+            .sort-type {
+              width: 73px;
+              margin-left: 8px;
+            }
+          }
           .parameters {
             margin-left: auto;
             margin-top: 8px;
diff --git a/core/core-frontend/src/custom-component/v-query/options.ts b/core/core-frontend/src/custom-component/v-query/options.ts
index 0a89c3afa6..7eaa91af48 100644
--- a/core/core-frontend/src/custom-component/v-query/options.ts
+++ b/core/core-frontend/src/custom-component/v-query/options.ts
@@ -15,6 +15,10 @@ const infoFormat = (obj: ComponentInfo) => {
       name,
       deType
     },
+    sortField: {
+      id: '',
+      sortType: 'asc'
+    },
     timeType: 'fixed',
     relativeToCurrent: 'custom',
     required: false,