Browse Source

增加排序功能,修改错别字 dashbord->dashboard 需更新数据库中base_menu表中 所有的dashbord改为dashboard

QM303176530 5 years ago
parent
commit
30d2c1a472

+ 7 - 1
server/model/sys_api.go

@@ -130,7 +130,13 @@ func (a *SysApi) GetInfoList(info PageInfo, Order string, Desc bool) (err error,
 		} else {
 			db = db.Limit(limit).Offset(offset)
 			if Order != "" {
-				err = db.Order(Order+" desc", true).Find(&apiList).Error
+				var OrderStr string
+				if Desc {
+					OrderStr = Order + " desc"
+				} else {
+					OrderStr = Order
+				}
+				err = db.Order(OrderStr, true).Find(&apiList).Error
 			} else {
 				err = db.Order("api_group", true).Find(&apiList).Error
 			}

+ 13 - 0
web/src/utils/stringFun.js

@@ -0,0 +1,13 @@
+export const toUpperCase = (str) => {
+    if (str[0]) {
+        return str.replace(str[0], str[0].toUpperCase())
+    } else {
+        return ""
+    }
+}
+
+// 驼峰转换下划线
+export const toSQLLine = (str) => {
+    if (str=="ID") return "ID"
+    return str.replace(/([A-Z])/g,"_$1").toLowerCase();
+  }

+ 0 - 7
web/src/utils/toUpperCase.js

@@ -1,7 +0,0 @@
-export const toUpperCase = (str) => {
-    if (str[0]) {
-        return str.replace(str[0], str[0].toUpperCase())
-    } else {
-        return ""
-    }
-}

+ 0 - 0
web/src/view/dashbord/component/animition.vue → web/src/view/dashboard/component/animition.vue


+ 1 - 1
web/src/view/dashbord/index.vue → web/src/view/dashboard/index.vue

@@ -27,7 +27,7 @@
 
 <script>
 import { mapGetters } from 'vuex'
-import Animition from '@/view/dashbord/component/animition.vue'
+import Animition from '@/view/dashboard/component/animition.vue'
 export default {
   name: 'Dashbord',
   data() {

+ 15 - 7
web/src/view/superAdmin/api/api.vue

@@ -26,12 +26,12 @@
         </el-form-item>
       </el-form>
     </div>
-    <el-table :data="tableData" border stripe>
-      <el-table-column label="id" min-width="60" prop="ID"></el-table-column>
-      <el-table-column label="api路径" min-width="150" prop="path"></el-table-column>
-      <el-table-column label="api分组" min-width="150" prop="apiGroup"></el-table-column>
-      <el-table-column label="api简介" min-width="150" prop="description"></el-table-column>
-      <el-table-column label="请求" min-width="150" prop="method">
+    <el-table @sort-change="sortChange" :data="tableData" border stripe>
+      <el-table-column sortable="custom" label="id" min-width="60" prop="ID"></el-table-column>
+      <el-table-column sortable="custom" label="api路径" min-width="150" prop="path"></el-table-column>
+      <el-table-column sortable="custom" label="api分组" min-width="150" prop="apiGroup"></el-table-column>
+      <el-table-column sortable="custom" label="api简介" min-width="150" prop="description"></el-table-column>
+      <el-table-column sortable="custom" label="请求" min-width="150" prop="method">
         <template slot-scope="scope">
           <div>
             {{scope.row.method}}
@@ -107,7 +107,7 @@ import {
   deleteApi
 } from '@/api/api'
 import infoList from '@/components/mixins/infoList'
-
+import {toSQLLine} from '@/utils/stringFun'
 const methodOptions = [
   {
     value: 'POST',
@@ -160,6 +160,14 @@ export default {
     }
   },
   methods: {
+    // 排序
+    sortChange({prop,order}){
+      if(prop){
+        this.searchInfo.orderKey = toSQLLine(prop)
+        this.searchInfo.desc = order=="descending"
+      }
+     this.getTableData()
+    },
     //条件搜索前端看此方法
     onSubmit() {
       this.page = 1

+ 1 - 1
web/src/view/systemTools/autoCode/index.vue

@@ -80,7 +80,7 @@ const fieldTemplate={
         }
 
 import FieldDialog from "@/view/systemTools/autoCode/component/fieldDialog.vue"
-import {toUpperCase} from "@/utils/toUpperCase.js"
+import {toUpperCase} from "@/utils/stringFun.js"
 import {createTemp} from "@/api/autoCode.js"
 export default {
     name:"autoCode",