dashboard-shell-shell 3.0.5-test.6 → 3.0.5-test.9

package/components/SortableTable/THead.vue

@@ -237,7 +237,7 @@ export default {
         v-if="subExpandColumn"
         :width="expandWidth"
       />
-      <th
+      <!-- <th
         v-for="(col) in columns"
         v-show="!hasAdvancedFiltering || (hasAdvancedFiltering && col.isColVisible)"
         :key="col.name"
@@ -250,6 +250,20 @@ export default {
         @click.prevent="changeSort($event, col)"
         @keyup.enter="changeSort($event, col)"
         @keyup.space="changeSort($event, col)"
+      > -->
+      <th
+        v-for="(col) in columns"
+        v-show="!hasAdvancedFiltering || (hasAdvancedFiltering && col.isColVisible)"
+        :key="col.name"
+        :align="'left'"
+        :width="col.width"
+        :class="{ sortable: col.sort, [col.breakpoint]: !!col.breakpoint}"
+        :tabindex="col.sort ? 0 : -1"
+        class="sortable-table-head-element"
+        :aria-sort="ariaSort(col)"
+        @click.prevent="changeSort($event, col)"
+        @keyup.enter="changeSort($event, col)"
+        @keyup.space="changeSort($event, col)"
       >
         <div
           class="table-header-container"
@@ -260,6 +274,12 @@ export default {
             class="content"
           >
             <span
+              v-if="(col.name === 'harvester' || col.name === 'explorer') && col.label === ' '"
+            >
+              管理
+            </span>
+            <span
+              v-if="!((col.name === 'harvester' || col.name === 'explorer') && col.label === ' ')"
               v-clean-html="labelFor(col)"
               class="text-no-break"
             />
@@ -299,6 +319,7 @@ export default {
       <th
         v-if="rowActions && hasAdvancedFiltering && tableColsOptions.length"
         :width="rowActionsWidth"
+        :align="'left'"
       >
         <div
           ref="table-options"
@@ -357,10 +378,17 @@ export default {
           </div>
         </div>
       </th>
+      <!-- <th
+        v-else-if="rowActions"
+        :width="rowActionsWidth"
+      /> -->
       <th
         v-else-if="rowActions"
         :width="rowActionsWidth"
-      />
+        :align="'left'"
+      >
+        操作
+      </th>
     </tr>
   </thead>
 </template>
@@ -440,7 +468,7 @@ export default {
     }
 
     th {
-      padding: 8px 5px;
+      padding: 16.5px 5px;
       font-weight: normal;
       border: 0;
       color: var(--body-text);
@@ -479,6 +507,8 @@ export default {
 
       &:last-child {
         padding-right: 10px;
+        padding-left: 12px;
+        width: 200px;
       }
 
       &:not(.sortable) > SPAN {