From 9d88fdc1e015f441896230db0eb41e685be51bb3 Mon Sep 17 00:00:00 2001
From: huangdeliang <huangdeliang@skieer.com>
Date: Thu, 29 Jul 2021 14:31:01 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8B=96=E5=8A=A8=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 stdiet-ui/package.json                        |   2 +-
 stdiet-ui/src/utils/shortCutUtils.js          |  31 +++--
 .../InfoView/ShortCutCom/index.vue            | 127 +++++++++++++-----
 3 files changed, 116 insertions(+), 44 deletions(-)

diff --git a/stdiet-ui/package.json b/stdiet-ui/package.json
index dc83779d1..ae970217d 100644
--- a/stdiet-ui/package.json
+++ b/stdiet-ui/package.json
@@ -64,7 +64,7 @@
     "path-to-regexp": "2.4.0",
     "quill": "1.3.7",
     "screenfull": "4.2.0",
-    "sortablejs": "1.8.4",
+    "sortablejs": "^1.14.0",
     "vue": "2.6.10",
     "vue-count-to": "1.0.13",
     "vue-cropper": "0.4.9",
diff --git a/stdiet-ui/src/utils/shortCutUtils.js b/stdiet-ui/src/utils/shortCutUtils.js
index df49202b9..c45537e34 100644
--- a/stdiet-ui/src/utils/shortCutUtils.js
+++ b/stdiet-ui/src/utils/shortCutUtils.js
@@ -3,15 +3,20 @@ export function getShortCut(key) {
     try {
       const data = JSON.parse(localStorage.getItem("shortCut") || "[]");
       //关键字检索
-      if(key != undefined && key != null && key != ""){
-          const resultData = [];
-          data.forEach((item,index) => {
-              if(item.name.indexOf(key) != -1 || (item.className != undefined && item.className != null && item.className.indexOf(key) != -1)){
-                resultData.push(item);
-              }
-          });
-          res(resultData);
-      }else{
+      if (key != undefined && key != null && key != "") {
+        const resultData = [];
+        data.forEach((item, index) => {
+          if (
+            item.name.indexOf(key) != -1 ||
+            (item.className != undefined &&
+              item.className != null &&
+              item.className.indexOf(key) != -1)
+          ) {
+            resultData.push(item);
+          }
+        });
+        res(resultData);
+      } else {
         res(data);
       }
     } catch (error) {
@@ -50,7 +55,9 @@ export async function removeMuchShortCut(ids) {
   const shortCutList = await getShortCut();
   return new Promise((res, rej) => {
     try {
-      const newShortCutList = shortCutList.filter(obj => ids.indexOf(obj.id) == -1);
+      const newShortCutList = shortCutList.filter(
+        obj => ids.indexOf(obj.id) == -1
+      );
       localStorage.setItem("shortCut", JSON.stringify(newShortCutList));
       res();
     } catch (error) {
@@ -74,3 +81,7 @@ export async function editShortCut(data) {
     }
   });
 }
+
+export function updateSortCut(data) {
+  localStorage.setItem("shortCut", JSON.stringify(data));
+}
diff --git a/stdiet-ui/src/views/custom/recipesBuild/InfoView/ShortCutCom/index.vue b/stdiet-ui/src/views/custom/recipesBuild/InfoView/ShortCutCom/index.vue
index 1499eff0b..f94ad5c3e 100644
--- a/stdiet-ui/src/views/custom/recipesBuild/InfoView/ShortCutCom/index.vue
+++ b/stdiet-ui/src/views/custom/recipesBuild/InfoView/ShortCutCom/index.vue
@@ -1,7 +1,13 @@
 <template>
   <div class="short_cut_com_wrapper">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="关键词" prop="key" >
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      :inline="true"
+      v-show="showSearch"
+      label-width="68px"
+    >
+      <el-form-item label="关键词" prop="key">
         <el-input
           v-model.trim="queryParams.key"
           placeholder="请输入名称/种类"
@@ -12,23 +18,54 @@
         />
       </el-form-item>
       <el-form-item>
-        <el-button type="cyan" icon="el-icon-search" size="mini" @click="getList">搜索</el-button>
+        <el-button
+          type="cyan"
+          icon="el-icon-search"
+          size="mini"
+          @click="getList"
+          >搜索</el-button
+        >
       </el-form-item>
     </el-form>
-    
-      <div class="header">
-        <el-button icon="el-icon-search" size="mini" @click="showSearch = !showSearch" circle :title="showSearch ? '隐藏搜索' : '显示搜索'"/>
-        <el-button icon="el-icon-refresh" size="mini" @click="getList" circle title="刷新"/>
-        <el-button icon="el-icon-delete" size="mini" circle :title="'清空快捷列表'" @click="handleOnMuchDelete"/>
-      </div>
+
+    <div class="header">
+      <el-button
+        icon="el-icon-search"
+        size="mini"
+        @click="showSearch = !showSearch"
+        circle
+        :title="showSearch ? '隐藏搜索' : '显示搜索'"
+      />
+      <el-button
+        icon="el-icon-refresh"
+        size="mini"
+        @click="getList"
+        circle
+        title="刷新"
+      />
+      <el-button
+        icon="el-icon-delete"
+        size="mini"
+        circle
+        :title="'清空快捷列表'"
+        @click="handleOnMuchDelete"
+      />
+    </div>
     <el-table
       :data="dataList"
       ref="shortCutTable"
+      row-key="id"
       highlight-current-row
+      row-class-name="draggable"
       @current-change="handleOnCurrentChange"
       height="700"
     >
-      <el-table-column prop="name" label="对象" align="center">
+      <el-table-column
+        prop="name"
+        label="对象"
+        align="center"
+        class-name="handle"
+      >
         <template slot-scope="scope">
           <el-popover
             placement="left"
@@ -96,11 +133,7 @@
       </el-table-column>
       <el-table-column label="操作" :width="60" align="center">
         <template slot-scope="scope">
-          <el-button
-            type="text"
-            size="mini"
-            @click="handleOnDelete(scope.row)"
-          >
+          <el-button type="text" size="mini" @click="handleOnDelete(scope.row)">
             删除
           </el-button>
         </template>
@@ -109,18 +142,19 @@
   </div>
 </template>
 <script>
+import Sortable from "sortablejs";
 import {
   getShortCut,
   removeShortCut,
   editShortCut,
-  removeMuchShortCut
+  removeMuchShortCut,
+  updateSortCut,
 } from "@/utils/shortCutUtils";
 import AutoHideInfo from "@/components/AutoHideInfo";
 import { createNamespacedHelpers } from "vuex";
 import RecipesCom from "../../RecipesView/RecipesCom";
-const { mapState, mapMutations, mapGetters } = createNamespacedHelpers(
-  "recipes"
-);
+const { mapState, mapMutations, mapGetters } =
+  createNamespacedHelpers("recipes");
 import { messageTypes } from "@/utils";
 export default {
   name: "ShortCutCom",
@@ -133,9 +167,9 @@ export default {
       dataList: [],
       modifingId: 0,
       showSearch: false,
-      queryParams:{
-        key: null
-      }
+      queryParams: {
+        key: null,
+      },
     };
   },
   created() {
@@ -144,6 +178,27 @@ export default {
   mounted() {
     window.addEventListener("storage", this.storageListener);
     window.addEventListener("message", this.messageListener);
+
+    Sortable.create(
+      this.$refs.shortCutTable.$el.querySelector(".el-table__body tbody"),
+      {
+        animation: 150,
+        handle: ".handle",
+        draggable: ".draggable",
+        onEnd: (evt) => {
+          const { newIndex, oldIndex } = evt;
+          if (newIndex === oldIndex) {
+            return;
+          }
+          const newDataList = JSON.parse(JSON.stringify(this.dataList));
+          const [tarObj] = newDataList.splice(oldIndex, 1);
+          newDataList.splice(newIndex, 0, tarObj);
+
+          updateSortCut(newDataList);
+          this.dataList = newDataList;
+        },
+      }
+    );
   },
   beforeDestroy() {
     window.removeEventListener("storage", this.storageListener);
@@ -173,8 +228,8 @@ export default {
       getShortCut(this.queryParams.key).then((data) => {
         this.dataList = data;
         //超过10个就显示搜索按钮
-        if(this.dataList && this.dataList.length > 5 && !this.showSearch){
-           this.showSearch = true;
+        if (this.dataList && this.dataList.length > 5 && !this.showSearch) {
+          this.showSearch = true;
         }
         // console.log(this.dataList);
         if (setCurrent) {
@@ -191,24 +246,30 @@ export default {
       });
     },
     handleOnMuchDelete() {
-      if(this.dataList && this.dataList.length > 0){
-         let ids = [];
-         this.dataList.forEach((item,index) => {
-            ids.push(item.id);
-         });
-         this.$confirm("是否确定清除当前 "+ids.length+" 条快捷数据?", "警告", {
+      if (this.dataList && this.dataList.length > 0) {
+        let ids = [];
+        this.dataList.forEach((item, index) => {
+          ids.push(item.id);
+        });
+        this.$confirm(
+          "是否确定清除当前 " + ids.length + " 条快捷数据?",
+          "警告",
+          {
             confirmButtonText: "确定",
             cancelButtonText: "取消",
             type: "warning",
-          }).then(function () {
+          }
+        )
+          .then(function () {
             return removeMuchShortCut(ids);
-          }).then((response) => {
+          })
+          .then((response) => {
             this.getList();
             if (ids.indexOf(this.curShortCutObj.id) != -1) {
               this.setCurShortCutObj({});
             }
           })
-          .catch(function () {});     
+          .catch(function () {});
       }
     },
     handleOnCurrentChange(data) {