solve conflict

Signed-off-by: zhangtianli2006 <49156174+zhangtianli2006@users.noreply.github.com>

Author: ZTL-UwU

package.json

@@ -15,6 +15,7 @@
     "dompurify": "^2.0.12",
     "element-ui": "^2.13.2",
     "highlight.js": "^10.1.1",
+    "js-sha256": "^0.9.0",
     "marked": "^1.1.1",
     "simplemde": "^1.11.2",
     "vue": "^2.6.11",

src/StringPrototype.js

@@ -22,6 +22,8 @@ if (String.prototype.replaceAll === undefined) {
   };
 }
 
-String.prototype.trim = function () {
-  return this.replace(/(^\s*)|(\s*$)/g, '');
-};
+if (String.prototype.trim === undefined) {
+  String.prototype.trim = function () {
+    return this.replace(/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g, '');
+  };
+}

src/components/lib/AjaxTable.vue

@@ -22,7 +22,7 @@
       layout="prev, pager, next, jumper"
       @current-change="this.onPageChange"
       class="pagination"
-      :total="this.total"
+      :total="this.own_total"
     />
   </div>
 </template>
@@ -36,14 +36,20 @@ export default {
       tableData: null,
       offset: 0,
       pageId: 1,
+      own_total: this.total,
     };
   },
   watch: {
     limit() {
       this.onPageChange(this.pageId);
+      console.log(this.limit);
     },
-    costumData() {
-      this.load_data();
+    costumData(new_val, old_val) {
+      let json_new_val = JSON.stringify(new_val);
+      let json_old_val = JSON.stringify(old_val);
+      if (json_new_val != json_old_val) {
+        this.onPageChange(1);
+      }
     }
   },
   methods: {
@@ -65,7 +71,7 @@ export default {
         })
         .then(res => {
           if (limit === this.limit) {
-            this.total = res.data.count;
+            this.own_total = res.data.count;
             this.tableData = res.data.res.map(this.process);
             this.loading = false;
           }

src/components/problem/edit.vue

@@ -107,12 +107,15 @@ import apiurl from './../../apiurl';
 import MarkdownEditor from './../lib/MarkdownEditor.vue';
 import ConfirmDelete from './../lib/confirmDelete.vue';
 
+import sha256 from 'js-sha256';
+
 export default {
   name: 'ProblemEdit',
   data() {
     return {
       title: '',
       mdContent: 'Loading...',
+      mdContent_sha256: null,
       contentLoading: true,
       time: 'Unknown',
       memery: 'Unknown',
@@ -136,6 +139,7 @@ export default {
           this.disable = !data.enabled;
           this.html = data.allow_html;
           this.contentLoading = false;
+          this.mdContent_sha256 = sha256(this.mdContent);
           this.$axios
             .get(apiurl('/problem/' + String(this.$route.params.id) + '/description'))
             .then(detail => {
@@ -156,15 +160,19 @@ export default {
       this.$router.push('/problem/' + this.$route.params.id);
     },
     submit() {
+      let request_data = {
+        title: this.title,
+        memory_limit: this.memery * 1000,
+        time_limit: this.time,
+        allow_html: this.html,
+        enabled: !this.disable
+      };
+      if(sha256(this.mdContent) !== this.mdContent_sha256) {
+        request_data['description'] = this.mdContent;
+      }
+      this.mdContent_sha256 = sha256(this.mdContent);
       this.$axios
-        .patch(apiurl('/problem/' + this.$route.params.id), {
-          title: this.title,
-          description: this.mdContent,
-          memory_limit: this.memery * 1000,
-          time_limit: this.time,
-          allow_html: this.html,
-          enabled: !this.disable
-        })
+        .patch(apiurl('/problem/' + this.$route.params.id), request_data)
         .then(() => {
           this.$SegmentMessage.success(this, 'Your changes have been submitted');
         })

src/components/problem/list.vue

@@ -10,10 +10,8 @@
             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>
@@ -59,7 +57,7 @@
         :total="data_count"
         :process="process"
         :default_sort="{prop: 'pid', order: 'ascending'}"
-        :costumData="{title:this.title}"
+        :costumData="{title:title}"
       />
     </el-card>
   </div>
@@ -79,7 +77,6 @@ export default {
       ajax_url: apiurl('/problem/list'),
       limit: 50,
       searchTitle: '',
-      title: null,
       showTags: this.$store.state.tags.displayTags,
       columns: [{
         name: 'score',
@@ -114,7 +111,12 @@ export default {
     },
     limit(val) {
       this.set_column(val);
-    }
+    },
+  },
+  computed: {
+    title() {
+      return this.searchTitle.trim();
+    },
   },
   methods: {
     get_list_lenth() {
@@ -174,10 +176,6 @@ export default {
       
       return x;
     },
-    search() {
-      this.searchTitle = this.searchTitle.trim();
-      this.title = this.searchTitle;
-    }
   },
   components: {
     AjaxTable,