vxe-table 4.4.2-beta.2 → 4.4.2-beta.4

package/packages/table/src/table.ts

@@ -849,6 +849,7 @@ export default defineComponent({
             field?: VxeColumnPropTypes.Field
             resizeWidth?: number
             visible?: boolean
+            fixed?: string
           }
         } = {}
         if (!id) {
@@ -868,7 +869,15 @@ export default defineComponent({
         if (isCustomFixed) {
           const columnFixedStorage = getCustomStorageMap(fixedStorageKey)[id]
           if (columnFixedStorage) {
-            // 开发中...
+            const colFixeds = columnFixedStorage.split(',')
+            colFixeds.forEach((fixConf: any) => {
+              const [field, fixed] = fixConf.split('|')
+              if (customMap[field]) {
+                customMap[field].fixed = fixed
+              } else {
+                customMap[field] = { field, fixed }
+              }
+            })
           }
         }
         // 自定义顺序
@@ -910,7 +919,7 @@ export default defineComponent({
             keyMap[colKey] = column
           }
         })
-        XEUtils.each(customMap, ({ visible, resizeWidth }, field) => {
+        XEUtils.each(customMap, ({ visible, resizeWidth, fixed }, field) => {
           const column = keyMap[field]
           if (column) {
             if (XEUtils.isNumber(resizeWidth)) {
@@ -919,6 +928,9 @@ export default defineComponent({
             if (XEUtils.isBoolean(visible)) {
               column.visible = visible
             }
+            if (fixed) {
+              column.fixed = fixed
+            }
           }
         })
       }
@@ -3059,25 +3071,55 @@ export default defineComponent({
           footerData: footerTableData.slice(0)
         }
       },
+      /**
+       * 设置为固定列
+       */
+      setColumnFixed (fieldOrColumn, fixed) {
+        const column = handleFieldOrColumn($xetable, fieldOrColumn)
+        if (column && column.fixed !== fixed) {
+          XEUtils.eachTree([column], (column) => {
+            column.fixed = fixed
+          })
+          tablePrivateMethods.saveCustomFixed()
+          return tableMethods.refreshColumn()
+        }
+        return nextTick()
+      },
+      /**
+       * 取消指定固定列
+       */
+      clearColumnFixed (fieldOrColumn) {
+        const column = handleFieldOrColumn($xetable, fieldOrColumn)
+        if (column && column.fixed) {
+          XEUtils.eachTree([column], (column) => {
+            column.fixed = null
+          })
+          tablePrivateMethods.saveCustomFixed()
+          return tableMethods.refreshColumn()
+        }
+        return nextTick()
+      },
       /**
        * 隐藏指定列
        */
       hideColumn (fieldOrColumn) {
         const column = handleFieldOrColumn($xetable, fieldOrColumn)
-        if (column) {
+        if (column && column.visible) {
           column.visible = false
+          return tablePrivateMethods.handleCustom()
         }
-        return tablePrivateMethods.handleCustom()
+        return nextTick()
       },
       /**
        * 显示指定列
        */
       showColumn (fieldOrColumn) {
         const column = handleFieldOrColumn($xetable, fieldOrColumn)
-        if (column) {
+        if (column && !column.visible) {
           column.visible = true
+          return tablePrivateMethods.handleCustom()
         }
-        return tablePrivateMethods.handleCustom()
+        return nextTick()
       },
       setColumnWidth (fieldOrColumn, width) {
         const column = handleFieldOrColumn($xetable, fieldOrColumn)
@@ -4850,13 +4892,38 @@ export default defineComponent({
           localStorage.setItem(resizableStorageKey, XEUtils.toJSONString(columnWidthStorageMap))
         }
       },
+      saveCustomFixed () {
+        const { id, customConfig } = props
+        const { collectColumn } = internalData
+        const customOpts = computeCustomOpts.value
+        const { storage } = customOpts
+        const isCustomFixed = storage === true || (storage && storage.fixed)
+        if (customConfig && isCustomFixed) {
+          const columnFixedStorageMap = getCustomStorageMap(fixedStorageKey)
+          const colFixeds: any[] = []
+          if (!id) {
+            errLog('vxe.error.reqProp', ['id'])
+            return
+          }
+          XEUtils.eachTree(collectColumn, (column) => {
+            if (column.fixed && column.fixed !== column.defaultFixed) {
+              const colKey = column.getKey()
+              if (colKey) {
+                colFixeds.push(`${colKey}|${column.fixed}`)
+              }
+            }
+          })
+          columnFixedStorageMap[id] = colFixeds.join(',') || undefined
+          localStorage.setItem(fixedStorageKey, XEUtils.toJSONString(columnFixedStorageMap))
+        }
+      },
       saveCustomVisible () {
         const { id, customConfig } = props
         const { collectColumn } = internalData
         const customOpts = computeCustomOpts.value
         const { checkMethod, storage } = customOpts
-        const isVisible = storage === true || (storage && storage.visible)
-        if (customConfig && isVisible) {
+        const isCustomVisible = storage === true || (storage && storage.visible)
+        if (customConfig && isCustomVisible) {
           const columnVisibleStorageMap = getCustomStorageMap(visibleStorageKey)
           const colHides: any[] = []
           const colShows: any[] = []

package/types/table.d.ts

@@ -307,6 +307,16 @@ export interface TablePublicMethods<DT = VxeTableDataRow> {
     tableData: DT[]
     footerData: DT[][]
   }
+  /**
+   * 设置指定列为固定列
+   * @param columnOrField 列对象或字段名
+   */
+  setColumnFixed(fieldOrColumn: VxeColumnPropTypes.Field | VxeTableDefines.ColumnInfo<any>, fixed: VxeColumnPropTypes.Fixed): Promise<void>
+  /**
+   * 取消指定的固定列
+   * @param columnOrField 列对象或字段名
+   */
+  clearColumnFixed(fieldOrColumn: VxeColumnPropTypes.Field | VxeTableDefines.ColumnInfo<any>): Promise<void>
   /**
    * 隐藏指定列
    * @param columnOrField 列对象或字段名
@@ -720,6 +730,7 @@ export interface TablePrivateMethods<D = VxeTableDataRow> {
   cacheRowMap(isSource?: boolean): void
   saveCustomResizable(isReset?: boolean): void
   saveCustomVisible(): void
+  saveCustomFixed(): void
   analyColumnWidth(): void
   checkSelectionStatus(): void
   handleSelectRow(params: any, value: any, isForce?: boolean): void
@@ -2324,6 +2335,7 @@ export namespace VxeTableDefines {
     colSpan: number
     halfVisible: boolean
     defaultVisible: any
+    defaultFixed: any
     checked: boolean
     halfChecked: boolean
     disabled: boolean