Merge branch 'main' of https://gitea.frp.extimaging.com/XCKJ/irc_web into main

src/App.vue

@@ -62,12 +62,14 @@
         v-adaptive="{ bottomOffset: 50 }"
         height="100"
         style="width: 100%"
+        @sort-change="handleSortByColumn"
       >
         <el-table-column
           prop="Code"
           :label="$t('il8n:table:label')"
           width="300"
           show-overflow-tooltip
+          sortable="custom"
         >
         </el-table-column>
         <!--        <el-table-column-->
@@ -79,7 +81,11 @@
         <!--            {{scope.row.Description}}-->
         <!--          </template>-->
         <!--        </el-table-column>-->
-        <el-table-column prop="Value" :label="$t('il8n:table:en')">
+        <el-table-column
+          prop="Value"
+          :label="$t('il8n:table:en')"
+          sortable="custom"
+        >
           <template slot-scope="scope">
             <el-input
               v-model="scope.row.Value"
@@ -92,7 +98,11 @@
             ></el-input>
           </template>
         </el-table-column>
-        <el-table-column prop="ValueCN" :label="$t('il8n:table:cn')">
+        <el-table-column
+          prop="ValueCN"
+          :label="$t('il8n:table:cn')"
+          sortable="custom"
+        >
           <template slot-scope="scope">
             <el-input
               v-model="scope.row.ValueCN"
@@ -105,7 +115,11 @@
             ></el-input>
           </template>
         </el-table-column>
-        <el-table-column prop="ValueCN" :label="$t('il8n:table:state')">
+        <el-table-column
+          prop="ValueCN"
+          :label="$t('il8n:table:state')"
+          sortable="custom"
+        >
           <template slot-scope="scope">
             <el-select
               v-model="scope.row.State"
@@ -122,7 +136,11 @@
             </el-select>
           </template>
         </el-table-column>
-        <el-table-column prop="Version" :label="$t('il8n:table:Version')">
+        <el-table-column
+          prop="Version"
+          :label="$t('il8n:table:Version')"
+          sortable="custom"
+        >
         </el-table-column>
       </el-table>
       <div style="text-align: right; padding-top: 10px; padding-right: 10px">
@@ -195,6 +213,18 @@ export default {
   //   },
   // },
   methods: {
+    // 排序
+    handleSortByColumn(column) {
+      if (column.order === 'ascending') {
+        this.tableData.sort((a, b) =>
+          a[column.prop].localeCompare(b[column.prop])
+        )
+      } else {
+        this.tableData.sort((a, b) =>
+          b[column.prop].localeCompare(a[column.prop])
+        )
+      }
+    },
     handleStateChange() {
       this.tableData.forEach((item) => {
         item.State = this.State

src/views/trials/trials-panel/trial-summary/trial-document/components/uploadFiles.vue

@@ -14,6 +14,7 @@
             class="upload"
             style="margin-right: 10px"
             :disabled="limitLength"
+            v-if="!limitLength"
           >
             <input
               multiple="multiple"
@@ -25,7 +26,11 @@
               class="select-file"
               title=""
               @change="beginScanFiles($event)"
-              v-if="!loading && (!limitLength || fileList.length < limitLength)"
+              v-if="
+                !loading &&
+                (!limitLength ||
+                  (fileList.length < limitLength && limitLength > 1))
+              "
             />
             <div class="btn-select">
               {{ $t('trials:trialDocument:button:selectFolder') }}