Merge branch 'main' of http://github.com/ideal-world/task-table

Author: akfdwjx

src/components/layout/list/List.vue

@@ -98,7 +98,7 @@ onMounted(() => {
     :class="`iw-list iw-row-select-container relative iw-list--size${props.tableConf.styles.size}`"
     :style="setTableWidth()"
   >
-    <HeaderComp :columns-conf="props.columnsConf" :layout-conf="props.layoutConf" :table-conf="props.tableConf" :set-column-styles="setColumnStyles" />
+    <HeaderComp :columns-conf="props.columnsConf" :layout-conf="props.layoutConf" :table-conf="props.tableConf" :set-column-styles="setColumnStyles" :sort="layoutConf.sort" />
     <!-- 不分组模式 -->
     <!-- Non-grouping mode -->
     <template v-if="props.layoutConf.data && !Array.isArray(props.layoutConf.data)">

src/components/layout/list/ListHeader.vue

@@ -8,6 +8,12 @@ import ColumnResizeComp from '../../function/ColumnResize.vue'
 import ColumnFixedComp from './ListColumnFixed.vue'
 import ColumnWrapComp from './ListColumnWrap.vue'
 
+enum ORDER_ENUM {
+  POSITIVE_SORT = false, //正序
+  INVERT_SORT= true, //倒序
+  UNDEFINED = null //不排序
+}
+
 const props = defineProps<{
   // 列配置
   // Column configuration
@@ -74,6 +80,24 @@ const cateColumns = computed(() => {
   return cateColumns
 })
 
+/**
+ * 组装sort数据到columns（sort: { enabledColumnNames: ['no'], items: [{ columnName: 'no', orderDesc: false }] }）
+ * Assemble sort data into columns
+ */
+const columnsWithSort = computed(()=> {
+
+  return props.columnsConf.map(e=> {
+    const canSort = props.layoutConf.sort.enabledColumnNames.includes(e.name);
+    if(canSort) {
+      return {
+        ...e,
+        orderDesc: props.layoutConf.sort.items?.find(f=> f.columnName === e.name)?.orderDesc ?? ORDER_ENUM.UNDEFINED
+      }
+    }
+    return e;
+  })
+})
+
 /**
  * 设置新的列宽
  *
@@ -94,6 +118,44 @@ async function setNewWidth(newWidth: number, columnName?: string) {
     await eb.modifyLayout(changedLayoutReq)
   }
 }
+
+/**
+ * 排序事件 sort event
+ * @param column 列
+ */
+function handleSort(column) {
+  const { orderDesc , name } = column;
+  const items = props.layoutConf.sort?.items || [];
+  const currentIndex = items?.findIndex(f=> f.columnName === name)
+  const currentItem = items?.find(f=> f.columnName === name)
+  if(currentItem) {//存在修改 exist modify
+    switch(orderDesc){
+      case ORDER_ENUM.POSITIVE_SORT: 
+        currentItem.orderDesc = ORDER_ENUM.INVERT_SORT;
+        break;
+      case ORDER_ENUM.INVERT_SORT: 
+        items.splice(currentIndex, 1)
+        // currentItem.orderDesc = ORDER_ENUM.UNDEFINED;
+        break;
+      case ORDER_ENUM.UNDEFINED: 
+        currentItem.orderDesc = ORDER_ENUM.POSITIVE_SORT;
+        break;
+      
+    }
+  }else {//不存在添加 no exist add
+    items.push({
+      columnName: column.name,
+      orderDesc: ORDER_ENUM.POSITIVE_SORT,
+    })
+  }
+  
+  eb.modifyLayout({
+    sort: {
+      enabledColumnNames: props.layoutConf.sort.enabledColumnNames,
+      items,
+    },
+  })
+}
 </script>
 
 <template>
@@ -144,14 +206,18 @@ async function setNewWidth(newWidth: number, columnName?: string) {
       <!-- 数据列 -->
       <!-- Data column -->
       <div
-        v-for="(column, colIdx) in columnsConf" :key="`${props.layoutConf.id}-${column.name}`"
+        v-for="(column, colIdx) in columnsWithSort" :key="`${props.layoutConf.id}-${column.name}`"
         :class="`${props.tableConf.styles.cellClass} iw-list-cell iw-resize-item flex items-center bg-base-200 ${(colIdx !== 0 || props.layoutConf.showSelectColumn) && 'border-l border-l-base-300'} whitespace-nowrap overflow-hidden text-ellipsis flex-nowrap hover:cursor-pointer`"
         :data-column-name="column.name"
         :style="props.setColumnStyles(colIdx)"
         :title="column.title"
         @click="(event: MouseEvent) => showHeaderContextMenu(event, column.name)"
       >
         <i :class="`${column.icon} mr-1`" /> {{ column.title }}
+        <div v-if="column.hasOwnProperty('orderDesc')" class="sort-box flex flex-col items-center justify-center ml-2" @click.stop="handleSort(column)">
+          <i class="sort-icon octicon-chevron-up-12" :class="`${column.orderDesc === false ? 'text-primary' : ''}`" />
+          <i class="sort-icon octicon-chevron-down-12 mt-[-12px]" :class="column.orderDesc ? 'text-primary' : ''" />
+        </div>
       </div>
       <!-- 操作列 -->
       <!-- Action column -->