From c228013bbaec57184db372ffbc4f3f86de6990fa Mon Sep 17 00:00:00 2001
From: zhangtianli2006 <49156174+zhangtianli2006@users.noreply.github.com>
Date: Thu, 13 Aug 2020 15:41:38 +0800
Subject: [PATCH 1/7] add sort to table

Signed-off-by: zhangtianli2006 <49156174+zhangtianli2006@users.noreply.github.com>
---
 src/components/lib/AjaxTable.vue | 10 +++++++++-
 src/components/problem/list.vue  | 11 ++++++++---
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/src/components/lib/AjaxTable.vue b/src/components/lib/AjaxTable.vue
index 6f9d2fc6..3108c0ac 100644
--- a/src/components/lib/AjaxTable.vue
+++ b/src/components/lib/AjaxTable.vue
@@ -1,6 +1,10 @@
 <template>
   <div class="ajax-table">
-    <el-table v-loading="loading" :data="tableData">
+    <el-table
+      v-loading="loading"
+      :data="tableData"
+      :default-sort="default_sort"
+    >
       <el-table-column
         v-for="item in columns"
         :key="item"
@@ -9,6 +13,7 @@
         :width="item.width"
         :align="item.align"
         :header-align="item.headerAlign"
+        :sortable="item.sortable"
       />
     </el-table>
     <el-pagination
@@ -87,6 +92,9 @@ export default {
     process: {
       type: Function,
       default: x => x
+    },
+    default_sort: {
+      
     }
   },
 };
diff --git a/src/components/problem/list.vue b/src/components/problem/list.vue
index 82edbf71..1a69e838 100644
--- a/src/components/problem/list.vue
+++ b/src/components/problem/list.vue
@@ -46,6 +46,7 @@
         :limit="limit"
         :total="data_count"
         :process="process"
+        :default_sort="{prop: 'pid', order: 'ascending'}"
       />
     </el-card>
   </div>
@@ -69,19 +70,23 @@ export default {
         name: 'score',
         label: 'Status',
         width: '120',
-        align: 'center'
+        align: 'center',
+        sortable: true
       }, {
         name: 'pid',
         label: 'Problem ID',
         width: '120',
-        align: 'center'
+        align: 'center',
+        sortable: true
       }, {
         name: 'title',
-        label: 'Title'
+        label: 'Title',
+        sortable: false
       }, {
         name: 'tag',
         width: '400',
         align: 'right',
+        sortable: false
       }],
       data_count: 10
     };

From dec88581c1eb77bff7a6e25b9d3b751a12a0744d Mon Sep 17 00:00:00 2001
From: zhangtianli2006 <49156174+zhangtianli2006@users.noreply.github.com>
Date: Thu, 13 Aug 2020 16:25:41 +0800
Subject: [PATCH 2/7] add search problem

Signed-off-by: zhangtianli2006 <49156174+zhangtianli2006@users.noreply.github.com>
---
 src/StringPrototype.js           |  6 +++++-
 src/components/lib/AjaxTable.vue | 12 ++++++++++--
 src/components/problem/list.vue  | 19 +++++++++++++++++++
 src/components/user/edit.vue     |  1 +
 4 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/src/StringPrototype.js b/src/StringPrototype.js
index 6e4b7bc1..f2bbf596 100644
--- a/src/StringPrototype.js
+++ b/src/StringPrototype.js
@@ -20,4 +20,8 @@ if (String.prototype.replaceAll === undefined) {
     
     return res;
   };
-}
\ No newline at end of file
+}
+
+String.prototype.trim = function () {
+  return this.replace(/(^\s*)|(\s*$)/g, '');
+};
\ No newline at end of file
diff --git a/src/components/lib/AjaxTable.vue b/src/components/lib/AjaxTable.vue
index bd67b553..05341e5e 100644
--- a/src/components/lib/AjaxTable.vue
+++ b/src/components/lib/AjaxTable.vue
@@ -41,6 +41,9 @@ export default {
   watch: {
     limit() {
       this.onPageChange(this.pageId);
+    },
+    title() {
+      this.load_data();
     }
   },
   methods: {
@@ -56,7 +59,8 @@ export default {
         .get(this.ajax_url, {
           params: {
             offset: this.offset,
-            limit: this.limit
+            limit: this.limit,
+            title: this.title
           }
         })
         .then(res => {
@@ -88,6 +92,9 @@ export default {
       type: Number,
       default: 20
     },
+    title: {
+      type: String
+    },
     total: {
       type: Number,
       required: true
@@ -97,7 +104,8 @@ export default {
       default: x => x
     },
     default_sort: {
-      
+      type: Object,
+      default: null
     }
   },
 };
diff --git a/src/components/problem/list.vue b/src/components/problem/list.vue
index 9b86dbcf..ae58c6d1 100644
--- a/src/components/problem/list.vue
+++ b/src/components/problem/list.vue
@@ -3,6 +3,18 @@
     <el-row :gutter="20">
       <el-col :span="10">
         <el-card>
+          <i class="el-icon-search" />
+          Search
+          <el-input
+            placeholder="Search"
+            v-model="searchTitle"
+            class="input-with-select" 
+            style="margin-top: 9px;"
+            @clear="search"
+            clearable
+          >
+            <el-button slot="append" icon="el-icon-check" @click="search"></el-button>
+          </el-input>
         </el-card>
       </el-col>
       <el-col :span="6">
@@ -47,6 +59,7 @@
         :total="data_count"
         :process="process"
         :default_sort="{prop: 'pid', order: 'ascending'}"
+        :title="title"
       />
     </el-card>
   </div>
@@ -65,6 +78,8 @@ export default {
       alive: true,
       ajax_url: apiurl('/problem/list'),
       limit: 50,
+      searchTitle: '',
+      title: null,
       showTags: this.$store.state.tags.displayTags,
       columns: [{
         name: 'score',
@@ -123,6 +138,10 @@ export default {
       x.tag = (<listTag tags={ x.tags }></listTag>);
       
       return x;
+    },
+    search() {
+      this.searchTitle = this.searchTitle.trim();
+      this.title = this.searchTitle;
     }
   },
   components: {
diff --git a/src/components/user/edit.vue b/src/components/user/edit.vue
index ea4d666a..edcf2cd3 100644
--- a/src/components/user/edit.vue
+++ b/src/components/user/edit.vue
@@ -165,6 +165,7 @@ export default {
           }
         })
         .catch(err => {
+          this.buttonLoading = false;
           if (err.request.status === 404) {
             this.$SegmentMessage.error(this, 'User not found');
           } else if (err.request.status === 403) {

From 0c765bacacf4b8a635ee7c82c21be36f8ce467d2 Mon Sep 17 00:00:00 2001
From: zhangtianli2006 <49156174+zhangtianli2006@users.noreply.github.com>
Date: Thu, 13 Aug 2020 16:32:12 +0800
Subject: [PATCH 3/7] fix jump to problem none intitger bug

Signed-off-by: zhangtianli2006 <49156174+zhangtianli2006@users.noreply.github.com>
---
 src/components/lib/jumpToProblem.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/lib/jumpToProblem.vue b/src/components/lib/jumpToProblem.vue
index ce8465c4..b3e30afe 100644
--- a/src/components/lib/jumpToProblem.vue
+++ b/src/components/lib/jumpToProblem.vue
@@ -26,6 +26,7 @@ export default {
   },
   methods: {
     jump() {
+      this.jumpToProblem = String(parseInt(this.jumpToProblem.trim()));
       this.$router.push('/problem/' + this.jumpToProblem);
     }
   }

From fe69f904fa2bdea102fe9047e1acbe51afa2f825 Mon Sep 17 00:00:00 2001
From: szdytom <33175397+szdytom@users.noreply.github.com>
Date: Thu, 13 Aug 2020 16:41:56 +0800
Subject: [PATCH 4/7] Update src/components/lib/AjaxTable.vue

---
 src/components/lib/AjaxTable.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/lib/AjaxTable.vue b/src/components/lib/AjaxTable.vue
index 05341e5e..68bdf9f3 100644
--- a/src/components/lib/AjaxTable.vue
+++ b/src/components/lib/AjaxTable.vue
@@ -42,7 +42,7 @@ export default {
     limit() {
       this.onPageChange(this.pageId);
     },
-    title() {
+    costumData() {
       this.load_data();
     }
   },
@@ -117,4 +117,4 @@ export default {
     margin-top: 20px;
     text-align: center;
 }
-</style>
\ No newline at end of file
+</style>

From 72c8ba74f196e7573d2f793894beb2290f20eff2 Mon Sep 17 00:00:00 2001
From: szdytom <33175397+szdytom@users.noreply.github.com>
Date: Thu, 13 Aug 2020 16:42:04 +0800
Subject: [PATCH 5/7] Update src/components/problem/list.vue

---
 src/components/problem/list.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/problem/list.vue b/src/components/problem/list.vue
index ae58c6d1..0ae484d8 100644
--- a/src/components/problem/list.vue
+++ b/src/components/problem/list.vue
@@ -59,7 +59,7 @@
         :total="data_count"
         :process="process"
         :default_sort="{prop: 'pid', order: 'ascending'}"
-        :title="title"
+        :costumData="{title:this.title}"
       />
     </el-card>
   </div>

From 45724b844d8631437ab190bf88909b9f469e2e83 Mon Sep 17 00:00:00 2001
From: szdytom <33175397+szdytom@users.noreply.github.com>
Date: Thu, 13 Aug 2020 16:42:11 +0800
Subject: [PATCH 6/7] Update src/components/lib/AjaxTable.vue

---
 src/components/lib/AjaxTable.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/lib/AjaxTable.vue b/src/components/lib/AjaxTable.vue
index 68bdf9f3..463d9c53 100644
--- a/src/components/lib/AjaxTable.vue
+++ b/src/components/lib/AjaxTable.vue
@@ -60,7 +60,7 @@ export default {
           params: {
             offset: this.offset,
             limit: this.limit,
-            title: this.title
+            ...this.costumData
           }
         })
         .then(res => {

From 6cc0a6efe0739eee7a07780b231d7eef0ccbb4e7 Mon Sep 17 00:00:00 2001
From: szdytom <33175397+szdytom@users.noreply.github.com>
Date: Thu, 13 Aug 2020 16:42:21 +0800
Subject: [PATCH 7/7] Update src/components/lib/AjaxTable.vue

---
 src/components/lib/AjaxTable.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/lib/AjaxTable.vue b/src/components/lib/AjaxTable.vue
index 463d9c53..17066e09 100644
--- a/src/components/lib/AjaxTable.vue
+++ b/src/components/lib/AjaxTable.vue
@@ -92,8 +92,8 @@ export default {
       type: Number,
       default: 20
     },
-    title: {
-      type: String
+    costumData: {
+      type: Object
     },
     total: {
       type: Number,