From a8dbe2e29702a763570910d73499910a39c2a8b1 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Fri, 11 Nov 2022 17:02:52 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E8=BF=87=E6=BB=A4=E5=99=A8):=20=E4=B8=8B?=
 =?UTF-8?q?=E6=8B=89=E8=BF=87=E6=BB=A4=E5=99=A8=E8=87=AA=E5=AE=9A=E4=B9=89?=
 =?UTF-8?q?=E6=8E=92=E5=BA=8F(=E7=AD=89=E5=BE=85=E8=AE=BE=E8=AE=A1?=
 =?UTF-8?q?=E8=AF=B7=E5=8B=BFmerge)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../serviceImpl/TextSelectServiceImpl.js      |   3 +
 .../panel/filter/filterMain/FilterControl.vue |  84 +++++++++-
 .../filter/filterMain/FilterCustomSort.vue    | 145 ++++++++++++++++++
 3 files changed, 229 insertions(+), 3 deletions(-)
 create mode 100644 frontend/src/views/panel/filter/filterMain/FilterCustomSort.vue

diff --git a/frontend/src/components/widget/serviceImpl/TextSelectServiceImpl.js b/frontend/src/components/widget/serviceImpl/TextSelectServiceImpl.js
index ab8cd690df..4b5b79d85a 100644
--- a/frontend/src/components/widget/serviceImpl/TextSelectServiceImpl.js
+++ b/frontend/src/components/widget/serviceImpl/TextSelectServiceImpl.js
@@ -99,6 +99,9 @@ class TextSelectServiceImpl extends WidgetService {
   isSortWidget() {
     return true
   }
+  isCustomSortWidget() {
+    return true
+  }
 
   fillValueDerfault(element) {
     const defaultV = element.options.value === null ? '' : element.options.value.toString()
diff --git a/frontend/src/views/panel/filter/filterMain/FilterControl.vue b/frontend/src/views/panel/filter/filterMain/FilterControl.vue
index 4067341c30..de293a262b 100644
--- a/frontend/src/views/panel/filter/filterMain/FilterControl.vue
+++ b/frontend/src/views/panel/filter/filterMain/FilterControl.vue
@@ -51,6 +51,52 @@
           </el-popover>
         </span>
 
+        <span
+          v-if="widget.isCustomSortWidget && widget.isCustomSortWidget()"
+          style="padding-left: 10px;"
+        >
+          <el-checkbox
+            v-model="enableCustomSort"
+            @change="enableCustomSortChange"
+          >
+            <span>{{ $t('chart.sort') }}</span>
+          </el-checkbox>
+
+          <el-popover
+            v-model="customSortPopovervisible"
+            placement="bottom-end"
+            :disabled="!enableCustomSort"
+            width="180"
+          >
+            <div style="width: 100%;overflow-y: auto;overflow-x: hidden;word-break: break-all;position: relative;">
+              <filter-custom-sort
+                :field-id="fieldIds"
+                @on-filter-sort-change="customSortChange"
+              />
+              <div
+                slot="footer"
+                class="dialog-footer filter-custom-sort-footer"
+              >
+                <el-button
+                  size="mini"
+                  @click="cancelCustomSort"
+                >{{ $t('chart.cancel') }}</el-button>
+                <el-button
+                  type="primary"
+                  size="mini"
+                  @click="saveCustomSort"
+                >{{ $t('chart.confirm') }}</el-button>
+              </div>
+            </div>
+
+            <i
+              slot="reference"
+              :class="{'i-filter-active': enableCustomSort, 'i-filter-inactive': !enableCustomSort}"
+              class="el-icon-sort i-filter"
+            />
+          </el-popover>
+        </span>
+
       </div>
     </el-col>
 
@@ -197,9 +243,10 @@
 </template>
 
 <script>
-
+import FilterCustomSort from './FilterCustomSort'
 export default {
   name: 'FilterControl',
+  components: { FilterCustomSort },
   props: {
     widget: {
       type: Object,
@@ -232,10 +279,16 @@ export default {
         { id: 'HH', name: 'HH' },
         { id: 'HH:mm', name: 'HH:mm' },
         { id: 'HH:mm:ss', name: 'HH:mm:ss' }
-      ]
+      ],
+      enableCustomSort: false,
+      customSortPopovervisible: false
+    }
+  },
+  computed: {
+    fieldIds() {
+      return this.element.options.attrs.fieldId || []
     }
   },
-  computed: {},
   watch: {
     'childViews.datasetParams': {
       handler(newName, oldName) {
@@ -265,6 +318,24 @@ export default {
     }
   },
   methods: {
+    enableCustomSortChange(val) {
+      this.enableCustomSort = val
+      this.element.options.attrs.sort = {
+        sort: 'custom'
+      }
+    },
+    customSortChange(list) {
+
+    },
+    saveCustomSort() {
+
+    },
+    cancelCustomSort() {
+      this.customSortPopovervisible = false
+    },
+    initCustomParam() {
+      this.enableCustomSort = this.element.options.attrs.sort?.sort === 'custom'
+    },
     multipleChange(value) {
       this.fillAttrs2Filter()
     },
@@ -395,4 +466,11 @@ export default {
   text-overflow: ellipsis;
 }
 
+.filter-custom-sort-footer {
+  margin-top: 5px;
+  padding-top: 5px;
+  border-top: solid 1px #eee;
+  text-align: end;
+}
+
 </style>
diff --git a/frontend/src/views/panel/filter/filterMain/FilterCustomSort.vue b/frontend/src/views/panel/filter/filterMain/FilterCustomSort.vue
new file mode 100644
index 0000000000..6f45887a32
--- /dev/null
+++ b/frontend/src/views/panel/filter/filterMain/FilterCustomSort.vue
@@ -0,0 +1,145 @@
+<template>
+  <div>
+    <draggable
+      v-model="sortList"
+      group="drag"
+      animation="300"
+      :move="onMove"
+      class="drag-list"
+      @update="onUpdate"
+    >
+      <transition-group class="draggable-group">
+        <span
+          v-for="(item) in sortList"
+          :key="item"
+          class="item-dimension"
+          :title="item"
+        >
+          <svg-icon
+            icon-class="drag"
+            class="item-icon"
+          />
+          <span class="item-span">
+            {{ item }}
+          </span>
+        </span>
+      </transition-group>
+    </draggable>
+  </div>
+</template>
+
+<script>
+import { linkMultFieldValues, multFieldValues } from '@/api/dataset/dataset'
+import { getLinkToken, getToken } from '@/utils/auth'
+export default {
+  name: 'FilterCustomSort',
+  props: {
+
+    fieldId: {
+      type: String,
+      required: true
+    }
+  },
+  data() {
+    return {
+      sortList: []
+    }
+  },
+  computed: {
+    panelInfo() {
+      return this.$store.state.panel.panelInfo
+    }
+  },
+  watch: {
+    fieldId() {
+      this.init()
+    }
+  },
+  mounted() {
+    this.init()
+  },
+  methods: {
+    init() {
+      let method = multFieldValues
+      const token = this.$store.getters.token || getToken()
+      const linkToken = this.$store.getters.linkToken || getLinkToken()
+      if (!token && linkToken) {
+        method = linkMultFieldValues
+      }
+      const param = { fieldIds: this.fieldId.split(',') }
+      if (this.panelInfo.proxy) {
+        param.userId = this.panelInfo.proxy
+      }
+
+      method(param).then(res => {
+        this.sortList = this.optionData(res.data)
+      })
+    },
+    optionData(data) {
+      if (!data) return null
+      return data.filter(item => !!item)
+    },
+    onMove() {
+    },
+    onUpdate() {
+      this.$emit('on-filter-sort-change', this.sortList)
+    }
+  }
+}
+</script>
+
+<style scoped>
+.drag-list {
+  overflow: auto;
+  height: 30vh;
+}
+
+.item-dimension {
+  padding: 2px;
+  margin: 2px;
+  border: solid 1px #eee;
+  text-align: left;
+  color: #606266;
+  /*background-color: rgba(35,46,64,.05);*/
+  background-color: white;
+  display: flex;
+  align-items: center;
+}
+
+.item-icon{
+  cursor: move;
+  margin: 0 2px;
+}
+
+.item-span{
+  display: inline-block;
+  width: 100%;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+}
+
+.blackTheme .item-dimension {
+  border: solid 1px;
+  border-color: var(--TableBorderColor);
+  color: var(--TextPrimary);
+  background-color: var(--MainBG);
+}
+
+.item-dimension + .item-dimension {
+  margin-top: 6px;
+}
+
+.item-dimension:hover {
+  color: #1890ff;
+  background: #e8f4ff;
+  border-color: #a3d3ff;
+  cursor: pointer;
+}
+
+.blackTheme .item-dimension:hover {
+  color: var(--Main);
+  background: var(--ContentBG);
+  cursor: pointer;
+}
+</style>