vxe-table 4.16.19 → 4.17.0-beta.0

package/packages/table/src/table.ts

@@ -151,9 +151,7 @@ export default defineVxeComponent({
         isAllSelected: false,
         isIndeterminate: false,
         style: null,
-        options: [],
         column: null,
-        multiple: false,
         visible: false,
         maxHeight: null
       },
@@ -613,6 +611,10 @@ export default defineVxeComponent({
       return Object.assign({}, getConfig().table.filterConfig, props.filterConfig) as VxeTablePropTypes.FilterOpts
     })
 
+    const computeFloatingFilterOpts = computed(() => {
+      return Object.assign({}, getConfig().table.floatingFilterConfig, props.floatingFilterConfig)
+    })
+
     const computeMouseOpts = computed(() => {
       return Object.assign({}, getConfig().table.mouseConfig, props.mouseConfig) as VxeTablePropTypes.MouseOpts
     })
@@ -910,6 +912,7 @@ export default defineVxeComponent({
       computeEditOpts,
       computeSortOpts,
       computeFilterOpts,
+      computeFloatingFilterOpts,
       computeMouseOpts,
       computeAreaOpts,
       computeKeyboardOpts,
@@ -1785,7 +1788,7 @@ export default defineVxeComponent({
           fullColFieldData[field] = rest
         } else {
           if (storage && !type) {
-            errLog('vxe.error.reqSupportProp', ['storage', `${column.getTitle() || type || ''} -> field=?`])
+            errLog('vxe.error.reqSupportProp', ['storage', `[${type ? `type=${type}` : `title=${column.getTitle()}`}]field=?`])
           }
           if (columnOpts.drag && (isCrossDrag || isSelfToChildDrag)) {
             errLog('vxe.error.reqSupportProp', ['column-drag-config.isCrossDrag | column-drag-config.isSelfToChildDrag', `${column.getTitle() || type || ''} -> field=?`])
@@ -6372,7 +6375,7 @@ export default defineVxeComponent({
       setFilterByEvent (evnt, fieldOrColumn, options) {
         const column = handleFieldOrColumn($xeTable, fieldOrColumn)
         if (column && column.filters) {
-          column.filters = toFilters(options || [])
+          column.filters = toFilters(options || [], column.id)
           return $xeTable.handleColumnConfirmFilter(column, evnt)
         }
         return nextTick()
@@ -6386,13 +6389,13 @@ export default defineVxeComponent({
         const { column, visible } = filterStore
         filterStore.isAllSelected = false
         filterStore.isIndeterminate = false
-        filterStore.options = []
         filterStore.visible = false
         if (visible) {
+          const field = column ? column.field : null
           dispatchEvent('filter-visible', {
             column,
-            property: column.field,
-            field: column.field,
+            property: field,
+            field,
             filterList: () => $xeTable.getCheckedFilters(),
             visible: false
           }, null)
@@ -7457,7 +7460,7 @@ export default defineVxeComponent({
      * 全局按下事件处理
      */
     const handleGlobalMousedownEvent = (evnt: MouseEvent) => {
-      const { editStore, ctxMenuStore, filterStore, customStore } = reactData
+      const { editStore, ctxMenuStore, customStore } = reactData
       const { mouseConfig, editRules } = props
       const el = refElem.value
       const editOpts = computeEditOpts.value
@@ -7476,7 +7479,7 @@ export default defineVxeComponent({
           // 如果点击筛选容器
         } else {
           if (!getEventTargetNode(evnt, document.body, 'vxe-table--ignore-clear').flag) {
-            tablePrivateMethods.preventEvent(evnt, 'event.clearFilter', filterStore.args, tableMethods.closeFilter)
+            tablePrivateMethods.preventEvent(evnt, 'event.clearFilter', internalData._currFilterParams, tableMethods.closeFilter)
           }
         }
       }
@@ -8972,24 +8975,25 @@ export default defineVxeComponent({
         reactData.reColumnFlag++
       },
       handleFilterOptions (column) {
-        const { filterStore } = reactData
-        const { filters, filterMultiple, filterRender } = column
-        const compConf = isEnableConf(filterRender) ? renderer.get(filterRender.name) : null
-        const frMethod = column.filterRecoverMethod || (compConf ? (compConf.tableFilterRecoverMethod || compConf.filterRecoverMethod) : null)
-        filterStore.multiple = filterMultiple
-        filterStore.options = filters
-        filterStore.column = column
-        // 复原状态
-        filterStore.options.forEach((option: any) => {
-          const { _checked, checked } = option
-          option._checked = checked
-          if (!checked && _checked !== checked) {
-            if (frMethod) {
-              frMethod({ option, column, $table: $xeTable })
+        if (column) {
+          const { filterStore } = reactData
+          const { filterRender, filters } = column
+          const filterOptions = filters || []
+          const compConf = isEnableConf(filterRender) ? renderer.get(filterRender.name) : null
+          const frMethod = column.filterRecoverMethod || (compConf ? (compConf.tableFilterRecoverMethod || compConf.filterRecoverMethod) : null)
+          filterStore.column = column
+          // 复原状态
+          filterOptions.forEach((option: any) => {
+            const { _checked, checked } = option
+            option._checked = checked
+            if (!checked && _checked !== checked) {
+              if (frMethod) {
+                frMethod({ option, column, $table: $xeTable })
+              }
             }
-          }
-        })
-        $xeTable.checkFilterOptions()
+          })
+          $xeTable.checkFilterOptions()
+        }
       },
       preventEvent (evnt, type, args, next, end) {
         let evntList = interceptor.get(type)

package/packages/table/src/util.ts

@@ -408,11 +408,14 @@ function getElementMarginAndWidth (elem: HTMLElement | null) {
   return 0
 }
 
-export function toFilters (filters: any) {
-  if (filters && XEUtils.isArray(filters)) {
-    return filters.map(({ label, value, data, resetValue, checked }) => {
-      return { label, value, data, resetValue, checked: !!checked, _checked: !!checked }
-    })
+export function toFilters (filters: any, colid?: string) {
+  if (filters) {
+    if (XEUtils.isArray(filters)) {
+      return filters.map(({ label, value, data, resetValue, checked }) => {
+        return { label, value, data, resetValue, checked: !!checked, _checked: !!checked, _colId: colid }
+      })
+    }
+    return []
   }
   return filters
 }

package/packages/ui/index.ts

@@ -156,6 +156,9 @@ VxeUI.setConfig({
       multiple: true,
       showIcon: true
     },
+    floatingFilterConfig: {
+      // enabled: false
+    },
     aggregateConfig: {
       padding: true,
       rowField: 'id',

package/packages/ui/src/vn.ts

@@ -32,6 +32,18 @@ export function getChangeEvent (renderOpts: VxeGlobalRendererHandles.RenderOptio
   return 'change'
 }
 
+export function hasInputType (renderOpts: VxeGlobalRendererHandles.RenderOptions) {
+  switch (renderOpts.name) {
+    case 'VxeInput':
+    case 'VxeNumberInput':
+    case 'VxeTextarea':
+    case '$input':
+    case '$textarea':
+      return true
+  }
+  return false
+}
+
 export function getSlotVNs (vns: VxeComponentSlotType | VxeComponentSlotType[]) {
   if (vns === null || vns === undefined) {
     return []

package/styles/components/table-module/filter.scss

@@ -41,7 +41,10 @@
   box-shadow: var(--vxe-ui-base-popup-box-shadow);
   z-index: 10;
   &:not(.is--multiple) {
-    text-align: center;
+    .vxe-table--filter-header,
+    .vxe-table--filter-body {
+      text-align: center;
+    }
   }
   &.is--active {
     display: block;